mongoid 2.4.0 → 2.4.1

data/CHANGELOG.md

@@ -3,7 +3,55 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
-## 2.4.0 \[ In Development \] \[ Branch: master \]
+## 2.4.1 \[ In Development \] \[ Branch: 2.4.0-stable \]
+
+### Resolved Issues
+
+* \#1593 Arrays on embedded documents now properly atomically update when
+  modified from original version.
+
+* \#1592 Don't swallow exceptions from index generation in the create_indexes
+  rake task.
+
+* \#1589 Allow assignment of empty array to HABTM when no documents are yet
+  loaded into memory.
+
+* \#1587 When a previous value for an array field was an explicit nil, it can
+  now be reset atomically with new values.
+
+* \#1585 `Model#respond_to?` returns true now for the setter when allowing
+  dynamic fields.
+
+* \#1582 Allow nil values to be set in arrays.
+
+* \#1580 Allow arrays to be set to nil post save, and not just empty.
+
+* \#1579 Don't call #to_a on individual set field elements in criterion.
+
+* \#1576 Don't hit database on uniqueness validation if the field getting
+  validated has not changed.
+
+* \#1571 Aliased fields get all the dirty attribute methods and all getters and
+  setters for both the original name and the alias. (Hans Hasselberg)
+
+* \#1568 Fallback to development environment with warning when no env configured.
+
+* \#1565 For fields and foreign keys with non-standard Ruby or database names,
+  use define_method instead of class_eval for creating the accessors and
+  dirty methods.
+
+* \#1557 Internal strategy class no longer conflicts with models.
+
+* \#1551 Parent documents now return `true` for `Model#changed?` if only child
+  (embedded) documents have changed.
+
+* \#1547 Resetting persisted children from a parent save when new waits until post
+  callbacks, mirroring update functionality.
+
+* \#1536 Eager loading now happens when calling `first` or `last` on a
+  criteria if inclusions are specified.
+
+## 2.4.0
 
 ### New Features
 

data/lib/mongoid/attributes.rb

@@ -77,7 +77,7 @@ module Mongoid #:nodoc:
     def respond_to?(*args)
       (Mongoid.allow_dynamic_fields &&
         attributes &&
-        attributes.has_key?(args.first.to_s)
+        attributes.has_key?(args.first.to_s.reader)
       ) || super
     end
 

data/lib/mongoid/config/environment.rb

@@ -19,7 +19,7 @@ module Mongoid #:nodoc
       def env_name
         return Rails.env if defined?(Rails)
         return Sinatra::Base.environment.to_s if defined?(Sinatra)
-        ENV["RACK_ENV"] || raise(Errors::NoEnvironment.new)
+        ENV["RACK_ENV"] || ENV["MONGOID_ENV"] || raise(Errors::NoEnvironment.new)
       end
 
       # Load the yaml from the provided path and return the settings for the

data/lib/mongoid/contexts/mongo.rb

@@ -135,6 +135,26 @@ module Mongoid #:nodoc:
         klass.collection.distinct(field, selector)
       end
 
+      # Eager load the inclusions for the provided documents.
+      #
+      # @example Eager load the inclusions.
+      #   context.eager_load(docs)
+      #
+      # @param [ Array<Document> ] docs The docs returning from the db.
+      #
+      # @since 2.4.1
+      def eager_load(docs)
+        parent_ids = docs.map(&:id)
+        criteria.inclusions.reject! do |metadata|
+          if metadata.macro == :referenced_in
+            child_ids = load_ids(metadata.foreign_key)
+            metadata.eager_load(child_ids)
+          else
+            metadata.eager_load(parent_ids)
+          end
+        end
+      end
+
       # Execute the context. This will take the selector and options
       # and pass them on to the Ruby driver's +find()+ method on the collection. The
       # collection itself will be retrieved from the class provided, and once the
@@ -148,15 +168,7 @@ module Mongoid #:nodoc:
         collection, options = klass.collection, process_options
         if criteria.inclusions.any?
           collection.find(selector, options).entries.tap do |docs|
-            parent_ids = docs.map(&:id)
-            criteria.inclusions.reject! do |metadata|
-              if metadata.macro == :referenced_in
-                child_ids = load_ids(metadata.foreign_key)
-                metadata.eager_load(child_ids)
-              else
-                metadata.eager_load(parent_ids)
-              end
-            end
+            eager_load(docs)
           end
         else
           collection.find(selector, options)
@@ -189,7 +201,10 @@ module Mongoid #:nodoc:
       # @return [ Document ] The first document in the collection.
       def first
         attributes = klass.collection.find_one(selector, options_with_default_sorting)
-        attributes ? Mongoid::Factory.from_db(klass, attributes) : nil
+        return nil unless attributes
+        Mongoid::Factory.from_db(klass, attributes).tap do |doc|
+          eager_load([ doc ]) if criteria.inclusions.any?
+        end
       end
       alias :one :first
 
@@ -255,7 +270,10 @@ module Mongoid #:nodoc:
         opts = options_with_default_sorting
         opts[:sort] = opts[:sort].map{ |option| [ option[0], option[1].invert ] }.uniq
         attributes = klass.collection.find_one(selector, opts)
-        attributes ? Mongoid::Factory.from_db(klass, attributes) : nil
+        return nil unless attributes
+        Mongoid::Factory.from_db(klass, attributes).tap do |doc|
+          eager_load([ doc ]) if criteria.inclusions.any?
+        end
       end
 
       # Return the max value for a field.

data/lib/mongoid/criterion/selector.rb

@@ -85,11 +85,29 @@ module Mongoid #:nodoc:
       # @since 1.0.0
       def try_to_typecast(key, value)
         access = key.to_s
-        if !fields.has_key?(access) && !aliased_fields.has_key?(access)
-          return value
+        if field = fields[key.to_s] || fields[aliased_fields[key.to_s]]
+          typecast_value_for(field, value)
+        elsif proper_and_or_value?(key, value)
+          handle_and_or_value(value)
+        else
+          value
+        end
+      end
+
+      def proper_and_or_value?(key, value)
+        ["$and", "$or"].include?(key) &&
+          value.is_a?(Array) &&
+          value.all?{ |e| e.is_a?(Hash) }
+      end
+
+      def handle_and_or_value(values)
+        [].tap do |result|
+          values.map do |value|
+            value.each do |key, value|
+              result.push key => try_to_typecast(key, value)
+            end
+          end
         end
-        field = fields[access] || fields[aliased_fields[access]]
-        typecast_value_for(field, value)
       end
 
       # Get the typecast value for the defined field.

data/lib/mongoid/dirty.rb

@@ -24,7 +24,21 @@ module Mongoid #:nodoc:
     #
     # @since 2.4.0
     def changed?
-      changed_attributes.any?
+      changed_attributes.any? || children_changed?
+    end
+
+    # Have any children (embedded documents) of this document changed?
+    #
+    # @example Have any children changed?
+    #   model.children_changed?
+    #
+    # @return [ true, false ] If any children have changed.
+    #
+    # @since 2.4.1
+    def children_changed?
+      _children.any? do |child|
+        child.changed?
+      end
     end
 
     # Get the attribute changes.
@@ -117,8 +131,14 @@ module Mongoid #:nodoc:
             field = fields[name]
             key = embedded? ? "#{atomic_position}.#{name}" : name
             if field && field.resizable?
-              pushes, pulls = new - (old || []), (old || []) - new
-              field.add_atomic_changes(self, key, modifications, pushes, pulls)
+              field.add_atomic_changes(
+                self,
+                name,
+                key,
+                modifications,
+                new,
+                old
+              )
             else
               modifications[key] = new
             end
@@ -207,36 +227,59 @@ module Mongoid #:nodoc:
       # Generate all the dirty methods needed for the attribute.
       #
       # @example Generate the dirty methods.
-      #   Model.create_dirty_methods("name")
+      #   Model.create_dirty_methods("name", "name")
       #
-      # @param [ String ] name The name of the attribute.
+      # @param [ String ] name The name of the field.
+      # @param [ String ] name The name of the accessor.
       #
       # @return [ Module ] The fields module.
       #
       # @since 2.4.0
-      def create_dirty_methods(name)
+      def create_dirty_methods(name, meth)
         generated_methods.module_eval do
-          class_eval <<-EOM
-            def #{name}_change
-              attribute_change(#{name.inspect})
+          if meth =~ /\W/
+            define_method("#{meth}_change") do
+              attribute_change(name)
             end
 
-            def #{name}_changed?
-              attribute_changed?(#{name.inspect})
+            define_method("#{meth}_changed?") do
+              attribute_changed?(name)
             end
 
-            def #{name}_was
-              attribute_was(#{name.inspect})
+            define_method("#{meth}_was") do
+              attribute_was(name)
             end
 
-            def #{name}_will_change!
-              attribute_will_change!(#{name.inspect})
+            define_method("#{meth}_will_change!") do
+              attribute_will_change!(name)
             end
 
-            def reset_#{name}!
-              reset_attribute!(#{name.inspect})
+            define_method("reset_#{meth}!") do
+              reset_attribute!(name)
             end
-          EOM
+          else
+            class_eval <<-EOM
+              def #{meth}_change
+                attribute_change(#{name.inspect})
+              end
+
+              def #{meth}_changed?
+                attribute_changed?(#{name.inspect})
+              end
+
+              def #{meth}_was
+                attribute_was(#{name.inspect})
+              end
+
+              def #{meth}_will_change!
+                attribute_will_change!(#{name.inspect})
+              end
+
+              def reset_#{meth}!
+                reset_attribute!(#{name.inspect})
+              end
+            EOM
+          end
         end
       end
     end

data/lib/mongoid/extensions/string/inflections.rb

@@ -100,7 +100,7 @@ module Mongoid #:nodoc:
         #
         # @return [ String ] The string stripped of "=".
         def reader
-          writer? ? gsub("=", "") : self
+          delete("=")
         end
 
         # Is this string a writer?

data/lib/mongoid/fields.rb

@@ -276,14 +276,15 @@ module Mongoid #:nodoc
       def add_field(name, options = {})
         aliased = options[:as]
         aliased_fields[aliased.to_s] = name if aliased
-        meth = aliased || name
         type = options[:localize] ? Fields::Internal::Localized : options[:type]
         Mappings.for(type, options[:identity]).instantiate(name, options).tap do |field|
           fields[name] = field
           add_defaults(field)
-          create_accessors(name, meth, options)
+          create_accessors(name, name, options)
+          create_accessors(name, aliased, options) if aliased
           process_options(field)
-          create_dirty_methods(name)
+          create_dirty_methods(name, name)
+          create_dirty_methods(name, aliased) if aliased
         end
       end
 
@@ -337,43 +338,164 @@ module Mongoid #:nodoc
       # @param [ Symbol ] name The name of the field.
       # @param [ Symbol ] meth The name of the accessor.
       # @param [ Hash ] options The options.
+      #
+      # @since 2.0.0
       def create_accessors(name, meth, options = {})
         field = fields[name]
+
+        create_field_getter(name, meth, field)
+        create_field_setter(name, meth)
+        create_field_check(name, meth)
+
+        if options[:localize]
+          create_translations_getter(name, meth)
+          create_translations_setter(name, meth)
+        end
+      end
+
+      # Create the getter method for the provided field.
+      #
+      # @example Create the getter.
+      #   Model.create_field_getter("name", "name", field)
+      #
+      # @param [ String ] name The name of the attribute.
+      # @param [ String ] meth The name of the method.
+      # @param [ Field ] field The field.
+      #
+      # @since 2.4.0
+      def create_field_getter(name, meth, field)
         generated_methods.module_eval do
-          if field.cast_on_read?
-            class_eval <<-EOM
-              def #{meth}
-                fields[#{name.inspect}].deserialize(read_attribute(#{name.inspect}))
+          if meth =~ /\W/
+            if field.cast_on_read?
+              define_method(meth) do
+                fields[name].deserialize(read_attribute(name))
               end
-            EOM
-          else
-            class_eval <<-EOM
-              def #{meth}
-                read_attribute(#{name.inspect}).tap do |value|
+            else
+              define_method(meth) do
+                read_attribute(name).tap do |value|
                   if value.is_a?(Array) || value.is_a?(Hash)
-                    attribute_will_change!(#{name.inspect})
+                    attribute_will_change!(name)
                   end
                 end
               end
-            EOM
+            end
+          else
+            if field.cast_on_read?
+              class_eval <<-EOM
+                def #{meth}
+                  fields[#{name.inspect}].deserialize(read_attribute(#{name.inspect}))
+                end
+              EOM
+            else
+              class_eval <<-EOM
+                def #{meth}
+                  read_attribute(#{name.inspect}).tap do |value|
+                    if value.is_a?(Array) || value.is_a?(Hash)
+                      attribute_will_change!(#{name.inspect})
+                    end
+                  end
+                end
+              EOM
+            end
           end
-          class_eval <<-EOM
-            def #{meth}=(value)
-              write_attribute(#{name.inspect}, value)
+        end
+      end
+
+      # Create the setter method for the provided field.
+      #
+      # @example Create the setter.
+      #   Model.create_field_setter("name", "name")
+      #
+      # @param [ String ] name The name of the attribute.
+      # @param [ String ] meth The name of the method.
+      #
+      # @since 2.4.0
+      def create_field_setter(name, meth)
+        generated_methods.module_eval do
+          if meth =~ /\W/
+            define_method(meth) do |value|
+              write_attribute(name, value)
             end
+          else
+            class_eval <<-EOM
+              def #{meth}=(value)
+                write_attribute(#{name.inspect}, value)
+              end
+            EOM
+          end
+        end
+      end
 
-            def #{meth}?
-              attr = read_attribute(#{name.inspect})
+      # Create the check method for the provided field.
+      #
+      # @example Create the check.
+      #   Model.create_field_check("name", "name")
+      #
+      # @param [ String ] name The name of the attribute.
+      # @param [ String ] meth The name of the method.
+      #
+      # @since 2.4.0
+      def create_field_check(name, meth)
+        generated_methods.module_eval do
+          if meth =~ /\W/
+            define_method("#{meth}?") do
+              attr = read_attribute(name)
               attr == true || attr.present?
             end
-          EOM
+          else
+            class_eval <<-EOM
+              def #{meth}?
+                attr = read_attribute(#{name.inspect})
+                attr == true || attr.present?
+              end
+            EOM
+          end
+        end
+      end
 
-          if options[:localize]
+      # Create the translation getter method for the provided field.
+      #
+      # @example Create the translation getter.
+      #   Model.create_translations_getter("name", "name")
+      #
+      # @param [ String ] name The name of the attribute.
+      # @param [ String ] meth The name of the method.
+      #
+      # @since 2.4.0
+      def create_translations_getter(name, meth)
+        generated_methods.module_eval do
+          if meth =~ /\W/
+            define_method("#{meth}_translations") do
+              attributes[name]
+            end
+          else
             class_eval <<-EOM
               def #{meth}_translations
                 attributes[#{name.inspect}]
               end
+            EOM
+          end
+        end
+      end
 
+      # Create the translation setter method for the provided field.
+      #
+      # @example Create the translation setter.
+      #   Model.create_translations_setter("name", "name")
+      #
+      # @param [ String ] name The name of the attribute.
+      # @param [ String ] meth The name of the method.
+      #
+      # @since 2.4.0
+      def create_translations_setter(name, meth)
+        generated_methods.module_eval do
+          if meth =~ /\W/
+            define_method("#{meth}_translations=") do |value|
+              attribute_will_change!(name)
+              attributes[name] = value
+            end
+          else
+            class_eval <<-EOM
               def #{meth}_translations=(value)
                 attribute_will_change!(#{name.inspect})
                 attributes[#{name.inspect}] = value
@@ -387,11 +509,13 @@ module Mongoid #:nodoc
       #
       # @example Include the fields.
       #   Person.generated_methods
+      #
+      # @return [ Module ] The module of generated methods.
+      #
+      # @since 2.0.0
       def generated_methods
         @generated_methods ||= begin
-          Module.new.tap do |mod|
-            include mod
-          end
+          Module.new.tap { |mod| include(mod) }
         end
       end
     end

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

@@ -13,19 +13,24 @@ module Mongoid #:nodoc:
         #   field.add_atomic_changes(doc, "key", {}, [], [])
         #
         # @param [ Document ] document The document to add to.
-        # @param [ String ] key The name of the field.
+        # @param [ String ] name The name of the field.
+        # @param [ String ] key The atomic location of the field.
         # @param [ Hash ] mods The current modifications.
         # @param [ Array ] new The new elements to add.
         # @param [ Array ] old The old elements getting removed.
         #
         # @since 2.4.0
-        def add_atomic_changes(document, key, mods, new, old)
-          if new.any? && old.any?
-            mods[key] = document.attributes[key]
-          elsif new.any?
-            document.atomic_array_pushes[key] = new
-          elsif old.any?
-            document.atomic_array_pulls[key] = old
+        def add_atomic_changes(document, name, key, mods, new, old)
+          pushes = (new || []) - (old || [])
+          pulls = (old || []) - (new || [])
+          if old.nil?
+            mods[key] = pushes
+          elsif !pushes.empty? && !pulls.empty?
+            mods[key] = document.attributes[name]
+          elsif !pushes.empty?
+            document.atomic_array_pushes[key] = pushes
+          elsif !pulls.empty?
+            document.atomic_array_pulls[key] = pulls
           end
         end
 

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

@@ -14,19 +14,24 @@ module Mongoid #:nodoc:
           #   field.add_atomic_changes(doc, "key", {}, [], [])
           #
           # @param [ Document ] document The document to add to.
-          # @param [ String ] key The name of the field.
+          # @param [ String ] name The name of the field.
+          # @param [ String ] key The atomic location of the field.
           # @param [ Hash ] mods The current modifications.
           # @param [ Array ] new The new elements to add.
           # @param [ Array ] old The old elements getting removed.
           #
           # @since 2.4.0
-          def add_atomic_changes(document, key, mods, new, old)
-            if new.any? && old.any?
-              mods[key] = document.attributes[key]
-            elsif new.any?
-              document.atomic_array_add_to_sets[key] = new
-            elsif old.any?
-              document.atomic_array_pulls[key] = old
+          def add_atomic_changes(document, name, key, mods, new, old)
+            pushes = (new || []) - (old || [])
+            pulls = (old || []) - (new || [])
+            if old.nil?
+              mods[key] = pushes
+            elsif !pushes.empty? && !pulls.empty?
+              mods[key] = document.attributes[name]
+            elsif !pushes.empty?
+              document.atomic_array_add_to_sets[key] = pushes
+            elsif !pulls.empty?
+              document.atomic_array_pulls[key] = pulls
             end
           end
 

data/lib/mongoid/fields/internal/set.rb

@@ -33,7 +33,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.4.0
         def selection(object)
-          return object if object.is_a?(::Hash)
+          return object unless object.is_a?(::Set)
           serialize(object)
         end
 

data/lib/mongoid/persistence/insertion.rb

@@ -25,11 +25,12 @@ module Mongoid #:nodoc:
               doc.run_callbacks(:create) do
                 yield(doc)
                 doc.new_record = false
-                doc.reset_persisted_children and true
+                true
               end
             end
 
             unless result == false
+              doc.reset_persisted_children
               doc.move_changes
               Threaded.clear_options!
             end

data/lib/mongoid/persistence/operations/update.rb

@@ -42,15 +42,6 @@ module Mongoid #:nodoc:
         def persist
           prepare do
             unless updates.empty?
-              # @todo Durran: This is a temporary fix for #791 until we rewrite
-              # the dirty tracking to properly flag a document as changed if
-              # only embedded documents have changed.
-              if document.respond_to?(:updated_at)
-                if document.timestamping? && !document.updated_at_changed?
-                  document.updated_at = Time.now
-                end
-              end
-
               collection.update(selector, updates, options)
               conflicts.each_pair do |key, value|
                 collection.update(selector, { key => value }, options)

data/lib/mongoid/relations/cascading.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require "mongoid/relations/cascading/strategy"
 require "mongoid/relations/cascading/delete"
 require "mongoid/relations/cascading/destroy"
 require "mongoid/relations/cascading/nullify"

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

@@ -2,7 +2,24 @@
 module Mongoid # :nodoc:
   module Relations #:nodoc:
     module Cascading #:nodoc:
-      class Delete < Strategy
+      class Delete
+
+        attr_accessor :document, :relation, :metadata
+
+        # Initialize the new cascade strategy, which will set up the relation
+        # and the metadata.
+        #
+        # @example Instantiate the strategy
+        #   Strategy.new(document, metadata)
+        #
+        # @param [ Document ] document The document to cascade from.
+        # @param [ Metadata ] metadata The relation's metadata.
+        #
+        # @return [ Strategy ] The new strategy.
+        def initialize(document, metadata)
+          @document, @metadata = document, metadata
+          @relation = document.send(metadata.name)
+        end
 
         # Execute the cascading deletion for the relation if it already exists.
         # This should be optimized in the future potentially not to load all

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

@@ -2,7 +2,24 @@
 module Mongoid # :nodoc:
   module Relations #:nodoc:
     module Cascading #:nodoc:
-      class Destroy < Strategy
+      class Destroy
+
+        attr_accessor :document, :relation, :metadata
+
+        # Initialize the new cascade strategy, which will set up the relation
+        # and the metadata.
+        #
+        # @example Instantiate the strategy
+        #   Strategy.new(document, metadata)
+        #
+        # @param [ Document ] document The document to cascade from.
+        # @param [ Metadata ] metadata The relation's metadata.
+        #
+        # @return [ Strategy ] The new strategy.
+        def initialize(document, metadata)
+          @document, @metadata = document, metadata
+          @relation = document.send(metadata.name)
+        end
 
         # Execute the cascading deletion for the relation if it already exists.
         # This should be optimized in the future potentially not to load all

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

@@ -2,7 +2,24 @@
 module Mongoid # :nodoc:
   module Relations #:nodoc:
     module Cascading #:nodoc:
-      class Nullify < Strategy
+      class Nullify
+
+        attr_accessor :document, :relation, :metadata
+
+        # Initialize the new cascade strategy, which will set up the relation
+        # and the metadata.
+        #
+        # @example Instantiate the strategy
+        #   Strategy.new(document, metadata)
+        #
+        # @param [ Document ] document The document to cascade from.
+        # @param [ Metadata ] metadata The relation's metadata.
+        #
+        # @return [ Strategy ] The new strategy.
+        def initialize(document, metadata)
+          @document, @metadata = document, metadata
+          @relation = document.send(metadata.name)
+        end
 
         # This cascade does not delete the referenced relations, but instead
         # sets the foreign key values to nil.

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

@@ -319,15 +319,13 @@ module Mongoid #:nodoc:
         def substitute(replacement)
           tap do |proxy|
             if replacement
-              if replacement != proxy.in_memory
-                new_docs, docs = replacement.compact.uniq, []
-                new_ids = new_docs.map { |doc| doc.id }
-                remove_not_in(new_ids)
-                new_docs.each do |doc|
-                  docs.push(doc) if doc.send(metadata.foreign_key) != base.id
-                end
-                proxy.concat(docs)
+              new_docs, docs = replacement.compact.uniq, []
+              new_ids = new_docs.map { |doc| doc.id }
+              remove_not_in(new_ids)
+              new_docs.each do |doc|
+                docs.push(doc) if doc.send(metadata.foreign_key) != base.id
               end
+              proxy.concat(docs)
             else
               proxy.purge
             end

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

@@ -142,10 +142,8 @@ module Mongoid # :nodoc:
         # @since 2.0.0.rc.1
         def substitute(replacement)
           tap do |proxy|
-            if replacement != proxy.in_memory
-              proxy.purge
-              proxy.push(replacement.compact.uniq) if replacement
-            end
+            proxy.purge
+            proxy.push(replacement.compact.uniq) unless replacement.blank?
           end
         end
 

data/lib/mongoid/validations/uniqueness.rb

@@ -41,6 +41,7 @@ module Mongoid #:nodoc:
       #
       # @since 1.0.0
       def validate_each(document, attribute, value)
+        return unless document.send("#{attribute}_changed?")
         if document.embedded?
           return if skip_validation?(document)
           relation = document._parent.send(document.metadata.name)

data/lib/mongoid/version.rb

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

data/lib/rails/mongoid.rb

@@ -15,22 +15,21 @@ module Rails #:nodoc:
     #
     # @since 2.1.0
     def create_indexes(pattern)
-      logger = Logger.new($stdout)
       Dir.glob(pattern).each do |file|
         logger = Logger.new($stdout)
         begin
           model = determine_model(file)
-          if model
-            model.create_indexes
-            logger.info("Generated indexes for #{model}")
-          else
-            logger.info("Not a Mongoid parent model: #{file}")
-          end
         rescue => e
-          logger.error %Q{Failed to create indexes for #{model}:
+          logger.error(%Q{Failed to determine model from #{file}:
             #{e.class}:#{e.message}
             #{e.backtrace.join("\n")}
-          }
+          })
+        end
+        if model
+          model.create_indexes
+          logger.info("Generated indexes for #{model}")
+        else
+          logger.info("Not a Mongoid parent model: #{file}")
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000 Z
+date: 2012-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70168048476500 !ruby/object:Gem::Requirement
+  requirement: &70092776306560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70168048476500
+  version_requirements: *70092776306560
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70168048475740 !ruby/object:Gem::Requirement
+  requirement: &70092776305140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *70168048475740
+  version_requirements: *70092776305140
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70168048474680 !ruby/object:Gem::Requirement
+  requirement: &70092776302420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70168048474680
+  version_requirements: *70092776302420
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70168048473620 !ruby/object:Gem::Requirement
+  requirement: &70092776301540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *70168048473620
+  version_requirements: *70092776301540
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70168048473140 !ruby/object:Gem::Requirement
+  requirement: &70092776300860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70168048473140
+  version_requirements: *70092776300860
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70168048472640 !ruby/object:Gem::Requirement
+  requirement: &70092776296740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70168048472640
+  version_requirements: *70092776296740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70168048472160 !ruby/object:Gem::Requirement
+  requirement: &70092776295300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70168048472160
+  version_requirements: *70092776295300
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70168048471300 !ruby/object:Gem::Requirement
+  requirement: &70092776293380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70168048471300
+  version_requirements: *70092776293380
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &70168048470800 !ruby/object:Gem::Requirement
+  requirement: &70092776292500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *70168048470800
+  version_requirements: *70092776292500
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -332,7 +332,6 @@ files:
 - lib/mongoid/relations/cascading/delete.rb
 - lib/mongoid/relations/cascading/destroy.rb
 - lib/mongoid/relations/cascading/nullify.rb
-- lib/mongoid/relations/cascading/strategy.rb
 - lib/mongoid/relations/cascading.rb
 - lib/mongoid/relations/constraint.rb
 - lib/mongoid/relations/conversions.rb
@@ -412,7 +411,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3374480126099241138
+      hash: 1067878638816238851
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

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

@@ -1,26 +0,0 @@
-# encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Cascading #:nodoc:
-      class Strategy
-
-        attr_accessor :document, :relation, :metadata
-
-        # Initialize the new cascade strategy, which will set up the relation
-        # and the metadata.
-        #
-        # @example Instantiate the strategy
-        #   Strategy.new(document, metadata)
-        #
-        # @param [ Document ] document The document to cascade from.
-        # @param [ Metadata ] metadata The relation's metadata.
-        #
-        # @return [ Strategy ] The new strategy.
-        def initialize(document, metadata)
-          @document, @metadata = document, metadata
-          @relation = document.send(metadata.name)
-        end
-      end
-    end
-  end
-end