mongoid 3.0.17 → 3.0.18

data/CHANGELOG.md

@@ -3,6 +3,28 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/en/mongoid/docs/upgrading.html).
 
+## 3.0.18
+
+### Resolved Issues
+
+* \#2703 Validations on associated documents on fire if the document is
+  changed. (Regression)
+
+* \#2707 Calling `find_or_create_by` or `find_by_initialize_by` off a relation
+  with a chained criteria or scope now properly keeps the relations intact on
+  the new or found document.
+
+* \#2699 Resetting a field now removes the name from the changed attributes
+  list. (Subhash Bhushan)
+
+* \#2683 Aliased fields are now supported when executing atomic operations from
+  criteria. (Arthur Neves)
+
+* \#2678 Calling `Criteria#sum` with no matching documents returns `0` instead
+  of `nil`.
+
+* \#2671 Matchers now correctly handle symbol keys. (Jonathan Hyman)
+
 ## 3.0.17
 
 ### Resolved Issues

data/lib/mongoid/contextual/aggregable/memory.rb

@@ -81,7 +81,7 @@ module Mongoid
           if block_given?
             super()
           else
-            count > 0 ? super(0) { |doc| doc.send(field) } : nil
+            count > 0 ? super(0) { |doc| doc.send(field) } : 0
           end
         end
 

data/lib/mongoid/contextual/aggregable/mongo.rb

@@ -104,7 +104,7 @@ module Mongoid
         #
         # @since 3.0.0
         def sum(field = nil)
-          block_given? ? super() : aggregates(field)["sum"]
+          block_given? ? super() : aggregates(field)["sum"] || 0
         end
 
         private

data/lib/mongoid/contextual/atomic.rb

@@ -15,7 +15,7 @@ module Mongoid
       #
       # @since 3.0.0
       def add_to_set(field, value)
-        query.update_all("$addToSet" => { field => value })
+        query.update_all("$addToSet" => { database_field_name(field) => value })
       end
 
       # Perform an atomic $bit operation on the matching documents.
@@ -31,7 +31,7 @@ module Mongoid
       #
       # @since 3.0.0
       def bit(field, value)
-        query.update_all("$bit" => { field => value })
+        query.update_all("$bit" => { database_field_name(field) => value })
       end
 
       # Perform an atomic $inc operation on the matching documents.
@@ -46,7 +46,7 @@ module Mongoid
       #
       # @since 3.0.0
       def inc(field, value)
-        query.update_all("$inc" => { field => value })
+        query.update_all("$inc" => { database_field_name(field) => value })
       end
 
       # Perform an atomic $pop operation on the matching documents.
@@ -66,7 +66,7 @@ module Mongoid
       #
       # @since 3.0.0
       def pop(field, value)
-        query.update_all("$pop" => { field => value })
+        query.update_all("$pop" => { database_field_name(field) => value })
       end
 
       # Perform an atomic $pull operation on the matching documents.
@@ -83,7 +83,7 @@ module Mongoid
       #
       # @since 3.0.0
       def pull(field, value)
-        query.update_all("$pull" => { field => value })
+        query.update_all("$pull" => { database_field_name(field) => value })
       end
 
       # Perform an atomic $pullAll operation on the matching documents.
@@ -98,7 +98,7 @@ module Mongoid
       #
       # @since 3.0.0
       def pull_all(field, values)
-        query.update_all("$pullAll" => { field => values })
+        query.update_all("$pullAll" => { database_field_name(field) => values })
       end
 
       # Perform an atomic $push operation on the matching documents.
@@ -113,7 +113,7 @@ module Mongoid
       #
       # @since 3.0.0
       def push(field, value)
-        query.update_all("$push" => { field => value })
+        query.update_all("$push" => { database_field_name(field) => value })
       end
 
       # Perform an atomic $pushAll operation on the matching documents.
@@ -128,7 +128,7 @@ module Mongoid
       #
       # @since 3.0.0
       def push_all(field, values)
-        query.update_all("$pushAll" => { field => values })
+        query.update_all("$pushAll" => { database_field_name(field) => values })
       end
 
       # Perform an atomic $rename of fields on the matching documents.
@@ -143,7 +143,7 @@ module Mongoid
       #
       # @since 3.0.0
       def rename(old_name, new_name)
-        query.update_all("$rename" => { old_name.to_s => new_name.to_s })
+        query.update_all("$rename" => { database_field_name(old_name) => new_name.to_s })
       end
 
       # Perform an atomic $set of fields on the matching documents.
@@ -158,7 +158,7 @@ module Mongoid
       #
       # @since 3.0.0
       def set(field, value)
-        query.update_all("$set" => { field => value })
+        query.update_all("$set" => { database_field_name(field) => value })
       end
 
       # Perform an atomic $unset of a field on the matching documents.
@@ -172,7 +172,7 @@ module Mongoid
       #
       # @since 3.0.0
       def unset(field)
-        query.update_all("$unset" => { field => true })
+        query.update_all("$unset" => { database_field_name(field) => true })
       end
     end
   end

data/lib/mongoid/contextual/mongo.rb

@@ -219,6 +219,8 @@ module Mongoid
         apply_options
       end
 
+      delegate(:database_field_name, to: :@klass)
+
       # Get the last document in the database for the criteria's selector.
       #
       # @example Get the last document.

data/lib/mongoid/criteria.rb

@@ -60,8 +60,8 @@ module Mongoid
     # @return [ Document ] A non-persisted document.
     #
     # @since 2.0.0
-    def build(attrs = {})
-      create_document(:new, attrs)
+    def build(attrs = {}, &block)
+      create_document(:new, attrs, &block)
     end
     alias :new :build
 
@@ -102,8 +102,8 @@ module Mongoid
     # @return [ Document ] A newly created document.
     #
     # @since 2.0.0.rc.1
-    def create(attrs = {})
-      create_document(:create, attrs)
+    def create(attrs = {}, &block)
+      create_document(:create, attrs, &block)
     end
 
     # Create a document in the database given the selector and return it.
@@ -121,8 +121,8 @@ module Mongoid
     # @return [ Document ] A newly created document.
     #
     # @since 3.0.0
-    def create!(attrs = {})
-      create_document(:create!, attrs)
+    def create!(attrs = {}, &block)
+      create_document(:create!, attrs, &block)
     end
 
     # Get the documents from the embedded criteria.
@@ -245,6 +245,32 @@ module Mongoid
       for_ids(ids).execute_or_raise(ids, args.multi_arged?)
     end
 
+    # Find the first +Document+ given the conditions, or creates a new document
+    # with the conditions that were supplied.
+    #
+    # @example Find or create the document.
+    #   Person.find_or_create_by(:attribute => "value")
+    #
+    # @param [ Hash ] attrs The attributes to check.
+    #
+    # @return [ Document ] A matching or newly created document.
+    def find_or_create_by(attrs = {}, &block)
+      find_or(:create, attrs, &block)
+    end
+
+    # Find the first +Document+ given the conditions, or initializes a new document
+    # with the conditions that were supplied.
+    #
+    # @example Find or initialize the document.
+    #   Person.find_or_initialize_by(:attribute => "value")
+    #
+    # @param [ Hash ] attrs The attributes to check.
+    #
+    # @return [ Document ] A matching or newly initialized document.
+    def find_or_initialize_by(attrs = {}, &block)
+      find_or(:new, attrs, &block)
+    end
+
     # Adds a criterion to the +Criteria+ that specifies an id that must be matched.
     #
     # @example Add a single id criteria.
@@ -600,15 +626,29 @@ module Mongoid
     # @return [ Document ] The new or saved document.
     #
     # @since 3.0.0
-    def create_document(method, attrs = {})
+    def create_document(method, attrs = {}, &block)
       klass.__send__(method,
         selector.reduce(attrs) do |hash, (key, value)|
           unless key.to_s =~ /\$/ || value.is_a?(Hash)
             hash[key] = value
           end
           hash
-        end
-      )
+        end, &block)
+    end
+
+    # Find the first object or create/initialize it.
+    #
+    # @api private
+    #
+    # @example Find or perform an action.
+    #   Person.find_or(:create, :name => "Dev")
+    #
+    # @param [ Symbol ] method The method to invoke.
+    # @param [ Hash ] attrs The attributes to query or set.
+    #
+    # @return [ Document ] The first or new document.
+    def find_or(method, attrs = {}, &block)
+      where(attrs).first || send(method, attrs, &block)
     end
 
     # Clone or dup the current +Criteria+. This will return a new criteria with

data/lib/mongoid/dirty.rb

@@ -239,7 +239,7 @@ module Mongoid
     #
     # @since 2.4.0
     def reset_attribute!(attr)
-      attributes[attr] = changed_attributes[attr] if attribute_changed?(attr)
+      attributes[attr] = changed_attributes.delete(attr) if attribute_changed?(attr)
     end
 
     module ClassMethods

data/lib/mongoid/document.rb

@@ -337,6 +337,7 @@ module Mongoid
         doc.instance_variable_set(:@attributes, attributes)
         doc.apply_defaults
         IdentityMap.set(doc) unless _loading_revision?
+        yield(doc) if block_given?
         doc.run_callbacks(:initialize) unless doc._initialize_callbacks.empty?
         doc
       end

data/lib/mongoid/finders.rb

@@ -7,8 +7,24 @@ module Mongoid
     extend Origin::Forwardable
 
     select_with :with_default_scope
-    delegate :aggregates, :avg, :each, :extras, :find_and_modify, :includes,
-      :map_reduce, :max, :min, :sum, :update, :update_all, to: :with_default_scope
+
+    # These are methods defined on the criteria that should also be accessible
+    # directly from the the class level.
+    delegate \
+      :aggregates,
+      :avg,
+      :each,
+      :extras,
+      :find_and_modify,
+      :find_or_create_by,
+      :find_or_initialize_by,
+      :includes,
+      :map_reduce,
+      :max,
+      :min,
+      :sum,
+      :update,
+      :update_all, to: :with_default_scope
 
     # Returns a count of records in the database.
     # If you want to specify conditions use where.
@@ -61,32 +77,6 @@ module Mongoid
       with_default_scope.find(*args)
     end
 
-    # Find the first +Document+ given the conditions, or creates a new document
-    # with the conditions that were supplied.
-    #
-    # @example Find or create the document.
-    #   Person.find_or_create_by(:attribute => "value")
-    #
-    # @param [ Hash ] attrs The attributes to check.
-    #
-    # @return [ Document ] A matching or newly created document.
-    def find_or_create_by(attrs = {}, &block)
-      find_or(:create, attrs, &block)
-    end
-
-    # Find the first +Document+ given the conditions, or initializes a new document
-    # with the conditions that were supplied.
-    #
-    # @example Find or initialize the document.
-    #   Person.find_or_initialize_by(:attribute => "value")
-    #
-    # @param [ Hash ] attrs The attributes to check.
-    #
-    # @return [ Document ] A matching or newly initialized document.
-    def find_or_initialize_by(attrs = {}, &block)
-      find_or(:new, attrs, &block)
-    end
-
     # Find the first +Document+ given the conditions, or raises
     # Mongoid::Errors::DocumentNotFound
     #
@@ -128,20 +118,5 @@ module Mongoid
     def last
       with_default_scope.last
     end
-
-    protected
-
-    # Find the first object or create/initialize it.
-    #
-    # @example Find or perform an action.
-    #   Person.find_or(:create, :name => "Dev")
-    #
-    # @param [ Symbol ] method The method to invoke.
-    # @param [ Hash ] attrs The attributes to query or set.
-    #
-    # @return [ Document ] The first or new document.
-    def find_or(method, attrs = {}, &block)
-      where(attrs).first || send(method, attrs, &block)
-    end
   end
 end

data/lib/mongoid/matchers/strategies.rb

@@ -21,7 +21,7 @@ module Mongoid
     module Strategies
       extend self
 
-      MATCHERS = {
+      MATCHERS = HashWithIndifferentAccess.new({
         "$all" => Matchers::All,
         "$and" => Matchers::And,
         "$exists" => Matchers::Exists,
@@ -34,7 +34,7 @@ module Mongoid
         "$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.
@@ -59,8 +59,8 @@ module Mongoid
           end
         else
           case key
-            when "$or" then Matchers::Or.new(value, document)
-            when "$and" then Matchers::And.new(value, document)
+            when "$or", :$or then Matchers::Or.new(value, document)
+            when "$and", :$and then Matchers::And.new(value, document)
             else Default.new(extract_attribute(document, key))
           end
         end

data/lib/mongoid/validations/associated.rb

@@ -30,7 +30,7 @@ module Mongoid
         begin
           document.begin_validate
           valid = Array.wrap(value).collect do |doc|
-            if doc.nil?
+            if doc.nil? || !doc.changed?
               true
             else
               doc.validated? ? true : doc.valid?

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "3.0.17"
+  VERSION = "3.0.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.0.17
+  version: 3.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel