mongoid 2.0.0.rc.6 → 2.0.0.rc.7

data/lib/mongoid/field.rb

@@ -51,8 +51,11 @@ module Mongoid #:nodoc:
       unless options[:identity]
         type.set(object)
       else
-        metadata = options[:metadata]
-        object.blank? ? type.set(object) : BSON::ObjectId.cast!(metadata.inverse_klass, object)
+        if object.blank?
+          type.set(object)
+        else
+          options[:metadata].constraint.convert(object)
+        end
       end
     end
 

data/lib/mongoid/identity.rb

@@ -12,7 +12,8 @@ module Mongoid #:nodoc:
     # @example Create the id and set the type.
     #   identity.create
     def create
-      identify and type
+      identify
+      type
     end
 
     # Create the new identity generator - this will be expanded in the future

data/lib/mongoid/matchers.rb

@@ -1,15 +1,5 @@
 # encoding: utf-8
-require "mongoid/matchers/default"
-require "mongoid/matchers/all"
-require "mongoid/matchers/exists"
-require "mongoid/matchers/gt"
-require "mongoid/matchers/gte"
-require "mongoid/matchers/in"
-require "mongoid/matchers/lt"
-require "mongoid/matchers/lte"
-require "mongoid/matchers/ne"
-require "mongoid/matchers/nin"
-require "mongoid/matchers/size"
+require "mongoid/matchers/strategies"
 
 module Mongoid #:nodoc:
 
@@ -28,28 +18,11 @@ module Mongoid #:nodoc:
     # @return [ true, false ] True if matches, false if not.
     def matches?(selector)
       selector.each_pair do |key, value|
-        return false unless matcher(key, value).matches?(value)
-      end; true
-    end
-
-    protected
-
-    # Get the matcher for the supplied key and value. Will determine the class
-    # name from the key.
-    #
-    # @example Get the matcher.
-    #   document.matcher(:title, { "$in" => [ "test" ] })
-    #
-    # @param [ Symbol, String ] key The field name.
-    # @param [ Object, Hash ] The value or selector.
-    #
-    # @return [ Matcher ] The matcher.
-    def matcher(key, value)
-      if value.is_a?(Hash)
-        name = "Mongoid::Matchers::#{value.keys.first.gsub("$", "").camelize}"
-        return name.constantize.new(attributes[key])
+        unless Strategies.matcher(self, key, value).matches?(value)
+          return false
+        end
       end
-      Default.new(attributes[key])
+      return true
     end
   end
 end

data/lib/mongoid/matchers/default.rb

@@ -1,26 +1,69 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Matchers #:nodoc:
+
+    # Contains all the default behavior for checking for matching documents
+    # given MongoDB expressions.
     class Default
+
+      attr_accessor :attribute, :document
+
       # Creating a new matcher only requires the value.
-      def initialize(attribute)
-        @attribute = attribute
+      #
+      # @example Create a new matcher.
+      #   Default.new("attribute")
+      #
+      # @param [ Object ] attribute The current attribute to check against.
+      #
+      # @since 1.0.0
+      def initialize(attribute, document = nil)
+        @attribute, @document = attribute, document
       end
-      # Return true if the attribute and value are equal.
+
+      # Return true if the attribute and value are equal, or if it is an array
+      # if the value is included.
+      #
+      # @example Does this value match?
+      #   default.matches?("value")
+      #
+      # @param [ Object ] value The value to check if it matches.
+      #
+      # @return [ true, false ] True if matches, false if not.
+      #
+      # @since 1.0.0
       def matches?(value)
-        @attribute.is_a?(Array) && value.is_a?(String) ?
-          @attribute.include?(value) : value === @attribute
+        attribute.is_a?(Array) ? attribute.include?(value) : value === attribute
       end
 
       protected
-      # Return the first value in the hash.
-      def first(value)
-        value.values.first
+
+      # Convenience method for getting the first value in a hash.
+      #
+      # @example Get the first value.
+      #   matcher.first(:test => "value")
+      #
+      # @param [ Hash ] hash The has to pull from.
+      #
+      # @return [ Object ] The first value.
+      #
+      # @since 1.0.0
+      def first(hash)
+        hash.values.first
       end
 
-      # If object exists then compare, else return false
+      # If object exists then compare the two, otherwise return false
+      #
+      # @example Determine if we can compare.
+      #   matcher.determine("test", "$in")
+      #
+      # @param [ Object ] value The value to compare with.
+      # @param [ Symbol, String ] operator The comparison operation.
+      #
+      # @return [ true, false ] The comparison or false.
+      #
+      # @since 1.0.0
       def determine(value, operator)
-        @attribute ? @attribute.send(operator, first(value)) : false
+        attribute ? attribute.send(operator, first(value)) : false
       end
     end
   end

data/lib/mongoid/matchers/or.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Matchers #:nodoc:
+
+    # Defines behavior for handling $or expressions in embedded documents.
+    class Or < Default
+
+      # Does the supplied query match the attribute?
+      #
+      # @example Does this match?
+      #   matcher.matches?("$or" => [ { field => value } ])
+      #
+      # @param [ Array ] conditions The or expression.
+      #
+      # @return [ true, false ] True if matches, false if not.
+      #
+      # @since 2.0.0.rc.7
+      def matches?(conditions)
+        conditions.each do |condition|
+          key = condition.keys.first
+          value = condition.values.first
+          if Strategies.matcher(document, key, value).matches?(value)
+            return true
+          end
+        end
+        return false
+      end
+    end
+  end
+end

data/lib/mongoid/matchers/strategies.rb

@@ -0,0 +1,63 @@
+# encoding: utf-8
+require "mongoid/matchers/default"
+require "mongoid/matchers/all"
+require "mongoid/matchers/exists"
+require "mongoid/matchers/gt"
+require "mongoid/matchers/gte"
+require "mongoid/matchers/in"
+require "mongoid/matchers/lt"
+require "mongoid/matchers/lte"
+require "mongoid/matchers/ne"
+require "mongoid/matchers/nin"
+require "mongoid/matchers/or"
+require "mongoid/matchers/size"
+
+module Mongoid #:nodoc:
+  module Matchers #:nodoc:
+
+    # This module is responsible for returning the correct matcher given a
+    # MongoDB query expression.
+    module Strategies
+      extend self
+
+      MATCHERS = {
+        "$all" => Matchers::All,
+        "$exists" => Matchers::Exists,
+        "$gt" => Matchers::Gt,
+        "$gte" => Matchers::Gte,
+        "$in" => Matchers::In,
+        "$lt" => Matchers::Lt,
+        "$lte" => Matchers::Lte,
+        "$ne" => Matchers::Ne,
+        "$nin" => Matchers::Nin,
+        "$or" => Matchers::Or,
+        "$size" => Matchers::Size
+      }
+
+      # Get the matcher for the supplied key and value. Will determine the class
+      # name from the key.
+      #
+      # @example Get the matcher.
+      #   document.matcher(:title, { "$in" => [ "test" ] })
+      #
+      # @param [ Document ] document The document to check.
+      # @param [ Symbol, String ] key The field name.
+      # @param [ Object, Hash ] The value or selector.
+      #
+      # @return [ Matcher ] The matcher.
+      #
+      # @since 2.0.0.rc.7
+      def matcher(document, key, value)
+        if value.is_a?(Hash)
+          MATCHERS[value.keys.first].new(document.attributes[key])
+        else
+          if key == "$or"
+            Matchers::Or.new(value, document)
+          else
+            Default.new(document.attributes[key])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/multi_parameter_attributes.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
+
+  # @todo: Durran: This module needs an overhaul.
   module MultiParameterAttributes
     module Errors
       # Raised when an error occurred while doing a mass assignment to an attribute through the
@@ -64,9 +66,9 @@ module Mongoid #:nodoc:
 
     def instantiate_object(klass, values_with_empty_parameters)
       return nil if values_with_empty_parameters.all? { |v| v.nil? }
-      
+
       values = values_with_empty_parameters.collect { |v| v.nil? ? 1 : v }
-      
+
       if klass == DateTime || klass == Date || klass == Time
         klass.send(:convert_to_time, values)
       elsif klass

data/lib/mongoid/nested_attributes.rb

@@ -3,6 +3,13 @@ module Mongoid #:nodoc:
   module NestedAttributes
     extend ActiveSupport::Concern
 
+    included do
+      class_attribute :nested_attributes
+      self.nested_attributes = []
+
+      delegate :nested_attributes, :to => "self.class"
+    end
+
     module ClassMethods
       REJECT_ALL_BLANK_PROC = proc { |attributes| attributes.all? { |_, value| value.blank? } }
 
@@ -32,6 +39,7 @@ module Mongoid #:nodoc:
         options = args.extract_options!
         options[:reject_if] = REJECT_ALL_BLANK_PROC if options[:reject_if] == :all_blank
         args.each do |name|
+          self.nested_attributes += [ "#{name}_attributes=" ]
           define_method("#{name}_attributes=") do |attrs|
             relation = relations[name.to_s]
             relation.nested_builder(attrs, options).build(self)

data/lib/mongoid/persistence.rb

@@ -55,6 +55,7 @@ module Mongoid #:nodoc:
     # @return [ TrueClass ] True.
     def remove(options = {})
       if Remove.new(self, options).persist
+        raw_attributes.freeze
         self.destroyed = true
         cascade!
       end; true
@@ -71,7 +72,7 @@ module Mongoid #:nodoc:
     #
     # @return [ true, false ] True if validation passed.
     def save!(options = {})
-      self.class.fail_validate!(self) unless upsert; true
+      self.class.fail_validate!(self) unless upsert(options); true
     end
 
     # Update the document in the datbase.

data/lib/mongoid/persistence/insert.rb

@@ -25,8 +25,8 @@ module Mongoid #:nodoc:
       # The +Document+, whether the insert succeeded or not.
       def persist
         return document if validate && document.invalid?(:create)
-        document.run_callbacks(:create) do
-          document.run_callbacks(:save) do
+        document.run_callbacks(:save) do
+          document.run_callbacks(:create) do
             if insert
               document.new_record = false
               document._children.each { |child| child.new_record = false }
@@ -45,7 +45,7 @@ module Mongoid #:nodoc:
             options.merge(:validate => validate)
           ).persist
         else
-          collection.insert(document.to_hash, options)
+          collection.insert(document.as_document, options)
         end
       end
     end

data/lib/mongoid/persistence/insert_embedded.rb

@@ -31,9 +31,10 @@ module Mongoid #:nodoc:
         if parent.new_record?
           parent.insert
         else
-          update = { document._inserter => { document._position => document.raw_attributes } }
+          update = { document._inserter => { document._position => document.as_document } }
           collection.update(parent._selector, update, options.merge(:multi => false))
           document.new_record = false
+          document.move_changes
         end
         document
       end

data/lib/mongoid/relations.rb

@@ -2,6 +2,7 @@
 require "mongoid/relations/accessors"
 require "mongoid/relations/auto_save"
 require "mongoid/relations/cascading"
+require "mongoid/relations/constraint"
 require "mongoid/relations/cyclic"
 require "mongoid/relations/proxy"
 require "mongoid/relations/bindings"
@@ -50,7 +51,7 @@ module Mongoid # :nodoc:
     #
     # @since 2.0.0.rc.1
     def embedded?
-      _parent.present?
+      cyclic ? _parent.present? : self.class.embedded?
     end
 
     # Determine if the document is part of an embeds_many relation.

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

@@ -50,7 +50,7 @@ module Mongoid # :nodoc:
                   inverse,
                   false,
                   OPTIONS
-                ).push(base, :continue => false)
+                ).push(base, :binding => true, :continue => false)
               end
             end
           end
@@ -88,7 +88,9 @@ module Mongoid # :nodoc:
             if options[:continue]
               inverse = metadata.inverse(target)
               if inverse
-                doc.do_or_do_not(inverse).delete(base)
+                doc.do_or_do_not(
+                  inverse, false, OPTIONS
+                ).delete(base, :binding => true, :continue => false)
               end
             end
           end

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

@@ -106,6 +106,8 @@ module Mongoid # :nodoc:
               document = existing.find(convert_id(attrs[:id]))
               destroyable?(attrs) ? document.destroy : document.update_attributes(attrs)
             else
+              # @todo: Durran: Tell the push not to save the base and call it
+              #   after all processing is done. This is related to #581.
               existing.push(metadata.klass.new(attrs)) unless destroyable?(attrs)
             end
           end

data/lib/mongoid/relations/cascading.rb

@@ -47,7 +47,7 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def cascade(metadata)
-          tap { cascades << metadata.name.to_s if metadata.dependent? }
+          tap { self.cascades += [ metadata.name.to_s ] if metadata.dependent? }
         end
       end
     end

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

@@ -10,7 +10,7 @@ module Mongoid # :nodoc:
         # @example Nullify the reference.
         #   strategy.cascade
         def cascade
-          relation.nullify
+          relation.nullify if relation
         end
       end
     end

data/lib/mongoid/relations/constraint.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+module Mongoid # :nodoc:
+  module Relations #:nodoc:
+
+    # Used for converting foreign key values to the correct type based on the
+    # types of ids that the document stores.
+    #
+    # @note Durran: The name of this class is this way to match the metadata
+    #   getter, and foreign_key was already taken there.
+    class Constraint
+      attr_reader :metadata
+
+      # Create the new constraint with the metadata.
+      #
+      # @example Instantiate the constraint.
+      #   Constraint.new(metdata)
+      #
+      # @param [ Metadata ] metadata The metadata of the relation.
+      #
+      # @since 2.0.0.rc.7
+      def initialize(metadata)
+        @metadata = metadata
+      end
+
+      # Convert the supplied object to the appropriate type to set as the
+      # foreign key for a relation.
+      #
+      # @example Convert the object.
+      #   constraint.convert("12345")
+      #
+      # @param [ Object ] object The object to convert.
+      #
+      # @return [ Object ] The object cast to the correct type.
+      #
+      # @since 2.0.0.rc.7
+      def convert(object)
+        return object if metadata.polymorphic?
+        BSON::ObjectId.convert(metadata.klass, object)
+      end
+    end
+  end
+end