mongoid 8.0.2 → 8.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c2c1f57188d73b1d7f6d965b01a05cd97ddab316855221e6b23f70858e820af
-  data.tar.gz: 0ad8309b683b8031796d3e3d99c36840481b7b2cc8aa773e32c4d1b050380671
+  metadata.gz: 684d53a067a1e3410535a0dc06db2b587c5e43a19c85af0defe7f29c81e1c74d
+  data.tar.gz: c285640352d90d219d7ccd6c0ce6c90fdf1b800f853d2aa44898025c9d49ccf8
 SHA512:
-  metadata.gz: 00ca56917eafe55f9b4ef394569ac8a64023c67906fdd65522d74a95046a7cacab42ca11baea2917e80f803cadc9c7d484e170227fcdf48a14a8656e96639fdb
-  data.tar.gz: 159b5215f615ca52777a81127e8312767d4e66adbb77e047d01769ed90281ef4959de4bda42e5ce2eadd9803e4a3d11f5d3d50c8da467241f3dd16bd90f69226
+  metadata.gz: 6a13a92d079784bfc190d1ebddff3f2bdd6f0d3d2fb0cee336856ba8e870199b83cc7c809d17cb62a913a64624630ffd397bfa45779503b107b97f82fb4be615
+  data.tar.gz: b887e765c135fe7018863908afabe9128007e85628cbcf11bc971cabf06a162833239da37d32293b1c3565838cf9ad14898fd91ac510a29bf37779b782411ee7

data/lib/mongoid/cacheable.rb

@@ -15,7 +15,7 @@ module Mongoid
     # plural model name.
     #
     # If new_record?     - will append /new
-    # If not             - will append /id-updated_at.to_s(cache_timestamp_format)
+    # If not             - will append /id-updated_at.to_formatted_s(cache_timestamp_format)
     # Without updated_at - will append /id
     #
     # This is usually called inside a cache() block
@@ -26,7 +26,7 @@ module Mongoid
     # @return [ String ] the string with or without updated_at
     def cache_key
       return "#{model_key}/new" if new_record?
-      return "#{model_key}/#{_id}-#{updated_at.utc.to_s(cache_timestamp_format)}" if do_or_do_not(:updated_at)
+      return "#{model_key}/#{_id}-#{updated_at.utc.to_formatted_s(cache_timestamp_format)}" if do_or_do_not(:updated_at)
       "#{model_key}/#{_id}"
     end
   end

data/lib/mongoid/extensions/big_decimal.rb

@@ -72,10 +72,14 @@ module Mongoid
               BSON::Decimal128.new(object)
             elsif object.numeric?
               BSON::Decimal128.new(object.to_s)
+            elsif !object.is_a?(String)
+              object.try(:to_d)
             end
           else
             if object.is_a?(BSON::Decimal128) || object.numeric?
               object.to_s
+            elsif !object.is_a?(String)
+              object.try(:to_d)
             end
           end
         end

data/lib/mongoid/extensions/float.rb

@@ -37,8 +37,12 @@ module Mongoid
         # @return [ Float | nil ] The object mongoized or nil.
         def mongoize(object)
           return if object.blank?
-          if object.numeric?
-            object.to_f
+          if object.is_a?(String)
+            if object.numeric?
+              object.to_f
+            end
+          else
+            object.try(:to_f)
           end
         end
         alias :demongoize :mongoize

data/lib/mongoid/extensions/integer.rb

@@ -45,8 +45,12 @@ module Mongoid
         # @return [ Integer | nil ] The object mongoized or nil.
         def mongoize(object)
           return if object.blank?
-          if object.numeric?
-            object.to_i
+          if object.is_a?(String)
+            if object.numeric?
+              object.to_i
+            end
+          else
+            object.try(:to_i)
           end
         end
         alias :demongoize :mongoize

data/lib/mongoid/fields/localized.rb

@@ -14,7 +14,9 @@ module Mongoid
       #
       # @return [ Object ] The value for the current locale.
       def demongoize(object)
-        if object
+        return if object.nil?
+        case object
+        when Hash
           type.demongoize(lookup(object))
         end
       end
@@ -76,7 +78,10 @@ module Mongoid
         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) }]
+          fallback_key = ::I18n.fallbacks[locale].find do |loc|
+            object.key?(loc.to_s) || object.key?(loc)
+          end
+          object[fallback_key.to_s] || object[fallback_key]
         end
       end
     end

data/lib/mongoid/persistence_context.rb

@@ -189,8 +189,7 @@ module Mongoid
       #
       # @return [ Mongoid::PersistenceContext ] The persistence context for the object.
       def set(object, options_or_context)
-        key = "[mongoid][#{object.object_id}]:context"
-        existing_context = Thread.current[key]
+        existing_context = get_context(object)
         existing_options = if existing_context
           existing_context.options
         else
@@ -201,7 +200,7 @@ module Mongoid
         end
         new_options = existing_options.merge(options_or_context)
         context = PersistenceContext.new(object, new_options)
-        Thread.current[key] = context
+        store_context(object, context)
       end
 
       # Get the persistence context for a particular class or model instance.
@@ -213,7 +212,7 @@ module Mongoid
       #
       # @return [ Mongoid::PersistenceContext ] The persistence context for the object.
       def get(object)
-        Thread.current["[mongoid][#{object.object_id}]:context"]
+        get_context(object)
       end
 
       # Clear the persistence context for a particular class or model instance.
@@ -232,7 +231,44 @@ module Mongoid
           end
         end
       ensure
-        Thread.current["[mongoid][#{object.object_id}]:context"] = original_context
+        store_context(object, original_context)
+      end
+
+      private
+
+      # Key to store persistence contexts in the thread local storage.
+      #
+      # @api private
+      PERSISTENCE_CONTEXT_KEY = :"[mongoid]:persistence_context"
+
+      # Get the persistence context for a given object from the thread local
+      #   storage.
+      #
+      # @param [ Object ] object Object to get the persistance context for.
+      #
+      # @return [ Mongoid::PersistenceContext | nil ] The persistence context
+      #   for the object if previously stored, otherwise nil.
+      #
+      # @api private
+      def get_context(object)
+        Thread.current[PERSISTENCE_CONTEXT_KEY] ||= {}
+        Thread.current[PERSISTENCE_CONTEXT_KEY][object.object_id]
+      end
+
+      # Store persistence context for a given object in the thread local
+      #   storage.
+      #
+      # @param [ Object ] object Object to store the persistance context for.
+      # @param [ Mongoid::PersistenceContext ] context Context to store
+      #
+      # @api private
+      def store_context(object, context)
+        if context.nil?
+          Thread.current[PERSISTENCE_CONTEXT_KEY]&.delete(object.object_id)
+        else
+          Thread.current[PERSISTENCE_CONTEXT_KEY] ||= {}
+          Thread.current[PERSISTENCE_CONTEXT_KEY][object.object_id] = context
+        end
       end
     end
   end

data/lib/mongoid/scopable.rb

@@ -168,7 +168,9 @@ module Mongoid
       #     Band.where(name: "Depeche Mode")
       #   end
       #
-      # @note This will force the default scope to be removed.
+      # @note This will force the default scope to be removed, but will not
+      #   remove scopes declared with ``.with_scope``. This will be changed
+      #   in Mongoid 9.
       #
       # @return [ Criteria | Object ] The unscoped criteria or result of the
       #   block.
@@ -249,12 +251,12 @@ module Mongoid
           if Mongoid.scope_overwrite_exception
             raise Errors::ScopeOverwrite.new(self.name, name)
           else
-            if Mongoid.logger
-              Mongoid.logger.warn(
-                "Creating scope :#{name}. " +
-                "Overwriting existing method #{self.name}.#{name}."
-              )
-            end
+            Mongoid.logger.warn(
+              "Creating scope :#{name} which conflicts with #{self.name}.#{name}. " +
+              "Calls to `Mongoid::Criteria##{name}` will delegate to " +
+              "`Mongoid::Criteria##{name}` for criteria with klass #{self.name} " +
+              "and will ignore the declared scope."
+            )
           end
         end
       end

data/lib/mongoid/threaded.rb

@@ -322,7 +322,7 @@ module Mongoid
     #
     # @param [ Mongo::Session ] session The session to save.
     def set_session(session)
-      Thread.current[:session] = session
+      Thread.current["[mongoid]:session"] = session
     end
 
     # Get the cached session for this thread.
@@ -332,7 +332,7 @@ module Mongoid
     #
     # @return [ Mongo::Session | nil ] The session cached on this thread or nil.
     def get_session
-      Thread.current[:session]
+      Thread.current["[mongoid]:session"]
     end
 
     # Clear the cached session for this thread.
@@ -344,7 +344,7 @@ module Mongoid
     def clear_session
       session = get_session
       session.end_session if session
-      Thread.current[:session] = nil
+      Thread.current["[mongoid]:session"] = nil
     end
   end
 end

data/lib/mongoid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mongoid
-  VERSION = "8.0.2"
+  VERSION = "8.0.3"
 end

data/spec/integration/i18n_fallbacks_spec.rb

@@ -3,19 +3,7 @@
 require 'spec_helper'
 
 describe 'i18n fallbacks' do
-  # These tests modify the environment
-  before(:all) do
-    unless %w(yes true 1).include?((ENV['TEST_I18N_FALLBACKS'] || '').downcase)
-      skip 'Set TEST_I18N_FALLBACKS=1 environment variable to run these tests'
-    end
-  end
-
-  before(:all) do
-    puts "I18n version: #{I18n::VERSION}"
-
-    require "i18n/backend/fallbacks"
-    I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
-  end
+  with_i18n_fallbacks
 
   context 'when fallbacks are enabled with a locale list' do
     before do
@@ -36,7 +24,6 @@ describe 'i18n fallbacks' do
     end
 
     context 'when translation is missing in active locale and present in fallback locale' do
-
       it 'falls back on default locale' do
         product = Product.new
         I18n.locale = :en
@@ -44,7 +31,6 @@ describe 'i18n fallbacks' do
         I18n.locale = :de
         product.description.should == 'Marvelous!'
       end
-
     end
 
     context 'when translation is missing in all locales' do
@@ -64,7 +50,6 @@ describe 'i18n fallbacks' do
           I18n.locale = :ru
           product.description.should be nil
         end
-
       end
 
       context 'i18n 1.0' do
@@ -82,7 +67,6 @@ describe 'i18n fallbacks' do
           I18n.locale = :ru
           product.description.should == 'Marvelous!'
         end
-
       end
     end
   end

data/spec/mongoid/cacheable_spec.rb

@@ -45,7 +45,7 @@ describe Mongoid::Cacheable do
         context "with the default cache_timestamp_format" do
 
           let!(:updated_at) do
-            document.updated_at.utc.to_s(:nsec)
+            document.updated_at.utc.to_formatted_s(:nsec)
           end
 
           it "has the id and updated_at key name" do
@@ -64,7 +64,7 @@ describe Mongoid::Cacheable do
           end
 
           let!(:updated_at) do
-            document.updated_at.utc.to_s(:number)
+            document.updated_at.utc.to_formatted_s(:number)
           end
 
           it "has the id and updated_at key name" do
@@ -103,7 +103,7 @@ describe Mongoid::Cacheable do
       end
 
       let!(:updated_at) do
-        agent.updated_at.utc.to_s(:nsec)
+        agent.updated_at.utc.to_formatted_s(:nsec)
       end
 
       it "has the id and updated_at key name" do

data/spec/mongoid/clients_spec.rb

@@ -1042,6 +1042,31 @@ describe Mongoid::Clients do
         end
       end
     end
+
+    context 'when using on different objects' do
+      require_mri
+
+      let(:first_band) do
+        Band.create!(name: "The Beatles")
+      end
+
+      let(:second_band) do
+        Band.create!(name: 'Led Zeppelin')
+      end
+
+      it 'does not create extra symbols symbols' do
+        first_band.with(write: { w: 0, j: false }) do |band|
+          band.set(active: false)
+        end
+        initial_symbols_count = Symbol.all_symbols.size
+        second_band.with(write: { w: 0, j: false }) do |band|
+          band.set(active: false)
+        end
+        expect(Symbol.all_symbols.size).to eq(initial_symbols_count)
+      end
+
+    end
+
   end
 
   context "when overriding the default database" do

data/spec/mongoid/contextual/memory_spec.rb

@@ -546,7 +546,7 @@ describe Mongoid::Contextual::Memory do
         end
 
         context 'when fallbacks are enabled with a locale list' do
-          require_fallbacks
+          with_i18n_fallbacks
 
           around(:all) do |example|
             prev_fallbacks = I18n.fallbacks.dup
@@ -565,7 +565,7 @@ describe Mongoid::Contextual::Memory do
 
           it "correctly uses the fallback" do
             I18n.locale = :en
-            d = Dictionary.create!(description: 'english-text')
+            Dictionary.create!(description: 'english-text')
             I18n.locale = :he
             distinct.should == "english-text"
           end
@@ -1598,7 +1598,7 @@ describe Mongoid::Contextual::Memory do
         end
 
         context 'when fallbacks are enabled with a locale list' do
-          require_fallbacks
+          with_i18n_fallbacks
 
           around(:all) do |example|
             prev_fallbacks = I18n.fallbacks.dup
@@ -1617,7 +1617,7 @@ describe Mongoid::Contextual::Memory do
 
           it "correctly uses the fallback" do
             I18n.locale = :en
-            d = Dictionary.create!(description: 'english-text')
+            Dictionary.create!(description: 'english-text')
             I18n.locale = :he
             plucked.should == "english-text"
           end
@@ -1960,7 +1960,6 @@ describe Mongoid::Contextual::Memory do
         address2b.name = "de3"
         person1
         person2
-
         I18n.locale = :en
       end
 

data/spec/mongoid/contextual/mongo_spec.rb

@@ -660,7 +660,7 @@ describe Mongoid::Contextual::Mongo do
       end
 
       context 'when fallbacks are enabled with a locale list' do
-        require_fallbacks
+        with_i18n_fallbacks
 
         around(:all) do |example|
           prev_fallbacks = I18n.fallbacks.dup
@@ -686,7 +686,7 @@ describe Mongoid::Contextual::Mongo do
 
           it "correctly uses the fallback" do
             I18n.locale = :en
-            d = Dictionary.create!(description: 'english-text')
+            Dictionary.create!(description: 'english-text')
             I18n.locale = :he
             distinct.should == "english-text"
           end
@@ -854,7 +854,6 @@ describe Mongoid::Contextual::Mongo do
         d2.save!
         d3.save!
         d4.save!
-
         I18n.locale = :en
       end
 
@@ -908,7 +907,6 @@ describe Mongoid::Contextual::Mongo do
         address2b.name = "de3"
         Person.create!(addresses: [ address1a, address1b ])
         Person.create!(addresses: [ address2a, address2b ])
-
         I18n.locale = :en
       end
 

data/spec/mongoid/criteria_projection_spec.rb

@@ -171,7 +171,6 @@ describe Mongoid::Criteria do
 
         let(:dictionary) do
           Dictionary.only(:description).first
-
         end
 
         it 'loads all translations' do

data/spec/mongoid/criteria_spec.rb

@@ -2059,7 +2059,7 @@ describe Mongoid::Criteria do
       end
 
       context 'when fallbacks are enabled with a locale list' do
-        require_fallbacks
+        with_i18n_fallbacks
 
         around(:all) do |example|
           prev_fallbacks = I18n.fallbacks.dup

data/spec/mongoid/extensions/big_decimal_spec.rb

@@ -273,6 +273,21 @@ describe Mongoid::Extensions::BigDecimal do
         end
       end
 
+      context "when the value is castable" do
+
+        let(:value) do
+          2.hours
+        end
+
+        before do
+          expect(value).to be_a(ActiveSupport::Duration)
+        end
+
+        it "returns nil" do
+          expect(mongoized).to eq(7200)
+        end
+      end
+
       context "when the value is nil" do
 
         let(:value) do

data/spec/mongoid/extensions/float_spec.rb

@@ -100,10 +100,10 @@ describe Mongoid::Extensions::Float do
           end
         end
 
-        context "when the string is numerical" do
+        context "when the string starts with a number" do
 
-          it "returns the float value for the string" do
-            expect(Float.send(method, "3")).to eq(3)
+          it "returns nil" do
+            expect(Float.send(method, "42bogus")).to be_nil
           end
         end
 
@@ -120,6 +120,13 @@ describe Mongoid::Extensions::Float do
             expect(Float.send(method, nil)).to be_nil
           end
         end
+
+        context "when giving an object that is castable to an Float" do
+
+          it "returns the integer value" do
+            expect(Float.send(method, 2.hours)).to eq(7200)
+          end
+        end
       end
     end
   end

data/spec/mongoid/extensions/integer_spec.rb

@@ -94,10 +94,10 @@ describe Mongoid::Extensions::Integer do
           end
         end
 
-        context "when the string is numerical" do
+        context "when the string starts with a number" do
 
-          it "returns the integer value for the string" do
-            expect(Integer.send(method, "3")).to eq(3)
+          it "returns nil" do
+            expect(Integer.send(method, "42bogus")).to be_nil
           end
         end
 
@@ -114,6 +114,13 @@ describe Mongoid::Extensions::Integer do
             expect(Integer.send(method, nil)).to be_nil
           end
         end
+
+        context "when giving an object that is castable to an Integer" do
+
+          it "returns the integer value" do
+            expect(Integer.send(method, 2.hours)).to eq(7200)
+          end
+        end
       end
     end
   end

data/spec/mongoid/fields/localized_spec.rb

@@ -102,6 +102,29 @@ describe Mongoid::Fields::Localized do
           end
         end
 
+        context "when key is a symbol" do
+
+          let(:value) do
+            field.demongoize({ :de => "This is a test" })
+          end
+
+          it "returns the string from the set locale" do
+            expect(value).to eq("This is a test")
+          end
+        end
+
+
+        context "passing a bogus value" do
+
+          let(:value) do
+            field.demongoize("bogus")
+          end
+
+          it "returns nil" do
+            expect(value).to be_nil
+          end
+        end
+
         context "when the value does not exist" do
 
           context "when not using fallbacks" do
@@ -117,10 +140,7 @@ describe Mongoid::Fields::Localized do
 
           context "when using fallbacks" do
 
-            before(:all) do
-              require "i18n/backend/fallbacks"
-              I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
-            end
+            with_i18n_fallbacks
 
             context "when fallbacks are defined" do
 
@@ -139,6 +159,17 @@ describe Mongoid::Fields::Localized do
                 end
               end
 
+              context "when the fallback translation exists and is a symbol" do
+
+                let(:value) do
+                  field.demongoize({ :es => "testing" })
+                end
+
+                it "returns the fallback translation" do
+                  expect(value).to eq("testing")
+                end
+              end
+
               context "when another fallback translation exists" do
 
                 let(:value) do
@@ -275,10 +306,7 @@ describe Mongoid::Fields::Localized do
 
           context "when using fallbacks" do
 
-            before(:all) do
-              require "i18n/backend/fallbacks"
-              I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
-            end
+            with_i18n_fallbacks
 
             context "when fallbacks are defined" do
 
@@ -476,10 +504,7 @@ describe Mongoid::Fields::Localized do
 
         context "when fallbacks are defined" do
 
-          before(:all) do
-            require "i18n/backend/fallbacks"
-            I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
-          end
+          with_i18n_fallbacks
 
           context "when the lookup does not need to use fallbacks" do
 

data/spec/mongoid/validatable/uniqueness_spec.rb

@@ -2476,7 +2476,6 @@ describe Mongoid::Validatable::UniquenessValidator do
   describe "i18n" do
 
     context 'when using a different locale' do
-
       around do |example|
         I18n.with_locale(:fr) { example.run }
       end

data/spec/support/macros.rb

@@ -2,6 +2,10 @@
 
 module Mongoid
   module Macros
+    class I18nBackendWithFallbacks < I18n::Backend::Simple
+      include I18n::Backend::Fallbacks
+    end
+
     def use_spec_mongoid_config
       around do |example|
         config_path = File.join(File.dirname(__FILE__), "..", "config", "mongoid.yml")
@@ -39,6 +43,18 @@ module Mongoid
       end
     end
 
+    def with_i18n_fallbacks
+      require_fallbacks
+
+      around do |example|
+        old_backend = I18n.backend
+        I18n.backend = I18nBackendWithFallbacks.new
+        example.run
+      ensure
+        I18n.backend = old_backend
+      end
+    end
+
     def driver_config_override(key, value)
       around do |example|
         existing = Mongo.send(key)