mongoid 2.4.6 → 2.4.7

data/CHANGELOG.md

@@ -3,6 +3,27 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
+## 2.4.7
+
+### Resolved Issues
+
+* Ensure reloading of embedded documents retains reference to the parent.
+
+* \#1837 Always pass symbol options to the driver.
+
+* \#1836 Ensure relation counts pick up persisted document that have not
+  had the foreign key link persisted.
+
+* \#1820 Destroying embedded documents in an embeds_many should also
+  removed the document from the underlying _uncoped target and reindex
+  the relation.
+
+* \#1814 Don't cascade callbacks on after_initialize.
+
+* \#1800 Invalid options for the Mongo connection are now filtered out.
+
+* \#1785 Case equality has been fixed to handle instance checks properly.
+
 ## 2.4.6
 
 ### Resolved Issues

data/lib/mongoid/callbacks.rb

@@ -105,7 +105,8 @@ module Mongoid #:nodoc:
     #
     # @since 2.3.0
     def cascadable_child?(kind, child)
-      [ :create, :destroy, :initialize ].include?(kind) || child.changed? || child.new_record?
+      return false if kind == :initialize
+      [ :create, :destroy ].include?(kind) || child.changed? || child.new_record?
     end
 
     # Get the name of the callback that the child should fire. This changes

data/lib/mongoid/config.rb

@@ -53,6 +53,21 @@ module Mongoid #:nodoc
       end
     end
 
+    # keys to remove from self to not pass through to Mongo::Connection
+    PRIVATE_OPTIONS = %w(uri host hosts port database databases username password logger)
+
+    # Get the blacklisted options from passing through to the driver.
+    #
+    # @example Get the blacklisted options.
+    #   Config.blacklisted_options
+    #
+    # @return [ Array<String> ] The blacklist.
+    #
+    # @since 2.4.7
+    def blacklisted_options
+      PRIVATE_OPTIONS + settings.keys.map(&:to_s)
+    end
+
     # Get any extra databases that have been configured.
     #
     # @example Get the extras.

data/lib/mongoid/config/database.rb

@@ -6,9 +6,6 @@ module Mongoid #:nodoc:
     # database from options.
     class Database < Hash
 
-      # keys to remove from self to not pass through to Mongo::Connection
-      PRIVATE_OPTIONS = %w(uri database username password logger)
-
       # Configure the database connections. This will return an array
       # containing the master and an array of slaves.
       #
@@ -86,7 +83,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.0.0.rc.1
       def master
-        Mongo::Connection.from_uri(uri(self), optional).tap do |conn|
+        Mongo::Connection.from_uri(uri(self), optional.symbolize_keys).tap do |conn|
           conn.apply_saved_authentication
         end
       end
@@ -102,7 +99,7 @@ module Mongoid #:nodoc:
       # @since 2.0.0.rc.1
       def slaves
         (self["slaves"] || []).map do |options|
-          Mongo::Connection.from_uri(uri(options), optional(true)).tap do |conn|
+          Mongo::Connection.from_uri(uri(options), optional(true).symbolize_keys).tap do |conn|
             conn.apply_saved_authentication
           end
         end
@@ -162,8 +159,8 @@ module Mongoid #:nodoc:
           :pool_size => pool_size,
           :logger => logger? ? Mongoid::Logger.new : nil,
           :slave_ok => slave
-        }).merge(self).reject { |k,v| PRIVATE_OPTIONS.include? k }.
-          inject({}) { |memo, (k, v)| memo[k.to_sym] = v; memo} # mongo likes symbols
+        }).merge(self).reject { |k,v| Config.blacklisted_options.include? k }.
+          inject({}) { |memo, (k, v)| memo[k.to_sym] = v; memo}
       end
 
       # Get a Mongo compliant URI for the database connection.

data/lib/mongoid/config/replset_database.rb

@@ -17,11 +17,9 @@ module Mongoid #:nodoc:
         # 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.clone << options))
+        options = reject{ |key, value| Config.blacklisted_options.include?(key.to_s) }
+        options["logger"] = Mongoid::Logger.new
+        connection = Mongo::ReplSetConnection.new(*(hosts.clone << options.symbolize_keys))
 
         if authenticating?
           connection.add_auth(database, username, password)

data/lib/mongoid/document.rb

@@ -44,7 +44,11 @@ module Mongoid #:nodoc:
     #
     # @return [ true, false ] True if the classes are equal, false if not.
     def ===(other)
-      other.is_a?(self.class)
+      if other.class == Class
+        self.class === other
+      else
+        id == other.id
+      end
     end
 
     # Delegates to ==. Used when needing checks in hashes.
@@ -276,7 +280,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.0.0.rc.4
       def ===(other)
-        other.is_a?(Class) ? self == other : other.is_a?(self)
+        other.class == Class ? self <= other : other.is_a?(self)
       end
 
       # Instantiate a new object, only when loaded from the database or when

data/lib/mongoid/hierarchy.rb

@@ -69,7 +69,12 @@ module Mongoid #:nodoc
     # @since 2.0.0.beta.1
     def remove_child(child)
       name = child.metadata.name
-      child.embedded_one? ? remove_ivar(name) : send(name).delete_one(child)
+      if child.embedded_one?
+        remove_ivar(name)
+      else
+        relation = send(name)
+        relation.send(:delete_one, child)
+      end
     end
 
     # After children are persisted we can call this to move all their changes

data/lib/mongoid/relations.rb

@@ -119,7 +119,9 @@ module Mongoid # :nodoc:
     def reload_relations
       relations.each_pair do |name, meta|
         if instance_variable_defined?("@#{name}")
-          remove_instance_variable("@#{name}")
+          if _parent.nil? || instance_variable_get("@#{name}") != _parent
+            remove_instance_variable("@#{name}")
+          end
         end
       end
     end

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

@@ -28,6 +28,22 @@ module Mongoid # :nodoc:
         end
         alias :push :<<
 
+        # Get this relation as as its representation in the database.
+        #
+        # @example Convert the relation to an attributes hash.
+        #   person.addresses.as_document
+        #
+        # @return [ Array<Hash> ] The relation as stored in the db.
+        #
+        # @since 2.0.0.rc.1
+        def as_document
+          [].tap do |attributes|
+            _unscoped.each do |doc|
+              attributes.push(doc.as_document)
+            end
+          end
+        end
+
         # Appends an array of documents to the relation. Performs a batch
         # insert of the documents instead of persisting one at a time.
         #
@@ -308,22 +324,6 @@ module Mongoid # :nodoc:
           end
         end
 
-        # Get this relation as as its representation in the database.
-        #
-        # @example Convert the relation to an attributes hash.
-        #   person.addresses.as_document
-        #
-        # @return [ Array<Hash> ] The relation as stored in the db.
-        #
-        # @since 2.0.0.rc.1
-        def as_document
-          [].tap do |attributes|
-            _unscoped.each do |doc|
-              attributes.push(doc.as_document)
-            end
-          end
-        end
-
         # Return the relation with all previous scoping removed. This is the
         # exact representation of the docs in the database.
         #
@@ -384,6 +384,22 @@ module Mongoid # :nodoc:
           end
         end
 
+        # Deletes one document from the target and unscoped.
+        #
+        # @api private
+        #
+        # @example Delete one document.
+        #   relation.delete_one(doc)
+        #
+        # @param [ Document ] document The document to delete.
+        #
+        # @since 2.4.7
+        def delete_one(document)
+          target.delete_one(document)
+          _unscoped.delete_one(document)
+          reindex
+        end
+
         # Integrate the document into the relation. will set its metadata and
         # attempt to bind the inverse.
         #

data/lib/mongoid/relations/targets/enumerable.rb

@@ -316,7 +316,12 @@ module Mongoid #:nodoc:
         #
         # @since 2.1.0
         def size
-          (unloaded ? unloaded.count : loaded.count) + added.count{ |d| d.new? }
+          count = (unloaded ? unloaded.count : loaded.count)
+          if count.zero?
+            count + added.count
+          else
+            count + added.count{ |d| d.new_record? }
+          end
         end
         alias :length :size
 

data/lib/mongoid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000 Z
+date: 2012-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70290122566500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70290122566500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70290122563300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *70290122563300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.22
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70290122575540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70290122575540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70290122572600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *70290122572600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70290122570780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70290122570780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70290122594580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *70290122594580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70290122606300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +117,15 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70290122606300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70290122604280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +133,15 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70290122604280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &70290122602380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +149,12 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *70290122602380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -414,7 +459,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2263773657060838243
+      hash: -4230484003984922722
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -423,7 +468,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 1.8.10
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Elegant Persistance in Ruby for MongoDB.