mongoid 5.1.5 → 5.2.0

data/lib/mongoid/extensions.rb

@@ -30,6 +30,7 @@ require "mongoid/extensions/big_decimal"
 require "mongoid/extensions/boolean"
 require "mongoid/extensions/date"
 require "mongoid/extensions/date_time"
+require "mongoid/extensions/decimal128"
 require "mongoid/extensions/false_class"
 require "mongoid/extensions/float"
 require "mongoid/extensions/hash"

data/lib/mongoid/extensions/decimal128.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+module Mongoid
+  module Extensions
+    module Decimal128
+
+      # Evolve the decimal128.
+      #
+      # @example Evolve the decimal128.
+      #   decimal128.__evolve_decimal128__
+      #
+      # @return [ BSON::Decimal128 ] self.
+      #
+      # @since 5.2.0
+      def __evolve_decimal128__
+        self
+      end
+
+      module ClassMethods
+
+        # Evolve the object into a mongo-friendly value to query with.
+        #
+        # @example Evolve the object.
+        #   Decimal128.evolve(dec)
+        #
+        # @param [ Object ] object The object to evolve.
+        #
+        # @return [ BSON::Decimal128 ] The decimal128.
+        #
+        # @since 5.2.0
+        def evolve(object)
+          object.__evolve_decimal128__
+        end
+      end
+    end
+  end
+end
+
+BSON::Decimal128.__send__(:include, Mongoid::Extensions::Decimal128)
+BSON::Decimal128.extend(Mongoid::Extensions::Decimal128::ClassMethods)

data/lib/mongoid/fields/localized.rb

@@ -77,9 +77,14 @@ module Mongoid
       # @since 3.0.0
       def lookup(object)
         locale = ::I18n.locale
-        if value = object[locale.to_s]
-          value
-        elsif fallbacks? && ::I18n.respond_to?(:fallbacks)
+
+        value = if object.key?(locale.to_s)
+          object[locale.to_s]
+        elsif object.key?(locale)
+          object[locale]
+        end
+        return value unless value.nil?
+        if fallbacks? && ::I18n.respond_to?(:fallbacks)
           object[::I18n.fallbacks[locale].map(&:to_s).find{ |loc| object.has_key?(loc) }]
         end
       end

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

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

data/lib/mongoid/persistable/deletable.rb

@@ -135,13 +135,9 @@ module Mongoid
         # @return [ Integer ] The number of documents deleted.
         #
         # @since 1.0.0
-        def delete_all(conditions = nil)
-          selector = conditions || {}
-          selector.merge!(_type: name) if hereditary?
-          coll = collection
-          deleted = coll.find(selector).count
-          coll.find(selector).delete_many
-          deleted
+        def delete_all(conditions = {})
+          selector = hereditary? ? conditions.merge(_type: name) : conditions
+          collection.find(selector).delete_many.deleted_count
         end
       end
     end

data/lib/mongoid/persistable/settable.rb

@@ -27,7 +27,9 @@ module Mongoid
             field = field_and_value_hash.keys.first.to_s
 
             if fields[field] && fields[field].type == Hash && attributes.key?(field)
-              process_attribute(field.to_s, attributes[field].merge(field_and_value_hash[field]))
+              merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+              value = attributes[field].merge(field_and_value_hash[field], &merger)
+              process_attribute(field.to_s, value)
             else
               process_attribute(field.to_s, field_and_value_hash[field])
             end

data/lib/mongoid/query_cache.rb

@@ -70,6 +70,20 @@ module Mongoid
       ensure
         QueryCache.enabled = enabled
       end
+
+      # Execute the block with the query cache disabled.
+      #
+      # @example Execute without the cache.
+      #   QueryCache.uncached { collection.find }
+      #
+      # @return [ Object ] The result of the block.
+      def uncached
+        enabled = QueryCache.enabled?
+        QueryCache.enabled = false
+        yield
+      ensure
+        QueryCache.enabled = enabled
+      end
     end
 
     # The middleware to be added to a rack application in order to activate the
@@ -222,7 +236,7 @@ module Mongoid
 
       def cached_cursor
         if limit
-          key = [ collection.namespace, selector, nil, skip, projection ]
+          key = [ collection.namespace, selector, nil, skip, sort, projection, collation  ]
           cursor = QueryCache.cache_table[key]
           if cursor
             limited_docs = cursor.to_a[0...limit.abs]
@@ -233,7 +247,7 @@ module Mongoid
       end
 
       def cache_key
-        [ collection.namespace, selector, limit, skip, projection ]
+        [ collection.namespace, selector, limit, skip, sort, projection, collation ]
       end
 
       def system_collection?
@@ -252,8 +266,16 @@ module Mongoid
         alias_query_cache_clear :insert_one, :insert_many
       end
     end
+
+    # Bypass the query cache when reloading a document.
+    module Document
+      def reload
+        QueryCache.uncached { super }
+      end
+    end
   end
 end
 
 Mongo::Collection.__send__(:include, Mongoid::QueryCache::Collection)
 Mongo::Collection::View.__send__(:include, Mongoid::QueryCache::View)
+Mongoid::Document.__send__(:include, Mongoid::QueryCache::Document)

data/lib/mongoid/relations/accessors.rb

@@ -160,7 +160,7 @@ module Mongoid
         #
         # @since 3.0.0
         def existence_check(name)
-          module_eval <<-END
+          module_eval <<-END, __FILE__, __LINE__ + 1
             def #{name}?
               without_autobuild { !__send__(:#{name}).blank? }
             end

data/lib/mongoid/relations/builders.rb

@@ -64,7 +64,7 @@ module Mongoid
         # @since 2.0.0.rc.1
         def builder(name, metadata)
           re_define_method("build_#{name}") do |*args|
-            attributes, options = parse_args(*args)
+            attributes, _options = parse_args(*args)
             document = Factory.build(metadata.klass, attributes)
             _building do
               child = send("#{name}=", document)
@@ -89,7 +89,7 @@ module Mongoid
         # @since 2.0.0.rc.1
         def creator(name, metadata)
           re_define_method("create_#{name}") do |*args|
-            attributes, options = parse_args(*args)
+            attributes, _options = parse_args(*args)
             document = Factory.build(metadata.klass, attributes)
             doc = _assigning do
               send("#{name}=", document)

data/lib/mongoid/relations/eager.rb

@@ -14,9 +14,9 @@ module Mongoid
       end
 
       def eager_load(docs)
-        docs.tap do |docs|
+        docs.tap do |d|
           if eager_loadable?
-            preload(criteria.inclusions, docs)
+            preload(criteria.inclusions, d)
           end
         end
       end

data/lib/mongoid/relations/reflections.rb

@@ -24,7 +24,7 @@ module Mongoid
       # @example Find multiple relation metadata by macro.
       #   person.reflect_on_all_associations(:embeds_many)
       #
-      # @param [ Array<String, Symbol> ] *macros The relation macros.
+      # @param [ Array<Symbol> ] *macros The relation macros.
       #
       # @return [ Array<Metadata> ] The matching relation metadata.
       def reflect_on_all_associations(*macros)
@@ -50,11 +50,13 @@ module Mongoid
         # @example Find multiple relation metadata by macro.
         #   Person.reflect_on_all_associations(:embeds_many)
         #
-        # @param [ Array<String, Symbol> ] *macros The relation macros.
+        # @param [ Array<Symbol> ] *macros The relation macros.
         #
         # @return [ Array<Metadata> ] The matching relation metadata.
         def reflect_on_all_associations(*macros)
-          relations.values.select { |meta| macros.include?(meta.macro) }
+          association_reflections = relations.values
+          association_reflections.select! { |reflection| macros.include?(reflection.macro) } unless macros.empty?
+          association_reflections
         end
       end
     end

data/lib/mongoid/relations/touchable.rb

@@ -78,7 +78,7 @@ module Mongoid
         # @return [ Symbol ] The method name.
         def define_relation_touch_method(name)
           method_name = "touch_#{name}_after_create_or_destroy"
-          class_eval <<-TOUCH
+          class_eval <<-TOUCH, __FILE__, __LINE__ + 1
             def #{method_name}
               without_autobuild do
                 relation = __send__(:#{name})

data/lib/mongoid/scopable.rb

@@ -117,7 +117,7 @@ module Mongoid
       # @since 3.0.0
       def queryable
         crit = Threaded.current_scope(self) || Criteria.new(self)
-        crit.embedded = true if crit.klass.embedded?
+        crit.embedded = true if (crit.klass.embedded? && !crit.klass.cyclic?)
         crit
       end
 

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "5.1.5"
+  VERSION = "5.2.0"
 end

data/lib/rails/generators/mongoid/config/templates/mongoid.yml

@@ -50,8 +50,8 @@ development:
         # via ismaster commands. (default: 10)
         # heartbeat_frequency: 10
 
-        # The time in seconds for selecting servers for a near read preference. (default: 5)
-        # local_threshold: 5
+        # The time in seconds for selecting servers for a near read preference. (default: 0.015)
+        # local_threshold: 0.015
 
         # The timeout in seconds for selecting a server for an operation. (default: 30)
         # server_selection_timeout: 30
@@ -130,6 +130,10 @@ development:
     # environment. The Mongoid logger will be set to the Rails logger
     # otherwise.(default: :info)
     # log_level: :info
+
+    # Application name that is printed to the mongodb logs upon establishing a
+    # connection in server versions >= 3.4. Note that the name cannot exceed 128 bytes.
+    # app_name: MyApplicationName
 test:
   clients:
     default:

data/spec/app/models/band.rb

@@ -13,6 +13,7 @@ class Band
   field :upserted, type: Mongoid::Boolean, default: false
   field :created, type: DateTime
   field :sales, type: BigDecimal
+  field :decimal, type: BSON::Decimal128
   field :y, as: :years, type: Integer
   field :founded, type: Date
   field :deleted, type: Boolean

data/spec/config/mongoid.yml

@@ -13,6 +13,10 @@ test:
           tag_sets:
             - use: web
         max_pool_size: 1
+    reports:
+      database: reports
+      hosts:
+        - <%=ENV["MONGOID_SPEC_HOST"]%>:<%=ENV["MONGOID_SPEC_PORT"]%>
   options:
     include_root_in_json: false
     include_type_for_serialization: false
@@ -22,3 +26,4 @@ test:
     use_activesupport_time_zone: true
     use_utc: false
     log_level: :warn
+    app_name: 'testing'

data/spec/mongoid/clients/factory_spec.rb

@@ -36,6 +36,10 @@ describe Mongoid::Clients::Factory do
           it "sets the cluster's seeds" do
             expect(cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
           end
+
+          it "sets the platform to Mongoid's platform constant" do
+            expect(client.options[:platform]).to eq(Mongoid::PLATFORM_DETAILS)
+          end
         end
 
         context "when the configuration has no ports" do
@@ -280,5 +284,9 @@ describe Mongoid::Clients::Factory do
     it "sets the write concern" do
       expect(client.write_concern).to be_a(Mongo::WriteConcern::Acknowledged)
     end
+
+    it "sets the platform to Mongoid's platform constant" do
+      expect(client.options[:platform]).to eq(Mongoid::PLATFORM_DETAILS)
+    end
   end
 end

data/spec/mongoid/clients_spec.rb

@@ -408,6 +408,14 @@ describe Mongoid::Clients do
       it "returns the default client" do
         expect(mongo_client.options[:database].to_s).to eq(database_id)
       end
+
+      it "sets the platform to Mongoid's platform constant" do
+        expect(mongo_client.options[:platform]).to eq(Mongoid::PLATFORM_DETAILS)
+      end
+
+      it "sets the app_name to the config value" do
+        expect(mongo_client.options[:app_name]).to eq('testing')
+      end
     end
 
     context "when no client exists with the key" do
@@ -416,6 +424,10 @@ describe Mongoid::Clients do
         Band.store_in(client: :nonexistent)
       end
 
+      after do
+        Band.reset_storage_options!
+      end
+
       let(:band) do
         Band.new
       end
@@ -426,6 +438,63 @@ describe Mongoid::Clients do
         }.to raise_error(Mongoid::Errors::NoClientConfig)
       end
     end
+
+    context "when getting a client by name", if: testing_locally? do
+
+      let(:file) do
+        File.join(File.dirname(__FILE__), "..", "config", "mongoid.yml")
+      end
+
+      before do
+        described_class.clear
+        Mongoid.load!(file, :test)
+        Band.store_in(client: :reports)
+      end
+
+      after do
+        mongo_client.close
+        Mongoid::Config.reset
+        Band.reset_storage_options!
+      end
+
+      let!(:band) do
+        Band.store_in(client: :reports)
+      end
+
+      let!(:mongo_client) do
+        Band.new.mongo_client
+      end
+
+      it "uses the reports client" do
+        expect(mongo_client.options[:database].to_s).to eq('reports')
+      end
+
+      it "sets the platform to Mongoid's platform constant" do
+        expect(mongo_client.options[:platform]).to eq(Mongoid::PLATFORM_DETAILS)
+      end
+
+      it "sets the app_name to the config value" do
+        expect(mongo_client.options[:app_name]).to eq('testing')
+      end
+    end
+
+    context 'when the app_name is not set in the config' do
+
+      before do
+        Mongoid::Config.reset
+        Mongoid.configure do |config|
+          config.load_configuration(CONFIG)
+        end
+      end
+
+      let(:mongo_client) do
+        Band.new.mongo_client
+      end
+
+      it 'does not set the Mongoid.app_name option' do
+        expect(mongo_client.options.has_key?(:app_name)).to be(false)
+      end
+    end
   end
 
   describe ".mongo_client", if: non_legacy_server? do
@@ -457,13 +526,21 @@ describe Mongoid::Clients do
         Mongoid.clients[:default][:database] = database_id
       end
 
-      let!(:mongo_client) do
+      let(:mongo_client) do
         Band.mongo_client
       end
 
       it "returns the default client" do
         expect(mongo_client.options[:database].to_s).to eq(database_id)
       end
+
+      it "sets the platform to Mongoid's platform constant" do
+        expect(mongo_client.options[:platform]).to eq(Mongoid::PLATFORM_DETAILS)
+      end
+
+      it "sets the app_name to the config value" do
+        expect(mongo_client.options[:app_name]).to eq('testing')
+      end
     end
 
     context "when no client exists with the key" do

data/spec/mongoid/config_spec.rb

@@ -82,6 +82,37 @@ describe Mongoid::Config do
     end
   end
 
+  context 'when the app_name is set in the config' do
+
+    let(:conf) do
+      CONFIG.merge(options: {app_name: 'admin-reporting'})
+    end
+
+    before do
+      Mongoid.configure do |config|
+        config.load_configuration(conf)
+      end
+    end
+
+    it 'sets the Mongoid.app_name to the provided value' do
+      expect(Mongoid.app_name).to eq('admin-reporting')
+    end
+  end
+
+  context 'when the app_name is not set in the config' do
+
+    before do
+      Mongoid::Config.reset
+      Mongoid.configure do |config|
+        config.load_configuration(CONFIG)
+      end
+    end
+
+    it 'does not set the Mongoid.app_name option' do
+      expect(Mongoid.app_name).to be_nil
+    end
+  end
+
   describe "#load!" do
 
     before(:all) do