mongo_mapper 0.8.3 → 0.8.4

data/UPGRADES

@@ -0,0 +1,7 @@
+0.7.6 => 0.8
+  * Proxy#owner has been removed in favor of Proxy#proxy_owner
+  * @new instance variable renamed to @_new (you shouldn't be using this anyway)
+  * Removed undefining of object_id in proxies and equal? method in Equality. This means checking equal? for a proxy and a regular document will always be false even if proxy refers to same document. Check Proxy#target instead. (ie: root.equal?(item.root.target))
+  * find no longer takes options as a last argument. It only works with id, multiple ids, array of ids.
+  * MongoMapper::MongoMapperError is now MongoMapper::Error
+  * metaclass, meta_eval, meta_def, class_def removed as they were not being used

data/examples/attr_accessible.rb

@@ -0,0 +1,22 @@
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+require 'mongo_mapper'
+
+MongoMapper.database = 'testing'
+
+class User
+  include MongoMapper::Document
+  key :email, String
+  key :admin, Boolean, :default => false
+
+  # Only accessible or protected can be used, they cannot be used together
+  attr_accessible :email
+end
+
+# only accessible are set on new/create/etc.
+user = User.create(:email => 'IDontLowerCaseThings@gmail.com', :admin => true)
+puts user.admin # false
+
+# can be set using accessor
+user.admin = true
+user.save
+puts user.admin # true

data/examples/attr_protected.rb

@@ -0,0 +1,22 @@
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+require 'mongo_mapper'
+
+MongoMapper.database = 'testing'
+
+class User
+  include MongoMapper::Document
+  key :email, String
+  key :admin, Boolean, :default => false
+
+  # Only accessible or protected can be used, they cannot be used together
+  attr_protected :admin
+end
+
+# protected are ignored on new/create/etc.
+user = User.create(:email => 'IDontLowerCaseThings@gmail.com', :admin => true)
+puts user.admin # false
+
+# can be set using accessor
+user.admin = true
+user.save
+puts user.admin # true

data/examples/cache_key.rb

@@ -0,0 +1,24 @@
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+require 'mongo_mapper'
+
+MongoMapper.database = 'testing'
+
+class User
+  include MongoMapper::Document
+end
+
+# New Documents
+puts User.new.cache_key     # User/new
+
+# Created Documents
+puts User.create.cache_key  # User/:id (ie: User/4c7a940cbcd1b3319b000003)
+
+# With Suffix
+puts User.create.cache_key(:foo) # User/:id/foo
+
+# With Multiple Suffixes
+puts User.create.cache_key(:foo, :bar, :baz) # User/:id/foo/bar/baz
+
+# When updated_at key exists it will be used
+User.timestamps!
+puts User.create.cache_key  # User/:id-:updated_at (ie: User/4c7a940cbcd1b3319b000003-20100829170828)

data/examples/custom_types.rb

@@ -0,0 +1,24 @@
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+require 'mongo_mapper'
+require 'pp'
+
+MongoMapper.database = 'testing'
+
+class DowncasedString
+  # to_mongo gets called anytime a value is assigned
+  def self.to_mongo(value)
+    value.nil? ? nil : value.to_s.downcase
+  end
+
+  # from mongo gets called anytime a value is read
+  def self.from_mongo(value)
+    value.nil? ? nil : value.to_s.downcase
+  end
+end
+
+class User
+  include MongoMapper::Document
+  key :email, DowncasedString
+end
+
+pp User.create(:email => 'IDontLowerCaseThings@gmail.com')

data/examples/identity_map/automatic.rb

@@ -0,0 +1,8 @@
+# Using the following will turn on identity map for all models
+module IdentityMapAddition
+  def self.included(model)
+    model.plugin MongoMapper::Plugins::IdentityMap
+  end
+end
+
+MongoMapper::Document.append_inclusions(IdentityMapAddition)

data/examples/identity_map/middleware.rb

@@ -0,0 +1,14 @@
+# To use this, add the following line in environment.rb
+# config.middleware.use 'PerRequestIdentityMap'
+class PerRequestIdentityMap
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    MongoMapper::Plugins::IdentityMap.clear
+    @app.call(env)
+  ensure
+    MongoMapper::Plugins::IdentityMap.clear
+  end
+end

data/examples/identity_map.rb

@@ -0,0 +1,33 @@
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+require 'mongo_mapper'
+require 'pp'
+
+MongoMapper.database = 'testing'
+
+class User
+  include MongoMapper::Document
+  plugin MongoMapper::Plugins::IdentityMap
+
+  key :name, String
+end
+User.delete_all
+
+user = User.create(:name => 'John')
+
+# User gets added to map on save
+pp User.identity_map[user.id]
+
+# Does not matter how you find user, it is always the same object until the identity map is cleared
+puts "#{User.identity_map[user.id].object_id} == #{user.object_id}"
+puts "#{User.find(user.id).object_id} == #{user.object_id}"
+puts "#{User.all[0].object_id} == #{user.object_id}"
+
+MongoMapper::Plugins::IdentityMap.clear
+puts "#{User.find(user.id).object_id} != #{user.object_id}"
+
+# User gets removed from map on destroy
+user = User.create
+user.destroy
+puts "Should be nil: " + User.identity_map[user.id].inspect
+
+

data/examples/validating/embedded_docs.rb

@@ -0,0 +1,29 @@
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+require 'mongo_mapper'
+require 'pp'
+
+MongoMapper.database = 'testing'
+
+class Field
+  include MongoMapper::EmbeddedDocument
+  key :name
+  validates_presence_of :name
+end
+
+class Template
+  include MongoMapper::Document
+  key :name
+  many :fields
+
+  # This tells the template to validate all
+  # fields when validating the template.
+  validates_associated :fields
+end
+
+# Name is missing on embedded field
+template = Template.new(:fields => [Field.new])
+puts template.valid? # false
+
+# Name is present on embedded field
+template = Template.new(:fields => [Field.new(:name => 'Yay')])
+puts template.valid? # true

data/lib/mongo_mapper/extensions/object_id.rb

@@ -17,7 +17,7 @@ class ObjectId
   extend MongoMapper::Extensions::ObjectId
 end
 
-class BSON::ObjectID
+class BSON::ObjectId
   alias_method :original_to_json, :to_json
 
   def as_json(options=nil)

data/lib/mongo_mapper/plugins/associations/many_documents_proxy.rb

@@ -96,7 +96,6 @@ module MongoMapper
           end
 
           def apply_scope(doc)
-            ensure_owner_saved
             criteria.each { |key, value| doc[key] = value }
             doc
           end

data/lib/mongo_mapper/plugins/associations/proxy.rb

@@ -25,6 +25,23 @@ module MongoMapper
           reset
         end
 
+        # Active support in rails 3 beta 4 can override to_json after this is loaded,
+        # at least when run in mongomapper tests. The implementation was changed in master 
+        # some time after this, so not sure whether this is still a problem.
+        #
+        # In rails 2, this isn't a problem however it also solves an issue where
+        # to_json isn't forwarded because it supports to_json itself
+        def to_json(*options)
+          load_target
+          target.to_json(*options)
+        end
+
+        # see comments to to_json
+        def as_json(*options)
+          load_target
+          target.as_json(*options)
+        end
+        
         def inspect
           load_target
           target.inspect

data/lib/mongo_mapper/plugins/clone.rb

@@ -7,6 +7,9 @@ module MongoMapper
           @_new       = true
           @_destroyed = false
           default_id_value({})
+          associations.each do |name, association|
+            instance_variable_set(association.ivar, nil)
+          end
           self.attributes = other.attributes.clone.except(:_id).inject({}) do |hash, entry|
             key, value = entry
             hash[key] = value.duplicable? ? value.clone : value

data/lib/mongo_mapper/plugins/dirty.rb

@@ -39,25 +39,29 @@ module MongoMapper
           changed.inject({}) { |h, key| h[key] = key_change(key); h }
         end
 
-        def initialize(*args)
-          super
-          changed_keys.clear if args.first.blank? || !new?
+        def initialize(*)
+          # never register initial id assignment as a change
+          super.tap { changed_keys.delete('_id') }
         end
 
-        def save(*args)
+        def initialize_from_database(*)
+          super.tap { changed_keys.clear }
+        end
+
+        def save(*)
           if status = super
             changed_keys.clear
           end
           status
         end
 
-        def save!(*args)
+        def save!(*)
           status = super
           changed_keys.clear
           status
         end
 
-        def reload(*args)
+        def reload(*)
           document = super
           changed_keys.clear
           document

data/lib/mongo_mapper/plugins/embedded_document.rb

@@ -4,7 +4,7 @@ module MongoMapper
     module EmbeddedDocument
       def self.configure(model)
         model.class_eval do
-          attr_reader :_root_document, :_parent_document
+          attr_accessor :_parent_document
         end
       end
 
@@ -39,9 +39,8 @@ module MongoMapper
           end
         end
 
-        def _parent_document=(value)
-          @_root_document   = value._root_document
-          @_parent_document = value
+        def _root_document
+          @_root_document ||= _parent_document.try(:_root_document)
         end
       end
     end

data/lib/mongo_mapper/plugins/identity_map.rb

@@ -41,7 +41,7 @@ module MongoMapper
           def find_one(opts={})
             query = clone.update(opts)
 
-            if query.simple? && model.identity_map[query[:_id]]
+            if model.identity_map_on? && query.simple? && model.identity_map[query[:_id]]
               model.identity_map[query[:_id]]
             else
               super.tap do |doc|

data/lib/mongo_mapper/plugins/keys/key.rb

@@ -22,7 +22,7 @@ module MongoMapper
         end
 
         def can_default_id?
-          type && [ObjectId, BSON::ObjectID, String].include?(type)
+          type && [ObjectId, BSON::ObjectId, String].include?(type)
         end
 
         def number?

data/lib/mongo_mapper/plugins/keys.rb

@@ -63,11 +63,10 @@ module MongoMapper
         def load(attrs)
           return nil if attrs.nil?
           begin
-            klass = attrs['_type'].present? ? attrs['_type'].constantize : self
-            klass.new(attrs, true)
+            attrs['_type'].present? ? attrs['_type'].constantize : self
           rescue NameError
-            new(attrs, true)
-          end
+            self
+          end.allocate.initialize_from_database(attrs)
         end
 
         private
@@ -160,16 +159,16 @@ module MongoMapper
       end
 
       module InstanceMethods
-        def initialize(attrs={}, from_database=false)
+        def initialize(attrs={})
           default_id_value(attrs)
+          @_new = true
+          assign(attrs)
+        end
 
-          if from_database
-            @_new = false
-            load_from_database(attrs)
-          else
-            @_new = true
-            assign(attrs)
-          end
+        def initialize_from_database(attrs={})
+          @_new = false
+          load_from_database(attrs)
+          self
         end
 
         def persisted?
@@ -275,7 +274,7 @@ module MongoMapper
             unless attrs.nil?
               id_provided = attrs.keys.map { |k| k.to_s }.detect { |k| k == 'id' || k == '_id' }
               if !id_provided && self.class.can_default_id?
-                write_key :_id, BSON::ObjectID.new
+                write_key :_id, BSON::ObjectId.new
               end
             end
           end

data/lib/mongo_mapper/plugins/serialization.rb

@@ -52,7 +52,7 @@ module MongoMapper
               hash[key] = value.map do |item|
                 item.respond_to?(:as_json) ? item.as_json(options) : item
               end
-            elsif value.is_a? BSON::ObjectID
+            elsif value.is_a? BSON::ObjectId
               hash[key] = value.to_s
             elsif value.respond_to?(:as_json)
               hash[key] = value.as_json(options)
@@ -60,7 +60,7 @@ module MongoMapper
           end
 
           # Replicate Rails 3 naming - and also bin anytihng after : for use in our dynamic classes from unit tests
-          hash = { ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self)).gsub(/:.*/,'') => hash } if include_root_in_json
+          hash = { ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self.class.name)).gsub(/:.*/,'') => hash } if include_root_in_json
           hash
         end
       end
@@ -73,4 +73,4 @@ module MongoMapper
 
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/validations.rb

@@ -21,8 +21,8 @@ module MongoMapper
 
         def valid?(instance)
           value = instance[attribute]
-          return true if allow_blank && value.blank?
-          return true if allow_nil && value.nil?
+          return allow_nil if value.nil? and not allow_nil.nil?
+          return allow_blank if value.blank? and not allow_blank.nil?
           base_conditions = case_sensitive ? {self.attribute => value} : {}
           doc = instance.class.first(base_conditions.merge(scope_conditions(instance)).merge(where_conditions(instance)))
           doc.nil? || instance._id == doc._id
@@ -47,4 +47,4 @@ module MongoMapper
       end
     end
   end
-end
+end

data/lib/mongo_mapper/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MongoMapper
-  Version = '0.8.3'
+  Version = '0.8.4'
 end

data/rails/init.rb

@@ -0,0 +1,19 @@
+# See http://groups.google.com/group/mongomapper/browse_thread/thread/68f62e8eda43b43a/4841dba76938290c
+#
+# This is only for development mode. You will still want to clear the identity map before each request in production.
+# See examples/identity_map for more on this.
+#
+# to_prepare is called before each request in development mode and the first request in production.
+Rails.configuration.to_prepare do
+  if Rails.configuration.cache_classes
+    MongoMapper::Plugins::IdentityMap.clear
+  else
+    # Rails reloading was making descendants fill up and leak memory, these make sure they get cleared
+    MongoMapper::Document.descendants.each {|m| m.descendants.clear if m.respond_to?(:descendants) }
+    MongoMapper::Document.descendants.clear
+    MongoMapper::EmbeddedDocument.descendants.each {|m| m.descendants.clear if m.respond_to?(:descendants) }
+    MongoMapper::EmbeddedDocument.descendants.clear
+    MongoMapper::Plugins::IdentityMap.clear
+    MongoMapper::Plugins::IdentityMap.models.clear
+  end
+end

data/test/functional/associations/test_belongs_to_proxy.rb

@@ -44,7 +44,7 @@ class BelongsToProxyTest < Test::Unit::TestCase
   end
 
   should "return nil if id set but document not found" do
-    id = BSON::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

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_helper.rb'
 require 'models'
 
 class ManyDocumentsProxyTest < Test::Unit::TestCase
@@ -145,6 +145,18 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       project.save!
       status.should_not be_new
     end
+
+    should "not save the parent when building associations" do
+      project = Project.new
+      status = project.statuses.build(:name => 'Foo')
+      project.should be_new
+    end
+
+    should "not save the built object" do
+      project = Project.new
+      status = project.statuses.build(:name => 'Foo')
+      status.should be_new
+    end
   end
 
   context "create" do
@@ -232,6 +244,24 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     end
   end
 
+  context "to_json" do
+    should "work on association" do
+      project = Project.create
+      3.times { |i| project.statuses.create(:name => i.to_s) }
+      
+      JSON.parse(project.statuses.to_json).collect{|status| status["name"] }.sort.should == ["0","1","2"]
+    end
+  end
+
+  context "as_json" do
+    should "work on association" do
+      project = Project.create
+      3.times { |i| project.statuses.create(:name => i.to_s) }
+      
+      project.statuses.as_json.collect{|status| status["name"] }.sort.should == ["0","1","2"]
+    end
+  end
+
   context "Unassociating documents" do
     setup do
       @project = Project.create

data/test/functional/associations/test_one_embedded_proxy.rb

@@ -54,6 +54,20 @@ class OneEmbeddedProxyTest < Test::Unit::TestCase
     }.should_not raise_error
   end
 
+  should "load the parent and root documents for nested embedded documents" do
+    @address_class = EDoc('Address') do
+      key :city, String
+      key :state, String
+    end
+    @author_class.one :address, :class => @address_class
+    @post_class.one :author, :class => @author_class
+
+    post = @post_class.create(:title => 'Post Title', :author => { :name => 'Frank', :address => { :city => 'Boston', :state => 'MA' } })
+
+    post.author.address._parent_document.should == post.author
+    post.author.address._root_document.should == post
+  end
+
   should "have boolean method for testing presence" do
     @post_class.one :author, :class => @author_class
 

data/test/functional/test_caching.rb

@@ -33,7 +33,7 @@ class CachingTest < Test::Unit::TestCase
 
     context "not new" do
       setup do
-        @object_id = BSON::ObjectID.new
+        @object_id = BSON::ObjectId.new
         @doc = @klass.new
         @doc.stubs(:new?).returns(false)
         @doc.stubs(:id).returns(@object_id)

data/test/functional/test_document.rb

@@ -230,7 +230,7 @@ class DocumentTest < Test::Unit::TestCase
 
   context "database has keys not defined in model" do
     setup do
-      @id = BSON::ObjectID.new
+      @id = BSON::ObjectId.new
       @document.collection.insert({
         :_id            => @id,
         :first_name     => 'John',

data/test/functional/test_identity_map.rb

@@ -140,7 +140,7 @@ class IdentityMapTest < Test::Unit::TestCase
 
     context "#load" do
       setup do
-        @id = BSON::ObjectID.new
+        @id = BSON::ObjectId.new
       end
 
       should "add document to map" do
@@ -327,7 +327,7 @@ class IdentityMapTest < Test::Unit::TestCase
 
       should "return nil for document id not found in collection" do
         assert_in_map(@person)
-        @person_class.find_by_id(BSON::ObjectID.new).should be_nil
+        @person_class.find_by_id(BSON::ObjectId.new).should be_nil
       end
     end
 
@@ -348,7 +348,7 @@ class IdentityMapTest < Test::Unit::TestCase
       end
 
       should "return nil if not found" do
-        @person_class.fields(:name).find(BSON::ObjectID.new).should be_nil
+        @person_class.fields(:name).find(BSON::ObjectId.new).should be_nil
       end
     end
 
@@ -452,7 +452,7 @@ class IdentityMapTest < Test::Unit::TestCase
 
       should "not add to map when loading" do
         @post_class.without_identity_map do
-          post = @post_class.load({'_id' => BSON::ObjectID.new, 'title' => 'Awesome!'})
+          post = @post_class.load({'_id' => BSON::ObjectId.new, 'title' => 'Awesome!'})
           assert_not_in_map(post)
         end
       end
@@ -465,6 +465,14 @@ class IdentityMapTest < Test::Unit::TestCase
           loaded.should_not equal(post)
         end
       end
+      
+      should "not load attributes from map when finding" do
+        post = @post_class.create(:title => 'Awesome!')
+        post.title = 'Temporary'
+        @post_class.without_identity_map do 
+          @post_class.find(post.id).title.should == 'Awesome!'
+        end
+      end
 
       context "all" do
         should "not add to map" do

data/test/functional/test_querying.rb

@@ -56,8 +56,8 @@ class QueryingTesting < Test::Unit::TestCase
     end
 
     should "automatically set id" do
-      @doc.id.should be_instance_of(BSON::ObjectID)
-      @doc._id.should be_instance_of(BSON::ObjectID)
+      @doc.id.should be_instance_of(BSON::ObjectId)
+      @doc._id.should be_instance_of(BSON::ObjectId)
     end
 
     should "no longer be new?" do
@@ -207,12 +207,12 @@ class QueryingTesting < Test::Unit::TestCase
       end
 
       should "compact not found when using find" do
-        @document.find(@doc1._id, BSON::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, BSON::ObjectID.new.to_s)
+          @document.find!(@doc1._id, BSON::ObjectId.new.to_s)
         end
       end
 
@@ -620,7 +620,7 @@ class QueryingTesting < Test::Unit::TestCase
     end
 
     should "assign an id for the document" do
-      @doc.id.should be_instance_of(BSON::ObjectID)
+      @doc.id.should be_instance_of(BSON::ObjectId)
     end
 
     should "save attributes" do
@@ -688,7 +688,7 @@ class QueryingTesting < Test::Unit::TestCase
     end
 
     should "assign an id for the document" do
-      @doc.id.should be_instance_of(BSON::ObjectID)
+      @doc.id.should be_instance_of(BSON::ObjectId)
     end
 
     should "save 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 {
-      BSON::ObjectID.from_string(project.id)
+      BSON::ObjectId.from_string(project.id)
     }.should_not raise_error
   end
 

data/test/test_helper.rb

@@ -2,8 +2,8 @@ require 'rubygems'
 gem 'activesupport',     ENV['ACTIVE_SUPPORT_VERSION']
 gem 'json'
 gem 'jnunemaker-matchy', '~> 0.4.0'
-gem 'shoulda',           '~> 2.10.2'
-gem 'timecop',           '~> 0.3.1'
+gem 'shoulda',           '~> 2.11'
+gem 'timecop',           '~> 0.3.5'
 gem 'mocha',             '~> 0.9.8'
 
 $:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')

data/test/unit/serializers/test_json_serializer.rb

@@ -26,6 +26,9 @@ class JsonSerializationTest < Test::Unit::TestCase
   end
 
   def setup
+    Kernel.const_set('TopLevelContact', Doc('TopLevelContact'))
+    TopLevelContact.key :name, String
+
     Contact.include_root_in_json = false
     @contact = Contact.new(
       :name        => 'Konata Izumi',
@@ -34,6 +37,18 @@ class JsonSerializationTest < Test::Unit::TestCase
       :awesome     => true,
       :preferences => { :shows => 'anime' }
     )
+    @top_level_contact = TopLevelContact.new(
+      :name        => 'Konata Izumi'
+    )
+  end
+
+  def teardown
+    Kernel.send(:remove_const, 'TopLevelContact') if Object.const_defined?('TopLevelContact')
+  end
+
+  should "include root for class with no module" do
+    TopLevelContact.include_root_in_json = true
+    assert_match %r{^\{"top_level_contact":\s?\{}, convert_to_json(@top_level_contact)
   end
 
   should "include demodulized root" do

data/test/unit/test_clone.rb

@@ -31,7 +31,7 @@ class CloneTest < Test::Unit::TestCase
       end
 
       should "clone many embedded documents" do
-        @doc.clone.widgets.should_not equal(@doc.widgets)
+        @doc.clone.widgets.object_id.should_not equal(@doc.widgets.object_id)
       end
 
       should "not be destroyed" do

data/test/unit/test_document.rb

@@ -105,7 +105,7 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "create id during initialization" do
-      @document.new._id.should be_instance_of(BSON::ObjectID)
+      @document.new._id.should be_instance_of(BSON::ObjectId)
     end
 
     should "have access to logger" do
@@ -165,7 +165,7 @@ class DocumentTest < Test::Unit::TestCase
 
     context "equality" do
       setup do
-        @oid = BSON::ObjectID.new
+        @oid = BSON::ObjectId.new
       end
 
       should "delegate hash to _id" do
@@ -201,7 +201,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' => BSON::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

@@ -236,17 +236,17 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
 
       should "create id during initialization" do
-        @document.new._id.should be_instance_of(BSON::ObjectID)
+        @document.new._id.should be_instance_of(BSON::ObjectId)
       end
 
       should "have id method returns _id" do
-        id = BSON::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 = BSON::ObjectID.new
+        id = BSON::ObjectId.new
         doc = @document.new(:id => id.to_s)
         doc._id.should == id
         doc.id.should  == id
@@ -555,7 +555,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
 
       context "equality" do
         setup do
-          @oid = BSON::ObjectID.new
+          @oid = BSON::ObjectId.new
         end
 
         should "delegate hash to _id" do
@@ -586,7 +586,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' => BSON::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_extensions.rb

@@ -204,7 +204,7 @@ class SupportTest < Test::Unit::TestCase
     end
 
     should "return value if object id" do
-      id = BSON::ObjectID.new
+      id = BSON::ObjectId.new
       ObjectId.to_mongo(id).should be(id)
     end
 
@@ -221,7 +221,7 @@ class SupportTest < Test::Unit::TestCase
       Object.from_mongo('21').should == '21'
       Object.from_mongo(9223372036854775807).should == 9223372036854775807
 
-      id = BSON::ObjectID.new
+      id = BSON::ObjectId.new
       ObjectId.from_mongo(id).should == id
     end
   end
@@ -353,28 +353,28 @@ class SupportTest < Test::Unit::TestCase
     end
   end
 
-  context "BSON::ObjectID" do
+  context "BSON::ObjectId" do
     context "#as_json" do
       should "convert object id to string" do
-        id = BSON::ObjectID.new
+        id = BSON::ObjectId.new
         id.as_json.should == id.to_s
       end
     end
 
     context "#to_json" do
       should "convert object id to string" do
-        id = BSON::ObjectID.new
+        id = BSON::ObjectId.new
         id.to_json.should == %Q("#{id}")
       end
 
       should "support ruby driver syntax also" do
-        id = BSON::ObjectID.new
+        id = BSON::ObjectId.new
         id.original_to_json.should == %Q({"$oid": "#{id}"})
       end
     end
   end
 
-  context "BSON::ObjectID.to_json" do
+  context "BSON::ObjectId.to_json" do
 
   end
 end

data/test/unit/test_key.rb

@@ -96,7 +96,7 @@ class KeyTest < Test::Unit::TestCase
     subject { @key }
 
     should "cast each element correctly" do
-      ids = [BSON::ObjectID.new, BSON::ObjectID.new, BSON::ObjectID.new.to_s, BSON::ObjectID.new.to_s]
+      ids = [BSON::ObjectId.new, BSON::ObjectId.new, BSON::ObjectId.new.to_s, BSON::ObjectId.new.to_s]
       subject.set(ids).should == ids.map { |id| ObjectId.to_mongo(id) }
     end
   end
@@ -106,7 +106,7 @@ class KeyTest < Test::Unit::TestCase
     subject { @key }
 
     should "cast each element correctly" do
-      ids = [BSON::ObjectID.new, BSON::ObjectID.new, BSON::ObjectID.new.to_s, BSON::ObjectID.new.to_s]
+      ids = [BSON::ObjectId.new, BSON::ObjectId.new, BSON::ObjectId.new.to_s, BSON::ObjectId.new.to_s]
       subject.set(ids).should == ids.map { |id| ObjectId.to_mongo(id) }
     end
   end

data/test/unit/test_validations.rb

@@ -7,6 +7,26 @@ class ValidationsTest < Test::Unit::TestCase
         @document = Doc()
       end
 
+      context "Validating uniquness of" do
+        should "not validate nil when allow_nil false" do
+          @document.key :name, String
+          @document.validates_uniqueness_of :name, :allow_nil => false
+          doc = @document.new(:name => nil)
+          doc.should have_error_on(:name)
+          doc.name = "Ryan"
+          doc.should_not have_error_on(:name)
+        end
+
+        should "not validate blank when allow_blank false" do
+          @document.key :name, String
+          @document.validates_uniqueness_of :name, :allow_blank => false
+          doc = @document.new(:name => "")
+          doc.should have_error_on(:name)
+          doc.name = "Ryan"
+          doc.should_not have_error_on(:name)
+        end
+      end
+
       context "Validating acceptance of" do
         should "work with validates_acceptance_of macro" do
           @document.key :terms, String

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - John Nunemaker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 -04:00
+date: 2010-08-29 00:00:00 -04:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,12 +58,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 25
         segments: 
         - 0
         - 3
-        - 3
-        version: 0.3.3
+        - 5
+        version: 0.3.5
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -118,12 +118,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 21
         segments: 
         - 2
-        - 10
-        - 2
-        version: 2.10.2
+        - 11
+        version: "2.11"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -169,11 +168,19 @@ extra_rdoc_files: []
 
 files: 
 - bin/mmconsole
+- examples/attr_accessible.rb
+- examples/attr_protected.rb
+- examples/cache_key.rb
+- examples/custom_types.rb
+- examples/identity_map/automatic.rb
+- examples/identity_map/middleware.rb
+- examples/identity_map.rb
 - examples/keys.rb
 - examples/modifiers/set.rb
 - examples/plugins.rb
 - examples/querying.rb
 - examples/scopes.rb
+- examples/validating/embedded_docs.rb
 - lib/mongo_mapper/connection.rb
 - lib/mongo_mapper/document.rb
 - lib/mongo_mapper/embedded_document.rb
@@ -243,6 +250,7 @@ files:
 - lib/mongo_mapper/support/descendant_appends.rb
 - lib/mongo_mapper/version.rb
 - lib/mongo_mapper.rb
+- rails/init.rb
 - test/_NOTE_ON_TESTING
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_proxy.rb
@@ -300,6 +308,7 @@ files:
 - test/unit/test_time_zones.rb
 - test/unit/test_validations.rb
 - LICENSE
+- UPGRADES
 - README.rdoc
 has_rdoc: true
 homepage: http://github.com/jnunemaker/mongomapper