mongoid 6.4.4 → 7.1.7

data/spec/mongoid/extensions/range_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Extensions::Range do
@@ -139,6 +142,13 @@ describe Mongoid::Extensions::Range do
         expect(("a".."z").mongoize).to eq({ "min" => "a", "max" => "z" })
       end
     end
+
+    context 'when the value is a string' do
+
+      it 'returns a string' do
+        expect(Range.mongoize('3')).to eq('3')
+      end
+    end
   end
 
   describe "#resizable?" do

data/spec/mongoid/extensions/regexp_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Extensions::Regexp do

data/spec/mongoid/extensions/set_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Extensions::Set do

data/spec/mongoid/extensions/string_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Extensions::String do
@@ -69,33 +72,47 @@ describe Mongoid::Extensions::String do
   describe "#__mongoize_time__" do
 
     context "when using active support's time zone" do
+      include_context 'using AS time zone'
 
-      before do
-        Mongoid.use_activesupport_time_zone = true
-        ::Time.zone = "Tokyo"
-      end
+      context "when the string is a valid time with time zone" do
+
+        let(:string) do
+          # JST is +0900
+          "2010-11-19 00:24:49.123457 +1100"
+        end
+
+        let(:mongoized) do
+          string.__mongoize_time__
+        end
+
+        let(:expected_time) { Time.parse("2010-11-18 13:24:49.123457 +0000").in_time_zone }
 
-      after do
-        ::Time.zone = "Berlin"
+        it "converts to the AS time zone" do
+          expect(mongoized.zone).to eq("JST")
+        end
+
+        it_behaves_like 'mongoizes to AS::TimeWithZone'
+        it_behaves_like 'maintains precision when mongoized'
       end
 
-      context "when the string is a valid time" do
+      context "when the string is a valid time without time zone" do
 
         let(:string) do
-          "2010-11-19 00:24:49 +0900"
+          "2010-11-19 00:24:49.123457"
         end
 
-        let(:time) do
+        let(:mongoized) do
           string.__mongoize_time__
         end
 
-        it "converts to a time" do
-          expect(time).to eq(Time.configured.parse(string))
-        end
+        let(:expected_time) { Time.parse("2010-11-18 15:24:49.123457 +0000").in_time_zone }
 
-        it "converts to the as time zone" do
-          expect(time.zone).to eq("JST")
+        it "converts to the AS time zone" do
+          expect(mongoized.zone).to eq("JST")
         end
+
+        it_behaves_like 'mongoizes to AS::TimeWithZone'
+        it_behaves_like 'maintains precision when mongoized'
       end
 
       context "when the string is an invalid time" do
@@ -113,29 +130,46 @@ describe Mongoid::Extensions::String do
     end
 
     context "when not using active support's time zone" do
+      include_context 'not using AS time zone'
 
-      before do
-        Mongoid.use_activesupport_time_zone = false
-      end
+      context "when the string is a valid time with time zone" do
+
+        let(:string) do
+          "2010-11-19 00:24:49.123457 +1100"
+        end
+
+        let(:expected_time) { Time.parse("2010-11-18 13:24:49.123457 +0000").in_time_zone }
 
-      after do
-        Mongoid.use_activesupport_time_zone = true
-        Time.zone = nil
+        let(:mongoized) do
+          string.__mongoize_time__
+        end
+
+        it_behaves_like 'mongoizes to Time'
+        it_behaves_like 'maintains precision when mongoized'
       end
 
-      context "when the string is a valid time" do
+      context "when the string is a valid time without time zone" do
 
         let(:string) do
-          "2010-11-19 00:24:49 +0900"
+          "2010-11-19 00:24:49.123457"
         end
 
-        let(:time) do
-          string.__mongoize_time__
+        let(:utc_offset) do
+          Time.now.utc_offset
         end
 
-        it "converts to a time" do
-          expect(time).to eq(Time.parse(string))
+        before do
+          expect(utc_offset).not_to eq(Time.zone.now.utc_offset)
         end
+
+        let(:expected_time) { Time.parse("2010-11-19 00:24:49.123457 +0000").in_time_zone - utc_offset }
+
+        let(:mongoized) do
+          string.__mongoize_time__
+        end
+
+        it_behaves_like 'mongoizes to Time'
+        it_behaves_like 'maintains precision when mongoized'
       end
 
       context "when the string is an invalid time" do
@@ -277,49 +311,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

data/spec/mongoid/extensions/symbol_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Extensions::Symbol do

data/spec/mongoid/extensions/time_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Extensions::Time do
@@ -460,4 +463,31 @@ describe Mongoid::Extensions::Time do
       expect(eom_time_mongoized.subsec.to_f.round(3)).to eq(eom_time.utc.subsec.to_f.round(3))
     end
   end
+
+  describe "__mongoize_time__" do
+
+    let(:time) do
+      Time.at(1543331265.123457)
+    end
+
+    let(:mongoized) do
+      time.__mongoize_time__
+    end
+
+    let(:expected_time) { time.in_time_zone }
+
+    context "when using active support's time zone" do
+      include_context 'using AS time zone'
+
+      it_behaves_like 'mongoizes to Time'
+      it_behaves_like 'maintains precision when mongoized'
+    end
+
+    context "when not using active support's time zone" do
+      include_context 'not using AS time zone'
+
+      it_behaves_like 'mongoizes to Time'
+      it_behaves_like 'maintains precision when mongoized'
+    end
+  end
 end

data/spec/mongoid/extensions/time_with_zone_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Extensions::TimeWithZone do
@@ -398,4 +401,35 @@ describe Mongoid::Extensions::TimeWithZone do
       expect(time.mongoize.to_f).to eq(time.to_f)
     end
   end
+
+  describe "__mongoize_time__" do
+
+    let(:time) do
+      ActiveSupport::TimeZone['Magadan'].at(1543331265.123457)
+    end
+
+    before do
+      expect(time).to be_a(ActiveSupport::TimeWithZone)
+    end
+
+    let(:mongoized) do
+      time.__mongoize_time__
+    end
+
+    let(:expected_time) { time.in_time_zone }
+
+    context "when using active support's time zone" do
+      include_context 'using AS time zone'
+
+      it_behaves_like 'mongoizes to AS::TimeWithZone'
+      it_behaves_like 'maintains precision when mongoized'
+    end
+
+    context "when not using active support's time zone" do
+      include_context 'not using AS time zone'
+
+      it_behaves_like 'mongoizes to AS::TimeWithZone'
+      it_behaves_like 'maintains precision when mongoized'
+    end
+  end
 end

data/spec/mongoid/extensions/true_class_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Extensions::TrueClass do

data/spec/mongoid/extensions_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe BSON::ObjectId do

data/spec/mongoid/factory_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Factory do
@@ -92,7 +95,7 @@ describe Mongoid::Factory do
     context "when the type is a symbol" do
 
       let(:person) do
-        described_class.build(Person, {:_type => "Doctor"})
+        described_class.build(Person, { :_type => "Doctor" })
       end
 
       it "instantiates the subclass" do
@@ -192,5 +195,47 @@ describe Mongoid::Factory do
         expect(document.title).to eq("Sir")
       end
     end
+
+    context 'when type does not correspond to a Class name' do
+
+      let(:attributes) do
+        { "title" => "Sir", "_type" => "invalid_class_name" }
+      end
+
+      let(:person) do
+        described_class.from_db(Person, attributes)
+      end
+
+      it 'raises a exception' do
+        expect {
+          person
+        }.to raise_exception(Mongoid::Errors::UnknownModel)
+      end
+
+    end
+
+    context 'when type is correct but the instantiation raises a NoMethodError' do
+      class BadPerson < Person
+        def self.instantiate(*args)
+          call_some_nonexistent_method(*args)
+          super
+        end
+      end
+
+      let(:attributes) do
+        { "title" => "Sir", "_type" => "BadPerson" }
+      end
+
+      let(:person) do
+        described_class.from_db(BadPerson, attributes)
+      end
+
+      it 'raises a exception' do
+        expect {
+          person
+        }.to raise_exception(NoMethodError)
+      end
+
+    end
   end
 end

data/spec/mongoid/fields/foreign_key_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Fields::ForeignKey do
@@ -7,7 +10,7 @@ describe Mongoid::Fields::ForeignKey do
     let(:field) do
       described_class.new(
         :vals,
-        metadata: Person.relations["preferences"],
+        association: Person.relations["preferences"],
         type: Array,
         default: [],
         identity: true
@@ -68,7 +71,7 @@ describe Mongoid::Fields::ForeignKey do
     let(:field) do
       described_class.new(
         :vals,
-        metadata: Person.relations["posts"],
+        association: Person.relations["posts"],
         type: Array,
         default: default,
         identity: true
@@ -89,7 +92,7 @@ describe Mongoid::Fields::ForeignKey do
     let(:field) do
       described_class.new(
         :vals,
-        metadata: Person.relations["posts"],
+        association: Person.relations["posts"],
         type: Array,
         default: [],
         identity: true
@@ -103,14 +106,14 @@ describe Mongoid::Fields::ForeignKey do
 
   describe "#evolve" do
 
-    let(:metadata) do
+    let(:association) do
       Person.reflect_on_association(:preferences)
     end
 
     context "when provided a document" do
 
       let(:field) do
-        described_class.new(:person_id, type: Object, metadata: metadata)
+        described_class.new(:person_id, type: Object, association: association)
       end
 
       let(:game) do
@@ -129,7 +132,7 @@ describe Mongoid::Fields::ForeignKey do
     context "when the type is an array" do
 
       let(:field) do
-        described_class.new(:preference_ids, type: Array, default: [], metadata: metadata)
+        described_class.new(:preference_ids, type: Array, default: [], association: association)
       end
 
       context "when providing a single value" do
@@ -197,12 +200,12 @@ describe Mongoid::Fields::ForeignKey do
 
           context "when the relation stores ids as strings" do
 
-            let!(:metadata) do
+            let!(:association) do
               Agent.reflect_on_association(:accounts)
             end
 
             let!(:field) do
-              described_class.new(:account_ids, type: Array, default: [], metadata: metadata)
+              described_class.new(:account_ids, type: Array, default: [], association: association)
             end
 
             let(:id_one) do
@@ -260,12 +263,12 @@ describe Mongoid::Fields::ForeignKey do
 
     context "when the type is an object" do
 
-      let(:metadata) do
+      let(:association) do
         Game.reflect_on_association(:person)
       end
 
       let(:field) do
-        described_class.new(:person_id, type: Object, metadata: metadata)
+        described_class.new(:person_id, type: Object, association: association)
       end
 
       context "when providing a single value" do
@@ -312,12 +315,12 @@ describe Mongoid::Fields::ForeignKey do
 
         context "when the relation stores string ids" do
 
-          let(:metadata) do
+          let(:association) do
             Comment.reflect_on_association(:account)
           end
 
           let(:field) do
-            described_class.new(:person_id, type: Object, metadata: metadata)
+            described_class.new(:person_id, type: Object, association: association)
           end
 
           context "when the value is an id string" do
@@ -384,12 +387,12 @@ describe Mongoid::Fields::ForeignKey do
 
           context "when the relation stores ids as strings" do
 
-            let(:metadata) do
+            let(:association) do
               Comment.reflect_on_association(:account)
             end
 
             let(:field) do
-              described_class.new(:person_id, type: Object, metadata: metadata)
+              described_class.new(:person_id, type: Object, association: association)
             end
 
             let(:id_one) do
@@ -445,14 +448,14 @@ describe Mongoid::Fields::ForeignKey do
       end
     end
 
-    context "when the metadata is polymoprhic" do
+    context "when the association is polymoprhic" do
 
-      let(:metadata) do
+      let(:association) do
         Agent.reflect_on_association(:names)
       end
 
       let(:field) do
-        described_class.new(:nameable_id, type: Object, metadata: metadata)
+        described_class.new(:nameable_id, type: Object, association: association)
       end
 
       let(:value) do
@@ -464,7 +467,7 @@ describe Mongoid::Fields::ForeignKey do
       end
 
       it "does not change the foreign key" do
-        expect(evolved).to be(value)
+        expect(evolved).to eq(BSON::ObjectId.from_string(value))
       end
     end
   end
@@ -500,12 +503,8 @@ describe Mongoid::Fields::ForeignKey do
 
       context "when the array is object ids" do
 
-        let(:metadata) do
-          Mongoid::Relations::Metadata.new(
-            inverse_class_name: "Game",
-            name: :person,
-            relation: Mongoid::Relations::Referenced::In
-          )
+        let(:association) do
+          Game.relations["person"]
         end
 
         let(:field) do
@@ -514,7 +513,7 @@ describe Mongoid::Fields::ForeignKey do
             type: Array,
             default: [],
             identity: true,
-            metadata: metadata,
+            association: association,
             overwrite: true
           )
         end
@@ -589,12 +588,8 @@ describe Mongoid::Fields::ForeignKey do
 
       context "when the array is object ids" do
 
-        let(:metadata) do
-          Mongoid::Relations::Metadata.new(
-            inverse_class_name: "Game",
-            name: :person,
-            relation: Mongoid::Relations::Referenced::In
-          )
+        let(:association) do
+          Game.relations['person']
         end
 
         let(:field) do
@@ -603,7 +598,7 @@ describe Mongoid::Fields::ForeignKey do
             type: Object,
             default: nil,
             identity: true,
-            metadata: metadata,
+            association: association,
             overwrite: true
           )
         end