mongo_mapper 0.7.3 → 0.7.4

data/test/functional/test_protected.rb

@@ -69,6 +69,10 @@ class ProtectedTest < Test::Unit::TestCase
       @doc.name.should == 'Stimpson J. Cat'
       @doc.admin.should be_false
     end
+
+    should "accept nil as constructor's argument without raising exception" do
+      lambda { @doc_class.new(nil) }.should_not raise_error
+    end
   end
 
   context "Single collection inherited protected attributes" do

data/test/functional/test_string_id_compatibility.rb

@@ -28,7 +28,7 @@ class StringIdCompatibilityTest < Test::Unit::TestCase
     project._id.should be_instance_of(String)
     project.id.size.should == 24
     lambda {
-      Mongo::ObjectID.from_string(project.id)
+      BSON::ObjectID.from_string(project.id)
     }.should_not raise_error
   end
   

data/test/support/custom_matchers.rb

@@ -1,16 +1,4 @@
 module CustomMatchers
-  custom_matcher :be_nil do |receiver, matcher, args|
-    matcher.positive_failure_message = "Expected #{receiver} to be nil but it wasn't"
-    matcher.negative_failure_message = "Expected #{receiver} not to be nil but it was"
-    receiver.nil?
-  end
-  
-  custom_matcher :be_blank do |receiver, matcher, args|
-    matcher.positive_failure_message = "Expected #{receiver} to be blank but it wasn't"
-    matcher.negative_failure_message = "Expected #{receiver} not to be blank but it was"
-    receiver.blank?
-  end
-  
   custom_matcher :be_true do |receiver, matcher, args|
     matcher.positive_failure_message = "Expected #{receiver} to be true but it wasn't"
     matcher.negative_failure_message = "Expected #{receiver} not to be true but it was"
@@ -23,12 +11,6 @@ module CustomMatchers
     receiver.eql?(false)
   end
 
-  custom_matcher :be_valid do |receiver, matcher, args|
-    matcher.positive_failure_message = "Expected to be valid but it was invalid #{receiver.errors.inspect}"
-    matcher.negative_failure_message = "Expected to be invalid but it was valid #{receiver.errors.inspect}"
-    receiver.valid?
-  end
-
   custom_matcher :have_error_on do |receiver, matcher, args|
     receiver.valid?
     attribute = args[0]

data/test/test_helper.rb

@@ -2,14 +2,16 @@ require File.expand_path(File.dirname(__FILE__) + '/../lib/mongo_mapper')
 require 'fileutils'
 
 gem 'jnunemaker-matchy', '0.4.0'
-gem 'shoulda', '2.10.2'
-gem 'timecop', '0.3.1'
-gem 'mocha', '0.9.8'
+gem 'shoulda',           '2.10.2'
+gem 'json',              '>= 1.2.3'
+gem 'timecop',           '0.3.1'
+gem 'mocha',             '0.9.8'
 
-require 'matchy'
 require 'shoulda'
 require 'timecop'
+require 'matchy'
 require 'mocha'
+require 'json'
 require 'pp'
 
 require 'support/custom_matchers'

data/test/unit/associations/test_base.rb

@@ -194,9 +194,14 @@ class AssociationBaseTest < Test::Unit::TestCase
     end
     
     should "be OneProxy for one" do
-      base = Base.new(:one, :target, :polymorphic => true)
+      base = Base.new(:one, :status, :polymorphic => true)
       base.proxy_class.should == OneProxy
     end
+
+    should "be OneEmbeddedProxy for one embedded" do
+      base = Base.new(:one, :media)
+      base.proxy_class.should == OneEmbeddedProxy
+    end
     
     should "be InArrayProxy for many with :in option" do
       base = Base.new(:many, :messages, :in => :message_ids)
@@ -204,4 +209,4 @@ class AssociationBaseTest < Test::Unit::TestCase
     end
   end
   
-end
+end

data/test/unit/test_document.rb

@@ -84,8 +84,8 @@ class DocumentTest < Test::Unit::TestCase
   end
   
   context "descendants" do
-    should "default to nil" do
-      Enter.descendants.should be_nil
+    should "default to an empty array" do
+      Enter.descendants.should == []
     end
 
     should "be recorded" do
@@ -102,7 +102,7 @@ class DocumentTest < Test::Unit::TestCase
     end
     
     should "create id during initialization" do
-      @document.new._id.should be_instance_of(Mongo::ObjectID)
+      @document.new._id.should be_instance_of(BSON::ObjectID)
     end
     
     should "have access to logger" do
@@ -177,7 +177,7 @@ class DocumentTest < Test::Unit::TestCase
 
     context "equality" do
       setup do
-        @oid = Mongo::ObjectID.new
+        @oid = BSON::ObjectID.new
       end
       
       should "delegate hash to _id" do
@@ -213,7 +213,7 @@ class DocumentTest < Test::Unit::TestCase
       end
 
       should "not be equal if class same but id different" do
-        (@document.new('_id' => @oid) == @document.new('_id' => Mongo::ObjectID.new)).should be(false)
+        (@document.new('_id' => @oid) == @document.new('_id' => BSON::ObjectID.new)).should be(false)
       end
 
       should "not be equal if id same but class different" do

data/test/unit/test_embedded_document.rb

@@ -202,8 +202,8 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
 
       context "descendants" do
-        should "default to nil" do
-          Child.descendants.should be_nil
+        should "default to an empty array" do
+          Child.descendants.should == []
         end
 
         should "be recorded" do
@@ -232,17 +232,17 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
 
       should "create id during initialization" do
-        @document.new._id.should be_instance_of(Mongo::ObjectID)
+        @document.new._id.should be_instance_of(BSON::ObjectID)
       end
 
       should "have id method returns _id" do
-        id = Mongo::ObjectID.new
+        id = BSON::ObjectID.new
         doc = @document.new(:_id => id)
         doc.id.should == id
       end
 
       should "convert string object id to mongo object id when assigning id with _id object id type" do
-        id = Mongo::ObjectID.new
+        id = BSON::ObjectID.new
         doc = @document.new(:id => id.to_s)
         doc._id.should == id
         doc.id.should  == id
@@ -568,7 +568,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
 
       context "equality" do
         setup do
-          @oid = Mongo::ObjectID.new
+          @oid = BSON::ObjectID.new
         end
 
         should "delegate hash to _id" do
@@ -599,7 +599,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         end
 
         should "not be equal if class same but id different" do
-          (@document.new('_id' => @oid) == @document.new('_id' => Mongo::ObjectID.new)).should be_false
+          (@document.new('_id' => @oid) == @document.new('_id' => BSON::ObjectID.new)).should be_false
         end
 
         should "not be equal if id same but class different" do

data/test/unit/test_query.rb

@@ -53,6 +53,12 @@ class QueryTest < Test::Unit::TestCase
       criteria[:created_at]['$gt'].should be_utc
     end
 
+    should "work with multiple symbol operators on the same field" do
+      Query.new(Message, :position.gt => 0, :position.lte => 10).criteria.should == {
+        :position => {"$gt" => 0, "$lte" => 10}
+      }
+    end
+
     should "work with simple criteria" do
       Query.new(Room, :foo => 'bar').criteria.should == {
         :foo => 'bar'
@@ -65,34 +71,34 @@ class QueryTest < Test::Unit::TestCase
     end
 
     should "convert id to _id" do
-      id = Mongo::ObjectID.new
+      id = BSON::ObjectID.new
       Query.new(Room, :id => id).criteria.should == {:_id => id}
     end
 
     should "convert id with symbol operator to _id with modifier" do
-      id = Mongo::ObjectID.new
+      id = BSON::ObjectID.new
       Query.new(Room, :id.ne => id).criteria.should == {
         :_id => {'$ne' => id}
       }
     end
 
     should "make sure that _id's are object ids" do
-      id = Mongo::ObjectID.new
+      id = BSON::ObjectID.new
       Query.new(Room, :_id => id.to_s).criteria.should == {:_id => id}
     end
 
     should "work fine with _id's that are object ids" do
-      id = Mongo::ObjectID.new
+      id = BSON::ObjectID.new
       Query.new(Room, :_id => id).criteria.should == {:_id => id}
     end
 
     should "make sure other object id typed keys get converted" do
-      id = Mongo::ObjectID.new
+      id = BSON::ObjectID.new
       Query.new(Message, :room_id => id.to_s).criteria.should == {:room_id => id}
     end
 
     should "work fine with object ids for object id typed keys" do
-      id = Mongo::ObjectID.new
+      id = BSON::ObjectID.new
       Query.new(Message, :room_id => id).criteria.should == {:room_id => id}
     end
 
@@ -152,7 +158,7 @@ class QueryTest < Test::Unit::TestCase
     end
     
     should "make sure that ids in array are object ids" do
-      id1, id2, id3 = Mongo::ObjectID.new, Mongo::ObjectID.new, Mongo::ObjectID.new
+      id1, id2, id3 = BSON::ObjectID.new, BSON::ObjectID.new, BSON::ObjectID.new
       
       Query.new(Room, :_id => [id1.to_s, id2.to_s, id3.to_s]).criteria.should == {
         :_id => {'$in' => [id1, id2, id3]}
@@ -282,6 +288,10 @@ class QueryTest < Test::Unit::TestCase
     should "also work with select as array of symbols" do
       Query.new(Room, :select => [:a, :b]).options[:fields].should == [:a, :b]
     end
+
+    should "work with select as hash" do
+      Query.new(Room, :select => {:a => 0, :b => 1}).options[:fields].should == {:a => 0, :b => 1}
+    end
   end
 
   context "Condition auto-detection" do

data/test/unit/test_support.rb

@@ -21,11 +21,11 @@ class SupportTest < Test::Unit::TestCase
   
   context "Binary#to_mongo" do
     should "convert to byte buffer if not byte buffer" do
-      Binary.to_mongo('asdfsadasdfs').is_a?(ByteBuffer).should be_true
+      Binary.to_mongo('asdfsadasdfs').is_a?(BSON::ByteBuffer).should be_true
     end
     
     should "be byte buffer if byte buffer" do
-      Binary.to_mongo(ByteBuffer.new('asdfsadasdfs')).is_a?(ByteBuffer).should be_true
+      Binary.to_mongo(BSON::ByteBuffer.new('asdfsadasdfs')).is_a?(BSON::ByteBuffer).should be_true
     end
     
     should "be nil if nil" do
@@ -35,7 +35,7 @@ class SupportTest < Test::Unit::TestCase
   
   context "Binary#from_mongo" do
     should "return value" do
-      buffer = ByteBuffer.new('asdfasdfasdf')
+      buffer = BSON::ByteBuffer.new('asdfasdfasdf')
       Binary.from_mongo(buffer).to_s.should == buffer.to_s
     end
   end
@@ -180,19 +180,19 @@ class SupportTest < Test::Unit::TestCase
     end
     
     should "return value if object id" do
-      id = Mongo::ObjectID.new
+      id = BSON::ObjectID.new
       ObjectId.to_mongo(id).should be(id)
     end
     
     should "return object id if string" do
-      id = Mongo::ObjectID.new
+      id = BSON::ObjectID.new
       ObjectId.to_mongo(id.to_s).should be(id)
     end
   end
   
   context "ObjectId#from_mongo" do
     should "return value" do
-      id = Mongo::ObjectID.new
+      id = BSON::ObjectID.new
       ObjectId.from_mongo(id).should == id
     end
   end
@@ -356,15 +356,27 @@ class SupportTest < Test::Unit::TestCase
     end
   end
   
-  context "Mongo::ObjectID.to_json" do
-    should "convert object id to string" do
-      id = Mongo::ObjectID.new
-      id.to_json.should == %Q("#{id}")
+  context "BSON::ObjectID" do
+    context "#as_json" do
+      should "convert object id to string" do
+        id = BSON::ObjectID.new
+        id.as_json.should == id.to_s
+      end
     end
-    
-    should "support ruby driver syntax also" do
-      id = Mongo::ObjectID.new
-      id.original_to_json.should == %Q({"$oid": "#{id}"})
+    context "#to_json" do
+      should "convert object id to string" do
+        id = BSON::ObjectID.new
+        id.to_json.should == %Q("#{id}")
+      end
+
+      should "support ruby driver syntax also" do
+        id = BSON::ObjectID.new
+        id.original_to_json.should == %Q({"$oid": "#{id}"})
+      end
     end
   end
+  
+  context "BSON::ObjectID.to_json" do
+    
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 3
-  version: 0.7.3
+  - 4
+  version: 0.7.4
 platform: ruby
 authors: 
 - John Nunemaker
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -04:00
+date: 2010-04-18 00:00:00 -04:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,9 +40,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 19
-        - 3
-        version: 0.19.3
+        - 20
+        - 1
+        version: 0.20.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -55,14 +55,28 @@ dependencies:
         segments: 
         - 1
         - 8
-        - 3
-        version: 1.8.3
+        - 4
+        version: 1.8.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: jnunemaker-matchy
+  name: json
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 3
+        version: 1.2.3
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: jnunemaker-matchy
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -72,11 +86,11 @@ dependencies:
         - 0
         version: 0.4.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -86,11 +100,11 @@ dependencies:
         - 2
         version: 2.10.2
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: timecop
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -100,11 +114,11 @@ dependencies:
         - 1
         version: 0.3.1
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -114,7 +128,7 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 description: 
 email: nunemaker@gmail.com
 executables: 
@@ -146,6 +160,7 @@ files:
 - 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
@@ -185,6 +200,7 @@ files:
 - 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
@@ -264,6 +280,7 @@ test_files:
 - 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