friendly 0.5.1 → 0.6.0

data/Rakefile

@@ -15,9 +15,9 @@ begin
     gem.add_development_dependency "jferris-mocha"
     gem.add_development_dependency "memcached"
     gem.add_dependency "sequel", ">= 3.7.0"
-    gem.add_dependency "json_pure"
-    gem.add_dependency "activesupport"
+    gem.add_dependency "activesupport", "=2.3.5"
     gem.add_dependency "will_paginate"
+    gem.add_dependency "rufus-json", "=0.2.3"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0

data/friendly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{friendly}
-  s.version = "0.5.1"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Golick"]
-  s.date = %q{2010-01-25}
+  s.date = %q{2010-07-02}
   s.description = %q{}
   s.email = %q{jamesgolick@gmail.com}
   s.extra_rdoc_files = [
@@ -156,7 +156,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://friendlyorm.com}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{NoSQL with MySQL in Ruby}
   s.test_files = [
     "spec/fakes/data_store_fake.rb",
@@ -207,24 +207,24 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<jferris-mocha>, [">= 0"])
       s.add_development_dependency(%q<memcached>, [">= 0"])
       s.add_runtime_dependency(%q<sequel>, [">= 3.7.0"])
-      s.add_runtime_dependency(%q<json_pure>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, ["= 2.3.5"])
       s.add_runtime_dependency(%q<will_paginate>, [">= 0"])
+      s.add_runtime_dependency(%q<rufus-json>, ["= 0.2.3"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<jferris-mocha>, [">= 0"])
       s.add_dependency(%q<memcached>, [">= 0"])
       s.add_dependency(%q<sequel>, [">= 3.7.0"])
-      s.add_dependency(%q<json_pure>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<activesupport>, ["= 2.3.5"])
       s.add_dependency(%q<will_paginate>, [">= 0"])
+      s.add_dependency(%q<rufus-json>, ["= 0.2.3"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
@@ -232,9 +232,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jferris-mocha>, [">= 0"])
     s.add_dependency(%q<memcached>, [">= 0"])
     s.add_dependency(%q<sequel>, [">= 3.7.0"])
-    s.add_dependency(%q<json_pure>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<activesupport>, ["= 2.3.5"])
     s.add_dependency(%q<will_paginate>, [">= 0"])
+    s.add_dependency(%q<rufus-json>, ["= 0.2.3"])
   end
 end
 

data/lib/friendly.rb

@@ -18,7 +18,6 @@ require 'friendly/storage_proxy'
 require 'friendly/translator'
 require 'friendly/uuid'
 
-require 'json/pure'
 require 'will_paginate/collection'
 
 module Friendly

data/lib/friendly/translator.rb

@@ -1,17 +1,19 @@
+require "rufus-json"
+
 module Friendly
   class Translator
     RESERVED_ATTRS = [:id, :created_at, :updated_at].freeze
 
     attr_reader :serializer, :time
 
-    def initialize(serializer = JSON, time = Time)
+    def initialize(serializer = Rufus::Json, time = Time)
       @serializer = serializer
       @time       = time
     end
 
     def to_object(klass, record)
       record.delete(:added_id)
-      attributes = serializer.parse(record.delete(:attributes))
+      attributes = serializer.decode(record.delete(:attributes))
       attributes.merge!(record).merge!(:new_record => false)
       klass.new_without_change_tracking attributes
     end
@@ -26,7 +28,7 @@ module Friendly
     protected
       def serialize(document)
         attrs = document.to_hash.reject { |k,v| RESERVED_ATTRS.include?(k) }
-        serializer.generate(attrs)
+        serializer.encode(attrs)
       end
   end
 end

data/lib/friendly/uuid.rb

@@ -1,5 +1,6 @@
 require 'friendly/time'
 require 'friendly/attribute'
+require 'rufus-json'
 
 # This class was extracted from the cassandra gem by Evan Weaver
 # As such, it is distributed under the terms of the apache license.
@@ -85,7 +86,7 @@ module Friendly
     end
 
     def to_json(*args)
-      to_guid.to_json(*args)
+      Rufus::Json.encode(to_guid)
     end
 
     def seconds

data/spec/integration/basic_object_lifecycle_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path("../../spec_helper", __FILE__)
+require 'rufus-json'
 
 describe "Creating and retrieving an object" do
   before do
@@ -39,7 +40,7 @@ describe "Creating and retrieving an object" do
 
   it "doesn't serialize id, created_at, or updated_at in the attributes column" do
     result = $db.from("users").first(:id => @user.id)
-    attrs  = JSON.parse(result[:attributes])
+    attrs  = Rufus::Json.decode(result[:attributes])
     attrs.keys.should_not include("id")
     attrs.keys.should_not include("created_at")
     attrs.keys.should_not include("updated_at")

data/spec/spec_helper.rb

@@ -7,7 +7,7 @@ require 'rubygems'
 require 'spec'
 require 'spec/autorun'
 require 'sequel'
-require 'json/pure'
+require 'yajl'
 gem     'jferris-mocha'
 require 'mocha'
 require 'memcached'

data/spec/unit/translator_spec.rb

@@ -10,7 +10,7 @@ describe "Friendly::Translator" do
 
   describe "translating a row to an object" do
     before do
-      @serializer.stubs(:parse).with("THE JSON").returns(:name => "Stewie")
+      @serializer.stubs(:decode).with("THE JSON").returns(:name => "Stewie")
       @time  = Time.new
       @row   = {:added_id   => 12345,
                 :created_at => @time,
@@ -33,7 +33,7 @@ describe "Friendly::Translator" do
       before do
         @hash = {:name => "Stewie"}
         @time.stubs(:new).returns(Time.new)
-        @serializer.stubs(:generate).with(@hash).returns("SOME JSON")
+        @serializer.stubs(:encode).with(@hash).returns("SOME JSON")
         @document = stub(:to_hash     => @hash, 
                          :new_record? => true, 
                          :created_at  => nil,
@@ -62,7 +62,7 @@ describe "Friendly::Translator" do
                  :created_at => @created_at,
                  :updated_at => Time.new}
         @time.stubs(:new).returns(Time.new + 5000)
-        @serializer.stubs(:generate).returns("SOME JSON")
+        @serializer.stubs(:encode).returns("SOME JSON")
         @document = stub(:to_hash     => @hash, 
                          :created_at  => @created_at,
                          :new_record? => false,
@@ -71,7 +71,7 @@ describe "Friendly::Translator" do
       end
 
       it "serializes the attributes" do
-        @serializer.should have_received(:generate).with(:name => "Stewie")
+        @serializer.should have_received(:encode).with(:name => "Stewie")
         @record[:attributes].should == "SOME JSON"
       end
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: friendly
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  hash: 7
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - James Golick
@@ -9,89 +15,129 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 -08:00
+date: 2010-07-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: jferris-mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: memcached
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sequel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 3
+        - 7
+        - 0
         version: 3.7.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: json_pure
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        hash: 9
+        segments: 
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: will_paginate
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rufus-json
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 2
+        - 3
+        version: 0.2.3
+  type: :runtime
+  version_requirements: *id008
 description: ""
 email: jamesgolick@gmail.com
 executables: []
@@ -247,21 +293,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: NoSQL with MySQL in Ruby