mongoid 2.1.4 → 2.1.5

data/lib/mongoid/atomic/modifiers.rb

@@ -35,6 +35,7 @@ module Mongoid #:nodoc:
       # @since 2.1.0
       def set(modifications)
         modifications.each_pair do |field, value|
+          next if field == "_id"
           sets.update(field => value)
           fields << field.split(".", 2)[0]
         end

data/lib/mongoid/railties/database.rake

@@ -79,7 +79,7 @@ namespace :db do
 
     desc 'Create the indexes defined on your mongoid models'
     task :create_indexes => :environment do
-      ::Rails::Mongoid.index_children(get_mongoid_models)
+      ::Rails::Mongoid.create_indexes("app/models/**/*.rb")
     end
 
     def convert_ids(obj)

data/lib/mongoid/relations.rb

@@ -69,7 +69,7 @@ module Mongoid # :nodoc:
     #
     # @since 2.0.0.rc.1
     def embedded_many?
-      @embedded_many ||= (metadata && metadata.macro == :embeds_many)
+      metadata && metadata.macro == :embeds_many
     end
 
     # Determine if the document is part of an embeds_one relation.
@@ -81,7 +81,7 @@ module Mongoid # :nodoc:
     #
     # @since 2.0.0.rc.1
     def embedded_one?
-      @embedded_one ||= (metadata && metadata.macro == :embeds_one)
+      metadata && metadata.macro == :embeds_one
     end
 
     # Determine if the document is part of an references_many relation.
@@ -93,7 +93,7 @@ module Mongoid # :nodoc:
     #
     # @since 2.0.0.rc.1
     def referenced_many?
-      @referenced_many ||= (metadata && metadata.macro == :references_many)
+      metadata && metadata.macro == :references_many
     end
 
     # Determine if the document is part of an references_one relation.
@@ -105,7 +105,7 @@ module Mongoid # :nodoc:
     #
     # @since 2.0.0.rc.1
     def referenced_one?
-      @referenced_one ||= (metadata && metadata.macro == :references_one)
+      metadata && metadata.macro == :references_one
     end
   end
 end

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

@@ -124,8 +124,8 @@ module Mongoid # :nodoc:
         def delete(document)
           target.delete_one(document).tap do |doc|
             if doc && !binding?
-              unbind_one(doc)
               doc.delete(:suppress => true)
+              unbind_one(doc)
             end
             reindex
           end
@@ -374,8 +374,8 @@ module Mongoid # :nodoc:
           criteria.size.tap do
             criteria.each do |doc|
               target.delete_one(doc)
-              unbind_one(doc)
               doc.send(method, :suppress => true)
+              unbind_one(doc)
             end
             reindex
           end

data/lib/mongoid/relations/many.rb

@@ -80,7 +80,8 @@ module Mongoid #:nodoc:
       #
       # @since 2.0.0
       def respond_to?(name, include_private = false)
-        [].respond_to?(name, include_private) || super
+        [].respond_to?(name, include_private) ||
+          klass.respond_to?(name, include_private) || super
       end
 
       # This is public access to the relation's criteria.

data/lib/mongoid/relations/proxy.rb

@@ -9,7 +9,7 @@ module Mongoid # :nodoc:
       # We undefine most methods to get them sent through to the target.
       instance_methods.each do |method|
         undef_method(method) unless
-          method =~ /(^__|^send$|^object_id$|^extend$|^tap$)/
+          method =~ /(^__|^send$|^object_id$|^extend$|^respond_to\?$|^tap$)/
       end
 
       attr_accessor :base, :loaded, :metadata, :target

data/lib/mongoid/version.rb

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

data/lib/rails/mongoid.rb

@@ -3,23 +3,24 @@ module Rails #:nodoc:
   module Mongoid #:nodoc:
     extend self
 
-    # Recursive function to create all the indexes for the model, then
-    # potentially and subclass of the model since both are still root
-    # documents in the hierarchy.
-    #
-    # Note there is a tricky naming scheme going on here that needs to be
-    # revisisted. Module.descendants vs Class.descendents is way too
-    # confusing.
-    #
-    # @example Index the children.
-    #   Rails::Mongoid.index_children(classes)
-    #
-    # @param [ Array<Class> ] children The child model classes.
-    def index_children(children)
-      children.each do |model|
-        Logger.new($stdout).info("Generating indexes for #{model}")
-        model.create_indexes
-        index_children(model.descendants)
+    # Create indexes for each model given the provided pattern and the class is
+    # not embedded.
+    #
+    # @example Create all the indexes.
+    #   Rails::Mongoid.create_indexes("app/models/**/*.rb")
+    #
+    # @param [ String ] pattern The file matching pattern.
+    #
+    # @return [ Array<String> ] The file names.
+    #
+    # @since 2.1.0
+    def create_indexes(pattern)
+      Dir.glob(pattern).each do |file|
+        model = determine_model(file)
+        if model
+          Logger.new($stdout).info("Generating indexes for #{model}")
+          model.create_indexes
+        end
       end
     end
 
@@ -54,5 +55,26 @@ module Rails #:nodoc:
     def load_model(file)
       require_dependency(file)
     end
+
+    # Given the provided file name, determine the model and return the class.
+    #
+    # @example Determine the model from the file.
+    #   Rails::Mongoid.determine_model("app/models/person.rb")
+    #
+    # @param [ String ] file The filename.
+    #
+    # @return [ Class ] The model.
+    #
+    # @since 2.1.0
+    def determine_model(file)
+      model_path = file[0..-4].split('/')[2..-1]
+      begin
+        klass = model_path.map { |path| path.camelize }.join('::').constantize
+        if klass.ancestors.include?(::Mongoid::Document) && !klass.embedded
+          return klass
+        end
+      rescue => e
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-03 00:00:00.000000000Z
+date: 2011-08-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70122215923500 !ruby/object:Gem::Requirement
+  requirement: &70194026936900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122215923500
+  version_requirements: *70194026936900
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70122215922340 !ruby/object:Gem::Requirement
+  requirement: &70194026936180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *70122215922340
+  version_requirements: *70194026936180
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70122215921340 !ruby/object:Gem::Requirement
+  requirement: &70194026935100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70122215921340
+  version_requirements: *70194026935100
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70122215920320 !ruby/object:Gem::Requirement
+  requirement: &70194026934200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *70122215920320
+  version_requirements: *70194026934200
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70122215918960 !ruby/object:Gem::Requirement
+  requirement: &70194026933020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70122215918960
+  version_requirements: *70194026933020
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70122215917980 !ruby/object:Gem::Requirement
+  requirement: &70194026932080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *70122215917980
+  version_requirements: *70194026932080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70122215916160 !ruby/object:Gem::Requirement
+  requirement: &70194026931080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70122215916160
+  version_requirements: *70194026931080
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70122215915360 !ruby/object:Gem::Requirement
+  requirement: &70194026929800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70122215915360
+  version_requirements: *70194026929800
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -378,7 +378,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2177920959190561279
+      hash: 3142306228316146123
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: