mongoid 7.0.3 → 7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f9840f2a5bdcfd628358c56f70818857080118680059a6ca299c6de3b4554c2
-  data.tar.gz: f8700656e769546f2c8d2555013aa601d10552e9e48faf37f24c66fded700b1d
+  metadata.gz: 97ae228df96e11fe59977a8d1af1bb0e86597fe5ee31d8cbe257a077d6e87d4f
+  data.tar.gz: b8face8e682359ca47c26c0dc168ab1a99762769176fd2f8796ae472a341cd76
 SHA512:
-  metadata.gz: a05fb92510939cf2ccff55855219033db8a9a45399865f725e695af95a9501f72a0db72422766dd54fc9946854e0065b9beb870bfeb3a02b8ac9e605962419e0
-  data.tar.gz: 267ff19b100ca5ef83f383ddd8d4ece8ce0e122a16cbc6c1605bc872e391ad775bd6336beb53af733ba8d7b47d9ec01d9842f5502c7f0c135cdc2fa258b80b47
+  metadata.gz: 1aafc53e49a0576a7bfb081bca208629ba7323c1a52468e0279644b0b9c2a9d4015c63d35cdf1f16b0967056ed976d015638fab512bce7a221acfeda75c867ed
+  data.tar.gz: 0c3e7557c424ccd5a95d3e5c4249e4a45a31f74577be2ba7cfac70d67d3226cd00b0b655e7f9d576086a0fc18c7b9d7bf37c57e8a06fb07131a3bec99e85fe8a

data/lib/mongoid/association/relatable.rb

@@ -145,20 +145,19 @@ module Mongoid
       # @since 7.0
       def inverse_type; end
 
-      # The class name of the relation object(s).
+      # The class name, possibly unqualified or :: prefixed, of the association
+      # object(s).
       #
-      # The class name may be fully qualified or may be specified relative
-      # to the class on which the association is defined (this class is
-      # accessible as inverse_class). If :class_name option is given in the
-      # association, the exact value of that option is returned here for
-      # backwards compatibility reasons. If :class_name option is not given,
-      # the name of the class computed by Mongoid to be the association target
-      # is returned, and it will be fully qualified.
+      # This method returns the class name as it is used in the association
+      # definition. If :class_name option is given in the association, the
+      # exact value of that option is returned here. If :class_name option is
+      # not given, the name of the class is calculated from association name
+      # but is not resolved to the actual class.
       #
       # The class name returned by this method may not correspond to a defined
-      # class. The return value of the method is the class name that Mongoid
-      # would reference, relative to the host document class, when it needs to
-      # perform operations on the association target.
+      # class, either because the corresponding class has not been loaded yet,
+      # or because the association references a non-existent class altogether.
+      # To obtain the association class, use +relation_class+ method.
       #
       # @note The return value of this method should not be used to determine
       #   whether two associations have the same target class, because the
@@ -170,15 +169,7 @@ module Mongoid
       #
       # @since 7.0
       def relation_class_name
-        @class_name ||= @options[:class_name] || begin
-          cls_name = ActiveSupport::Inflector.classify(name)
-          begin
-            cls_name = resolve_name(inverse_class, cls_name).name
-          rescue NameError
-            # ignore
-          end
-          cls_name
-        end
+        @class_name ||= @options[:class_name] || ActiveSupport::Inflector.classify(name)
       end
       alias :class_name :relation_class_name
 
@@ -478,10 +469,21 @@ module Mongoid
 
       # Resolves the given class/module name in the context of the specified
       # module, as Ruby would when a constant is referenced in the source.
+      #
+      # @note This method can swallow exceptions produced during class loading,
+      #   because it rescues NameError internally. Since this method attempts
+      #   to load classes, failure during the loading process may also lead to
+      #   there being incomplete class definitions.
       def resolve_name(mod, name)
         cls = exc = nil
         parts = name.to_s.split('::')
-        namespace_hierarchy(mod).each do |ns|
+        if parts.first == ''
+          parts.shift
+          hierarchy = [Object]
+        else
+          hierarchy = namespace_hierarchy(mod)
+        end
+        hierarchy.each do |ns|
           begin
             parts.each do |part|
               # Simple const_get sometimes pulls names out of weird scopes,

data/lib/mongoid/copyable.rb

@@ -74,7 +74,11 @@ module Mongoid
 
         if association.is_a?(Association::Embedded::EmbedsMany)
           attrs[association.key].each do |attr|
-            embedded_klass = attr.fetch('_type', association.relation_class_name).constantize
+            embedded_klass = if type = attr['_type']
+              type.constantize
+            else
+              association.relation_class
+            end
             process_localized_attributes(embedded_klass, attr)
           end
         else

data/lib/mongoid/extensions/string.rb

@@ -82,7 +82,9 @@ module Mongoid
       #
       # @since 3.0.0
       def numeric?
-        true if Float(self) rescue (self =~ /^NaN|\-?Infinity$/)
+        !!Float(self)
+      rescue ArgumentError
+        (self =~ /\A(?:NaN|-?Infinity)\z/) == 0
       end
 
       # Get the string as a getter string.

data/lib/mongoid/version.rb

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

data/spec/app/models/other_owner_object.rb

@@ -0,0 +1,2 @@
+class OtherOwnerObject
+end

data/spec/mongoid/association/embedded/embedded_in_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require_relative './embeds_one_models'
 
 describe Mongoid::Association::Embedded::EmbeddedIn do
 
@@ -313,6 +314,42 @@ describe Mongoid::Association::Embedded::EmbeddedIn do
           it 'returns nil' do
             expect(association.inverses).to eq(nil)
           end
+
+          context 'when class_name is given and is a plain string' do
+            let(:association) do
+              EomParent.relations['child']
+            end
+
+            it 'returns the inverse in an array' do
+              inverses = association.inverses
+              expect(inverses).to eq([:parent])
+            end
+          end
+
+          context 'when class_name is given and is a :: prefixed string' do
+            let(:association) do
+              EomCcChild.relations['parent']
+            end
+
+            it 'returns the inverse in an array' do
+              pending 'MONGOID-4751'
+
+              inverses = association.inverses
+              expect(inverses).to eq([:child])
+            end
+
+            context 'when other associations referencing unloaded classes exist' do
+              let(:association) do
+                EomDnlChild.relations['parent']
+              end
+
+              it 'does not load other classes' do
+                inverses = association.inverses
+                expect(inverses).to eq([:child])
+                expect(Object.const_defined?(:EoDnlMarker)).to be false
+              end
+            end
+          end
         end
       end
     end
@@ -549,6 +586,16 @@ describe Mongoid::Association::Embedded::EmbeddedIn do
       it 'returns the class name option' do
         expect(association.relation_class_name).to eq('OtherContainer')
       end
+
+      context ':class_name is a :: prefixed string' do
+        let(:association) do
+          EomCcChild.relations['parent']
+        end
+
+        it 'returns the :: prefixed string' do
+          expect(association.relation_class_name).to eq('::EomCcParent')
+        end
+      end
     end
 
     context 'when the class_name option is not specified' do
@@ -557,6 +604,17 @@ describe Mongoid::Association::Embedded::EmbeddedIn do
         expect(association.relation_class_name).to eq('Container')
       end
     end
+
+    context 'when another association in the model is referencing a third model class' do
+      let(:association) do
+        EomDnlChild.relations['parent']
+      end
+
+      it 'does not attempt to load the third class' do
+        expect(association.relation_class_name).to eq('EomDnlParent')
+        expect(Object.const_defined?(:EoDnlMarker)).to be false
+      end
+    end
   end
 
   describe '#klass' do

data/spec/mongoid/association/embedded/embeds_one_dnl_models.rb

@@ -0,0 +1,6 @@
+# This file is added as an autoload target, but should never be actually
+# processed.
+
+# Marker class - if this class exists, this file was attempted to be required.
+class EoDnlMarker
+end

data/spec/mongoid/association/embedded/embeds_one_models.rb

@@ -0,0 +1,51 @@
+class EomParent
+  include Mongoid::Document
+
+  embeds_one :child, class_name: 'EomChild'
+
+  field :name, type: String
+end
+
+class EomChild
+  include Mongoid::Document
+
+  embedded_in :parent, class_name: 'EomParent'
+
+  field :a, type: Integer, default: 0
+  field :b, type: Integer, default: 0
+end
+
+# Models with associations with :class_name as a :: prefixed string
+
+class EomCcParent
+  include Mongoid::Document
+
+  embeds_one :child, class_name: '::EomCcChild'
+end
+
+class EomCcChild
+  include Mongoid::Document
+
+  embedded_in :parent, class_name: '::EomCcParent'
+end
+
+# Models referencing other models which should not be loaded unless the
+# respective association is referenced
+
+autoload :EomDnlMissingChild, 'mongoid/association/embedded/embeds_one_dnl_models'
+
+class EomDnlParent
+  include Mongoid::Document
+
+  embeds_one :child, class_name: 'EomDnlChild'
+  embeds_one :missing_child, class_name: 'EomDnlMissingChild'
+end
+
+autoload :EomDnlMissingParent, 'mongoid/association/embedded/embeds_one_dnl_models'
+
+class EomDnlChild
+  include Mongoid::Document
+
+  embedded_in :parent, class_name: 'EomDnlParent'
+  embedded_in :missing_parent, class_name: 'EomDnlMissingParent'
+end

data/spec/mongoid/association/embedded/embeds_one_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require_relative './embeds_one_models'
 
 describe Mongoid::Association::Embedded::EmbedsOne do
 
@@ -444,6 +445,32 @@ describe Mongoid::Association::Embedded::EmbedsOne do
           it 'returns the :as attribute' do
             expect(association.inverses).to eq([ :containable ])
           end
+
+          context 'when class_name is given and is a :: prefixed string' do
+
+            let(:association) do
+              EomCcParent.relations['child']
+            end
+
+            it 'returns the inverse in an array' do
+              pending 'MONGOID-4751'
+
+              inverses = association.inverses
+              expect(inverses).to eq([:parent])
+            end
+
+            context 'when other associations referencing unloaded classes exist' do
+              let(:association) do
+                EomDnlParent.relations['child']
+              end
+
+              it 'does not load other classes' do
+                inverses = association.inverses
+                expect(inverses).to eq([:parent])
+                expect(Object.const_defined?(:EoDnlMarker)).to be false
+              end
+            end
+          end
         end
       end
     end
@@ -604,6 +631,16 @@ describe Mongoid::Association::Embedded::EmbedsOne do
       it 'returns the class name option' do
         expect(association.relation_class_name).to eq('OtherEmbeddedObject')
       end
+
+      context ':class_name is a :: prefixed string' do
+        let(:association) do
+          EomCcParent.relations['child']
+        end
+
+        it 'returns the :: prefixed string' do
+          expect(association.relation_class_name).to eq('::EomCcChild')
+        end
+      end
     end
 
     context 'when the class_name option is not specified' do
@@ -612,6 +649,17 @@ describe Mongoid::Association::Embedded::EmbedsOne do
         expect(association.relation_class_name).to eq('EmbeddedObject')
       end
     end
+
+    context 'when another association in the model is referencing a third model class' do
+      let(:association) do
+        EomDnlParent.relations['child']
+      end
+
+      it 'does not attempt to load the third class' do
+        expect(association.relation_class_name).to eq('EomDnlChild')
+        expect(Object.const_defined?(:EoDnlMarker)).to be false
+      end
+    end
   end
 
   describe '#klass' do

data/spec/mongoid/association/referenced/belongs_to_spec.rb

@@ -1622,6 +1622,17 @@ describe Mongoid::Association::Referenced::BelongsTo do
       end
     end
 
+    context 'when the :class_name option is scoped with ::' do
+
+      let(:options) do
+        { class_name: '::OtherOwnerObject' }
+      end
+
+      it 'returns the class name option' do
+        expect(association.relation_class_name).to eq('::OtherOwnerObject')
+      end
+    end
+
     context 'when the class_name option is not specified' do
 
       it 'uses the name of the relation to deduce the class name' do
@@ -1644,17 +1655,23 @@ describe Mongoid::Association::Referenced::BelongsTo do
 
     context 'when the :class_name option is specified' do
 
-      let!(:_class) do
-        class OtherOwnerObject; end
-        OtherOwnerObject
+      let(:options) do
+        { class_name: 'OtherOwnerObject' }
+      end
+
+      it 'returns the named class' do
+        expect(association.relation_class).to eq(OtherOwnerObject)
       end
+    end
+
+    context 'when the :class_name option is scoped with ::' do
 
       let(:options) do
-        { class_name: 'OtherOwnerObject' }
+        { class_name: '::OtherOwnerObject' }
       end
 
-      it 'returns the class name option' do
-        expect(association.relation_class).to eq(_class)
+      it 'returns the named class' do
+        expect(association.relation_class).to eq(OtherOwnerObject)
       end
     end
 

data/spec/mongoid/association/referenced/has_one_spec.rb

@@ -909,12 +909,12 @@ describe Mongoid::Association::Referenced::HasOne do
         end
       end
 
-      it 'returns the proper namespaced class name' do
+      it 'returns the inferred unqualified class name' do
         define_classes
 
         expect(
             HasOneAssociationClassName::OwnedClass.relations['owner_class'].relation_class_name
-        ).to eq('HasOneAssociationClassName::OwnerClass')
+        ).to eq('OwnerClass')
       end
     end
 
@@ -945,6 +945,16 @@ describe Mongoid::Association::Referenced::HasOne do
         expect(association.relation_class_name).to eq('BelongingObject')
       end
     end
+
+    context "when the class is not defined" do
+      let(:name) do
+        :undefined_class
+      end
+
+      it 'does not trigger autoloading' do
+        expect(association.relation_class_name).to eq('UndefinedClass')
+      end
+    end
   end
 
   describe '#relation_class' do

data/spec/mongoid/extensions/string_spec.rb

@@ -277,49 +277,77 @@ describe Mongoid::Extensions::String do
     context "when the string is an integer" do
 
       it "returns true" do
-        expect("1234").to be_numeric
+        expect("1234".numeric?).to eq(true)
       end
     end
 
     context "when string is a float" do
 
       it "returns true" do
-        expect("1234.123").to be_numeric
+        expect("1234.123".numeric?).to eq(true)
       end
     end
 
     context "when the string is has exponents" do
 
       it "returns true" do
-        expect("1234.123123E4").to be_numeric
+        expect("1234.123123E4".numeric?).to eq(true)
       end
     end
 
     context "when the string is non numeric" do
 
       it "returns false" do
-        expect("blah").to_not be_numeric
+        expect("blah".numeric?).to eq(false)
       end
     end
 
     context "when the string is NaN" do
 
       it "returns true" do
-        expect("NaN").to be_numeric
+        expect("NaN".numeric?).to eq(true)
+      end
+    end
+
+    context "when the string is NaN and junk in front" do
+
+      it "returns false" do
+        expect("a\nNaN".numeric?).to eq(false)
+      end
+    end
+
+    context "when the string is NaN and whitespace at end" do
+
+      it "returns false" do
+        expect("NaN\n".numeric?).to eq(false)
       end
     end
 
     context "when the string is Infinity" do
 
       it "returns true" do
-        expect("Infinity").to be_numeric
+        expect("Infinity".numeric?).to eq(true)
+      end
+    end
+
+    context "when the string contains Infinity and junk in front" do
+
+      it "returns false" do
+        expect("a\nInfinity".numeric?).to eq(false)
+      end
+    end
+
+    context "when the string contains Infinity and whitespace at end" do
+
+      it "returns false" do
+        expect("Infinity\n".numeric?).to eq(false)
       end
     end
 
     context "when the string is -Infinity" do
 
       it "returns true" do
-        expect("-Infinity").to be_numeric
+        expect("-Infinity".numeric?).to eq(true)
       end
     end
   end

metadata

@@ -1,14 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 7.0.3
+  version: 7.0.4
 platform: ruby
 authors:
 - Durran Jordan
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2019-05-24 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDRDCCAiygAwIBAgIBATANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtkcml2
+  ZXItcnVieS9EQz0xMGdlbi9EQz1jb20wHhcNMTkwMTE3MjIzMDE1WhcNMjAwMTE3
+  MjIzMDE1WjAmMSQwIgYDVQQDDBtkcml2ZXItcnVieS9EQz0xMGdlbi9EQz1jb20w
+  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRXUgGvH0ZtWwDPc2umdHw
+  B+INNm6jNTRp8PMyUKxPzxaxX2OiBQk9gLC3zsK9ZmlZu4lNfpHVSCEPoiP/fhPg
+  Kyfq2xld3Qz0Pki5d5i0/r14343MTKiNiFulLlbbdlN0cXeEFNJHUycZnD2LOXwz
+  egYGHOl14FI8t5visIWtqRnLXXIlDsBHzmeEZjUZRGSgjC0R3RT/I+Fk5yUhn1w4
+  rqFyAiW+cjjzmT7mmqT0jV6fd0JFHbKnSgt9iPijKSimBgUOsorHwOTMlTzwsy0d
+  ZT+al1RiT5zqlAJLxFHwmoYOxD/bSNtKsYl60ek0hK2mISBVy9BBmLvCgHDx5uSp
+  AgMBAAGjfTB7MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBRbd1mx
+  fvSaVIwKI+tnEAYDW/B81zAgBgNVHREEGTAXgRVkcml2ZXItcnVieUAxMGdlbi5j
+  b20wIAYDVR0SBBkwF4EVZHJpdmVyLXJ1YnlAMTBnZW4uY29tMA0GCSqGSIb3DQEB
+  CwUAA4IBAQBtXpljL+EXFgH2YRSkYTNn9WKurclJKqaMTJvJoEm2mX1IbAg+BX+i
+  Eb+rKelkjezRqVkurzRjif8RI9aGBpAyfobQfHHJNzHQzSFwhEmwlGDQRgQzrDhN
+  cbkRB2wDgGJNjnjMKLXfeZX+SjWAsHDrOc+Ue9nHs2AdJxCTDgB1MMNGZ1UjLL9/
+  HhO93otEnxwCVijD9ruORb0bT9LlNKosQQEzrhXtOtNK9k7s7G6Gi0BFMOIJDVyq
+  bMYVwXXhV8czdzgkQB/ZPWHSbEWXnmkze1mzvqWBCPOVXYrcnL9cnEl/RoxtS1hr
+  Db6Ac6mCUSYfYHBWpWqxjc45n70i5Xi1
+  -----END CERTIFICATE-----
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -493,6 +514,7 @@ files:
 - spec/app/models/ordered_post.rb
 - spec/app/models/ordered_preference.rb
 - spec/app/models/oscar.rb
+- spec/app/models/other_owner_object.rb
 - spec/app/models/override.rb
 - spec/app/models/ownable.rb
 - spec/app/models/owner.rb
@@ -607,6 +629,8 @@ files:
 - spec/mongoid/association/embedded/embeds_one/binding_spec.rb
 - spec/mongoid/association/embedded/embeds_one/buildable_spec.rb
 - spec/mongoid/association/embedded/embeds_one/proxy_spec.rb
+- spec/mongoid/association/embedded/embeds_one_dnl_models.rb
+- spec/mongoid/association/embedded/embeds_one_models.rb
 - spec/mongoid/association/embedded/embeds_one_spec.rb
 - spec/mongoid/association/macros_spec.rb
 - spec/mongoid/association/nested/many_spec.rb
@@ -1041,6 +1065,8 @@ test_files:
 - spec/mongoid/association/embedded/embedded_in/buildable_spec.rb
 - spec/mongoid/association/embedded/embedded_in/binding_spec.rb
 - spec/mongoid/association/embedded/embeds_many_spec.rb
+- spec/mongoid/association/embedded/embeds_one_dnl_models.rb
+- spec/mongoid/association/embedded/embeds_one_models.rb
 - spec/mongoid/association/embedded/dirty_spec.rb
 - spec/mongoid/association/embedded/embedded_in_spec.rb
 - spec/mongoid/association/syncable_spec.rb
@@ -1205,6 +1231,7 @@ test_files:
 - spec/app/models/artist.rb
 - spec/app/models/my_hash.rb
 - spec/app/models/post.rb
+- spec/app/models/other_owner_object.rb
 - spec/app/models/track.rb
 - spec/app/models/tool.rb
 - spec/app/models/movie.rb