mongoid 2.2.6 → 2.3.0

data/lib/mongoid/hierarchy.rb

@@ -20,98 +20,101 @@ module Mongoid #:nodoc
       end
     end
 
-    # Get all child +Documents+ to this +Document+, going n levels deep if
-    # necessary. This is used when calling update persistence operations from
-    # the root document, where changes in the entire tree need to be
-    # determined. Note that persistence from the embedded documents will
-    # always be preferred, since they are optimized calls... This operation
-    # can get expensive in domains with large hierarchies.
-    #
-    # @example Get all the document's children.
-    #   person._children
-    #
-    # @return [ Array<Document> ] All child documents in the hierarchy.
-    def _children
-      @_children ||=
-        [].tap do |children|
-          relations.each_pair do |name, metadata|
-            if metadata.embedded?
-              child = send(name)
-              child.to_a.each do |doc|
-                children.push(doc)
-                children.concat(doc._children) unless metadata.versioned?
-              end if child
+    module InstanceMethods #:nodoc:
+
+      # Get all child +Documents+ to this +Document+, going n levels deep if
+      # necessary. This is used when calling update persistence operations from
+      # the root document, where changes in the entire tree need to be
+      # determined. Note that persistence from the embedded documents will
+      # always be preferred, since they are optimized calls... This operation
+      # can get expensive in domains with large hierarchies.
+      #
+      # @example Get all the document's children.
+      #   person._children
+      #
+      # @return [ Array<Document> ] All child documents in the hierarchy.
+      def _children
+        @_children ||=
+          [].tap do |children|
+            relations.each_pair do |name, metadata|
+              if metadata.embedded?
+                child = send(name)
+                child.to_a.each do |doc|
+                  children.push(doc)
+                  children.concat(doc._children) unless metadata.versioned?
+                end if child
+              end
             end
           end
-        end
-    end
+      end
 
-    # Determines if the document is a subclass of another document.
-    #
-    # @example Check if the document is a subclass
-    #   Square.new.hereditary?
-    #
-    # @return [ true, false ] True if hereditary, false if not.
-    def hereditary?
-      self.class.hereditary?
-    end
+      # Determines if the document is a subclass of another document.
+      #
+      # @example Check if the document is a subclass
+      #   Square.new.hereditary?
+      #
+      # @return [ true, false ] True if hereditary, false if not.
+      def hereditary?
+        self.class.hereditary?
+      end
 
-    # Sets up a child/parent association. This is used for newly created
-    # objects so they can be properly added to the graph.
-    #
-    # @example Set the parent document.
-    #   document.parentize(parent)
-    #
-    # @param [ Document ] document The parent document.
-    #
-    # @return [ Document ] The parent document.
-    def parentize(document)
-      self._parent = document
-    end
+      # Sets up a child/parent association. This is used for newly created
+      # objects so they can be properly added to the graph.
+      #
+      # @example Set the parent document.
+      #   document.parentize(parent)
+      #
+      # @param [ Document ] document The parent document.
+      #
+      # @return [ Document ] The parent document.
+      def parentize(document)
+        self._parent = document
+      end
 
-    # Remove a child document from this parent. If an embeds one then set to
-    # nil, otherwise remove from the embeds many.
-    #
-    # This is called from the +RemoveEmbedded+ persistence command.
-    #
-    # @example Remove the child.
-    #   document.remove_child(child)
-    #
-    # @param [ Document ] child The child (embedded) document to remove.
-    #
-    # @since 2.0.0.beta.1
-    def remove_child(child)
-      name = child.metadata.name
-      child.embedded_one? ? remove_ivar(name) : send(name).delete_one(child)
-    end
+      # Remove a child document from this parent. If an embeds one then set to
+      # nil, otherwise remove from the embeds many.
+      #
+      # This is called from the +RemoveEmbedded+ persistence command.
+      #
+      # @example Remove the child.
+      #   document.remove_child(child)
+      #
+      # @param [ Document ] child The child (embedded) document to remove.
+      #
+      # @since 2.0.0.beta.1
+      def remove_child(child)
+        name = child.metadata.name
+        child.embedded_one? ? remove_ivar(name) : send(name).delete_one(child)
+      end
 
-    # After children are persisted we can call this to move all their changes
-    # and flag them as persisted in one call.
-    #
-    # @example Reset the children.
-    #   document.reset_persisted_children
-    #
-    # @return [ Array<Document> ] The children.
-    #
-    # @since 2.1.0
-    def reset_persisted_children
-      _children.each do |child|
-        child.move_changes
-        child.new_record = false
+      # After children are persisted we can call this to move all their changes
+      # and flag them as persisted in one call.
+      #
+      # @example Reset the children.
+      #   document.reset_persisted_children
+      #
+      # @return [ Array<Document> ] The children.
+      #
+      # @since 2.1.0
+      def reset_persisted_children
+        _children.each do |child|
+          child.move_changes
+          child.new_record = false
+        end
       end
-    end
 
-    # Return the root document in the object graph. If the current document
-    # is the root object in the graph it will return self.
-    #
-    # @example Get the root document in the hierarchy.
-    #   document._root
-    #
-    # @return [ Document ] The root document in the hierarchy.
-    def _root
-      object = self
-      while (object._parent) do object = object._parent; end
-      object || self
+      # Return the root document in the object graph. If the current document
+      # is the root object in the graph it will return self.
+      #
+      # @example Get the root document in the hierarchy.
+      #   document._root
+      #
+      # @return [ Document ] The root document in the hierarchy.
+      def _root
+        object = self
+        while (object._parent) do object = object._parent; end
+        object || self
+      end
     end
   end
 end

data/lib/mongoid/identity.rb

@@ -69,9 +69,11 @@ module Mongoid #:nodoc:
     #
     # @return [ Array<Object> ] The array of keys.
     def compose
+      kf = document.key_formatter
       document.primary_key.collect do |key|
-        document.attributes[key.to_s]
-      end.reject { |val| val.nil? }
+        val = document.attributes[key.to_s]
+        val && kf ? kf.call(val) : val
+      end.compact
     end
 
     # Determines if the document stores the type information. This is if it is

data/lib/mongoid/keys.rb

@@ -9,7 +9,7 @@ module Mongoid #:nodoc:
     attr_reader :identifier
 
     included do
-      cattr_accessor :primary_key, :using_object_ids
+      cattr_accessor :primary_key, :using_object_ids, :key_formatter
       self.using_object_ids = true
     end
 
@@ -122,6 +122,7 @@ module Mongoid #:nodoc:
       # @since 1.0.0
       def key(*fields)
         self.primary_key = fields
+        self.key_formatter = block_given? ? Proc.new : nil
         identity(:type => String)
         set_callback(:save, :around, :set_composite_key)
       end

data/lib/mongoid/logger.rb

@@ -4,13 +4,7 @@ module Mongoid #:nodoc:
   # The Mongoid logger which wraps some other ruby compliant logger class.
   class Logger
 
-    delegate \
-      :info,
-      :debug,
-      :error,
-      :fatal,
-      :level,
-      :unknown, :to => :logger, :allow_nil => true
+    delegate :info, :debug, :error, :fatal, :unknown, :to => :logger, :allow_nil => true
 
     # Emit a warning log message.
     #

data/lib/mongoid/matchers/and.rb

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

data/lib/mongoid/matchers/in.rb

@@ -14,7 +14,7 @@ module Mongoid #:nodoc:
       #
       # @return [ true, false ] If a value exists.
       def matches?(value)
-        value.values.first.include?(@attribute)
+        Array.wrap(@attribute).any? { |e| value.values.first.include?(e) }
       end
     end
   end

data/lib/mongoid/matchers/nin.rb

@@ -14,7 +14,7 @@ module Mongoid #:nodoc:
       #
       # @return [ true, false ] If a value exists.
       def matches?(value)
-        !value.values.first.include?(@attribute)
+        Array.wrap(@attribute).none? { |e| value.values.first.include?(e) }
       end
     end
   end

data/lib/mongoid/matchers/strategies.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require "mongoid/matchers/default"
 require "mongoid/matchers/all"
+require "mongoid/matchers/and"
 require "mongoid/matchers/exists"
 require "mongoid/matchers/gt"
 require "mongoid/matchers/gte"
@@ -22,6 +23,7 @@ module Mongoid #:nodoc:
 
       MATCHERS = {
         "$all" => Matchers::All,
+        "$and" => Matchers::And,
         "$exists" => Matchers::Exists,
         "$gt" => Matchers::Gt,
         "$gte" => Matchers::Gte,
@@ -51,10 +53,10 @@ module Mongoid #:nodoc:
         if value.is_a?(Hash)
           MATCHERS[value.keys.first].new(extract_attribute(document, key))
         else
-          if key == "$or"
-            Matchers::Or.new(value, document)
-          else
-            Default.new(extract_attribute(document, key))
+          case key
+            when "$or" then Matchers::Or.new(value, document)
+            when "$and" then Matchers::And.new(value, document)
+            else Default.new(extract_attribute(document, key))
           end
         end
       end

data/lib/mongoid/multi_parameter_attributes.rb

@@ -44,10 +44,11 @@ module Mongoid #:nodoc:
     #   person.process(:title => "sir", :age => 40)
     #
     # @param [ Hash ] attrs The attributes to set.
+    # @param [ Symbol ] role A role for scoped mass assignment.
     # @param [ Boolean ] guard_protected_attributes False to skip mass assignment protection.
     #
     # @since 2.0.0.rc.7
-    def process(attrs = nil, guard_protected_attributes = true)
+    def process(attrs = nil, role = :default, guard_protected_attributes = true)
       if attrs
         errors = []
         attributes = {}
@@ -81,7 +82,7 @@ module Mongoid #:nodoc:
           )
         end
 
-        super attributes, guard_protected_attributes
+        super attributes, role, guard_protected_attributes
       else
         super
       end

data/lib/mongoid/named_scope.rb

@@ -125,20 +125,10 @@ module Mongoid #:nodoc:
 
     protected
 
-      # Warns if overriding another scope or method.
-      #
-      # @example Warn if name exists.
-      #   Model.valid_scope_name?("test")
-      #
-      # @param [ String, Symbol ] name The name of the scope.
       def valid_scope_name?(name)
-        if scopes[name] || respond_to?(name, true)
-          if Mongoid.logger
-            Mongoid.logger.warn(
-              "Creating scope :#{name}. " +
-              "Overwriting existing method #{self.name}.#{name}."
-            )
-          end
+        if !scopes[name] && respond_to?(name, true)
+          Mongoid.logger.warn "Creating scope :#{name}. " \
+                                    "Overwriting existing method #{self.name}.#{name}." if Mongoid.logger
         end
       end
     end

data/lib/mongoid/nested_attributes.rb

@@ -54,7 +54,7 @@ module Mongoid #:nodoc:
         args.each do |name|
           self.nested_attributes += [ "#{name}_attributes=" ]
           define_method("#{name}_attributes=") do |attrs|
-            assigning do
+            _assigning do
               relation = relations[name.to_s]
               relation.nested_builder(attrs, options).build(self)
             end

data/lib/mongoid/paranoia.rb

@@ -45,7 +45,6 @@ module Mongoid #:nodoc:
     #
     # @return [ true ] True.
     def remove(options = {})
-      return super if embedded? && respond_to?(:version_max) && version_max
       now = Time.now
       collection.update({ :_id => id }, { '$set' => { :deleted_at => now } })
       @attributes["deleted_at"] = now
@@ -86,7 +85,7 @@ module Mongoid #:nodoc:
       #
       # @return [ Criteria ] The paranoid compliant criteria.
       def criteria(embedded = false, scoped = true)
-        scoped ? super.where(:deleted_at.exists => false) : super
+        scoped ? super.merge({ :conditions => { :deleted_at => nil } }) : super
       end
 
       # Find deleted documents
@@ -98,7 +97,7 @@ module Mongoid #:nodoc:
       #
       # @return [ Criteria ] The deleted criteria.
       def deleted
-        where(:deleted_at.exists => true)
+        where(:deleted_at.ne => nil)
       end
     end
   end

data/lib/mongoid/persistence.rb

@@ -163,11 +163,13 @@ module Mongoid #:nodoc:
       #   Person.create(:title => "Mr")
       #
       # @param [ Hash ] attributes The attributes to create with.
+      # @param [ Hash ] options A mass-assignment protection options. Supports
+      #   :as and :without_protection
       #
       # @return [ Document ] The newly created document.
-      def create(attributes = {}, &block)
+      def create(attributes = {}, options = {}, &block)
         creating do
-          new(attributes, &block).tap { |doc| doc.save }
+          new(attributes, options, &block).tap { |doc| doc.save }
         end
       end
 
@@ -180,11 +182,13 @@ module Mongoid #:nodoc:
       #   Person.create!(:title => "Mr")
       #
       # @param [ Hash ] attributes The attributes to create with.
+      # @param [ Hash ] options A mass-assignment protection options. Supports
+      #   :as and :without_protection
       #
       # @return [ Document ] The newly created document.
-      def create!(attributes = {}, &block)
+      def create!(attributes = {}, options = {}, &block)
         creating do
-          new(attributes, &block).tap do |doc|
+          new(attributes, options, &block).tap do |doc|
             fail_validate!(doc) if doc.insert.errors.any?
             fail_callback!(doc, :create!) if doc.new?
           end
@@ -209,7 +213,7 @@ module Mongoid #:nodoc:
         selector.merge!(:_type => name) if hereditary?
         collection.find(selector).count.tap do
           collection.remove(selector, Safety.merge_safety_options)
-          Threaded.clear_safety_options!
+          Threaded.clear_options!
         end
       end
 

data/lib/mongoid/persistence/atomic/operation.rb

@@ -76,7 +76,7 @@ module Mongoid #:nodoc:
         # @since 2.1.0
         def prepare
           yield(document).tap do
-            Threaded.clear_safety_options!
+            Threaded.clear_options!
           end
         end
       end