mongoid 2.4.3 → 2.4.4

data/CHANGELOG.md

@@ -3,7 +3,39 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
-## 2.4.3 \[ In Development \] \[ Branch: 2.4.0-stable \]
+## 2.4.4 (branch: 2.4.0-stable)
+
+### Resolved Issues
+
+* \#1705 Allow changing the order of many to many foreign keys.
+
+* \#1703 Updated at is now versioned again. (Lucas Souza)
+
+* \#1686 Set the base metadata on unbind as well as bind for belongs to
+  relations.
+
+* \#1681 Attempt to create indexes for models without namespacing if the
+  namespace does not exist for the subdirectory.
+
+* \#1676 Allow eager loading to work as a default scope.
+
+* \#1665/#1672 Expand complex criteria in nested criteria selectors, like
+  #matches. (Hans Hasselberg)
+
+* \#1668 Ensure Mongoid logger exists before calling warn. (Rémy Coutable)
+
+* \#1661 Ensure uniqueness validation works on cloned documents.
+
+* \#1659 Clear delayed atomic sets when resetting the same embedded relation.
+
+* \#1656/#1657 Don't hit database for uniqueness validation if BOTH scope
+  and attribute hasn't changed. (priyaaank)
+
+* \#1205/#1642 When limiting fields returned from the database via
+  `Criteria#only` and `Criteria#without` and then subsequently saving
+  the document. Default values no longer override excluded fields.
+
+## 2.4.3
 
 ### Resolved Issues
 

data/lib/mongoid/collections/retry.rb

@@ -51,7 +51,7 @@ module Mongoid #:nodoc:
       end
 
       def log_retry(retry_number, ex)
-        Mongoid.logger.warn "A #{ex.class.name} was raised. Retry attempt ##{retry_number}."
+        Mongoid.logger.warn "A #{ex.class.name} was raised. Retry attempt ##{retry_number}." if Mongoid.logger
       end
     end
   end

data/lib/mongoid/contexts/mongo.rb

@@ -166,12 +166,14 @@ module Mongoid #:nodoc:
       # @return [ Cursor ] An enumerable +Cursor+ of results.
       def execute
         collection, options = klass.collection, process_options
-        if criteria.inclusions.any?
-          collection.find(selector, options).entries.tap do |docs|
-            eager_load(docs)
+        selecting do
+          if criteria.inclusions.any?
+            collection.find(selector, options).entries.tap do |docs|
+              eager_load(docs)
+            end
+          else
+            collection.find(selector, options)
           end
-        else
-          collection.find(selector, options)
         end
       end
 
@@ -202,8 +204,10 @@ module Mongoid #:nodoc:
       def first
         attributes = klass.collection.find_one(selector, options_with_default_sorting)
         return nil unless attributes
-        Mongoid::Factory.from_db(klass, attributes).tap do |doc|
-          eager_load([ doc ]) if criteria.inclusions.any?
+        selecting do
+          Mongoid::Factory.from_db(klass, attributes).tap do |doc|
+            eager_load([ doc ]) if criteria.inclusions.any?
+          end
         end
       end
       alias :one :first
@@ -271,8 +275,10 @@ module Mongoid #:nodoc:
         opts[:sort] = opts[:sort].map{ |option| [ option[0], option[1].invert ] }.uniq
         attributes = klass.collection.find_one(selector, opts)
         return nil unless attributes
-        Mongoid::Factory.from_db(klass, attributes).tap do |doc|
-          eager_load([ doc ]) if criteria.inclusions.any?
+        selecting do
+          Mongoid::Factory.from_db(klass, attributes).tap do |doc|
+            eager_load([ doc ]) if criteria.inclusions.any?
+          end
         end
       end
 
@@ -452,6 +458,28 @@ module Mongoid #:nodoc:
         end
         options.dup
       end
+
+      # If we are limiting results, we need to set the field limitations on a
+      # thread local to avoid overriding the default values.
+      #
+      # @example Execute with selection.
+      #   context.selecting do
+      #     collection.find
+      #   end
+      #
+      # @return [ Object ] The yielded value.
+      #
+      # @since 2.4.4
+      def selecting
+        begin
+          unless options[:fields].blank?
+            Threaded.selection = options[:fields]
+          end
+          yield
+        ensure
+          Threaded.selection = nil
+        end
+      end
     end
   end
 end

data/lib/mongoid/criteria.rb

@@ -262,6 +262,7 @@ module Mongoid #:nodoc:
       scope_options = @options.dup
       sorting = scope_options.delete(:sort)
       scope_options[:order_by] = sorting if sorting
+      scope_options[:includes] = inclusions.map(&:name) if inclusions.any?
       { :where => @selector }.merge(scope_options)
     end
     alias :to_ary :to_a

data/lib/mongoid/criterion/inclusion.rb

@@ -210,7 +210,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.2.0
       def includes(*relations)
-        relations.each do |name|
+        relations.flatten.each do |name|
           inclusions.push(klass.reflect_on_association(name))
         end
         clone

data/lib/mongoid/extensions/hash/criteria_helpers.rb

@@ -19,6 +19,7 @@ module Mongoid #:nodoc:
             each_pair do |k,v|
               if k.respond_to?(:key) && k.respond_to?(:to_mongo_query)
                 hsh[k.key] ||= {}
+                v = v.expand_complex_criteria if v.is_a?(::Hash)
                 hsh[k.key].merge!(k.to_mongo_query(v))
               else
                 hsh[k] = v

data/lib/mongoid/fields/internal/foreign_keys/array.rb

@@ -13,6 +13,8 @@ module Mongoid #:nodoc:
           # @example Add the atomic changes.
           #   field.add_atomic_changes(doc, "key", {}, [], [])
           #
+          # @todo: Durran: Refactor, big time.
+          #
           # @param [ Document ] document The document to add to.
           # @param [ String ] name The name of the field.
           # @param [ String ] key The atomic location of the field.
@@ -32,6 +34,8 @@ module Mongoid #:nodoc:
               document.atomic_array_add_to_sets[key] = pushes
             elsif !pulls.empty?
               document.atomic_array_pulls[key] = pulls
+            elsif new != old
+              mods[key] = document.attributes[name]
             end
           end
 

data/lib/mongoid/fields/mappings.rb

@@ -2,13 +2,14 @@
 module Mongoid #:nodoc
   module Fields #:nodoc:
 
+    module Internal #:nodoc:
+    end
+
     # This module maps classes used in field type definitions to the custom
     # definable field in Mongoid.
     module Mappings
       extend self
 
-      MODULE = "Mongoid::Fields::Internal"
-
       # Get the custom field type for the provided class used in the field
       # definition.
       #
@@ -21,21 +22,21 @@ module Mongoid #:nodoc
       #
       # @since 2.1.0
       def for(klass, foreign_key = false)
-        return Internal::Object unless klass
-        if foreign_key
-          return "#{MODULE}::ForeignKeys::#{klass.to_s.demodulize}".constantize
-        end
-        begin
-          modules = "#{ MODULE }::|BSON::|ActiveSupport::"
-          if match = klass.to_s.match(Regexp.new("^(#{ modules })?(\\w+)$"))
-            "#{MODULE}::#{ match[2] }".constantize
+        if klass.nil?
+          Internal::Object
+        elsif foreign_key
+          Internal::ForeignKeys.const_get(klass.to_s)
+        else
+          modules = "BSON::|ActiveSupport::"
+          match = klass.to_s.match(Regexp.new("^(#{ modules })?(\\w+)$"))
+          if match and Internal.const_defined?(match[2])
+            Internal.const_get(match[2])
           else
-            klass.to_s.constantize
+            klass
           end
-        rescue NameError
-          klass
         end
       end
+
     end
   end
 end

data/lib/mongoid/fields/serializable.rb

@@ -74,10 +74,10 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.8
       def eval_default(doc)
-        if default_val.respond_to?(:call)
-          serialize(doc.instance_exec(&default_val))
+        if fields = Threaded.selection
+          evaluated_default(doc) if included?(fields)
         else
-          serialize(default_val.duplicable? ? default_val.dup : default_val)
+          evaluated_default(doc)
         end
       end
 
@@ -188,6 +188,44 @@ module Mongoid #:nodoc:
         @versioned ||= (options[:versioned].nil? ? true : options[:versioned])
       end
 
+      private
+
+      # Is the field included in the fields that were returned from the
+      # database? We can apply the default if:
+      #   1. The field is included in an only limitation (field: 1)
+      #   2. The field is not excluded in a without limitation (field: 0)
+      #
+      # @example Is the field included?
+      #   field.included?(fields)
+      #
+      # @param [ Hash ] fields The field limitations.
+      #
+      # @return [ true, false ] If the field was included.
+      #
+      # @since 2.4.4
+      def included?(fields)
+        (fields.values.first == 1 && fields[name.to_sym] == 1) ||
+          (fields.values.first == 0 && !fields.has_key?(name.to_sym))
+      end
+
+      # Get the evaluated default.
+      #
+      # @example Get the evaluated default.
+      #   field.evaluated_default.
+      #
+      # @param [ Document ] doc The doc being applied to.
+      #
+      # @return [ Object ] The default value.
+      #
+      # @since 2.4.4
+      def evaluated_default(doc)
+        if default_val.respond_to?(:call)
+          serialize(doc.instance_exec(&default_val))
+        else
+          serialize(default_val.duplicable? ? default_val.dup : default_val)
+        end
+      end
+
       module ClassMethods #:nodoc:
 
         # Create the new field with a name and optional additional options.

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

@@ -27,9 +27,7 @@ module Mongoid # :nodoc:
                   base.you_must(metadata.inverse_type_setter, target.class.model_name)
                 end
                 if inverse
-                  inverse_metadata = metadata.inverse_metadata(target)
-                  if inverse_metadata != metadata && !inverse_metadata.nil?
-                    base.metadata = inverse_metadata
+                  if set_base_metadata
                     if base.referenced_many?
                       target.send(inverse).push(base) unless Mongoid.identity_map_enabled?
                     else
@@ -59,6 +57,7 @@ module Mongoid # :nodoc:
                   base.you_must(metadata.inverse_type_setter, nil)
                 end
                 if inverse
+                  set_base_metadata
                   if base.referenced_many?
                     target.send(inverse).delete(base)
                   else
@@ -69,6 +68,27 @@ module Mongoid # :nodoc:
             end
           end
           alias :unbind_one :unbind
+
+          private
+
+          # Ensure that the metadata on the base is correct, for the cases
+          # where we have multiple belongs to definitions and were are setting
+          # different parents in memory in order.
+          #
+          # @api private
+          #
+          # @example Set the base metadata.
+          #   binding.set_base_metadata
+          #
+          # @return [ true, false ] If the metadata changed.
+          #
+          # @since 2.4.4
+          def set_base_metadata
+            inverse_metadata = metadata.inverse_metadata(target)
+            if inverse_metadata != metadata && !inverse_metadata.nil?
+              base.metadata = inverse_metadata
+            end
+          end
         end
       end
     end

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

@@ -288,6 +288,7 @@ module Mongoid # :nodoc:
               proxy.clear
             else
               atomically(:$set) do
+                base.delayed_atomic_sets.clear
                 if replacement.first.is_a?(Hash)
                   replacement = Many.builder(base, metadata, replacement).build
                 end

data/lib/mongoid/threaded.rb

@@ -175,6 +175,32 @@ module Mongoid #:nodoc:
       Thread.current[:"[mongoid]:safety-options"] = options
     end
 
+    # Get the field selection options from the current thread.
+    #
+    # @example Get the field selection options.
+    #   Threaded.selection
+    #
+    # @return [ Hash ] The field selection.
+    #
+    # @since 2.4.4
+    def selection
+      Thread.current[:"[mongoid]:selection"]
+    end
+
+    # Set the field selection on the current thread.
+    #
+    # @example Set the field selection.
+    #   Threaded.selection = { field: 1 }
+    #
+    # @param [ Hash ] value The current field selection.
+    #
+    # @return [ Hash ] The field selection.
+    #
+    # @since 2.4.4
+    def selection=(value)
+      Thread.current[:"[mongoid]:selection"] = value
+    end
+
     # Get the mongoid scope stack for chained criteria.
     #
     # @example Get the scope stack.

data/lib/mongoid/timestamps/updated.rb

@@ -7,7 +7,7 @@ module Mongoid #:nodoc:
       extend ActiveSupport::Concern
 
       included do
-        field :updated_at, :type => Time, :versioned => false
+        field :updated_at, :type => Time
         set_callback :save, :before, :set_updated_at, :if => :able_to_set_updated_at?
       end
 

data/lib/mongoid/validations/uniqueness.rb

@@ -41,32 +41,28 @@ module Mongoid #:nodoc:
       #
       # @since 1.0.0
       def validate_each(document, attribute, value)
-        return unless document.send("attribute_changed?", attribute.to_s)
+        attrib, val = to_validate(document, attribute, value)
+        return unless validation_required?(document, attrib)
         if document.embedded?
           return if skip_validation?(document)
           relation = document._parent.send(document.metadata.name)
-          criteria = relation.where(criterion(document, attribute, value))
-          criteria = scope(criteria, document, attribute)
-          if document.primary_key == Array.wrap(attribute)
-            if criteria.count > 1
-              document.errors.add(
-                attribute,
-                :taken, options.except(:case_sensitive, :scope).merge(:value => value)
-              )
-            end
-          else
-            if criteria.exists?
-              document.errors.add(
-                attribute,
-                :taken,
-                options.except(:case_sensitive, :scope).merge(:value => value)
-              )
-            end
+          criteria = relation.where(criterion(document, attrib, val))
+          criteria = scope(criteria, document, attrib)
+          if criteria.count > 1
+            document.errors.add(
+              attrib,
+              :taken,
+              options.except(:case_sensitive, :scope).merge(:val => val)
+            )
           end
         else
-          criteria = klass.where(criterion(document, attribute, value))
-          criteria = scope(criteria, document, attribute)
-          document.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value)) if criteria.exists?
+          criteria = klass.where(criterion(document, attrib, val))
+          criteria = scope(criteria, document, attrib)
+          if criteria.exists?
+            document.errors.add(
+              attrib, :taken, options.except(:case_sensitive, :scope).merge(:val => val)
+            )
+          end
         end
       end
 
@@ -98,8 +94,7 @@ module Mongoid #:nodoc:
       # @since 2.3.0
       def criterion(document, attribute, value)
         { attribute => filter(value) }.tap do |selector|
-          if document.persisted? ||
-            (document.embedded? && (document.primary_key != Array.wrap(attribute)))
+          if document.persisted? && !document.embedded?
             selector.merge!(:_id => { "$ne" => document.id })
           end
         end
@@ -131,10 +126,8 @@ module Mongoid #:nodoc:
       #
       # @since 2.3.0
       def scope(criteria, document, attribute)
-        unless document.primary_key == Array.wrap(attribute)
-          Array.wrap(options[:scope]).each do |item|
-            criteria = criteria.where(item => document.attributes[item.to_s])
-          end
+        Array.wrap(options[:scope]).each do |item|
+          criteria = criteria.where(item => document.attributes[item.to_s])
         end
         criteria
       end
@@ -152,6 +145,63 @@ module Mongoid #:nodoc:
       def skip_validation?(document)
         !document._parent || document.embedded_one?
       end
+
+      # Scope reference has changed? 
+      #
+      # @example Has scope reference changed?
+      #   validator.scope_value_changed?(doc)
+      #
+      # @param [ Document ] document The embedded document.
+      #
+      # @return [ true, false ] If the scope reference has changed.
+      #
+      # @since 
+      def scope_value_changed?(document)
+        Array.wrap(options[:scope]).any? do |item|
+          document.send("attribute_changed?", item.to_s)
+        end
+      end
+
+      # Get the name of the field and the value to validate. This is for the
+      # case when we validate a relation via the relation name and not the key,
+      # we need to send the key name and value to the db, not the relation
+      # object.
+      #
+      # @example Get the name and key to validate.
+      #   validator.to_validate(doc, :parent, Parent.new)
+      #
+      # @param [ Document ] document The doc getting validated.
+      # @param [ Symbol ] attribute The attribute getting validated.
+      # @param [ Object ] value The value of the attribute.
+      #
+      # @return [ Array<Object, Object> ] The field and value.
+      #
+      # @since 2.4.4
+      def to_validate(document, attribute, value)
+        metadata = document.relations[attribute.to_s]
+        if metadata && metadata.stores_foreign_key?
+          [ metadata.foreign_key, value.id ]
+        else
+          [ attribute, value ]
+        end
+      end
+
+      # Are we required to validate the document?
+      #
+      # @example Is validation needed?
+      #   validator.validation_required?(doc, :field)
+      #
+      # @param [ Document ] document The document getting validated.
+      # @param [ Symbol ] attribute The attribute to validate.
+      #
+      # @return [ true, false ] If we need to validate.
+      #
+      # @since 2.4.4
+      def validation_required?(document, attribute)
+        document.new_record? ||
+          document.send("attribute_changed?", attribute.to_s) ||
+          scope_value_changed?(document)
+      end
     end
   end
 end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.4.3"
+  VERSION = "2.4.4"
 end

data/lib/mongoid/versioning.rb

@@ -78,7 +78,7 @@ module Mongoid #:nodoc:
     #
     # @since 2.1.0
     def versioned_changes
-      only_versioned_attributes(changes)
+      only_versioned_attributes(changes.except("updated_at"))
     end
 
     # Filters the results of +attributes+ by removing any fields that should

data/lib/rails/mongoid.rb

@@ -18,7 +18,7 @@ module Rails #:nodoc:
       Dir.glob(pattern).each do |file|
         logger = Logger.new($stdout)
         begin
-          model = determine_model(file)
+          model = determine_model(file, logger)
         rescue => e
           logger.error(%Q{Failed to determine model from #{file}:
             #{e.class}:#{e.message}
@@ -83,10 +83,17 @@ module Rails #:nodoc:
     # @return [ Class ] The model.
     #
     # @since 2.1.0
-    def determine_model(file)
+    def determine_model(file, logger)
       if file =~ /app\/models\/(.*).rb$/
         model_path = $1.split('/')
-        klass = model_path.map { |path| path.camelize }.join('::').constantize
+        begin
+          parts = model_path.map { |path| path.camelize }
+          name = parts.join("::")
+          klass = name.constantize
+        rescue NameError => e
+          logger.info("Attempted to constantize #{name}, trying without namespacing.")
+          klass = parts.last.constantize
+        end
         if klass.ancestors.include?(::Mongoid::Document) && !klass.embedded
           return klass
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-28 00:00:00.000000000 Z
+date: 2012-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70324286112920 !ruby/object:Gem::Requirement
+  requirement: &70339260281720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70324286112920
+  version_requirements: *70339260281720
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70324286112300 !ruby/object:Gem::Requirement
+  requirement: &70339260281240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *70324286112300
+  version_requirements: *70339260281240
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70324286111520 !ruby/object:Gem::Requirement
+  requirement: &70339260280760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70324286111520
+  version_requirements: *70339260280760
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70324286110820 !ruby/object:Gem::Requirement
+  requirement: &70339260280280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *70324286110820
+  version_requirements: *70339260280280
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70324286066060 !ruby/object:Gem::Requirement
+  requirement: &70339260279800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70324286066060
+  version_requirements: *70339260279800
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70324286064560 !ruby/object:Gem::Requirement
+  requirement: &70339260279320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *70324286064560
+  version_requirements: *70339260279320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70324286063860 !ruby/object:Gem::Requirement
+  requirement: &70339260278840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70324286063860
+  version_requirements: *70339260278840
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70324286063360 !ruby/object:Gem::Requirement
+  requirement: &70339260278360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70324286063360
+  version_requirements: *70339260278360
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &70324286062880 !ruby/object:Gem::Requirement
+  requirement: &70339260277880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *70324286062880
+  version_requirements: *70339260277880
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -414,7 +414,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 907876578455724233
+      hash: -632008619262652936
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: