mongoid 3.0.5 → 3.0.6

data/CHANGELOG.md

@@ -3,7 +3,54 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
-## 3.0.5 (branch 3.0.0-stable)
+## 3.0.6 (branch 3.0.0-stable)
+
+### Resolved Issues
+
+* \#2375 Uniqueness validation scoping now works with aliased fields.
+
+* \#2372 Ensure that all atomic operations mongoize values before executing.
+
+* \#2370 Paranoid documents now properly don't get deleted when using
+  `dependent: :restrict` and an exception is raised.
+
+* \#2365 Don't do anything when trying to replace an embeds_one with the same
+  document.
+
+* \#2362 Don't store inverse of field values in the database when they are not
+  needed. (When there is not more than one polymorphic parent defined on the
+  same class).
+
+* \#2360 Cloning documents should ignore mass assignment protection rules.
+
+* \#2356 When limiting fields returned in queries via `only` ensure that the
+  limitation is scoped to the model.
+
+* \#2353 Allow `update_attribute` to properly handle aliased fields.
+
+* \#2348 Conversion of strings to times should raise an arugment error if the
+  string is invalid. (Campbell Allen)
+
+* \#2346 Ensure `belongs_to` relations are evolvable when passed the proxy and
+  not the document.
+
+* \#2334 Fixed aggregation map/reduce when fields sometimes do not exist.
+  (James McKinney)
+
+* \#2330 Fixed inconsistency of #size and #length on criteria when the documents
+  have been iterated over with a limit applied.
+
+* \#2328 Ensure ordering is applied on all relation criteria if defined.
+
+* \#2327 Don't execute callbacks from base document if the document cannot execute
+  them.
+
+* \#2318 Ensure setting any numeric on a Float field actually sets it as a float,
+  even if the number provided is an integer.
+
+## 3.0.5
+
+### Resolved Issues
 
 * \#2313 Fixed deserialization of `nil` `TimeWithZone` fields. (nagachika)
 
@@ -32,8 +79,6 @@ For instructions on upgrading to newer versions, visit
 
 * \#1091 Allow presence validation to pass if the value is `false`.
 
-### Resolved Issues
-
 ## 3.0.4
 
 ### Resolved Issues

data/lib/mongoid.rb

@@ -33,6 +33,7 @@ require "active_model"
 require "origin"
 require "moped"
 
+require "mongoid/evolvable"
 require "mongoid/extensions"
 require "mongoid/errors"
 require "mongoid/threaded"
@@ -45,7 +46,6 @@ require "mongoid/contextual"
 require "mongoid/copyable"
 require "mongoid/criteria"
 require "mongoid/dirty"
-require "mongoid/evolvable"
 require "mongoid/factory"
 require "mongoid/fields"
 require "mongoid/finders"

data/lib/mongoid/callbacks.rb

@@ -38,6 +38,20 @@ module Mongoid
       attr_accessor :before_callback_halted
     end
 
+    # Is the provided type of callback executable by this document?
+    #
+    # @example Is the callback executable?
+    #   document.callback_executable?(:save)
+    #
+    # @param [ Symbol ] kin The type of callback.
+    #
+    # @return [ true, false ] If the callback can be executed.
+    #
+    # @since 3.0.6
+    def callback_executable?(kind)
+      respond_to?("_#{kind}_callbacks")
+    end
+
     # Run only the after callbacks for the specific event.
     #
     # @note ActiveSupport does not allow this type of behaviour by default, so
@@ -97,7 +111,7 @@ module Mongoid
           return false
         end
       end
-      super(kind, *args, &block)
+      callback_executable?(kind) ? super(kind, *args, &block) : true
     end
 
     private
@@ -158,7 +172,7 @@ module Mongoid
     #
     # @since 2.3.0
     def cascadable_child?(kind, child)
-      return false if kind == :initialize || !child.respond_to?("_#{kind}_callbacks")
+      return false if kind == :initialize || !child.callback_executable?(kind)
       [ :create, :destroy ].include?(kind) || child.changed? || child.new_record?
     end
 

data/lib/mongoid/config.rb

@@ -36,11 +36,12 @@ module Mongoid
     # @param [ String ] name The database name.
     #
     # @since 3.0.0
-    def connect_to(name)
+    def connect_to(name, options = { consistency: :eventual })
       self.sessions = {
         default: {
           database: name,
-          hosts: [ "localhost:27017" ]
+          hosts: [ "localhost:27017" ],
+          options: options
         }
       }
     end

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

@@ -167,10 +167,12 @@ module Mongoid
           function(key, values) {
             var agg = { count: 0, max: null, min: null, sum: 0 };
             values.forEach(function(val) {
-              if (agg.max == null || val.max > agg.max) agg.max = val.max;
-              if (agg.min == null || val.max < agg.min) agg.min = val.max;
+              if (val.max !== null) {
+                if (agg.max == null || val.max > agg.max) agg.max = val.max;
+                if (agg.min == null || val.max < agg.min) agg.min = val.max;
+                agg.sum += val.sum;
+              }
               agg.count += 1;
-              agg.sum += val.sum;
             });
             return agg;
           }}

data/lib/mongoid/contextual/find_and_modify.rb

@@ -27,7 +27,7 @@ module Mongoid
       # @since 3.0.0
       def initialize(collection, criteria, update, options = {})
         @collection, @criteria, @options, @update =
-          collection, criteria, options, update
+          collection, criteria, options, update.mongoize
         @query = collection.find(criteria.selector)
         apply_criteria_options
       end

data/lib/mongoid/contextual/mongo.rb

@@ -129,10 +129,9 @@ module Mongoid
       # @since 3.0.0
       def each(&block)
         if block_given?
-          reset_length
           selecting do
             documents_for_iteration.each do |doc|
-              yield_and_increment(doc, &block)
+              yield_document(doc, &block)
             end
             @cache_loaded = true
             eager_loadable? ? docs : self
@@ -572,34 +571,6 @@ module Mongoid
         !eager_loaded && !criteria.inclusions.empty?
       end
 
-      # Increment the length of the results.
-      #
-      # @api private
-      #
-      # @example Increment the length.
-      #   context.increment_length
-      #
-      # @return [ Integer ] The new length
-      #
-      # @since 3.0.0
-      def increment_length
-        @length += 1
-      end
-
-      # Reset the length to zero. This happens once before iteration.
-      #
-      # @api private
-      #
-      # @example Reset the length.
-      #   context.reset_length
-      #
-      # @return [ Integer ] zero.
-      #
-      # @since 3.0.0
-      def reset_length
-        @length = 0
-      end
-
       # Apply all the optional criterion.
       #
       # @example Apply the options.
@@ -627,12 +598,11 @@ module Mongoid
       # @since 2.4.4
       def selecting
         begin
-          unless criteria.options[:fields].blank?
-            Threaded.selection = criteria.options[:fields]
-          end
+          fields = criteria.options[:fields]
+          Threaded.set_selection(criteria.object_id, fields) unless fields.blank?
           yield
         ensure
-          Threaded.selection = nil
+          Threaded.set_selection(criteria.object_id, nil)
         end
       end
 
@@ -650,28 +620,28 @@ module Mongoid
       def with_eager_loading(document)
         selecting do
           return nil unless document
-          doc = Factory.from_db(klass, document)
+          doc = Factory.from_db(klass, document, criteria.object_id)
           eager_load([ doc ]) if eager_loadable?
           doc
         end
       end
 
-      # Yield to the document and increment the length.
+      # Yield to the document.
       #
       # @api private
       #
-      # @example Yield and increment.
-      #   context.yield_and_increment(doc) do |doc|
+      # @example Yield the document.
+      #   context.yield_document(doc) do |doc|
       #     ...
       #   end
       #
       # @param [ Document ] document The document to yield to.
       #
       # @since 3.0.0
-      def yield_and_increment(document, &block)
-        doc = document.respond_to?(:_id) ? document : Factory.from_db(klass, document)
+      def yield_document(document, &block)
+        doc = document.respond_to?(:_id) ?
+          document : Factory.from_db(klass, document, criteria.object_id)
         yield(doc)
-        increment_length
         documents.push(doc) if cacheable?
       end
     end

data/lib/mongoid/copyable.rb

@@ -22,7 +22,7 @@ module Mongoid
       if attrs.delete("versions")
         attrs["version"] = 1
       end
-      self.class.new(attrs)
+      self.class.new(attrs, without_protection: true)
     end
     alias :dup :clone
   end

data/lib/mongoid/document.rb

@@ -7,6 +7,7 @@ module Mongoid
     extend ActiveSupport::Concern
     include Mongoid::Components
 
+    attr_accessor :criteria_instance_id
     attr_reader :new_record
 
     # Default comparison is via the string version of the id.
@@ -301,13 +302,16 @@ module Mongoid
       #   Person.instantiate(:title => "Sir", :age => 30)
       #
       # @param [ Hash ] attrs The hash of attributes to instantiate with.
+      # @param [ Integer ] criteria_instance_id The criteria id that
+      #   instantiated the document.
       #
       # @return [ Document ] A new document.
       #
       # @since 1.0.0
-      def instantiate(attrs = nil)
+      def instantiate(attrs = nil, criteria_instance_id = nil)
         attributes = attrs || {}
         doc = allocate
+        doc.criteria_instance_id = criteria_instance_id
         doc.instance_variable_set(:@attributes, attributes)
         doc.apply_defaults
         IdentityMap.set(doc) unless _loading_revision?

data/lib/mongoid/extensions/float.rb

@@ -42,7 +42,7 @@ module Mongoid
         # @since 3.0.0
         def mongoize(object)
           unless object.blank?
-            __numeric__(object) rescue 0.0
+            __numeric__(object).to_f rescue 0.0
           else
             nil
           end

data/lib/mongoid/extensions/string.rb

@@ -35,10 +35,16 @@ module Mongoid
       # @example Mongoize the string.
       #   "2012-01-01".__mongoize_time__
       #
+      # @note The extra parse from Time is because ActiveSupport::TimeZone
+      #   either returns nil or Time.now if the string is empty or invalid,
+      #   which is a regression from pre-3.0 and also does not agree with
+      #   the core Time API.
+      #
       # @return [ Time ] The time.
       #
       # @since 3.0.0
       def __mongoize_time__
+        ::Time.parse(self)
         ::Time.configured.parse(self)
       end
 

data/lib/mongoid/factory.rb

@@ -34,12 +34,12 @@ module Mongoid
     # @param [ Hash ] attributes The document attributes.
     #
     # @return [ Document ] The instantiated document.
-    def from_db(klass, attributes = nil)
+    def from_db(klass, attributes = nil, criteria_instance_id = nil)
       type = (attributes || {})["_type"]
       if type.blank?
-        klass.instantiate(attributes)
+        klass.instantiate(attributes, criteria_instance_id)
       else
-        type.camelize.constantize.instantiate(attributes)
+        type.camelize.constantize.instantiate(attributes, criteria_instance_id)
       end
     end
   end

data/lib/mongoid/fields/standard.rb

@@ -50,7 +50,7 @@ module Mongoid
       #
       # @since 2.1.8
       def eval_default(doc)
-        if fields = Threaded.selection
+        if fields = Threaded.selection(doc.criteria_instance_id)
           evaluated_default(doc) if included?(fields)
         else
           evaluated_default(doc)

data/lib/mongoid/paranoia.rb

@@ -58,10 +58,10 @@ module Mongoid
     #
     # @since 1.0.0
     def remove(options = {})
+      cascade!
       time = self.deleted_at = Time.now
       paranoid_collection.find(atomic_selector).
         update({ "$set" => { paranoid_field => time }})
-      cascade!
       @destroyed = true
       IdentityMap.remove(self)
       Threaded.clear_options!

data/lib/mongoid/persistence.rb

@@ -155,10 +155,11 @@ module Mongoid
     #
     # @since 2.0.0.rc.6
     def update_attribute(name, value)
-      unless attribute_writable?(name.to_s)
-        raise Errors::ReadonlyAttribute.new(name, value)
+      normalized = name.to_s
+      unless attribute_writable?(normalized)
+        raise Errors::ReadonlyAttribute.new(normalized, value)
       end
-      write_attribute(name, value)
+      write_attribute(aliased_fields[normalized] || normalized, value)
       save(validate: false)
     end
 

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

@@ -93,7 +93,7 @@ module Mongoid
         #
         # @since 3.0.3
         def cast_value
-          value
+          value.mongoize
         end
 
         # Executes the common functionality between operations.

data/lib/mongoid/relations/binding.rb

@@ -169,9 +169,11 @@ module Mongoid
       #
       # @since 3.0.0
       def bind_inverse_of_field(doc, name)
-        if inverse_metadata = metadata.inverse_metadata(doc)
-          if setter = inverse_metadata.inverse_of_field_setter
-            doc.you_must(setter, name)
+        if metadata.inverse_field_bindable?
+          if inverse_metadata = metadata.inverse_metadata(doc)
+            if setter = inverse_metadata.inverse_of_field_setter
+              doc.you_must(setter, name)
+            end
           end
         end
       end

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

@@ -97,7 +97,7 @@ module Mongoid
               doc = existing.find(converted)
               if destroyable?(attrs)
                 existing.delete(doc)
-                doc.destroy unless doc.embedded?
+                doc.destroy unless doc.embedded? || doc.destroyed?
               else
                 attrs.delete_id
                 metadata.embedded? ? doc.attributes = attrs : doc.update_attributes(attrs)

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

@@ -28,7 +28,9 @@ module Mongoid
         # @example Perform the cascading delete.
         #   strategy.cascade
         def cascade
-          raise Errors::DeleteRestriction.new(document, metadata.name) unless relation.blank?
+          unless relation.blank?
+            raise Errors::DeleteRestriction.new(document, metadata.name)
+          end
         end
       end
     end

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

@@ -337,7 +337,7 @@ module Mongoid
           criterion = klass.scoped
           criterion.embedded = true
           criterion.documents = target
-          criterion
+          Many.apply_ordering(criterion, metadata)
         end
 
         # Deletes one document from the target and unscoped.

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

@@ -36,18 +36,20 @@ module Mongoid
         #
         # @since 2.0.0.rc.1
         def substitute(replacement)
-          if _assigning?
-            base.add_atomic_unset(target)
-          else
-            target.destroy if persistable?
+          if replacement != self
+            if _assigning?
+              base.add_atomic_unset(target)
+            else
+              target.destroy if persistable?
+            end
+            unbind_one
+            return nil unless replacement
+            replacement = Factory.build(klass, replacement) if replacement.is_a?(::Hash)
+            self.target = replacement
+            bind_one
+            characterize_one(target)
+            target.save if persistable? && !_assigning?
           end
-          unbind_one
-          return nil unless replacement
-          replacement = Factory.build(klass, replacement) if replacement.is_a?(::Hash)
-          self.target = replacement
-          bind_one
-          characterize_one(target)
-          target.save if persistable? && !_assigning?
           self
         end
 

data/lib/mongoid/relations/metadata.rb

@@ -150,8 +150,7 @@ module Mongoid
       #
       # @since 2.1.0
       def criteria(object, type)
-        query = relation.criteria(self, object, type)
-        order ? query.order_by(order) : query
+        relation.criteria(self, object, type)
       end
 
       # Returns the cyclic option of the relation.
@@ -436,6 +435,21 @@ module Mongoid
         !!inverse_class_name
       end
 
+      # Is the inverse field bindable? Ie, do we have more than one definition
+      # on the parent class with the same polymorphic name (as).
+      #
+      # @example Is the inverse of bindable?
+      #   metadata.inverse_of_bindable?
+      #
+      # @return [ true, false ] If the relation needs the inverse of field set.
+      #
+      # @since 3.0.6
+      def inverse_field_bindable?
+        @inverse_field_bindable ||= (inverse_klass.relations.values.count do |meta|
+          meta.as == as
+        end > 1)
+      end
+
       # Used for relational many to many only. This determines the name of the
       # foreign key field on the inverse side of the relation, since in this
       # case there are keys on both sides.

data/lib/mongoid/relations/proxy.rb

@@ -147,6 +147,21 @@ module Mongoid
 
       class << self
 
+        # Apply ordering to the criteria if it was defined on the relation.
+        #
+        # @example Apply the ordering.
+        #   Proxy.apply_ordering(criteria, metadata)
+        #
+        # @param [ Criteria ] criteria The criteria to modify.
+        # @param [ Metadata ] metadata The relation metadata.
+        #
+        # @return [ Criteria ] The ordered criteria.
+        #
+        # @since 3.0.6
+        def apply_ordering(criteria, metadata)
+          metadata.order ? criteria.order_by(metadata.order) : criteria
+        end
+
         # Get the criteria that is used to eager load a relation of this
         # type.
         #

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

@@ -8,6 +8,7 @@ module Mongoid
       # of the relation and the reference is to document(s) in another
       # collection.
       class In < Relations::One
+        include Evolvable
 
         # Instantiate a new referenced_in relation.
         #

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

@@ -537,13 +537,15 @@ module Mongoid
           #
           # @since 2.1.0
           def criteria(metadata, object, type = nil)
-            with_inverse_field_criterion(
-              with_polymorphic_criterion(
-                metadata.klass.where(metadata.foreign_key => object),
-                metadata,
-                type
-              ),
-              metadata
+            apply_ordering(
+              with_inverse_field_criterion(
+                with_polymorphic_criterion(
+                  metadata.klass.where(metadata.foreign_key => object),
+                  metadata,
+                  type
+                ),
+                metadata
+              ), metadata
             )
           end
 

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

@@ -278,7 +278,7 @@ module Mongoid
           #
           # @since 2.1.0
           def criteria(metadata, object, type = nil)
-            metadata.klass.all_of(_id: { "$in" => object })
+            apply_ordering(metadata.klass.all_of(_id: { "$in" => object }), metadata)
           end
 
           # Get the criteria that is used to eager load a relation of this

data/lib/mongoid/threaded.rb

@@ -301,25 +301,28 @@ module Mongoid
     # @example Get the field selection options.
     #   Threaded.selection
     #
+    # @param [ Class ] klass The model class.
+    #
     # @return [ Hash ] The field selection.
     #
     # @since 2.4.4
-    def selection
-      Thread.current["[mongoid]:selection"]
+    def selection(klass)
+      Thread.current["[mongoid][#{klass}]:selection"]
     end
 
     # Set the field selection on the current thread.
     #
     # @example Set the field selection.
-    #   Threaded.selection = { field: 1 }
+    #   Threaded.set_selection(Person, { field: 1 })
     #
+    # @param [ Integer ] criteria_instance_id The criteria instance id.
     # @param [ Hash ] value The current field selection.
     #
     # @return [ Hash ] The field selection.
     #
     # @since 2.4.4
-    def selection=(value)
-      Thread.current["[mongoid]:selection"] = value
+    def set_selection(criteria_instance_id, value)
+      Thread.current["[mongoid][#{criteria_instance_id}]:selection"] = value
     end
 
     # Get the global session override.

data/lib/mongoid/validations/associated.rb

@@ -39,7 +39,7 @@ module Mongoid
         ensure
           document.exit_validate
         end
-        document.errors.add(attribute, :invalid) unless valid
+        document.errors.add(attribute, :invalid, options) unless valid
       end
     end
   end

data/lib/mongoid/validations/uniqueness.rb

@@ -167,7 +167,9 @@ module Mongoid
       # @since 2.3.0
       def scope(criteria, document, attribute)
         Array.wrap(options[:scope]).each do |item|
-          criteria = criteria.where(item => document.attributes[item.to_s])
+          normalized = item.to_s
+          name = document.aliased_fields[normalized] || normalized
+          criteria = criteria.where(item => document.attributes[name])
         end
         criteria = criteria.where(deleted_at: nil) if document.paranoid?
         criteria

data/lib/mongoid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-25 00:00:00.000000000 Z
+date: 2012-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -307,7 +307,6 @@ files:
 - lib/mongoid/sharding.rb
 - lib/mongoid/state.rb
 - lib/mongoid/threaded/lifecycle.rb
-- lib/mongoid/threaded/sessions.rb
 - lib/mongoid/threaded.rb
 - lib/mongoid/timestamps/created.rb
 - lib/mongoid/timestamps/timeless.rb
@@ -353,7 +352,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1770994134498643287
+      hash: -3437651563723863969
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: