mongoid 2.1.2 → 2.1.3

data/lib/mongoid/criterion/complex.rb

@@ -56,6 +56,18 @@ module Mongoid #:nodoc:
         return false unless other.is_a?(self.class)
         self.key == other.key && self.operator == other.operator
       end
+
+      # Returns the name of the key as a string.
+      #
+      # @example Get the name of the key.
+      #   criterion.to_s
+      #
+      # @return [ String ] The field name.
+      #
+      # @since 2.1.0
+      def to_s
+        key.to_s
+      end
     end
   end
 end

data/lib/mongoid/document.rb

@@ -46,7 +46,7 @@ module Mongoid #:nodoc:
     #
     # @return [ true, false ] True if the classes are equal, false if not.
     def ===(other)
-      self.class == other.class
+      other.is_a?(self.class)
     end
 
     # Delegates to ==. Used when needing checks in hashes.
@@ -159,6 +159,7 @@ module Mongoid #:nodoc:
             remove_instance_variable("@#{name}")
           end
         end
+        run_callbacks(:initialize)
       end
     end
 

data/lib/mongoid/relations/cyclic.rb

@@ -80,7 +80,7 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def cyclic_parent_name
-          ("parent_" << self.name.underscore.singularize).to_sym
+          ("parent_" << self.name.demodulize.underscore.singularize).to_sym
         end
 
         # Determines the child name given the class.
@@ -95,7 +95,7 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def cyclic_child_name(many = true)
-          ("child_" << self.name.underscore.send(many ? :pluralize : :singularize)).to_sym
+          ("child_" << self.name.demodulize.underscore.send(many ? :pluralize : :singularize)).to_sym
         end
       end
     end

data/lib/mongoid/relations/embedded/many.rb

@@ -123,7 +123,10 @@ module Mongoid # :nodoc:
         # @since 2.0.0.rc.1
         def delete(document)
           target.delete_one(document).tap do |doc|
-            unbind_one(doc) if doc && !binding?
+            if doc && !binding?
+              unbind_one(doc)
+              doc.delete(:suppress => true)
+            end
             reindex
           end
         end

data/lib/mongoid/relations/many.rb

@@ -83,6 +83,18 @@ module Mongoid #:nodoc:
         [].respond_to?(name, include_private) || super
       end
 
+      # This is public access to the relation's criteria.
+      #
+      # @example Get the scoped relation.
+      #   relation.scoped
+      #
+      # @return [ Criteria ] The scoped criteria.
+      #
+      # @since 2.1.0
+      def scoped
+        criteria
+      end
+
       # Gets the document as a serializable hash, used by ActiveModel's JSON and
       # XML serializers. This override is just to be able to pass the :include
       # and :except options to get associations in the hash.

data/lib/mongoid/relations/referenced/many.rb

@@ -60,23 +60,6 @@ module Mongoid #:nodoc:
         end
         alias :new :build
 
-        # Clear the relation. Will delete the documents from the db if they are
-        # already persisted.
-        #
-        # @example Clear the relation.
-        #   person.posts.clear
-        #
-        # @return [ Many ] The relation emptied.
-        #
-        # @since 2.0.0.beta.1
-        def clear
-          criteria.delete_all
-          target.clear do |doc|
-            unbind_one(doc)
-            doc.destroyed = true
-          end
-        end
-
         # Creates a new document on the references many relation. This will
         # save the document if the parent has been persisted.
         #
@@ -259,6 +242,24 @@ module Mongoid #:nodoc:
         end
         alias :nullify_all :nullify
 
+        # Clear the relation. Will delete the documents from the db if they are
+        # already persisted.
+        #
+        # @example Clear the relation.
+        #   person.posts.clear
+        #
+        # @return [ Many ] The relation emptied.
+        #
+        # @since 2.0.0.beta.1
+        def purge
+          criteria.delete_all
+          target.clear do |doc|
+            unbind_one(doc)
+            doc.destroyed = true
+          end
+        end
+        alias :clear :purge
+
         # Substitutes the supplied target documents for the existing documents
         # in the relation. If the new target is nil, perform the necessary
         # deletion.
@@ -273,7 +274,7 @@ module Mongoid #:nodoc:
         # @since 2.0.0.rc.1
         def substitute(replacement)
           tap do |proxy|
-            proxy.clear
+            proxy.purge
             proxy.push(replacement) if replacement
           end
         end

data/lib/mongoid/relations/referenced/many_to_many.rb

@@ -171,14 +171,19 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def nullify
-          # @todo: Durran: This is wrong.
-          criteria.update(metadata.inverse_foreign_key => [])
-          # We need to update the inverse as well.
+          criteria.pull(metadata.inverse_foreign_key, base.id)
+          unless base.destroyed?
+            base.set(
+              metadata.foreign_key,
+              base.send(metadata.foreign_key).clear
+            )
+          end
           target.clear do |doc|
             unbind_one(doc)
           end
         end
         alias :nullify_all :nullify
+        alias :clear :nullify
 
         private
 

data/lib/mongoid/validations.rb

@@ -26,7 +26,7 @@ module Mongoid #:nodoc:
     # @since 2.0.0.rc.1
     def read_attribute_for_validation(attr)
       if relations[attr.to_s]
-        relation = ivar(attr)
+        relation = send(attr)
         relation ? relation.in_memory : nil
       else
         send(attr)

data/lib/mongoid/version.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
+  VERSION_DATE = "2011-08-03"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-31 00:00:00.000000000 %:z
+date: 2011-08-03 00:00:00.000000000 %:z
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2151774380 !ruby/object:Gem::Requirement
+  requirement: &2151762700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151774380
+  version_requirements: *2151762700
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &2151772820 !ruby/object:Gem::Requirement
+  requirement: &2151761080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *2151772820
+  version_requirements: *2151761080
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2151770980 !ruby/object:Gem::Requirement
+  requirement: &2151759440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2151770980
+  version_requirements: *2151759440
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2151758560 !ruby/object:Gem::Requirement
+  requirement: &2151746880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *2151758560
+  version_requirements: *2151746880
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2151755800 !ruby/object:Gem::Requirement
+  requirement: &2151744200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *2151755800
+  version_requirements: *2151744200
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2151752500 !ruby/object:Gem::Requirement
+  requirement: &2151742640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *2151752500
+  version_requirements: *2151742640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151750800 !ruby/object:Gem::Requirement
+  requirement: &2151740940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2151750800
+  version_requirements: *2151740940
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &2151748540 !ruby/object:Gem::Requirement
+  requirement: &2151738900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,7 +99,7 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *2151748540
+  version_requirements: *2151738900
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -380,7 +380,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1067199592280239396
+      hash: -3549058104272802333
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: