mongoid 8.0.1 → 8.0.3

data/lib/mongoid/validatable/uniqueness.rb

@@ -74,7 +74,7 @@ module Mongoid
       # @example Is the validation case sensitive?
       #   validator.case_sensitive?
       #
-      # @return [ true, false ] If the validation is case sensitive.
+      # @return [ true | false ] If the validation is case sensitive.
       def case_sensitive?
         !(options[:case_sensitive] == false)
       end
@@ -86,7 +86,7 @@ module Mongoid
       # @example Create the criteria.
       #   validator.create_criteria(User, user, :name, "syd")
       #
-      # @param [ Class, Proxy ] base The base to execute the criteria from.
+      # @param [ Class | Proxy ] base The base to execute the criteria from.
       # @param [ Document ] document The document to validate.
       # @param [ Symbol ] attribute The name of the attribute.
       # @param [ Object ] value The value of the object.
@@ -149,7 +149,7 @@ module Mongoid
       #
       # @param [ Object ] value The value to filter.
       #
-      # @return [ Object, Regexp ] The value, filtered or not.
+      # @return [ Object | Regexp ] The value, filtered or not.
       def filter(value)
         !case_sensitive? && value ? /\A#{Regexp.escape(value.to_s)}\z/i : value
       end
@@ -182,7 +182,7 @@ module Mongoid
       #
       # @param [ Document ] document The embedded document.
       #
-      # @return [ true, false ] If the validation should be skipped.
+      # @return [ true | false ] If the validation should be skipped.
       def skip_validation?(document)
         !document._parent || document.embedded_one?
       end
@@ -196,7 +196,7 @@ module Mongoid
       #
       # @param [ Document ] document The embedded document.
       #
-      # @return [ true, false ] If the scope reference has changed.
+      # @return [ true | false ] If the scope reference has changed.
       def scope_value_changed?(document)
         Array.wrap(options[:scope]).any? do |item|
           document.send("attribute_changed?", item.to_s)
@@ -278,7 +278,7 @@ module Mongoid
       # @param [ Document ] document The document getting validated.
       # @param [ Symbol ] attribute The attribute to validate.
       #
-      # @return [ true, false ] If we need to validate.
+      # @return [ true | false ] If we need to validate.
       def validation_required?(document, attribute)
         document.new_record? ||
           document.send("attribute_changed?", attribute.to_s) ||
@@ -295,7 +295,7 @@ module Mongoid
       # @param [ Document ] document The document getting validated.
       # @param [ Symbol ] attribute The attribute to validate.
       #
-      # @return [ true, false ] If the attribute is localized.
+      # @return [ true | false ] If the attribute is localized.
       def localized?(document, attribute)
         document.fields[document.database_field_name(attribute)].try(:localized?)
       end

data/lib/mongoid/validatable.rb

@@ -44,7 +44,7 @@ module Mongoid
     #
     # @param [ Hash ] options The options to check.
     #
-    # @return [ true, false ] If we are validating.
+    # @return [ true | false ] If we are validating.
     def performing_validations?(options = {})
       options[:validate].nil? ? true : options[:validate]
     end
@@ -83,7 +83,7 @@ module Mongoid
     #
     # @param [ Symbol ] context The optional validation context.
     #
-    # @return [ true, false ] True if valid, false if not.
+    # @return [ true | false ] True if valid, false if not.
     def valid?(context = nil)
       super context ? context : (new_record? ? :create : :update)
     end
@@ -93,7 +93,7 @@ module Mongoid
     # @example Is the document validated?
     #   document.validated?
     #
-    # @return [ true, false ] Has the document already been validated?
+    # @return [ true | false ] Has the document already been validated?
     def validated?
       Threaded.validated?(self)
     end
@@ -103,7 +103,7 @@ module Mongoid
     # @example Are we validating with a query?
     #   document.validating_with_query?
     #
-    # @return [ true, false ] If we are validating with a query.
+    # @return [ true | false ] If we are validating with a query.
     def validating_with_query?
       self.class.validating_with_query?
     end
@@ -129,7 +129,7 @@ module Mongoid
       # @example Validate with a specific validator.
       #   validates_with MyValidator, on: :create
       #
-      # @param [ Class<Array>, Hash ] args The validator classes and options.
+      # @param [ Class<Array> | Hash ] args The validator classes and options.
       #
       # @note See ActiveModel::Validations::With for full options. This is
       #   overridden to add autosave functionality when presence validation is
@@ -151,7 +151,7 @@ module Mongoid
       # @example Are we validating with a query?
       #   Model.validating_with_query?
       #
-      # @return [ true, false ] If we are validating with a query.
+      # @return [ true | false ] If we are validating with a query.
       def validating_with_query?
         Threaded.executing?("#{name}-validate-with-query")
       end

data/lib/mongoid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mongoid
-  VERSION = "8.0.1"
+  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/equality_spec.rb

@@ -85,8 +85,8 @@ describe Mongoid::Equality do
 
   describe ".===" do
 
-    context "when legacy_triple_equals is set" do
-      config_override :legacy_triple_equals, true
+    context "when legacy_triple_equals is not set" do
+      config_override :legacy_triple_equals, false
 
       context "when comparable is an instance of this document" do
 
@@ -128,8 +128,8 @@ describe Mongoid::Equality do
       end
     end
 
-    context "when legacy_triple_equals is not set" do
-      config_override :legacy_triple_equals, false
+    context "when legacy_triple_equals is set" do
+      config_override :legacy_triple_equals, true
 
       context "when comparable is an instance of this document" do
 
@@ -205,8 +205,8 @@ describe Mongoid::Equality do
 
         context "when the class is the same" do
 
-          it "returns false" do
-            expect(person === Person).to be false
+          it "returns true" do
+            expect(person === Person).to be true
           end
         end
 
@@ -219,8 +219,8 @@ describe Mongoid::Equality do
 
         context "when the class is a superclass" do
 
-          it "returns false" do
-            expect(Doctor.new === Person).to be false
+          it "returns true" do
+            expect(Doctor.new === Person).to be true
           end
         end
       end
@@ -256,8 +256,8 @@ describe Mongoid::Equality do
       context "when comparing to a class" do
         context "when the class is the same" do
 
-          it "returns true" do
-            expect(person === Person).to be true
+          it "returns false" do
+            expect(person === Person).to be false
           end
         end
 
@@ -270,8 +270,8 @@ describe Mongoid::Equality do
 
         context "when the class is a superclass" do
 
-          it "returns true" do
-            expect(Doctor.new === Person).to be true
+          it "returns false" do
+            expect(Doctor.new === Person).to be false
           end
         end
       end

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/indexable_spec.rb

@@ -223,8 +223,11 @@ describe Mongoid::Indexable do
     let(:klass) do
       Class.new do
         include Mongoid::Document
-        field :a, as: :authentication_token
+
         store_in collection: :specs
+
+        field :a, as: :authentication_token
+        field :username
       end
     end
 
@@ -588,6 +591,25 @@ describe Mongoid::Indexable do
       end
     end
 
+    context "when using a wildcard index" do
+
+      before do
+        klass.index({ '$**': 1 }, wildcard_projection: { _id: 1, username: 0 })
+      end
+
+      let(:spec) do
+        klass.index_specification('$**': 1)
+      end
+
+      it "creates the index" do
+        expect(spec).to be_a(Mongoid::Indexable::Specification)
+      end
+
+      it "sets the index with correct options" do
+        expect(spec.options).to eq(wildcard_projection: { _id: 1, username: 0 })
+      end
+    end
+
     context "when providing an invalid option" do
 
       it "raises an error" do

data/spec/mongoid/scopable_spec.rb

@@ -481,27 +481,45 @@ describe Mongoid::Scopable do
 
       context "when a block is provided" do
 
-        before do
-          Band.scope(:active, ->{ Band.where(active: true) }) do
-            def add_origin
-              tap { |c| c.selector[:origin] = "Deutschland" }
-            end
+        context "when with optional and keyword arguments" do
+          before do
+            Band.scope(:named_by, ->(name, deleted: false) {
+              Band.where(name: name, deleted: deleted)
+            })
           end
-        end
 
-        after do
-          class << Band
-            undef_method :active
+          let(:scope) do
+            Band.named_by("Emily", deleted: true)
           end
-          Band._declared_scopes.clear
-        end
 
-        let(:scope) do
-          Band.active.add_origin
+          it "sets the conditions from keyword arguments" do
+            scope.selector.should == {'name' => 'Emily', 'deleted' => true}
+          end
         end
 
-        it "adds the extension to the scope" do
-          expect(scope.selector).to eq({ "active" => true, "origin" => "Deutschland" })
+        context "when without arguments" do
+          before do
+            Band.scope(:active, ->{ Band.where(active: true) }) do
+              def add_origin
+                tap { |c| c.selector[:origin] = "Deutschland" }
+              end
+            end
+          end
+
+          after do
+            class << Band
+              undef_method :active
+            end
+            Band._declared_scopes.clear
+          end
+
+          let(:scope) do
+            Band.active.add_origin
+          end
+
+          it "adds the extension to the scope" do
+            expect(scope.selector).to eq({ "active" => true, "origin" => "Deutschland" })
+          end
         end
       end
 
@@ -1173,7 +1191,7 @@ describe Mongoid::Scopable do
       end
     end
 
-    context 'when nesting unsoped under with_scope' do
+    context 'when nesting unscoped under with_scope' do
       let(:c1) { Band.where(active: true) }
 
       it 'restores previous scope' 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