mongoid 2.2.0 → 2.2.1

data/CHANGELOG.md

@@ -2,14 +2,68 @@
 
 For instructions on upgrading to newer versions, visit [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
+## 2.2.1
+
+### Resolved Issues
+
+* \#1210, \#517 Allow embedded document relation queries to use dot notation.
+  (Scott Ellard)
+
+* \#1198 Enumerable target should use criteria count if loaded has no docs.
+
+* \#1164 Get rid of remaining no method in_memory errors.
+
+* \#1070 Allow custom field serializers to have their own constructors.
+
+* \#1176 Allow access to parent documents from embedded docs in after_destroy
+  callbacks.
+
+* \#1191 Context group methods (min, max, sum) no longer return NaN but instead
+  return nil if field doesn't exist or have values.
+
+* \#1193, \#1271 Always return Integers for integer fields with .000 precisions,
+  not floats.
+
+* \#1199 Fixed performance issues of hash and array field access when reading
+  multiple times.
+
+* \#1218 Fixed issues with relations referencing models with integer foreign keys.
+
+* \#1219 Fixed various conflicting modifications issues when pushing and pulling
+  from the same embedded document in a single call.
+
+* \#1220 Metadata should not get overwritten by nil on binding.
+
+* \#1231 Renamed Mongoid's atomic set class to Sets to avoid conflicts with Ruby's
+  native Set after document inclusion.
+
+* \#1232 Fix access to related models during before_destroy callbacks when
+  cascading.
+
+* \#1234 Fixed HABTM foreign key synchronization issues when destroying
+  documents.
+
+* \#1243 Polymorphic relations dont convert to object ids when querying if the
+  ids are defined as strings.
+
+* \#1247 Force Model.first to sort by ascending id to guarantee first document.
+
+* \#1248 Added #unscoped to embedded many relations.
+
+* \#1249 Destroy flags in nested attributes now actually destroy the document
+  for has_many instead of just breaking the relation.
+
+* \#1272 Don't modify configuration options in place when creating replica set
+  connections.
+
 ## 2.2.0
 
 ### New Features
 
-* Mongoid now contains eager loading in the form of `Criteria#includes(|*args)`.
-  This works on all relational associations and requires the identity map to
+* Mongoid now contains eager loading in the form of `Criteria#includes(*args)`.
+  This works on has_one, has_many, belongs_to associations and requires the identity map to
   be enabled in order to function. Set `identity_map_enabled: true` in your
-  `mongoid.yml`.
+  `mongoid.yml`. Ex: `Person.where(title: "Sir").includes(:posts, :game)`
 
 * Relations can now take a module as a value to the `:extend` option. (Roman
   Shterenzon)

data/Rakefile

@@ -19,7 +19,7 @@ task :install => :build do
 end
 
 task :release => :build do
-  system "git tag -a #{Mongoid::VERSION} -m 'Tagging #{Mongoid::VERSION}'"
+  system "git tag -a v#{Mongoid::VERSION} -m 'Tagging #{Mongoid::VERSION}'"
   system "git push --tags"
   system "gem push mongoid-#{Mongoid::VERSION}.gem"
 end

data/lib/mongoid/atomic/modifiers.rb

@@ -115,7 +115,8 @@ module Mongoid #:nodoc:
       #
       # @since 2.2.0
       def push_conflict?(field)
-        set_fields.include?(field.split(".", 2)[0])
+        name = field.split(".", 2)[0]
+        set_fields.include?(name) || pull_fields.include?(name)
       end
 
       # Get the conflicting pull modifications.

data/lib/mongoid/config.rb

@@ -48,7 +48,6 @@ module Mongoid #:nodoc
 
     option :allow_dynamic_fields, :default => true
     option :autocreate_indexes, :default => false
-    option :binding_defaults, :default => { :binding => false, :continue => true }
     option :identity_map_enabled, :default => false
     option :include_root_in_json, :default => false
     option :max_retries_on_connection_failure, :default => 0

data/lib/mongoid/config/replset_database.rb

@@ -14,14 +14,14 @@ module Mongoid #:nodoc:
       #
       # @since 2.0.0.rc.5
       def configure
-        # yes, construction is weird but the driver wants 
+        # yes, construction is weird but the driver wants
         # "A list of host-port pairs ending with a hash containing any options"
         # mongo likes symbols
         options = self.inject({ :logger => Mongoid::Logger.new }) do |memo, (k, v)|
           memo[k.to_sym] = v
           memo
         end
-        connection = Mongo::ReplSetConnection.new(*(hosts << options))
+        connection = Mongo::ReplSetConnection.new(*(hosts.clone << options))
 
         if authenticating?
           connection.add_auth(database, username, password)

data/lib/mongoid/contexts/mongo.rb

@@ -4,7 +4,8 @@ module Mongoid #:nodoc:
     class Mongo
       attr_accessor :criteria
 
-      delegate :klass, :options, :field_list, :selector, :to => :criteria
+      delegate :cached?, :klass, :options, :field_list, :selector, :to => :criteria
+      delegate :collection, :to => :klass
 
       # Perform an add to set on the matching documents.
       #
@@ -86,7 +87,11 @@ module Mongoid #:nodoc:
       #
       # @return [ Integer ] The count of documents.
       def count(extras = false)
-        @count ||= klass.collection.find(selector, process_options).count(extras)
+        if cached?
+          @count ||= collection.find(selector, process_options).count(extras)
+        else
+          collection.find(selector, process_options).count(extras)
+        end
       end
       alias :size :count
       alias :length :count
@@ -153,7 +158,10 @@ module Mongoid #:nodoc:
       #
       # @return [ Document ] The first document in the collection.
       def first
-        attributes = klass.collection.find_one(selector, process_options)
+        opts = process_options
+        sorting = opts[:sort] ||= []
+        sorting << [:_id, :asc]
+        attributes = klass.collection.find_one(selector, opts)
         attributes ? Mongoid::Factory.from_db(klass, attributes) : nil
       end
       alias :one :first
@@ -202,7 +210,7 @@ module Mongoid #:nodoc:
       # @example Iterate over the results.
       #   context.iterate { |doc| p doc }
       def iterate(&block)
-        return caching(&block) if criteria.cached?
+        return caching(&block) if cached?
         if block_given?
           execute.each { |doc| yield doc }
         end
@@ -362,7 +370,8 @@ module Mongoid #:nodoc:
           :initial => { start => "start" },
           :reduce => reduce.gsub("[field]", field)
         )
-        collection.empty? ? nil : collection.first[start.to_s]
+        value = collection.empty? ? nil : collection.first[start.to_s]
+        value ? (value.nan? ? nil : value) : value
       end
 
       # Filters the field list. If no fields have been supplied, then it will be

data/lib/mongoid/criteria.rb

@@ -7,7 +7,6 @@ require "mongoid/criterion/inclusion"
 require "mongoid/criterion/inspection"
 require "mongoid/criterion/optional"
 require "mongoid/criterion/selector"
-require "mongoid/criterion/unconvertable"
 
 module Mongoid #:nodoc:
 
@@ -195,9 +194,10 @@ module Mongoid #:nodoc:
       @options, @klass, @documents, @embedded = {}, klass, [], embedded
     end
 
-    # Merges another object into this +Criteria+. The other object may be a
-    # +Criteria+ or a +Hash+. This is used to combine multiple scopes together,
-    # where a chained scope situation may be desired.
+    # Merges another object with this +Criteria+ and returns a new criteria.
+    # The other object may be a +Criteria+ or a +Hash+. This is used to
+    # combine multiple scopes together, where a chained scope situation
+    # may be desired.
     #
     # @example Merge the criteria with a conditions hash.
     #   criteria.merge({ :conditions => { :title => "Sir" } })

data/lib/mongoid/criterion/inclusion.rb

@@ -247,12 +247,27 @@ module Mongoid #:nodoc:
       #
       # @since 2.0.0
       def execute_or_raise(args, criteria)
-        (args[0].is_a?(Array) ? criteria.entries : criteria.one).tap do |result|
+        (args[0].is_a?(Array) ? criteria.entries : from_map_or_db(criteria)).tap do |result|
           if Mongoid.raise_not_found_error && !args.flatten.blank?
             raise Errors::DocumentNotFound.new(klass, args) if result._vacant?
           end
         end
       end
+
+      # Get the document from the identity map, and if not found hit the
+      # database.
+      #
+      # @example Get the document from the map or criteria.
+      #   criteria.from_map_or_db(criteria)
+      #
+      # @param [ Criteria ] The cloned criteria.
+      #
+      # @return [ Document ] The found document.
+      #
+      # @since 2.2.1
+      def from_map_or_db(criteria)
+        IdentityMap.get(klass, criteria.selector[:_id]) || criteria.one
+      end
     end
   end
 end

data/lib/mongoid/document.rb

@@ -7,9 +7,7 @@ module Mongoid #:nodoc:
     extend ActiveSupport::Concern
     include Mongoid::Components
 
-    included do
-      attr_reader :new_record
-    end
+    attr_reader :new_record
 
     # Default comparison is via the string version of the id.
     #
@@ -181,7 +179,7 @@ module Mongoid #:nodoc:
       attributes.tap do |attrs|
         relations.each_pair do |name, meta|
           if meta.embedded?
-            relation = send(name, false, :continue => false)
+            relation = send(name)
             attrs[name] = relation.as_document unless relation.blank?
           end
         end

data/lib/mongoid/extensions.rb

@@ -3,12 +3,14 @@ require "mongoid/extensions/array/deletion"
 require "mongoid/extensions/false_class/equality"
 require "mongoid/extensions/hash/criteria_helpers"
 require "mongoid/extensions/hash/scoping"
+require "mongoid/extensions/integer/checks"
 require "mongoid/extensions/nil/collectionization"
 require "mongoid/extensions/object/checks"
 require "mongoid/extensions/object/reflections"
 require "mongoid/extensions/object/substitutable"
 require "mongoid/extensions/object/yoda"
 require "mongoid/extensions/proc/scoping"
+require "mongoid/extensions/string/checks"
 require "mongoid/extensions/string/conversions"
 require "mongoid/extensions/string/inflections"
 require "mongoid/extensions/symbol/inflections"
@@ -33,6 +35,10 @@ class Hash #:nodoc
   include Mongoid::Extensions::Hash::Scoping
 end
 
+class Integer #:nodoc
+  include Mongoid::Extensions::Integer::Checks
+end
+
 class NilClass #:nodoc
   include Mongoid::Extensions::Nil::Collectionization
 end
@@ -49,6 +55,7 @@ class Proc #:nodoc:
 end
 
 class String #:nodoc
+  include Mongoid::Extensions::String::Checks
   include Mongoid::Extensions::String::Conversions
   include Mongoid::Extensions::String::Inflections
 end

data/lib/mongoid/extensions/integer/checks.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Integer #:nodoc:
+
+      # This module has object checks in it.
+      module Checks #:nodoc:
+
+        # Is the object not to be converted to bson on criteria creation?
+        #
+        # @example Is the object unconvertable?
+        #   object.unconvertable_to_bson?
+        #
+        # @return [ true ] If the object is unconvertable.
+        #
+        # @since 2.2.1
+        def unconvertable_to_bson?
+          true
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/extensions/object/yoda.rb

@@ -21,6 +21,22 @@ module Mongoid #:nodoc:
         def do_or_do_not(name, *args)
           respond_to?(name) ? send(name, *args) : nil
         end
+
+        # You must unlearn what you have learned. -- Yoda
+        #
+        # @example You must perform this execution.
+        #   object.you_must(:use, "The Force")
+        #
+        # @param [ String, Symbol ] name The method name.
+        # @param [ Array ] *args The arguments.
+        #
+        # @return [ Object, nil ] The result of the method call or nil if the
+        #   method does not exist. Nil if the object is frozen.
+        #
+        # @since 2.2.1
+        def you_must(name, *args)
+          frozen? ? nil : do_or_do_not(name, *args)
+        end
       end
     end
   end

data/lib/mongoid/extensions/object_id/conversions.rb

@@ -35,7 +35,7 @@ module Mongoid #:nodoc:
           case args
           when ::String
             return nil if args.blank?
-            if args.is_a?(Mongoid::Criterion::Unconvertable)
+            if args.unconvertable_to_bson?
               args
             else
               BSON::ObjectId.from_string(args)

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

@@ -0,0 +1,24 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module String #:nodoc:
+
+      # This module has object checks in it.
+      module Checks #:nodoc:
+        attr_accessor :unconvertable_to_bson
+
+        # Is the object not to be converted to bson on criteria creation?
+        #
+        # @example Is the object unconvertable?
+        #   object.unconvertable_to_bson?
+        #
+        # @return [ true, false ] If the object is unconvertable.
+        #
+        # @since 2.2.1
+        def unconvertable_to_bson?
+          !!@unconvertable_to_bson
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Mongoid #:nodoc:
       module Inflections
 
         ActiveSupport::Inflector.inflections do |inflect|
-          inflect.singular("address", "address")
+          inflect.singular(/address$/, "address")
           inflect.singular("addresses", "address")
           inflect.irregular("canvas", "canvases")
         end

data/lib/mongoid/fields.rb

@@ -229,7 +229,7 @@ module Mongoid #:nodoc
         meth = options.delete(:as) || name
         Mappings.for(
           options[:type], options[:identity]
-        ).new(name, options).tap do |field|
+        ).instantiate(name, options).tap do |field|
           fields[name] = field
           defaults << name unless field.default.nil?
           create_accessors(name, meth, options)
@@ -305,7 +305,9 @@ module Mongoid #:nodoc
             define_method(meth) do
               read_attribute(name).tap do |value|
                 if value.is_a?(Array) || value.is_a?(Hash)
-                  changed_attributes[name] = value.clone unless attribute_changed?(name)
+                  unless changed_attributes.include?(name)
+                    changed_attributes[name] = value.clone
+                  end
                 end
               end
             end

data/lib/mongoid/fields/serializable.rb

@@ -23,9 +23,10 @@ module Mongoid #:nodoc:
     #     end
     #   end
     module Serializable
+      extend ActiveSupport::Concern
 
       # Set readers for the instance variables.
-      attr_reader :default, :label, :name, :options
+      attr_accessor :default, :label, :name, :options
 
       # When reading the field do we need to cast the value? This holds true when
       # times are stored or for big decimals which are stored as strings.
@@ -88,23 +89,6 @@ module Mongoid #:nodoc:
         end
       end
 
-      # Create the new field with a name and optional additional options.
-      #
-      # @example Create the new field.
-      #   Field.new(:name, :type => String)
-      #
-      # @param [ Hash ] options The field options.
-      #
-      # @option options [ Class ] :type The class of the field.
-      # @option options [ Object ] :default The default value for the field.
-      # @option options [ String ] :label The field's label.
-      #
-      # @since 2.1.0
-      def initialize(name, options = {})
-        @name, @options = name, options
-        @default, @label = options[:default], options[:label]
-      end
-
       # Get the metadata for the field if its a foreign key.
       #
       # @example Get the metadata.
@@ -165,6 +149,30 @@ module Mongoid #:nodoc:
       def versioned?
         @versioned ||= (options[:versioned].nil? ? true : options[:versioned])
       end
+
+      module ClassMethods #:nodoc:
+
+        # Create the new field with a name and optional additional options.
+        #
+        # @example Create the new field.
+        #   Field.new(:name, :type => String)
+        #
+        # @param [ Hash ] options The field options.
+        #
+        # @option options [ Class ] :type The class of the field.
+        # @option options [ Object ] :default The default value for the field.
+        # @option options [ String ] :label The field's label.
+        #
+        # @since 2.1.0
+        def instantiate(name, options = {})
+          allocate.tap do |field|
+            field.name = name
+            field.options = options
+            field.default = options[:default]
+            field.label = options[:label]
+          end
+        end
+      end
     end
   end
 end