mongo_mapper 0.7.3 → 0.7.4

data/lib/mongo_mapper/support.rb

@@ -11,10 +11,10 @@ end
 
 class Binary
   def self.to_mongo(value)
-    if value.is_a?(ByteBuffer)
+    if value.is_a?(BSON::Binary)
       value
     else
-      value.nil? ? nil : ByteBuffer.new(value)
+      value.nil? ? nil : BSON::Binary.new(value)
     end
   end
 
@@ -129,10 +129,10 @@ class ObjectId
   def self.to_mongo(value)
     if value.blank?
       nil
-    elsif value.is_a?(Mongo::ObjectID)
+    elsif value.is_a?(BSON::ObjectID)
       value
     else
-      Mongo::ObjectID.from_string(value.to_s)
+      BSON::ObjectID.from_string(value.to_s)
     end
   end
   
@@ -198,11 +198,15 @@ class Time
   end
 end
 
-class Mongo::ObjectID
+class BSON::ObjectID
   alias_method :original_to_json, :to_json
   
+  def as_json(options=nil)
+    to_s
+  end
+  
   def to_json(options = nil)
-    %Q("#{to_s}")
+    as_json.to_json
   end
 end
 

data/lib/mongo_mapper/version.rb

@@ -1,3 +1,3 @@
 module MongoMapper
-  Version = '0.7.3'
+  Version = '0.7.4'
 end

data/mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.7.3"
+  s.version = "0.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2010-04-05}
+  s.date = %q{2010-04-18}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
      "lib/mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy.rb",
      "lib/mongo_mapper/plugins/associations/many_embedded_proxy.rb",
      "lib/mongo_mapper/plugins/associations/many_polymorphic_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/one_embedded_proxy.rb",
      "lib/mongo_mapper/plugins/associations/one_proxy.rb",
      "lib/mongo_mapper/plugins/associations/proxy.rb",
      "lib/mongo_mapper/plugins/callbacks.rb",
@@ -78,6 +79,7 @@ Gem::Specification.new do |s|
      "test/functional/associations/test_many_embedded_polymorphic_proxy.rb",
      "test/functional/associations/test_many_embedded_proxy.rb",
      "test/functional/associations/test_many_polymorphic_proxy.rb",
+     "test/functional/associations/test_one_embedded_proxy.rb",
      "test/functional/associations/test_one_proxy.rb",
      "test/functional/test_associations.rb",
      "test/functional/test_binary.rb",
@@ -133,6 +135,7 @@ Gem::Specification.new do |s|
      "test/functional/associations/test_many_embedded_polymorphic_proxy.rb",
      "test/functional/associations/test_many_embedded_proxy.rb",
      "test/functional/associations/test_many_polymorphic_proxy.rb",
+     "test/functional/associations/test_one_embedded_proxy.rb",
      "test/functional/associations/test_one_proxy.rb",
      "test/functional/test_associations.rb",
      "test/functional/test_binary.rb",
@@ -180,16 +183,18 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_runtime_dependency(%q<mongo>, ["= 0.19.3"])
-      s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.8.3"])
+      s.add_runtime_dependency(%q<mongo>, ["= 0.20.1"])
+      s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.8.4"])
+      s.add_development_dependency(%q<json>, [">= 1.2.3"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_development_dependency(%q<shoulda>, ["= 2.10.2"])
       s.add_development_dependency(%q<timecop>, ["= 0.3.1"])
       s.add_development_dependency(%q<mocha>, ["= 0.9.8"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_dependency(%q<mongo>, ["= 0.19.3"])
-      s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.3"])
+      s.add_dependency(%q<mongo>, ["= 0.20.1"])
+      s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.4"])
+      s.add_dependency(%q<json>, [">= 1.2.3"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_dependency(%q<shoulda>, ["= 2.10.2"])
       s.add_dependency(%q<timecop>, ["= 0.3.1"])
@@ -197,8 +202,9 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-    s.add_dependency(%q<mongo>, ["= 0.19.3"])
-    s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.3"])
+    s.add_dependency(%q<mongo>, ["= 0.20.1"])
+    s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.4"])
+    s.add_dependency(%q<json>, [">= 1.2.3"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     s.add_dependency(%q<shoulda>, ["= 2.10.2"])
     s.add_dependency(%q<timecop>, ["= 0.3.1"])

data/test/functional/associations/test_belongs_to_polymorphic_proxy.rb

@@ -60,4 +60,4 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
       @status.target.nil?.should be_true
     end
   end
-end
+end

data/test/functional/associations/test_belongs_to_proxy.rb

@@ -52,7 +52,7 @@ class BelongsToProxyTest < Test::Unit::TestCase
   end
   
   should "return nil if id set but document not found" do
-    id = Mongo::ObjectID.new
+    id = BSON::ObjectID.new
     @comment_class.new(:name => 'Foo', :post_id => id).post.nil?.should be_true
   end
   

data/test/functional/associations/test_many_documents_proxy.rb

@@ -5,6 +5,16 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
   def setup
     Project.collection.remove
     Status.collection.remove
+
+    @pet_class = Doc do
+      key :name, String
+      key :owner_id, ObjectId
+    end
+
+    @owner_class = Doc do
+      key :name, String
+    end
+    @owner_class.many :pets, :class => @pet_class, :foreign_key => :owner_id, :order => 'name'
   end
   
   should "default reader to empty array" do
@@ -12,6 +22,32 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     project.statuses.should == []
   end
 
+  should "allow assignment of many associated documents using a hash" do
+    person_attributes = {
+      'name' => 'Mr. Pet Lover',
+      'pets' => [
+        {'name' => 'Jimmy', 'species' => 'Cocker Spainel'},
+        {'name' => 'Sasha', 'species' => 'Siberian Husky'},
+      ]
+    }
+
+    owner = @owner_class.new(person_attributes)
+    owner.name.should == 'Mr. Pet Lover'
+    owner.pets[0].name.should == 'Jimmy'
+    owner.pets[0].species.should == 'Cocker Spainel'
+    owner.pets[1].name.should == 'Sasha'
+    owner.pets[1].species.should == 'Siberian Husky'
+
+    owner.save.should be_true
+    owner.reload
+
+    owner.name.should == 'Mr. Pet Lover'
+    owner.pets[0].name.should == 'Jimmy'
+    owner.pets[0].species.should == 'Cocker Spainel'
+    owner.pets[1].name.should == 'Sasha'
+    owner.pets[1].species.should == 'Siberian Husky'
+  end
+
   should "allow adding to association like it was an array" do
     project = Project.new
     project.statuses <<     Status.new(:name => 'Foo1!')
@@ -20,26 +56,60 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     project.statuses.size.should == 3
   end
 
-  should "be able to replace the association" do
-    project = Project.new
-    project.statuses = [Status.new(:name => "ready")]
-    project.save.should be_true
+  context "replacing the association" do
+    context "with objects of the class" do
+      should "work" do
+        project = Project.new
+        project.statuses = [Status.new(:name => "ready")]
+        project.save.should be_true
+
+        project.reload
+        project.statuses.size.should == 1
+        project.statuses[0].name.should == "ready"
+      end
+    end
+
+    context "with Hashes" do
+      should "convert to objects of the class and work" do
+        project = Project.new
+        project.statuses = [{ 'name' => 'ready' }]
+        project.save.should be_true
 
-    project.reload
-    project.statuses.size.should == 1
-    project.statuses[0].name.should == "ready"
+        project.reload
+        project.statuses.size.should == 1
+        project.statuses[0].name.should == "ready"
+      end
+    end
   end
   
-  should "correctly assign foreign key when using <<, push and concat" do
-    project = Project.new
-    project.statuses <<     Status.new(:name => '<<')
-    project.statuses.push   Status.new(:name => 'push')
-    project.statuses.concat Status.new(:name => 'concat')
-    
-    project.reload
-    project.statuses[0].project_id.should == project.id
-    project.statuses[1].project_id.should == project.id
-    project.statuses[2].project_id.should == project.id
+  context "using <<, push and concat" do
+    context "with objects of the class" do
+      should "correctly assign foreign key" do
+        project = Project.new
+        project.statuses <<     Status.new(:name => '<<')
+        project.statuses.push   Status.new(:name => 'push')
+        project.statuses.concat Status.new(:name => 'concat')
+
+        project.reload
+        project.statuses[0].project_id.should == project.id
+        project.statuses[1].project_id.should == project.id
+        project.statuses[2].project_id.should == project.id
+      end
+    end
+
+    context "with Hashes" do
+      should "correctly convert to objects and assign foreign key" do
+        project = Project.new
+        project.statuses <<     { 'name' => '<<' }
+        project.statuses.push(  { 'name' => 'push' })
+        project.statuses.concat({ 'name' => 'concat' })
+
+        project.reload
+        project.statuses[0].project_id.should == project.id
+        project.statuses[1].project_id.should == project.id
+        project.statuses[2].project_id.should == project.id
+      end
+    end
   end
   
   context "build" do
@@ -62,6 +132,19 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       status.save!
       project.statuses.size.should == 1
     end
+    
+    should "update collection without save" do
+      project = Project.create
+      project.statuses.build(:name => 'Foo')
+      project.statuses.size.should == 1
+    end
+    
+    should "save built document when saving parent" do
+      project = Project.create
+      status = project.statuses.build(:name => 'Foo')
+      project.save!
+      status.should_not be_new
+    end
   end
   
   context "create" do

data/test/functional/associations/test_one_embedded_proxy.rb

@@ -0,0 +1,68 @@
+require 'test_helper'
+
+class OneEmbeddedProxyTest < Test::Unit::TestCase
+  def setup
+    @post_class = Doc('Post') do
+      key :title, String
+    end
+    @author_class = EDoc('Author') do
+      key :name, String
+      embedded_in :post
+    end
+  end
+
+  should "default to nil" do
+    @post_class.one :author, :class => @author_class
+    @post_class.new.author.should be_nil
+  end
+
+  should "be able to build" do
+    @post_class.one :author, :class => @author_class
+
+    post = @post_class.create
+    author = post.author.build(:name => "John")
+    post.author.should be_instance_of(@author_class)
+    post.author.should be_new
+    post.author.name.should == 'John'
+    post.author.should == author
+    post.author.post.should == post
+  end
+
+  should "send object id to target" do
+    @post_class.one :author, :class => @author_class
+
+    post = @post_class.new
+    author = @author_class.new(:name => 'Frank')
+    post.author = author
+
+    post.author.object_id.should == post.author.target.object_id
+  end
+
+  should "be able to replace the association" do
+    @post_class.one :author, :class => @author_class
+
+    post = @post_class.new
+    author = @author_class.new(:name => 'Frank')
+    post.author = author
+    post.save
+    post.reload
+
+    post.author.should == author
+    post.author.nil?.should be_false
+
+    new_author = @author_class.new(:name => 'Emily')
+    post.author = new_author
+    post.author.should == new_author
+  end
+
+  should "have boolean method for testing presence" do
+    @post_class.one :author, :class => @author_class
+
+    post = @post_class.new
+    post.author?.should be_false
+
+    post.author = @author_class.new(:name => 'Frank')
+    post.author?.should be_true
+  end
+
+end

data/test/functional/associations/test_one_proxy.rb

@@ -24,23 +24,57 @@ class OneProxyTest < Test::Unit::TestCase
     
     post.author.object_id.should == post.author.target.object_id
   end
-  
-  should "be able to replace the association" do
+
+  should "allow assignment of associated document using a hash" do
     @post_class.one :author, :class => @author_class
-    
-    post = @post_class.new
-    author = @author_class.new(:name => 'Frank')
-    post.author = author
+
+    post = @post_class.new('author' => { 'name' => 'Frank' })
+    post.author.name.should == 'Frank'
+
+    post.save.should be_true
     post.reload
-    
-    post.author.should == author
-    post.author.nil?.should be_false
-    
-    new_author = @author_class.new(:name => 'Emily')
-    post.author = new_author
-    post.author.should == new_author
+
+    post.author.name.should == 'Frank'
   end
   
+  context "replacing the association" do
+    context "with an object of the class" do
+      should "work" do
+        @post_class.one :author, :class => @author_class
+
+        post = @post_class.new
+        author = @author_class.new(:name => 'Frank')
+        post.author = author
+        post.reload
+
+        post.author.should == author
+        post.author.nil?.should be_false
+
+        new_author = @author_class.new(:name => 'Emily')
+        post.author = new_author
+        post.author.should == new_author
+      end
+    end
+
+    context "with a Hash" do
+      should "convert to an object of the class and work" do
+        @post_class.one :author, :class => @author_class
+
+        post = @post_class.new
+        author = { 'name' => 'Frank' }
+        post.author = author
+        post.reload
+
+        post.author.name.should == 'Frank'
+        post.author.nil?.should be_false
+
+        new_author = { 'name' => 'Emily' }
+        post.author = new_author
+        post.author.name.should == 'Emily'
+      end
+    end
+  end
+
   should "have boolean method for testing presence" do
     @post_class.one :author, :class => @author_class
     
@@ -58,6 +92,7 @@ class OneProxyTest < Test::Unit::TestCase
     post = @post_class.create
     author = @author_class.create(:name => 'Frank', :primary => false, :post_id => post.id)
     primary = @author_class.create(:name => 'Bill', :primary => true, :post_id => post.id)
+    post.reload
     post.author.should == author
     post.primary_author.should == primary
   end

data/test/functional/test_binary.rb

@@ -10,7 +10,7 @@ class BinaryTest < Test::Unit::TestCase
     doc.save
     
     doc = doc.reload
-    doc.contents.to_s.should == ByteBuffer.new('010101').to_s
+    doc.contents.to_s.should == BSON::ByteBuffer.new('010101').to_s
   end
   
   context "Saving a document with a blank binary value" do

data/test/functional/test_document.rb

@@ -142,8 +142,8 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "automatically set id" do
-      @doc_instance.id.should be_instance_of(Mongo::ObjectID)
-      @doc_instance._id.should be_instance_of(Mongo::ObjectID)
+      @doc_instance.id.should be_instance_of(BSON::ObjectID)
+      @doc_instance._id.should be_instance_of(BSON::ObjectID)
     end
 
     should "no longer be new?" do
@@ -303,12 +303,12 @@ class DocumentTest < Test::Unit::TestCase
       end
 
       should "compact not found when using find" do
-        @document.find(@doc1._id, Mongo::ObjectID.new.to_s).should == [@doc1]
+        @document.find(@doc1._id, BSON::ObjectID.new.to_s).should == [@doc1]
       end
 
       should "raise error if not all found when using find!" do
         assert_raises(MongoMapper::DocumentNotFound) do
-          @document.find!(@doc1._id, Mongo::ObjectID.new.to_s)
+          @document.find!(@doc1._id, BSON::ObjectID.new.to_s)
         end
       end
 
@@ -641,7 +641,7 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "assign an id for the document" do
-      @doc.id.should be_instance_of(Mongo::ObjectID)
+      @doc.id.should be_instance_of(BSON::ObjectID)
     end
 
     should "save attributes" do
@@ -709,7 +709,7 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "assign an id for the document" do
-      @doc.id.should be_instance_of(Mongo::ObjectID)
+      @doc.id.should be_instance_of(BSON::ObjectID)
     end
 
     should "save attributes" do
@@ -1180,7 +1180,7 @@ class DocumentTest < Test::Unit::TestCase
 
   context "database has keys not defined in model" do
     setup do
-      @id = Mongo::ObjectID.new
+      @id = BSON::ObjectID.new
       @document.collection.insert({
         :_id            => @id,
         :first_name     => 'John',