mongoid 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dff7445e398ee462ff1e26c6baaa5684ee9318d
-  data.tar.gz: beb9a64681e530861fcece3129d5347484342344
+  metadata.gz: 1aa194434a7d5ebe53a1f05929202d4976201f90
+  data.tar.gz: 31e2605c59062cb947a510d399a25c173c9ff504
 SHA512:
-  metadata.gz: d86170a4c56e57d6d5e11d89003307e9a7c8f2e45d2c75d7cb98ef81781b66a05b69ba8a71701161c0ef800a2284a322beaff08c6a3a70d03014d7313f7f8205
-  data.tar.gz: d8615708189aee7700312ac743c8ae63d69d092f45788f4137c9ec3e931985a876d38ec08819359b960e3a64a333c981535b1da8f6405ab55d2dc6d591d15d37
+  metadata.gz: a4d133d4ce0e944995f0a0718ba506ca8ede6cc6f232a14cbe34d371f3db80d5736610ffdc6726bb5de3b658355c4ce818b10c82c172669da82aeafabbb13172
+  data.tar.gz: bf1274305b4c8165ac084e06246adf841fd17aeefdf017eb442e81d92c2aa75c6ab8183e591ba7e5b8a757d8ea39899c4a6ce41cb966d835f020edf3a45e6e6e

data/CHANGELOG.md

@@ -3,6 +3,8 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/en/mongoid/docs/upgrading.html).
 
+### As of version 5.0.2, please refer to the github releases for change logs.
+
 ## 5.0.1
 
 ### Resolved Issues

data/README.md

@@ -1,7 +1,6 @@
 # Mongoid
 [![Build Status](https://travis-ci.org/mongodb/mongoid.svg?branch=master)](https://travis-ci.org/mongodb/mongoid)
 [![Code Climate](https://codeclimate.com/github/mongodb/mongoid.svg)](https://codeclimate.com/github/mongodb/mongoid)
-[![Coverage Status](https://img.shields.io/coveralls/mongodb/mongoid/master.svg)](https://coveralls.io/r/mongodb/mongoid?branch=master)
 [![Dependency Status](https://www.versioneye.com/ruby/mongoid/4.0.0/badge.svg)](https://www.versioneye.com/ruby/mongoid/4.0.0)
 
 Mongoid is an ODM (Object-Document-Mapper) framework for MongoDB in Ruby.

data/lib/mongoid.rb

@@ -34,7 +34,6 @@ I18n.load_path << File.join(File.dirname(__FILE__), "config", "locales", "en.yml
 
 module Mongoid
   extend Loggable
-  extend Gem::Deprecate
   extend self
 
   # The minimum MongoDB version supported.
@@ -65,8 +64,6 @@ module Mongoid
   def default_client
     Clients.default
   end
-  alias :default_session :default_client
-  deprecate :default_session, :default_client, 2015, 12
 
   # Disconnect all active clients.
   #
@@ -79,8 +76,6 @@ module Mongoid
   def disconnect_clients
     Clients.disconnect
   end
-  alias :disconnect_sessions :disconnect_clients
-  deprecate :disconnect_sessions, :disconnect_clients, 2015, 12
 
   # Convenience method for getting a named client.
   #
@@ -93,8 +88,6 @@ module Mongoid
   def client(name)
     Clients.with_name(name)
   end
-  alias :session :client
-  deprecate :session, :client, 2015, 12
 
   # Take all the public instance methods from the Config singleton and allow
   # them to be accessed through the Mongoid module directly.

data/lib/mongoid/attributes.rb

@@ -176,7 +176,8 @@ module Mongoid
             attribute_will_change!(access)
           end
           if localized
-            (attributes[access] ||= {}).merge!(typed_value)
+            attributes[access] ||= {}
+            attributes[access].merge!(typed_value)
           else
             attributes[access] = typed_value
           end

data/lib/mongoid/attributes/nested.rb

@@ -53,6 +53,9 @@ module Mongoid
             autosave_nested_attributes(metadata)
             re_define_method(meth) do |attrs|
               _assigning do
+                if metadata.polymorphic? and metadata.inverse_type
+                  options = options.merge!(:class_name => self.send(metadata.inverse_type))
+                end
                 metadata.nested_builder(attrs, options).build(self)
               end
             end

data/lib/mongoid/clients.rb

@@ -8,7 +8,6 @@ require "mongoid/clients/options"
 module Mongoid
   module Clients
     extend ActiveSupport::Concern
-    extend Gem::Deprecate
     include StorageOptions
     include ThreadOptions
     include Options
@@ -93,15 +92,12 @@ module Mongoid
     def mongo_client
       super || self.class.mongo_client
     end
-    alias :mongo_session :mongo_client
-    deprecate :mongo_session, :mongo_client, 2015, 12
 
     def collection_name
       super || self.class.collection_name
     end
 
     module ClassMethods
-      extend Gem::Deprecate
 
       # Get the client for this model. This is determined in the following order:
       #
@@ -123,8 +119,6 @@ module Mongoid
         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
 
       # Get the collection for this model from the client. Will check for an
       # overridden collection name from the store_in macro or the collection

data/lib/mongoid/clients/options.rb

@@ -3,7 +3,6 @@ module Mongoid
   module Clients
     module Options
       extend ActiveSupport::Concern
-      extend Gem::Deprecate
 
       # Tell the next persistence operation to store in a specific collection,
       # database or client.
@@ -54,8 +53,6 @@ module Mongoid
           client.with(persistence_options.reject{ |k, v| k == :collection || k == :client })
         end
       end
-      alias :mongo_session :mongo_client
-      deprecate :mongo_session, :mongo_client, 2015, 12
 
       def collection_name
         if persistence_options && v = persistence_options[:collection]
@@ -99,7 +96,6 @@ module Mongoid
       end
 
       module ClassMethods
-        extend Gem::Deprecate
         include Threaded
 
         def client_name
@@ -108,8 +104,6 @@ module Mongoid
           end
           super
         end
-        alias :session_name :client_name
-        deprecate :session_name, :client_name, 2015, 12
 
         def collection_name
           if persistence_options && v = persistence_options[:collection]

data/lib/mongoid/clients/storage_options.rb

@@ -12,7 +12,6 @@ module Mongoid
       end
 
       module ClassMethods
-        extend Gem::Deprecate
 
         # Give this model specific custom default storage options.
         #
@@ -103,8 +102,6 @@ module Mongoid
         def client_name
           __evaluate__(storage_options[:client])
         end
-        alias :session_name :client_name
-        deprecate :session_name, :client_name, 2015, 12
 
         # Get the database name for the model.
         #

data/lib/mongoid/clients/thread_options.rb

@@ -5,13 +5,10 @@ module Mongoid
       extend ActiveSupport::Concern
 
       module ClassMethods
-        extend Gem::Deprecate
 
         def client_name
           Threaded.client_override || super
         end
-        alias :session_name :client_name
-        deprecate :session_name, :client_name, 2015, 12
 
         def database_name
           Threaded.database_override || super

data/lib/mongoid/config.rb

@@ -8,7 +8,6 @@ module Mongoid
   # This module defines all the configuration options for Mongoid, including the
   # database connections.
   module Config
-    extend Gem::Deprecate
     extend self
     extend Options
 
@@ -158,8 +157,6 @@ module Mongoid
     def override_client(name)
       Threaded.client_override = name ? name.to_s : nil
     end
-    alias :override_session :override_client
-    deprecate :override_session, :override_client, 2015, 12
 
     # Purge all data in all collections, including indexes.
     #
@@ -219,8 +216,6 @@ module Mongoid
     def clients
       @clients ||= {}
     end
-    alias :sessions :clients
-    deprecate :sessions, :clients, 2015, 12
 
     # Get the time zone to use.
     #
@@ -254,7 +249,5 @@ module Mongoid
       Validators::Client.validate(c)
       @clients = c
     end
-    alias :sessions= :clients=
-    deprecate :sessions=, :clients=, 2015, 12
   end
 end

data/lib/mongoid/contextual/command.rb

@@ -2,7 +2,6 @@
 module Mongoid
   module Contextual
     module Command
-      extend Gem::Deprecate
 
       # @attribute [r] collection The collection to query against.
       # @attribute [r] criteria The criteria for the context.
@@ -31,8 +30,6 @@ module Mongoid
       def client
         collection.database.client
       end
-      alias :session :client
-      deprecate :session, :client, 2015, 12
     end
   end
 end

data/lib/mongoid/contextual/mongo.rb

@@ -237,7 +237,7 @@ module Mongoid
       def first
         return documents.first if cached? && cache_loaded?
         try_cache(:first) do
-          with_eager_loading(view.first)
+          with_eager_loading(view.limit(-1).first)
         end
       end
       alias :one :first
@@ -335,7 +335,7 @@ module Mongoid
       def last
         try_cache(:last) do
           with_inverse_sorting do
-            with_eager_loading(view.first)
+            with_eager_loading(view.limit(-1).first)
           end
         end
       end

data/lib/mongoid/criteria.rb

@@ -597,7 +597,12 @@ module Mongoid
     #
     # @since 3.0.3
     def type_selection
-      { _type: { "$in" => klass._types }}
+      klasses = klass._types
+      if klasses.size > 1
+        { _type: { "$in" => klass._types }}
+      else
+        { _type: klass._types[0] }
+      end
     end
 
     # Get a new selector with type selection in it.

data/lib/mongoid/extensions/hash.rb

@@ -198,7 +198,7 @@ module Mongoid
         # @since 3.0.0
         def mongoize(object)
           return if object.nil?
-          evolve(object).update_values { |value| value.mongoize }
+          evolve(object.dup).update_values { |value| value.mongoize }
         end
 
         # Can the size of this object change?

data/lib/mongoid/indexable.rb

@@ -31,10 +31,10 @@ module Mongoid
         index_specifications.each do |spec|
           key, options = spec.key, spec.options
           if database = options[:database]
-            with(read: { mode: :primary }, database: database).
+            with(database: database).
               collection.indexes.create_one(key, options.except(:database))
           else
-            with(read: { mode: :primary }).collection.indexes.create_one(key, options)
+            collection.indexes.create_one(key, options)
           end
         end and true
       end
@@ -50,7 +50,7 @@ module Mongoid
       # @since 3.0.0
       def remove_indexes
         indexed_database_names.each do |database|
-          collection = with(read: { mode: :primary }, database: database).collection
+          collection = with(database: database).collection
           begin
             collection.indexes.each do |spec|
               unless spec["name"] == "_id_"
@@ -113,9 +113,11 @@ module Mongoid
       # @return [ Specification ] The found specification.
       #
       # @since 4.0.0
-      def index_specification(index_hash)
+      def index_specification(index_hash, index_name = nil)
         index = OpenStruct.new(fields: index_hash.keys, key: index_hash)
-        index_specifications.detect { |spec| spec == index }
+        index_specifications.detect do |spec|
+          spec == index || (index_name && index_name == spec.name)
+        end
       end
 
       private

data/lib/mongoid/indexable/specification.rb

@@ -56,6 +56,20 @@ module Mongoid
         @options = normalize_options(options.dup)
       end
 
+      # Get the index name, generated using the index key.
+      #
+      # @example Get the index name.
+      #   specification.name
+      #
+      # @return [ String ] name The index name.
+      #
+      # @since 5.0.2
+      def name
+        @name ||= key.reduce([]) do |n, (k,v)|
+          n << "#{k}_#{v}"
+        end.join('_')
+      end
+
       private
 
       # Normalize the spec, in case aliased fields are provided.

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

@@ -26,7 +26,8 @@ module Mongoid
           :key,
           :sphere_version,
           :text_version,
-          :version
+          :version,
+          :partial_filter_expression
         ]
 
         VALID_TYPES = [

data/lib/mongoid/persistable/settable.rb

@@ -22,12 +22,19 @@ module Mongoid
       def set(setters)
         prepare_atomic_operation do |ops|
           process_atomic_operations(setters) do |field, value|
-            process_attribute(field.to_s, value)
+            field_and_value_hash = hasherizer(field.split('.'), value)
+            field = field_and_value_hash.keys.first
+            process_attribute(field, field_and_value_hash[field])
             ops[atomic_attribute_name(field)] = attributes[field]
           end
           { "$set" => ops }
         end
       end
     end
+
+    def hasherizer(keys, value)
+      return value if keys.empty?
+      {}.tap { |hash| hash[keys.shift] = hasherizer(keys, value) }
+    end
   end
 end

data/lib/mongoid/query_cache.rb

@@ -206,12 +206,10 @@ module Mongoid
         if system_collection? || !QueryCache.enabled?
           super
         else
-          key = cache_key
-          cursor = QueryCache.cache_table[key]
-          unless cursor
+          unless cursor = cached_cursor
             server = read.select_server(cluster)
             cursor = CachedCursor.new(view, send_initial_query(server), server)
-            QueryCache.cache_table[key] = cursor
+            QueryCache.cache_table[cache_key] = cursor
           end
           cursor.each do |doc|
             yield doc
@@ -222,6 +220,18 @@ module Mongoid
 
       private
 
+      def cached_cursor
+        if limit
+          key = [ collection.namespace, selector, nil, skip, projection ]
+          cursor = QueryCache.cache_table[key]
+          if cursor
+            limited_docs = cursor.to_a[0...limit.abs]
+            cursor.instance_variable_set(:@cached_documents, limited_docs)
+          end
+        end
+        cursor || QueryCache.cache_table[cache_key]
+      end
+
       def cache_key
         [ collection.namespace, selector, limit, skip, projection ]
       end

data/lib/mongoid/railtie.rb

@@ -77,6 +77,7 @@ module Rails
         unless config.action_dispatch.rescue_responses
           ActionDispatch::ShowExceptions.rescue_responses.update(Railtie.rescue_responses)
         end
+        Mongo::Logger.logger = ::Mongoid.logger
       end
 
       # Due to all models not getting loaded and messing up inheritance queries

data/lib/mongoid/relations/accessors.rb

@@ -228,7 +228,9 @@ module Mongoid
           re_define_method("#{name}=") do |object|
             without_autobuild do
               if value = get_relation(name, metadata, object)
-                set_relation(name, value.substitute(object.substitutable))
+                if value.respond_to?(:substitute)
+                  set_relation(name, value.substitute(object.substitutable))
+                end
               else
                 __build__(name, object.substitutable, metadata)
               end

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

@@ -79,8 +79,12 @@ module Mongoid
           if docs.blank?
             if _assigning? && !empty?
               base.add_atomic_unset(first)
+              target_duplicate = target.dup
+              pre_process_batch_remove(target_duplicate, :delete)
+              post_process_batch_remove(target_duplicate, :delete)
+            else
+              batch_remove(target.dup)
             end
-            batch_remove(target.dup)
           else
             base.delayed_atomic_sets.clear unless _assigning?
             docs = normalize_docs(docs).compact

data/lib/mongoid/relations/metadata.rb

@@ -663,6 +663,9 @@ module Mongoid
       #
       # @since 2.0.0.rc.1
       def nested_builder(attributes, options)
+        if polymorphic? && options[:class_name]
+          self[:class_name] = options[:class_name]
+        end
         relation.nested_builder(self, attributes, options)
       end