mongoid 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: add22f9a2555b543be72f205bad6bc0baa3f00c5
-  data.tar.gz: e5e3472e31f1f826a4ad7cd0e2607aeef72a4adc
+  metadata.gz: 8dff7445e398ee462ff1e26c6baaa5684ee9318d
+  data.tar.gz: beb9a64681e530861fcece3129d5347484342344
 SHA512:
-  metadata.gz: 6349535d149183db9330fa3469e8ad25a119e3bb78545046f0cf44e1de7c75be8ca3f1785aeb387856d2ab7d50e079a17dc3328c3a8fe4d26cf1332923a3a994
-  data.tar.gz: 78fecf90c0308eb831ace2022c9acd4ac817b3b4080332a8207c31db0aeafd1d683b4ce30257e99bfe20e1745215d9789d6c88e5a99c05e847d76f77e5f429f9
+  metadata.gz: d86170a4c56e57d6d5e11d89003307e9a7c8f2e45d2c75d7cb98ef81781b66a05b69ba8a71701161c0ef800a2284a322beaff08c6a3a70d03014d7313f7f8205
+  data.tar.gz: d8615708189aee7700312ac743c8ae63d69d092f45788f4137c9ec3e931985a876d38ec08819359b960e3a64a333c981535b1da8f6405ab55d2dc6d591d15d37

data.tar.gz.sig

@@ -0,0 +1,2 @@
+vʶ�N=�Y-h�m>
_�B��LH��2�$a���\MJc�	N�}2����In�F7y.��Q��CR���n�F"bՒ�9���y���rn�is���n�{D6��4.�b�X�s�5�*edA���9�)�9��
+�QG��û!^���i�3R�gK��~�j����$X7h��V��#�z �h��d�2���M�@ǷS�6��Ԩ�X���]-R���vw#�3����
����F�i�sY��!���

data/CHANGELOG.md

@@ -3,7 +3,59 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/en/mongoid/docs/upgrading.html).
 
-## 5.0.0 - Not released
+## 5.0.1
+
+### Resolved Issues
+
+* [MONGOID-3020](https://jira.mongodb.org/browse/MONGOID-3020) Test added to show it's no longer an issue.
+* [MONGOID-3025](https://jira.mongodb.org/browse/MONGOID-3025) Test added to show it's no longer an issue.
+* [MONGOID-3061](https://jira.mongodb.org/browse/MONGOID-3061) No longer an issue.
+* [MONGOID-3073](https://jira.mongodb.org/browse/MONGOID-3073) Test added to show it's no longer an issue.
+* [MONGOID-3085](https://jira.mongodb.org/browse/MONGOID-3085) Test added to show it's no longer an issue.
+* [MONGOID-3101](https://jira.mongodb.org/browse/MONGOID-3101) No longer an issue.
+* [MONGOID-3160](https://jira.mongodb.org/browse/MONGOID-3160) No longer an issue.
+* [MONGOID-3176](https://jira.mongodb.org/browse/MONGOID-3176) No longer an issue.
+* [MONGOID-3214](https://jira.mongodb.org/browse/MONGOID-3214) Test added to show it's no longer an issue.
+* [MONGOID-3296](https://jira.mongodb.org/browse/MONGOID-3296) Add update callback for counter_cache.
+* [MONGOID-3326](https://jira.mongodb.org/browse/MONGOID-3326) Test added to show it's no longer an issue.
+* [MONGOID-3361](https://jira.mongodb.org/browse/MONGOID-3361) No longer an issue.
+* [MONGOID-3365](https://jira.mongodb.org/browse/MONGOID-3365) Test added to show it's no longer an issue.
+* [MONGOID-3402](https://jira.mongodb.org/browse/MONGOID-3402) Apply persistence options to parent.
+* [MONGOID-3524](https://jira.mongodb.org/browse/MONGOID-3524) No longer an issue.
+* [MONGOID-3529](https://jira.mongodb.org/browse/MONGOID-3529) Test exists already showing it's not an issue.
+* [MONGOID-3543](https://jira.mongodb.org/browse/MONGOID-3543) Test exists already showing it's not an issue.
+* [MONGOID-3611](https://jira.mongodb.org/browse/MONGOID-3611) Test added to show it's no longer an issue.
+* [MONGOID-3650](https://jira.mongodb.org/browse/MONGOID-3650) No longer an issue.
+* [MONGOID-3826](https://jira.mongodb.org/browse/MONGOID-3826), [MONGOID-4109](https://jira.mongodb.org/browse/MONGOID-4109) Fix Timelessness leaks.
+* [MONGOID-3946](https://jira.mongodb.org/browse/MONGOID-3946) Test added to show it's no longer an issue.
+* [MONGOID-3969](https://jira.mongodb.org/browse/MONGOID-3969) Test added to show it's no longer an issue.
+* [MONGOID-3971](https://jira.mongodb.org/browse/MONGOID-3971) Not an issue.
+* [MONGOID-3979](https://jira.mongodb.org/browse/MONGOID-3979) Not an issue, tests exist already.
+* [MONGOID-3985](https://jira.mongodb.org/browse/MONGOID-3985) Not an issue.
+* [MONGOID-4078](https://jira.mongodb.org/browse/MONGOID-4078) Behavior is intended.
+* [MONGOID-4079](https://jira.mongodb.org/browse/MONGOID-4079) Not an issue.
+* [MONGOID-4088](https://jira.mongodb.org/browse/MONGOID-4088) Account for sub-document dot notation with #pluck results.
+* [MONGOID-4098](https://jira.mongodb.org/browse/MONGOID-4098) Fixed by a change to the Ruby driver. See RUBY-1029.
+* [MONGOID-4101](https://jira.mongodb.org/browse/MONGOID-4101) Not an issue.
+* [MONGOID-4106](https://jira.mongodb.org/browse/MONGOID-4106) Not an issue.
+* [MONGOID-4110](https://jira.mongodb.org/browse/MONGOID-4110) Not an issue.
+* [MONGOID-4119](https://jira.mongodb.org/browse/MONGOID-4119) Ensure that criteria selector becomes pipeline operator value.
+* [MONGOID-4121](https://jira.mongodb.org/browse/MONGOID-4121) Not an issue.
+* [MONGOID-4123](https://jira.mongodb.org/browse/MONGOID-4123) Fixed as a result of MONGOID-4159.
+* [MONGOID-4125](https://jira.mongodb.org/browse/MONGOID-4125) Make sure none scopes referenced in procs are applied.
+* [MONGOID-4132](https://jira.mongodb.org/browse/MONGOID-4132) Not an issue.
+* [MONGOID-4157](https://jira.mongodb.org/browse/MONGOID-4157) Fixed by version 2.1.2 of the Ruby driver.
+* [MONGOID-4162](https://jira.mongodb.org/browse/MONGOID-4162) Adapt index option mappings to new driver. (@Nielsomat)
+* [MONGOID-3737](https://jira.mongodb.org/browse/MONGOID-3737) Test added to show it's no longer an issue.
+* [MONGOID-3621](https://jira.mongodb.org/browse/MONGOID-3621) Not an issue.
+* [MONGOID-3551](https://jira.mongodb.org/browse/MONGOID-3551) Not an issue.
+* [MONGOID-3696](https://jira.mongodb.org/browse/MONGOID-3696) Test added to show it's no longer an issue.
+* [MONGOID-3858](https://jira.mongodb.org/browse/MONGOID-3858) Test added to show it's no longer an issue.
+* [MONGOID-3672](https://jira.mongodb.org/browse/MONGOID-3672) Not an issue.
+* [MONGOID-4172](https://jira.mongodb.org/browse/MONGOID-4172) Use positional operator only on 1 level deep nesting.
+* Added public cert to repo and sign gem if private key is present
+
+## 5.0.0
 
 ### Major Changes (Backwards Incompatible)
 
@@ -2955,7 +3007,7 @@ child elements.
 
 * \#1394 Fix exists? to work when count is greater than 1. (Nick Hoffman)
 
-* \#1392 Return 0 on aggregation functions where field is nonexistant.
+* \#1392 Return 0 on aggregation functions where field is nonexistent.
 
 * \#1391 Uniqueness validation now works properly on embedded documents that are
   using primary key definitions.

data/lib/config/locales/en.yml

@@ -447,7 +447,7 @@ en:
           summary: "You cannot call create or create! through the
             relation (%{document}) whose parent (%{base}) is
             not already saved. This would cause the database to be out of sync
-            since the child could potentially reference a nonexistant parent."
+            since the child could potentially reference a nonexistent parent."
           resolution: "Make sure to only use create or create! when the parent
             document %{base} is persisted."
         unsupported_javascript:

data/lib/mongoid/attributes.rb

@@ -294,7 +294,7 @@ module Mongoid
     module ClassMethods
 
       # Alias the provided name to the original field. This will provide an
-      # aliased getter, setter, existance check, and all dirty attribute
+      # aliased getter, setter, existence check, and all dirty attribute
       # methods.
       #
       # @example Alias the attribute.

data/lib/mongoid/clients.rb

@@ -115,10 +115,13 @@ module Mongoid
       #
       # @since 3.0.0
       def mongo_client
-        name = client_name
-        client = Clients.with_name(name)
-        client = client.use(database_name)
-        client.with(self.persistence_options)
+        client = Clients.with_name(client_name)
+        opts = self.persistence_options ? self.persistence_options.dup : {}
+        if defined?(Mongo::Client::VALID_OPTIONS)
+          opts.reject! { |k, v| !Mongo::Client::VALID_OPTIONS.include?(k.to_sym) }
+        end
+        opts.merge!(database: database_name) unless client.database.name.to_sym == database_name.to_sym
+        client.with(opts)
       end
       alias :mongo_session :mongo_client
       deprecate :mongo_session, :mongo_client, 2015, 12

data/lib/mongoid/clients/options.rb

@@ -5,7 +5,7 @@ module Mongoid
       extend ActiveSupport::Concern
       extend Gem::Deprecate
 
-      # Tell the next persistance operation to store in a specific collection,
+      # Tell the next persistence operation to store in a specific collection,
       # database or client.
       #
       # @example Save the current document to a different collection.
@@ -125,7 +125,7 @@ module Mongoid
           super
         end
 
-        # Tell the next persistance operation to store in a specific collection,
+        # Tell the next persistence operation to store in a specific collection,
         # database or client.
         #
         # @example Create a document in a different collection.

data/lib/mongoid/contextual/aggregable/mongo.rb

@@ -124,7 +124,8 @@ module Mongoid
         def pipeline(field)
           db_field = "$#{database_field_name(field)}"
           pipeline = []
-          pipeline << { "$match" => criteria.nin(field => nil).selector }
+          pipeline << { "$match" => criteria.selector }
+          pipeline << { "$match" =>  criteria.exists(field => true).selector }
           pipeline << { "$sort" => criteria.options[:sort] } if criteria.options[:sort]
           pipeline << { "$skip" => criteria.options[:skip] } if criteria.options[:skip]
           pipeline << { "$limit" => criteria.options[:limit] } if criteria.options[:limit]

data/lib/mongoid/contextual/geo_near.rb

@@ -19,7 +19,7 @@ module Mongoid
       # @since 3.1.0
       def average_distance
         average = stats["avgDistance"]
-        average.nan? ? nil : average
+        (average.nil? || average.nan?) ? nil : average
       end
 
       # Iterates over each of the documents in the $geoNear, excluding the

data/lib/mongoid/contextual/memory.rb

@@ -9,6 +9,7 @@ module Mongoid
       include Aggregable::Memory
       include Relations::Eager
       include Queryable
+      include Positional
 
       # @attribute [r] root The root document.
       # @attribute [r] path The atomic path.
@@ -46,7 +47,9 @@ module Mongoid
           doc.as_document
         end
         unless removed.empty?
-          collection.find(selector).update_one("$pullAll" => { path => removed })
+          collection.find(selector).update_one(
+            positionally(selector, "$pullAll" => { path => removed })
+          )
         end
         deleted
       end

data/lib/mongoid/contextual/mongo.rb

@@ -402,12 +402,11 @@ module Mongoid
           hash
         end
 
-        view.projection(normalized_select).map do |doc|
-          if normalized_select.size == 1
-            doc[normalized_select.keys.first]
-          else
-            normalized_select.keys.map { |n| doc[n] }
+        view.projection(normalized_select).reduce([]) do |plucked, doc|
+          values = normalized_select.keys.map do |n|
+            n =~ /\./ ? doc[n.partition('.')[0]] : doc[n]
           end
+          plucked << (values.size == 1 ? values.first : values)
         end
       end
 

data/lib/mongoid/document.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require "mongoid/positional"
 require "mongoid/evolvable"
 require "mongoid/extensions"
 require "mongoid/errors"

data/lib/mongoid/indexable/specification.rb

@@ -7,14 +7,12 @@ module Mongoid
     # @since 4.0.0
     class Specification
 
-      # The mappings of nice Ruby-style names to the corresponding MongoDB
-      # name.
+      # The mappings of nice Ruby-style names to the corresponding driver
+      # option name.
       #
       # @since 4.0.0
       MAPPINGS = {
-        bucket_size: :bucketSize,
-        drop_dups: :dropDups,
-        expire_after_seconds: :expireAfterSeconds
+        expire_after_seconds: :expire_after
       }
 
       # @!attribute klass

data/lib/mongoid/indexable/validators/options.rb

@@ -11,6 +11,7 @@ module Mongoid
           :background,
           :database,
           :default_language,
+          :language_override,
           :drop_dups,
           :name,
           :sparse,
@@ -20,7 +21,12 @@ module Mongoid
           :bits,
           :bucket_size,
           :expire_after_seconds,
-          :weights
+          :weights,
+          :storage_engine,
+          :key,
+          :sphere_version,
+          :text_version,
+          :version
         ]
 
         VALID_TYPES = [

data/lib/mongoid/matchable/exists.rb

@@ -2,7 +2,7 @@
 module Mongoid
   module Matchable
 
-    # Checks for existance.
+    # Checks for existence.
     class Exists < Default
 
       # Return true if the attribute exists and checking for existence or

data/lib/mongoid/persistable.rb

@@ -27,6 +27,7 @@ module Mongoid
     include Incrementable
     include Logical
     include Poppable
+    include Positional
     include Pullable
     include Pushable
     include Renamable
@@ -208,7 +209,7 @@ module Mongoid
     def persist_atomic_operations(operations)
       if persisted?
         selector = atomic_selector
-        _root.collection.find(selector).update_one(operations)
+        _root.collection.find(selector).update_one(positionally(selector, operations))
       end
     end
   end

data/lib/mongoid/persistable/creatable.rb

@@ -61,7 +61,7 @@ module Mongoid
           _parent.insert
         else
           selector = _parent.atomic_selector
-          _root.collection.find(selector).update_one(atomic_inserts)
+          _root.collection.find(selector).update_one(positionally(selector, atomic_inserts))
         end
       end
 

data/lib/mongoid/persistable/deletable.rb

@@ -62,7 +62,7 @@ module Mongoid
         _parent.remove_child(self) if notifying_parent?(options)
         if _parent.persisted?
           selector = _parent.atomic_selector
-          _root.collection.find(selector).update_one(atomic_deletes)
+          _root.collection.find(selector).update_one(positionally(selector, atomic_deletes))
         end
         true
       end

data/lib/mongoid/persistable/updatable.rb

@@ -141,9 +141,9 @@ module Mongoid
           unless updates.empty?
             coll = _root.collection
             selector = atomic_selector
-            coll.find(selector).update_one(updates)
+            coll.find(selector).update_one(positionally(selector, updates))
             conflicts.each_pair do |key, value|
-              coll.find(selector).update_one({ key => value })
+              coll.find(selector).update_one(positionally(selector, { key => value }))
             end
           end
         end

data/lib/mongoid/positional.rb

@@ -0,0 +1,75 @@
+# encoding: utf-8
+module Mongoid
+
+  # This module is responsible for taking update selectors and switching out
+  # the indexes for the $ positional operator where appropriate.
+  #
+  # @since 4.0.0
+  module Positional
+
+    # Takes the provided selector and atomic operations and replaces the
+    # indexes of the embedded documents with the positional operator when
+    # needed.
+    #
+    # @note The only time we can accurately know when to use the positional
+    #   operator is at the exact time we are going to persist something. So
+    #   we can tell by the selector that we are sending if it is actually
+    #   possible to use the positional operator at all. For example, if the
+    #   selector is: { "_id" => 1 }, then we could not use the positional
+    #   operator for updating embedded documents since there would never be a
+    #   match - we base whether we can based on the number of levels deep the
+    #   selector goes, and if the id values are not nil.
+    #
+    # @example Process the operations.
+    #   positionally(
+    #     { "_id" => 1, "addresses._id" => 2 },
+    #     { "$set" => { "addresses.0.street" => "hobrecht" }}
+    #   )
+    #
+    # @param [ Hash ] selector The selector.
+    # @param [ Hash ] operations The update operations.
+    # @param [ Hash ] processed The processed update operations.
+    #
+    # @return [ Hash ] The new operations.
+    #
+    # @since 3.1.0
+    def positionally(selector, operations, processed = {})
+      if selector.size == 1 || selector.values.any? { |val| val.nil? }
+        return operations
+      end
+      keys = selector.keys.map{ |m| m.sub('._id','') } - ['_id']
+      keys = keys.sort_by { |s| s.length*-1 }
+      process_operations(keys, operations, processed)
+    end
+
+    private
+
+    def process_operations(keys, operations, processed)
+      operations.each_pair do |operation, update|
+        processed[operation] = process_updates(keys, update)
+      end
+      processed
+    end
+
+    def process_updates(keys, update, updates = {})
+      update.each_pair do |position, value|
+        updates[replace_index(keys, position)] = value
+      end
+      updates
+    end
+
+    def replace_index(keys, position)
+      # replace index with $ only if that key is in the selector and it is only
+      # nested a single level deep.
+      matches = position.scan(/\.\d+\./)
+      if matches.size == 1
+        keys.each do |kk|
+          if position =~ /^#{kk}\.\d+\.(.*)/
+            return "#{kk}.$.#{$1}"
+          end
+        end
+      end
+      position
+    end
+  end
+end

data/lib/mongoid/relations/counter_cache.rb

@@ -103,6 +103,25 @@ module Mongoid
           name = meta.name
           cache_column = meta.counter_cache_column_name.to_sym
 
+          after_update do
+            if record = __send__(name)
+              id_field = "#{name}_id"
+
+              if attribute_changed?(id_field)
+                original, current = attribute_change(id_field)
+
+                unless original.nil?
+                  record.class.decrement_counter(cache_column, original)
+                end
+
+                unless current.nil?
+                  record[cache_column] = (record[cache_column] || 0) + 1
+                  record.class.increment_counter(cache_column, current) if record.persisted?
+                end
+              end
+            end
+          end
+
           after_create do
             if record = __send__(name)
               record[cache_column] = (record[cache_column] || 0) + 1

data/lib/mongoid/relations/eager/base.rb

@@ -65,12 +65,14 @@ module Mongoid
 
         # Run the preloader.
         #
-        # @example Iterate over the documents loadded for the current relation
+        # @example Iterate over the documents loaded for the current relation
         #   loader.each_loaded_document { |doc| }
         #
         # @since 4.0.0
         def each_loaded_document
-          @metadata.klass.any_in(key => keys_from_docs).each do |doc|
+          criteria = @metadata.klass.any_in(key => keys_from_docs)
+          criteria.inclusions = criteria.inclusions - [ @metadata ]
+          criteria.each do |doc|
             yield doc
           end
         end

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

@@ -6,6 +6,7 @@ module Mongoid
       # Contains behaviour for executing operations in batch on embedded
       # documents.
       module Batchable
+        include Positional
 
         # Insert new documents as a batch push ($pushAll). This ensures that
         # all callbacks are run at the appropriate time and only 1 request is
@@ -36,7 +37,9 @@ module Mongoid
         def batch_clear(docs)
           pre_process_batch_remove(docs, :delete)
           unless docs.empty?
-            collection.find(selector).update_one("$unset" => { path => true })
+            collection.find(selector).update_one(
+              positionally(selector, "$unset" => { path => true })
+            )
             post_process_batch_remove(docs, :delete)
           end
           _unscoped.clear
@@ -54,7 +57,9 @@ module Mongoid
         def batch_remove(docs, method = :delete)
           removals = pre_process_batch_remove(docs, method)
           if !docs.empty?
-            collection.find(selector).update_one("$pullAll" => { path => removals })
+            collection.find(selector).update_one(
+              positionally(selector, "$pullAll" => { path => removals })
+            )
             post_process_batch_remove(docs, method)
           end
           reindex
@@ -125,7 +130,9 @@ module Mongoid
           self.inserts_valid = true
           inserts = pre_process_batch_insert(docs)
           if insertable?
-            collection.find(selector).update_one(operation => { path => inserts })
+            collection.find(selector).update_one(
+              positionally(selector, operation => { path => inserts })
+            )
             post_process_batch_insert(docs)
           end
           inserts