mongoid 2.2.0 → 2.2.1

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

@@ -21,7 +21,6 @@ module Mongoid #:nodoc:
         def serialize(object)
           raise_or_return(object)
         end
-        alias :set :serialize
 
         protected
 

data/lib/mongoid/fields/serializable/boolean.rb

@@ -37,7 +37,6 @@ module Mongoid #:nodoc:
           object = MAPPINGS[object]
           object.nil? ? nil : object
         end
-        alias :set :serialize
       end
     end
   end

data/lib/mongoid/fields/serializable/float.rb

@@ -26,7 +26,6 @@ module Mongoid #:nodoc:
             object
           end
         end
-        alias :set :serialize
       end
     end
   end

data/lib/mongoid/fields/serializable/integer.rb

@@ -21,12 +21,11 @@ module Mongoid #:nodoc:
         def serialize(object)
           return nil if object.blank?
           begin
-            object.to_s =~ /\./ ? Float(object) : Integer(object)
+            object.to_s =~ /(^[-+]?[0-9]+$)|(\.0+)$/ ? Integer(object) : Float(object)
           rescue
             object
           end
         end
-        alias :set :serialize
       end
     end
   end

data/lib/mongoid/fields/serializable/object_id.rb

@@ -25,7 +25,6 @@ module Mongoid #:nodoc:
             object
           end
         end
-        alias :set :serialize
       end
     end
   end

data/lib/mongoid/fields/serializable/string.rb

@@ -21,7 +21,6 @@ module Mongoid #:nodoc:
         def serialize(object)
           object.try(:to_s)
         end
-        alias :set :serialize
       end
     end
   end

data/lib/mongoid/fields/serializable/symbol.rb

@@ -21,7 +21,6 @@ module Mongoid #:nodoc:
         def serialize(object)
           object.blank? ? nil : object.to_sym
         end
-        alias :set :serialize
       end
     end
   end

data/lib/mongoid/matchers/strategies.rb

@@ -49,15 +49,38 @@ module Mongoid #:nodoc:
       # @since 2.0.0.rc.7
       def matcher(document, key, value)
         if value.is_a?(Hash)
-          MATCHERS[value.keys.first].new(document.attributes[key.to_s])
+          MATCHERS[value.keys.first].new(extract_attribute(document, key))
         else
           if key == "$or"
             Matchers::Or.new(value, document)
           else
-            Default.new(document.attributes[key.to_s])
+            Default.new(extract_attribute(document, key))
           end
         end
       end
+
+      private
+
+      # Extract the attribute from the key, being smarter about dot notation.
+      #
+      # @example Extract the attribute.
+      #   strategy.extract_attribute(doc, "info.field")
+      #
+      # @param [ Document ] document The document.
+      # @param [ String ] key The key.
+      #
+      # @return [ Object ] The value of the attribute.
+      #
+      # @since 2.2.1
+      def extract_attribute(document, key)
+        if (key_string = key.to_s) =~ /.+\..+/
+          key_string.split('.').inject(document.attributes) do |attribs, key|
+            attribs.try(:[], key)
+          end
+        else
+          document.attributes[key_string]
+        end
+      end
     end
   end
 end

data/lib/mongoid/nested_attributes.rb

@@ -45,7 +45,7 @@ module Mongoid #:nodoc:
       #   by a hash of options.
       #
       # @option *args [ true, false ] :allow_destroy Can deletion occur?
-      # @option *args [ Proc ] :reject_if Block to reject documents with.
+      # @option *args [ Proc, Symbol ] :reject_if Block or symbol pointing to a class method to reject documents with.
       # @option *args [ Integer ] :limit The max number to create.
       # @option *args [ true, false ] :update_only Only update existing docs.
       def accepts_nested_attributes_for(*args)

data/lib/mongoid/persistence/atomic.rb

@@ -9,7 +9,7 @@ require "mongoid/persistence/atomic/pull_all"
 require "mongoid/persistence/atomic/push"
 require "mongoid/persistence/atomic/push_all"
 require "mongoid/persistence/atomic/rename"
-require "mongoid/persistence/atomic/set"
+require "mongoid/persistence/atomic/sets"
 require "mongoid/persistence/atomic/unset"
 
 module Mongoid #:nodoc:
@@ -201,7 +201,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.0
       def set(field, value = nil, options = {})
-        Set.new(self, field, value, options).persist
+        Sets.new(self, field, value, options).persist
       end
 
       # Performs the atomic $unset on the supplied field.

data/lib/mongoid/persistence/atomic/{set.rb → sets.rb}

@@ -4,7 +4,7 @@ module Mongoid #:nodoc:
     module Atomic #:nodoc:
 
       # This class provides atomic $set behaviour.
-      class Set
+      class Sets
         include Operation
 
         # Sends the atomic $set operation to the database.

data/lib/mongoid/persistence/deletion.rb

@@ -19,10 +19,10 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.0
       def prepare(&block)
+        document.cascade!
         yield(document)
         document.freeze
         document.destroyed = true
-        document.cascade!
         IdentityMap.remove(document)
         Threaded.clear_safety_options!
         true

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

@@ -22,13 +22,13 @@ module Mongoid # :nodoc:
             unless binding?
               binding do
                 inverse = metadata.inverse(target)
-                base.send(metadata.foreign_key_setter, target.id)
+                base.you_must(metadata.foreign_key_setter, target.id)
                 if metadata.inverse_type
-                  base.send(metadata.inverse_type_setter, target.class.model_name)
+                  base.you_must(metadata.inverse_type_setter, target.class.model_name)
                 end
                 if inverse
                   inverse_metadata = metadata.inverse_metadata(target)
-                  if inverse_metadata != metadata
+                  if inverse_metadata != metadata && !inverse_metadata.nil?
                     base.metadata = inverse_metadata
                     if base.referenced_many?
                       target.send(inverse).push(base)
@@ -54,9 +54,9 @@ module Mongoid # :nodoc:
             unless binding?
               binding do
                 inverse = metadata.inverse(target)
-                base.send(metadata.foreign_key_setter, nil)
+                base.you_must(metadata.foreign_key_setter, nil)
                 if metadata.inverse_type
-                  base.send(metadata.inverse_type_setter, nil)
+                  base.you_must(metadata.inverse_type_setter, nil)
                 end
                 if inverse
                   if base.referenced_many?

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

@@ -19,9 +19,9 @@ module Mongoid # :nodoc:
           def bind_one(doc)
             unless binding?
               binding do
-                doc.send(metadata.foreign_key_setter, base.id)
+                doc.you_must(metadata.foreign_key_setter, base.id)
                 if metadata.type
-                  doc.send(metadata.type_setter, base.class.model_name)
+                  doc.you_must(metadata.type_setter, base.class.model_name)
                 end
                 doc.send(metadata.inverse_setter, base)
               end
@@ -39,9 +39,9 @@ module Mongoid # :nodoc:
           def unbind_one(doc)
             unless binding?
               binding do
-                doc.send(metadata.foreign_key_setter, nil)
+                doc.you_must(metadata.foreign_key_setter, nil)
                 if metadata.type
-                  doc.send(metadata.type_setter, nil)
+                  doc.you_must(metadata.type_setter, nil)
                 end
                 doc.send(metadata.inverse_setter, nil)
               end

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

@@ -19,7 +19,7 @@ module Mongoid # :nodoc:
           def bind_one(doc)
             unless binding?
               binding do
-                inverse_keys = doc.do_or_do_not(metadata.inverse_foreign_key)
+                inverse_keys = doc.you_must(metadata.inverse_foreign_key)
                 inverse_keys.push(base.id) if inverse_keys
                 base.synced[metadata.foreign_key] = true
                 doc.synced[metadata.inverse_foreign_key] = true
@@ -37,7 +37,7 @@ module Mongoid # :nodoc:
             unless binding?
               binding do
                 base.send(metadata.foreign_key).delete_one(doc.id)
-                inverse_keys = doc.do_or_do_not(metadata.inverse_foreign_key)
+                inverse_keys = doc.you_must(metadata.inverse_foreign_key)
                 inverse_keys.delete_one(base.id) if inverse_keys
                 base.synced[metadata.foreign_key] = true
                 doc.synced[metadata.inverse_foreign_key] = true

data/lib/mongoid/relations/bindings/referenced/one.rb

@@ -21,10 +21,10 @@ module Mongoid # :nodoc:
           def bind
             unless binding?
               binding do
-                target.send(metadata.foreign_key_setter, base.id)
+                target.you_must(metadata.foreign_key_setter, base.id)
                 target.send(metadata.inverse_setter, base)
                 if metadata.type
-                  target.send(metadata.type_setter, base.class.model_name)
+                  target.you_must(metadata.type_setter, base.class.model_name)
                 end
               end
             end
@@ -42,10 +42,10 @@ module Mongoid # :nodoc:
           def unbind
             unless binding?
               binding do
-                target.send(metadata.foreign_key_setter, nil)
+                target.you_must(metadata.foreign_key_setter, nil)
                 target.send(metadata.inverse_setter, nil)
                 if metadata.type
-                  target.send(metadata.type_setter, nil)
+                  target.you_must(metadata.type_setter, nil)
                 end
               end
             end

data/lib/mongoid/relations/builder.rb

@@ -35,8 +35,7 @@ module Mongoid # :nodoc:
       #
       # @since 2.0.0.rc.1
       def query?
-        return true unless object.respond_to?(:to_a)
-        obj = object.to_a.first
+        obj = Array(object).first
         !obj.is_a?(Mongoid::Document) && !obj.nil?
       end
     end

data/lib/mongoid/relations/builders/nested_attributes/many.rb

@@ -25,9 +25,9 @@ module Mongoid # :nodoc:
             end
             attributes.each do |attrs|
               if attrs.respond_to?(:with_indifferent_access)
-                process(attrs)
+                process(parent, attrs)
               else
-                process(attrs[1])
+                process(parent, attrs[1])
               end
             end
           end
@@ -89,12 +89,13 @@ module Mongoid # :nodoc:
           #   builder.process({ "id" => 1, "street" => "Bond" })
           #
           # @param [ Hash ] attrs The single document attributes to process.
-          def process(attrs)
-            return if reject?(attrs)
+          def process(parent, attrs)
+            return if reject?(parent, attrs)
             if id = attrs["id"] || attrs["_id"]
               doc = existing.find(convert_id(id))
               if destroyable?(attrs)
                 existing.delete(doc)
+                doc.destroy unless doc.embedded?
               else
                 metadata.embedded? ? doc.attributes = attrs : doc.update_attributes(attrs)
               end

data/lib/mongoid/relations/builders/nested_attributes/one.rb

@@ -22,7 +22,7 @@ module Mongoid # :nodoc:
           #
           # parent: The parent document of the relation.
           def build(parent)
-            return if reject?(attributes)
+            return if reject?(parent, attributes)
             @existing = parent.send(metadata.name)
             if update?
               existing.attributes = attributes

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

@@ -29,7 +29,7 @@ module Mongoid # :nodoc:
           # @example Get the value.
           #   builder.convertable
           #
-          # @return [ String, Unconvertable, BSON::ObjectId ] The string or object id.
+          # @return [ String, BSON::ObjectId ] The string or object id.
           #
           # @since 2.0.2
           def convertable(metadata, object)
@@ -37,7 +37,9 @@ module Mongoid # :nodoc:
             if inverse.using_object_ids? || object.is_a?(BSON::ObjectId)
               object
             else
-              Criterion::Unconvertable.new(object)
+              object.tap do |obj|
+                obj.unconvertable_to_bson = true if obj.is_a?(String)
+              end
             end
           end
         end

data/lib/mongoid/relations/cascading/destroy.rb

@@ -11,7 +11,14 @@ module Mongoid # :nodoc:
         # @example Perform the cascading destroy.
         #   strategy.cascade
         def cascade
-          relation.to_a.each { |doc| doc.destroy } if relation
+          if relation
+            if relation.is_a?(Enumerable)
+              relation.entries
+              relation.each { |doc| doc.destroy }
+            else
+              relation.destroy
+            end
+          end
         end
       end
     end

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

@@ -41,7 +41,7 @@ module Mongoid # :nodoc:
           tap do |proxy|
             proxy.unbind_one
             unless replacement
-              base.delete unless binding?
+              base.delete if persistable?
               return nil
             end
             base.new_record = true

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

@@ -268,6 +268,19 @@ module Mongoid # :nodoc:
           end
         end
 
+        # Get a criteria for the embedded documents without the default scoping
+        # applied.
+        #
+        # @example Get the unscoped criteria.
+        #   person.addresses.unscoped
+        #
+        # @return [ Criteria ] The unscoped criteria.
+        #
+        # @since 2.2.1
+        def unscoped
+          criteria(false)
+        end
+
         private
 
         # Appends the document to the target array, updating the index on the
@@ -306,8 +319,8 @@ module Mongoid # :nodoc:
         #   relation.criteria
         #
         # @return [ Criteria ] A new criteria.
-        def criteria
-          klass.criteria(true).tap do |criterion|
+        def criteria(scoped = true)
+          klass.criteria(true, scoped).tap do |criterion|
             criterion.documents = target
           end
         end

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

@@ -39,7 +39,7 @@ module Mongoid # :nodoc:
             if assigning?
               base.atomic_unsets.push(proxy.atomic_path)
             else
-              proxy.delete
+              proxy.delete if persistable?
             end
             proxy.unbind_one
             return nil unless replacement

data/lib/mongoid/relations/nested_builder.rb

@@ -25,14 +25,21 @@ module Mongoid # :nodoc:
       # @example Is there a reject proc?
       #   builder.reject?
       #
+      # @param The parent document of the relation
       # @param [ Hash ] attrs The attributes to check for rejection.
       #
-      # @return [ true, false ] True and call proc if rejectable, false if not.
+      # @return [ true, false ] True and call proc or method if rejectable, false if not.
       #
       # @since 2.0.0.rc.1
-      def reject?(attrs)
-        criteria = options[:reject_if]
-        criteria ? criteria.call(attrs) : false
+      def reject?(document, attrs)
+        case callback = options[:reject_if]
+        when Symbol
+          document.method(callback).arity == 0 ? document.send(callback) : document.send(callback, attrs)
+        when Proc
+          callback.call(attrs)
+        else
+         false
+        end
       end
 
       # Determines if only updates can occur. Only valid for one-to-one

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

@@ -329,7 +329,7 @@ module Mongoid #:nodoc:
         # @example Get the value.
         #   relation.convertable
         #
-        # @return [ String, Unconvertable, BSON::ObjectId ] The string or object id.
+        # @return [ String, BSON::ObjectId ] The string or object id.
         #
         # @since 2.0.2
         def convertable
@@ -337,7 +337,9 @@ module Mongoid #:nodoc:
           if inverse.using_object_ids? || base.id.is_a?(BSON::ObjectId)
             base.id
           else
-            Criterion::Unconvertable.new(base.id)
+            base.id.tap do |id|
+              id.unconvertable_to_bson = true if id.is_a?(String)
+            end
           end
         end
 

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

@@ -35,6 +35,7 @@ module Mongoid # :nodoc:
                   doc.save
                 else
                   base.send(metadata.foreign_key).push(doc.id)
+                  base.synced[metadata.foreign_key] = false
                 end
               end
               if persistable? || creating?
@@ -142,7 +143,7 @@ module Mongoid # :nodoc:
         # @since 2.0.0.rc.1
         def nullify
           criteria.pull(metadata.inverse_foreign_key, base.id)
-          unless base.destroyed?
+          if persistable?
             base.set(
               metadata.foreign_key,
               base.send(metadata.foreign_key).clear