mongoid 2.1.1 → 2.1.2

data/lib/mongoid/contexts/enumerable.rb

@@ -42,8 +42,10 @@ module Mongoid #:nodoc:
       #
       # @return [ Integer ] The count of documents.
       def count
-        @count ||= filter.size
+        @count ||= execute.size
       end
+      alias :length :count
+      alias :size :count
 
       # Delete all the documents in the database matching the selector.
       #

data/lib/mongoid/contexts/mongo.rb

@@ -88,6 +88,8 @@ module Mongoid #:nodoc:
       def count(extras = false)
         @count ||= klass.collection.find(selector, process_options).count(extras)
       end
+      alias :size :count
+      alias :length :count
 
       # Delete all the documents in the database matching the selector.
       #

data/lib/mongoid/criteria.rb

@@ -47,6 +47,8 @@ module Mongoid #:nodoc:
       :avg,
       :blank?,
       :count,
+      :size,
+      :length,
       :delete,
       :delete_all,
       :destroy,

data/lib/mongoid/railtie.rb

@@ -111,6 +111,11 @@ module Rails #:nodoc:
         end
       end
 
+      # Need to include the Mongoid identity map middleware.
+      initializer "include the identity map" do |app|
+        app.config.middleware.use "Rack::Mongoid::Middleware::IdentityMap"
+      end
+
       # Instantitate any registered observers after Rails initialization and
       # instantiate them after being reloaded in the development environment
       initializer "instantiate observers" do

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

@@ -112,7 +112,7 @@ module Mongoid # :nodoc:
           # attrs: The single document attributes to process.
           def process(attrs)
             return if reject?(attrs)
-            if id = attrs[:id] || attrs["id"] || attrs["_id"]
+            if id = attrs["id"] || attrs["_id"]
               document = existing.find(convert_id(id))
               destroyable?(attrs) ? existing.delete(document) : document.update_attributes(attrs)
             else

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

@@ -228,7 +228,7 @@ module Mongoid # :nodoc:
               proxy.clear
             else
               atomically(:$set) do
-                proxy.target = replacement
+                proxy.target = replacement.compact
                 proxy.target.each_with_index do |doc, index|
                   integrate(doc)
                   doc._index = index

data/lib/mongoid/relations/metadata.rb

@@ -391,6 +391,16 @@ module Mongoid # :nodoc:
         @inverse_klass ||= inverse_class_name.constantize
       end
 
+      # Get the metadata for the inverse relation.
+      #
+      # @example Get the inverse metadata.
+      #   metadata.inverse_metadata(doc)
+      #
+      # @param [ Document ] document The document to check.
+      #
+      # @return [ Metadata ] The inverse metadata.
+      #
+      # @since 2.1.0
       def inverse_metadata(document)
         document.reflect_on_association(inverse(document))
       end
@@ -767,9 +777,10 @@ module Mongoid # :nodoc:
       #
       # @since 2.0.0.rc.1
       def determine_inverse_relation
+        default = klass.relations[inverse_klass.name.underscore]
+        return default.name if default
         klass.relations.each_pair do |key, meta|
-          if key == inverse_klass.name.underscore ||
-            meta.class_name == inverse_class_name
+          if meta.class_name == inverse_class_name
             return key.to_sym
           end
         end

data/lib/mongoid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2151817520 !ruby/object:Gem::Requirement
+  requirement: &2151774380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151817520
+  version_requirements: *2151774380
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &2151806700 !ruby/object:Gem::Requirement
+  requirement: &2151772820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *2151806700
+  version_requirements: *2151772820
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2151801860 !ruby/object:Gem::Requirement
+  requirement: &2151770980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2151801860
+  version_requirements: *2151770980
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2151792280 !ruby/object:Gem::Requirement
+  requirement: &2151758560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *2151792280
+  version_requirements: *2151758560
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2151790140 !ruby/object:Gem::Requirement
+  requirement: &2151755800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,21 +66,21 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *2151790140
+  version_requirements: *2151755800
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2151788460 !ruby/object:Gem::Requirement
+  requirement: &2151752500 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *2151788460
+  version_requirements: *2151752500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151786380 !ruby/object:Gem::Requirement
+  requirement: &2151750800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,18 +88,18 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2151786380
+  version_requirements: *2151750800
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &2151784760 !ruby/object:Gem::Requirement
+  requirement: &2151748540 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *2151784760
+  version_requirements: *2151748540
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -380,7 +380,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4071051164423379877
+      hash: 1067199592280239396
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: