mongoid 2.1.5 → 2.1.6

data/lib/mongoid/dirty.rb

@@ -21,7 +21,9 @@ module Mongoid #:nodoc:
       {}.tap do |hash|
         changed.each do |name|
           change = attribute_change(name)
-          hash[name] = change if change[0] != change[1]
+          if change
+            hash[name] = change if change[0] != change[1]
+          end
         end
       end
     end
@@ -89,5 +91,20 @@ module Mongoid #:nodoc:
     def attribute_change(attr)
       [changed_attributes[attr], attributes[attr]] if attribute_changed?(attr)
     end
+
+    # Determine if a specific attribute has changed.
+    #
+    # @note Overriding AM::Dirty once again since their implementation is not
+    #   friendly to fields that can be changed in place.
+    #
+    # @param [ String ] attr The name of the attribute.
+    #
+    # @return [ true, false ] Whether the attribute has changed.
+    #
+    # @since 2.1.6
+    def attribute_changed?(attr)
+      return false unless changed_attributes.include?(attr)
+      changed_attributes[attr] != attributes[attr]
+    end
   end
 end

data/lib/mongoid/document.rb

@@ -154,11 +154,7 @@ module Mongoid #:nodoc:
       changed_attributes.clear
       apply_default_attributes
       tap do
-        relations.keys.each do |name|
-          if instance_variable_defined?("@#{name}")
-            remove_instance_variable("@#{name}")
-          end
-        end
+        reload_relations
         run_callbacks(:initialize)
       end
     end

data/lib/mongoid/extensions.rb

@@ -6,6 +6,7 @@ require "mongoid/extensions/hash/scoping"
 require "mongoid/extensions/nil/collectionization"
 require "mongoid/extensions/object/checks"
 require "mongoid/extensions/object/reflections"
+require "mongoid/extensions/object/substitutable"
 require "mongoid/extensions/object/yoda"
 require "mongoid/extensions/proc/scoping"
 require "mongoid/extensions/string/conversions"
@@ -37,6 +38,7 @@ end
 class Object #:nodoc:
   include Mongoid::Extensions::Object::Checks
   include Mongoid::Extensions::Object::Reflections
+  include Mongoid::Extensions::Object::Substitutable
   include Mongoid::Extensions::Object::Yoda
 end
 

data/lib/mongoid/extensions/object/substitutable.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Object #:nodoc:
+
+      # This module is for defining base substitutable behaviour.
+      module Substitutable #:nodoc:
+
+        def substitutable
+          self
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/fields.rb

@@ -242,11 +242,11 @@ module Mongoid #:nodoc
             end
           else
             define_method(meth) do
-              value = read_attribute(name)
-              if value.is_a?(Array) || value.is_a?(Hash)
-                changed_attributes[name] = value.clone unless attribute_changed?(name)
+              read_attribute(name).tap do |value|
+                if value.is_a?(Array) || value.is_a?(Hash)
+                  changed_attributes[name] = value.clone unless attribute_changed?(name)
+                end
               end
-              value
             end
           end
           define_method("#{meth}=") do |value|

data/lib/mongoid/fields/serializable/foreign_keys/array.rb

@@ -33,7 +33,7 @@ module Mongoid #:nodoc:
           #
           # @since 2.1.0
           def serialize(object)
-            object.blank? ? [] : constraint.convert(object)
+            object ? constraint.convert(object) : []
           end
 
           protected

data/lib/mongoid/relations.rb

@@ -107,5 +107,22 @@ module Mongoid # :nodoc:
     def referenced_one?
       metadata && metadata.macro == :references_one
     end
+
+    # Convenience method for iterating through the loaded relations and
+    # reloading them.
+    #
+    # @example Reload the relations.
+    #   document.reload_relations
+    #
+    # @return [ Hash ] The relations metadata.
+    #
+    # @since 2.1.6
+    def reload_relations
+      relations.each_pair do |name, meta|
+        if instance_variable_defined?("@#{name}")
+          remove_instance_variable("@#{name}")
+        end
+      end
+    end
   end
 end

data/lib/mongoid/relations/accessors.rb

@@ -74,20 +74,6 @@ module Mongoid # :nodoc:
         instance_variable_set("@#{name}", relation)
       end
 
-      # Replace an existing relation with a new one.
-      #
-      # @example Replace the relation.
-      #   document.substitute("addresses", Address.new)
-      #
-      # @param [ String ] name The name of the relation.
-      # @param [ Document ] object The document to replace with.
-      # @param [ Hash ] options The options.
-      #
-      # @since 2.0.0
-      def substitute(name, object)
-        set_relation(name, ivar(name).substitute(object))
-      end
-
       module ClassMethods #:nodoc:
 
         # Defines the getter for the relation. Nothing too special here: just
@@ -134,16 +120,11 @@ module Mongoid # :nodoc:
         # @since 2.0.0.rc.1
         def setter(name, metadata)
           tap do
-            define_method("#{name}=") do |*args|
-              object = args.first
-              if relation_exists?(name) && !object.is_a?(Hash)
-                substitute(name, object)
+            define_method("#{name}=") do |object|
+              if relation_exists?(name) || metadata.many?
+                set_relation(name, send(name).substitute(object.substitutable))
               else
-                if metadata.embedded? && object.blank? && send(name)
-                  substitute(name, object)
-                else
-                  build(name, object, metadata)
-                end
+                set_relation(name, build(name, object.substitutable, metadata))
               end
             end
           end

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

@@ -26,6 +26,18 @@ module Mongoid # :nodoc:
           end
         end
 
+        # This substituable does not clone.
+        #
+        # @example Get the substitutable.
+        #   proxy.substitutable
+        #
+        # @return [ Object ] The target.
+        #
+        # @since 2.1.6
+        def substitutable
+          target
+        end
+
         # Substitutes the supplied target documents for the existing document
         # in the relation.
         #
@@ -44,6 +56,7 @@ module Mongoid # :nodoc:
               base.delete unless binding?
               return nil
             end
+            base.new_record = true
             proxy.target = replacement
             proxy.bind_one
           end

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

@@ -231,6 +231,9 @@ module Mongoid # :nodoc:
               proxy.clear
             else
               atomically(:$set) do
+                if replacement.first.is_a?(Hash)
+                  replacement = Many.builder(metadata, replacement).build
+                end
                 proxy.target = replacement.compact
                 proxy.target.each_with_index do |doc, index|
                   integrate(doc)

data/lib/mongoid/relations/metadata.rb

@@ -375,7 +375,7 @@ module Mongoid # :nodoc:
       # @since 2.0.0.rc.1
       def inverse_foreign_key
         @inverse_foreign_key ||=
-          ( inverse_of ? inverse_of.to_s.singularize : inverse_class_name.underscore ) <<
+          ( inverse_of ? inverse_of.to_s.singularize : inverse_class_name.demodulize.underscore ) <<
           relation.foreign_key_suffix
       end
 
@@ -496,6 +496,18 @@ module Mongoid # :nodoc:
         @klass ||= class_name.constantize
       end
 
+      # Is this metadata representing a one to many or many to many relation?
+      #
+      # @example Is the relation a many?
+      #   metadata.many?
+      #
+      # @return [ true, false ] If the relation is a many.
+      #
+      # @since 2.1.6
+      def many?
+        @many ||= relation.macro =~ /many/
+      end
+
       # Returns the macro for the relation of this metadata.
       #
       # @example Get the macro.

data/lib/mongoid/relations/proxy.rb

@@ -16,7 +16,6 @@ module Mongoid # :nodoc:
 
       # Backwards compatibility with Mongoid beta releases.
       delegate :klass, :to => :metadata
-
       delegate :bind_one, :unbind_one, :to => :binding
 
       # Convenience for setting the target and the metadata properties since
@@ -36,6 +35,19 @@ module Mongoid # :nodoc:
         extend metadata.extension if metadata.extension?
       end
 
+      # The default substitutable object for a relation proxy is the clone of
+      # the target.
+      #
+      # @example Get the substitutable.
+      #   proxy.substitutable
+      #
+      # @return [ Object ] A clone of the target.
+      #
+      # @since 2.1.6
+      def substitutable
+        target.clone
+      end
+
       protected
 
       # Is the current thread in binding mode?

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

@@ -25,6 +25,18 @@ module Mongoid # :nodoc:
           end
         end
 
+        # This substituable does not clone.
+        #
+        # @example Get the substitutable.
+        #   proxy.substitutable
+        #
+        # @return [ Object ] The target.
+        #
+        # @since 2.1.6
+        def substitutable
+          target
+        end
+
         # Substitutes the supplied target documents for the existing document
         # in the relation.
         #

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

@@ -214,15 +214,8 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0.beta.1
         def initialize(base, target, metadata)
-          init(base, Targets::Enumerable.new(target), metadata) do |proxy|
+          init(base, Targets::Enumerable.new(target), metadata) do
             raise_mixed if klass.embedded?
-            batched do
-              proxy.in_memory do |doc|
-                characterize_one(doc)
-                bind_one(doc)
-                doc.save if persistable?
-              end
-            end
           end
         end
 
@@ -275,7 +268,7 @@ module Mongoid #:nodoc:
         def substitute(replacement)
           tap do |proxy|
             proxy.purge
-            proxy.push(replacement) if replacement
+            proxy.push(replacement.compact) if replacement
           end
         end
 

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

@@ -132,36 +132,6 @@ module Mongoid # :nodoc:
           end
         end
 
-        # Instantiate a new references_many relation. Will set the foreign key
-        # and the base on the inverse object.
-        #
-        # @example Create the new relation.
-        #   Referenced::Many.new(base, target, metadata)
-        #
-        # @param [ Document ] base The document this relation hangs off of.
-        # @param [ Array<Document> ] target The target of the relation.
-        # @param [ Metadata ] metadata The relation's metadata.
-        #
-        # @since 2.0.0.beta.1
-        def initialize(base, target, metadata)
-          init(base, Targets::Enumerable.new(target), metadata) do |proxy|
-            raise_mixed if klass.embedded?
-            batched do
-              proxy.in_memory do |doc|
-                characterize_one(doc)
-                bind_one(doc)
-                if persistable?
-                  base.push(metadata.foreign_key, doc.id)
-                  base.synced[metadata.foreign_key] = false
-                  doc.save
-                else
-                  base.send(metadata.foreign_key).push(doc.id)
-                end
-              end
-            end
-          end
-        end
-
         # Removes all associations between the base document and the target
         # documents by deleting the foreign keys and the references, orphaning
         # the target documents in the process.
@@ -185,6 +155,27 @@ module Mongoid # :nodoc:
         alias :nullify_all :nullify
         alias :clear :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
+          base.set(
+            metadata.foreign_key,
+            base.send(metadata.foreign_key).clear
+          )
+          target.clear do |doc|
+            unbind_one(doc)
+            doc.destroyed = true
+          end
+        end
+
         private
 
         # Appends the document to the target array, updating the index on the
@@ -244,6 +235,19 @@ module Mongoid # :nodoc:
             Builders::Referenced::ManyToMany.new(meta, object, loading)
           end
 
+          # Create the standard criteria for this relation given the supplied
+          # metadata and object.
+          #
+          # @example Get the criteria.
+          #   Proxy.criteria(meta, object)
+          #
+          # @param [ Metadata ] metadata The relation metadata.
+          # @param [ Object ] object The object for the criteria.
+          # @param [ Class ] type The criteria class.
+          #
+          # @return [ Criteria ] The criteria.
+          #
+          # @since 2.1.0
           def criteria(metadata, object, type = nil)
             metadata.klass.any_in(:_id => object)
           end

data/lib/mongoid/relations/synchronization.rb

@@ -61,6 +61,7 @@ module Mongoid # :nodoc:
       #
       # @since 2.1.0
       def update_inverse_keys(meta)
+        return unless changes.has_key?(meta.foreign_key)
         old, new = changes[meta.foreign_key]
         meta.criteria(new - old).add_to_set(meta.inverse_foreign_key, id)
         meta.criteria(old - new).pull(meta.inverse_foreign_key, id)

data/lib/mongoid/relations/targets/enumerable.rb

@@ -67,6 +67,20 @@ module Mongoid #:nodoc:
           loaded.clear and added.clear
         end
 
+        # Clones each document in the enumerable.
+        #
+        # @note This loads all documents into memory.
+        #
+        # @example Clone the enumerable.
+        #   enumerable.clone
+        #
+        # @return [ Array<Document> ] An array clone of the enumerable.
+        #
+        # @since 2.1.6
+        def clone
+          collect { |doc| doc.clone }
+        end
+
         # Delete the supplied document from the enumerable.
         #
         # @example Delete the document.

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.1.5"
+  VERSION = "2.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-05 00:00:00.000000000Z
+date: 2011-08-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70194026936900 !ruby/object:Gem::Requirement
+  requirement: &70184069667540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70194026936900
+  version_requirements: *70184069667540
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70194026936180 !ruby/object:Gem::Requirement
+  requirement: &70184069666660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *70194026936180
+  version_requirements: *70184069666660
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70194026935100 !ruby/object:Gem::Requirement
+  requirement: &70184069665680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70194026935100
+  version_requirements: *70184069665680
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70194026934200 !ruby/object:Gem::Requirement
+  requirement: &70184069664720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *70194026934200
+  version_requirements: *70184069664720
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70194026933020 !ruby/object:Gem::Requirement
+  requirement: &70184069663720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70194026933020
+  version_requirements: *70184069663720
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70194026932080 !ruby/object:Gem::Requirement
+  requirement: &70184069662540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *70194026932080
+  version_requirements: *70184069662540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70194026931080 !ruby/object:Gem::Requirement
+  requirement: &70184069661380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70194026931080
+  version_requirements: *70184069661380
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70194026929800 !ruby/object:Gem::Requirement
+  requirement: &70184069660280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70194026929800
+  version_requirements: *70184069660280
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -186,6 +186,7 @@ files:
 - lib/mongoid/extensions/nil/collectionization.rb
 - lib/mongoid/extensions/object/checks.rb
 - lib/mongoid/extensions/object/reflections.rb
+- lib/mongoid/extensions/object/substitutable.rb
 - lib/mongoid/extensions/object/yoda.rb
 - lib/mongoid/extensions/object_id/conversions.rb
 - lib/mongoid/extensions/proc/scoping.rb
@@ -378,7 +379,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3142306228316146123
+      hash: -4360740221674892894
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: