mongoid 7.2.1 → 9.0.0

data/spec/mongoid/extensions/binary_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -16,18 +16,53 @@ describe BSON::Binary do
     end
   end
 
-  describe ".demongoize" do
 
-    let(:binary) do
-      BSON::Binary.new("testing", :md5)
-    end
+  [ :mongoize, :demongoize].each do |method|
+    describe ".#{method}" do
 
-    let(:demongoized) do
-      BSON::Binary.demongoize(binary)
-    end
+      let(:binary) do
+        BSON::Binary.new("testing")
+      end
 
-    it "returns the binary" do
-      expect(demongoized).to eq(binary)
+      let(:evaluated) do
+        BSON::Binary.send(method, value)
+      end
+
+      context "when mongoizing a BSON::Binary" do
+
+        let(:value) { binary }
+
+        it "returns the binary" do
+          expect(evaluated).to eq(binary)
+        end
+      end
+
+      context "when mongoizing a String" do
+
+        let(:value) { "testing" }
+
+        it "returns it as binary" do
+          expect(evaluated).to eq(binary)
+        end
+      end
+
+      context "when mongoizing nil" do
+
+        let(:value) { nil }
+
+        it "returns nil" do
+          expect(evaluated).to eq(nil)
+        end
+      end
+
+      context "when mongoizing an invalid type" do
+
+        let(:value) { true }
+
+        it "returns nil" do
+          expect(evaluated).to be_nil
+        end
+      end
     end
   end
 

data/spec/mongoid/extensions/boolean_spec.rb

@@ -1,143 +1,129 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 
 describe Mongoid::Boolean do
 
-  describe ".demongoize" do
+  [ :mongoize, :demongoize ].each do |method|
 
-    context "when provided true" do
+    describe ".#{method}" do
 
-      it "returns true" do
-        expect(described_class.demongoize(true)).to eq(true)
-      end
-    end
-
-    context "when provided false" do
-
-      it "returns false" do
-        expect(described_class.demongoize(false)).to eq(false)
-      end
-    end
-  end
-
-  describe ".mongoize" do
-
-    context "when provided a boolean" do
+      context "when provided a boolean" do
 
-      context "when provided true" do
+        context "when provided true" do
 
-        it "returns true" do
-          expect(described_class.mongoize(true)).to eq(true)
+          it "returns true" do
+            expect(described_class.send(method, true)).to eq(true)
+          end
         end
-      end
 
-      context "when provided false" do
+        context "when provided false" do
 
-        it "returns false" do
-          expect(described_class.mongoize(false)).to eq(false)
+          it "returns false" do
+            expect(described_class.send(method, false)).to eq(false)
+          end
         end
       end
-    end
 
-    context "when provided a string" do
+      context "when provided a string" do
 
-      context "when provided true" do
+        context "when provided true" do
 
-        it "returns true" do
-          expect(described_class.mongoize("true")).to eq(true)
+          it "returns true" do
+            expect(described_class.send(method, "true")).to eq(true)
+          end
         end
-      end
 
-      context "when provided t" do
+        context "when provided t" do
 
-        it "returns true" do
-          expect(described_class.mongoize("t")).to eq(true)
+          it "returns true" do
+            expect(described_class.send(method, "t")).to eq(true)
+          end
         end
-      end
 
-      context "when provided 1" do
+        context "when provided 1" do
 
-        it "returns true" do
-          expect(described_class.mongoize("1")).to eq(true)
+          it "returns true" do
+            expect(described_class.send(method, "1")).to eq(true)
+          end
         end
-      end
 
-      context "when provided 1.0" do
+        context "when provided 1.0" do
 
-        it "returns true" do
-          expect(described_class.mongoize("1.0")).to eq(true)
+          it "returns true" do
+            expect(described_class.send(method, "1.0")).to eq(true)
+          end
         end
-      end
 
-      context "when provided yes" do
+        context "when provided yes" do
 
-        it "returns true" do
-          expect(described_class.mongoize("yes")).to eq(true)
+          it "returns true" do
+            expect(described_class.send(method, "yes")).to eq(true)
+          end
         end
-      end
 
-      context "when provided y" do
+        context "when provided y" do
 
-        it "returns true" do
-          expect(described_class.mongoize("y")).to eq(true)
+          it "returns true" do
+            expect(described_class.send(method, "y")).to eq(true)
+          end
         end
-      end
 
-      context "when provided on" do
+        context "when provided on" do
 
-        it "returns true" do
-          expect(described_class.mongoize("on")).to eq(true)
+          it "returns true" do
+            expect(described_class.send(method, "on")).to eq(true)
+          end
         end
-      end
 
-      context "when provided false" do
+        context "when provided false" do
 
-        it "returns false" do
-          expect(described_class.mongoize("false")).to eq(false)
+          it "returns false" do
+            expect(described_class.send(method, "false")).to eq(false)
+          end
         end
-      end
 
-      context "when provided f" do
+        context "when provided f" do
 
-        it "returns false" do
-          expect(described_class.mongoize("f")).to eq(false)
+          it "returns false" do
+            expect(described_class.send(method, "f")).to eq(false)
+          end
         end
-      end
 
-      context "when provided 0" do
+        context "when provided 0" do
 
-        it "returns false" do
-          expect(described_class.mongoize("0")).to eq(false)
+          it "returns false" do
+            expect(described_class.send(method, "0")).to eq(false)
+          end
         end
-      end
 
-      context "when provided 0.0" do
+        context "when provided 0.0" do
 
-        it "returns false" do
-          expect(described_class.mongoize("0.0")).to eq(false)
+          it "returns false" do
+            expect(described_class.send(method, "0.0")).to eq(false)
+          end
         end
-      end
 
-      context "when provided no" do
+        context "when provided no" do
 
-        it "returns false" do
-          expect(described_class.mongoize("no")).to eq(false)
+          it "returns false" do
+            expect(described_class.send(method, "no")).to eq(false)
+          end
         end
-      end
 
-      context "when provided n" do
+        context "when provided n" do
 
-        it "returns false" do
-          expect(described_class.mongoize("n")).to eq(false)
+          it "returns false" do
+            expect(described_class.send(method, "n")).to eq(false)
+          end
         end
-      end
 
-      context "when provided off" do
+        context "when provided off" do
 
-        it "returns true" do
-          expect(described_class.mongoize("off")).to eq(false)
+          it "returns true" do
+            expect(described_class.send(method, "off")).to eq(false)
+          end
         end
       end
     end

data/spec/mongoid/extensions/date_class_mongoize_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -28,7 +28,7 @@ describe Mongoid::Extensions::Date do
 
     context "when provided a string" do
       # This also configures a non-UTC time zone for AS which we want
-      include_context 'using AS time zone'
+      include_context 'setting ActiveSupport time zone'
 
       context "when the string is a valid date" do
 
@@ -99,25 +99,29 @@ describe Mongoid::Extensions::Date do
 
       context "when the string is empty" do
 
-        let(:evolved) do
+        let(:mongoized) do
           Date.mongoize("")
         end
 
         it "returns nil" do
-          expect(evolved).to be_nil
+          expect(mongoized).to be_nil
         end
       end
 
       context "when the string is an invalid time" do
 
+        let(:mongoized) do
+          Date.mongoize("time")
+        end
+
         it "returns nil" do
-          expect(Date.mongoize("time")).to eq(nil)
+          expect(mongoized).to be_nil
         end
       end
     end
 
     context "when provided a float" do
-      include_context 'using AS time zone'
+      include_context 'setting ActiveSupport time zone'
 
       let(:float) do
         time.to_f
@@ -157,7 +161,7 @@ describe Mongoid::Extensions::Date do
     end
 
     context "when provided an integer" do
-      include_context 'using AS time zone'
+      include_context 'setting ActiveSupport time zone'
 
       let(:integer) do
         time.to_i
@@ -197,7 +201,7 @@ describe Mongoid::Extensions::Date do
     end
 
     context "when provided a time" do
-      include_context 'using AS time zone'
+      include_context 'setting ActiveSupport time zone'
 
       let(:mongoized) do
         Date.mongoize(time)
@@ -233,7 +237,7 @@ describe Mongoid::Extensions::Date do
     end
 
     context "when provided an AS::TimeWithZone" do
-      include_context 'using AS time zone'
+      include_context 'setting ActiveSupport time zone'
 
       let(:mongoized) do
         Date.mongoize(time)
@@ -270,7 +274,7 @@ describe Mongoid::Extensions::Date do
     end
 
     context "when provided a DateTime" do
-      include_context 'using AS time zone'
+      include_context 'setting ActiveSupport time zone'
 
       let(:mongoized) do
         Date.mongoize(date_time)
@@ -307,7 +311,7 @@ describe Mongoid::Extensions::Date do
     end
 
     context "when provided an array" do
-      include_context 'using AS time zone'
+      include_context 'setting ActiveSupport time zone'
 
       let(:expected) do
         Time.utc(2010, 1, 1, 0, 0, 0)

data/spec/mongoid/extensions/date_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -7,8 +7,8 @@ describe Mongoid::Extensions::Date do
 
   describe "__mongoize_time__" do
 
-    context "when using active support's time zone" do
-      include_context 'using AS time zone'
+    context "when setting ActiveSupport time zone" do
+      include_context 'setting ActiveSupport time zone'
 
       let(:date) do
         Date.new(2010, 1, 1)
@@ -24,24 +24,6 @@ describe Mongoid::Extensions::Date do
 
       it_behaves_like 'mongoizes to AS::TimeWithZone'
     end
-
-    context "when not using active support's time zone" do
-      include_context 'not using AS time zone'
-
-      let(:date) do
-        Date.new(2010, 1, 1)
-      end
-
-      let(:expected_time) do
-        Time.local(2010, 1, 1, 0, 0, 0, 0)
-      end
-
-      let(:mongoized) do
-        date.__mongoize_time__
-      end
-
-      it_behaves_like 'mongoizes to Time'
-    end
   end
 
   describe ".demongoize" do
@@ -55,12 +37,37 @@ describe Mongoid::Extensions::Date do
     end
 
     it "keeps the date" do
-      expect(Date.demongoize(time)).to eq(expected)
+      expect(Date.demongoize(expected)).to eq(expected)
+      expect(Date.demongoize(expected)).to be_a(Date)
     end
 
     it "converts to a date" do
+      expect(Date.demongoize(time)).to eq(expected)
       expect(Date.demongoize(time)).to be_a(Date)
     end
+
+    context "when demongoizing nil" do
+
+      it "returns nil" do
+        expect(Date.demongoize(nil)).to be_nil
+      end
+    end
+
+    context "when demongoizing a bogus value" do
+
+      it "returns nil" do
+        expect(Date.demongoize("bogus")).to be_nil
+      end
+    end
+
+    context "when demongoizing a string" do
+
+      let(:date) { "2022-07-11 14:03:42 -0400" }
+
+      it "returns a date" do
+        expect(Date.demongoize(date)).to eq(date.to_date)
+      end
+    end
   end
 
   describe "#mongoize" do
@@ -77,4 +84,49 @@ describe Mongoid::Extensions::Date do
       expect(date.mongoize).to eq(time)
     end
   end
+
+  describe ".mongoize" do
+    let(:date) do
+      Date.new(2010, 1, 1)
+    end
+
+    let(:time) do
+      Time.utc(2010, 1, 1, 0, 0, 0, 0)
+    end
+
+    let(:datetime) do
+      time.to_datetime
+    end
+
+    context "when the value is a date" do
+
+      it "converts to a date" do
+        expect(Date.mongoize(date)).to eq(date)
+        expect(Date.mongoize(date)).to be_a(Time)
+      end
+    end
+
+    context "when the value is a time" do
+
+      it "keeps the time" do
+        expect(Date.mongoize(time)).to eq(date)
+        expect(Date.mongoize(time)).to be_a(Time)
+      end
+    end
+
+    context "when the value is a datetime" do
+
+      it "converts to a time" do
+        expect(Date.mongoize(datetime)).to eq(date)
+        expect(Date.mongoize(datetime)).to be_a(Time)
+      end
+    end
+
+    context "when the value is uncastable" do
+
+      it "returns nil" do
+        expect(Date.mongoize("bogus")).to be_nil
+      end
+    end
+  end
 end

data/spec/mongoid/extensions/date_time_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -19,19 +19,12 @@ describe Mongoid::Extensions::DateTime do
 
     let(:expected_time) { date_time.to_time.in_time_zone }
 
-    context "when using active support's time zone" do
-      include_context 'using AS time zone'
+    context "when setting ActiveSupport time zone" do
+      include_context 'setting ActiveSupport 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 Time'
-      it_behaves_like 'maintains precision when mongoized'
-    end
   end
 
   describe ".demongoize" do
@@ -53,14 +46,7 @@ describe Mongoid::Extensions::DateTime do
     end
 
     context "when using utc" do
-
-      before do
-        Mongoid.use_utc = true
-      end
-
-      after do
-        Mongoid.use_utc = false
-      end
+      config_override :use_utc, true
 
       context "when setting a utc time" do
 
@@ -81,14 +67,27 @@ describe Mongoid::Extensions::DateTime do
         end
       end
     end
+
+    context "when demongoizing a string" do
+
+      let(:date) { "2022-07-11 14:03:42 -0400" }
+
+      it "returns a date" do
+        expect(DateTime.demongoize(date)).to eq(date.to_datetime)
+      end
+    end
   end
 
   describe ".mongoize" do
 
     context "when the string is an invalid time" do
 
+      let(:mongoized) do
+        DateTime.mongoize("time")
+      end
+
       it "returns nil" do
-        expect(DateTime.mongoize("time")).to eq(nil)
+        expect(mongoized).to be_nil
       end
     end
   end

data/spec/mongoid/extensions/decimal128_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 

data/spec/mongoid/extensions/false_class_spec.rb

@@ -1,23 +1,16 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 
 describe Mongoid::Extensions::FalseClass do
 
-  describe "#__sortable__" do
-
-    it "returns 0" do
-      expect(false.__sortable__).to eq(0)
-    end
-  end
-
   describe "#is_a?" do
 
     context "when provided a Boolean" do
 
       it "returns true" do
-        expect(false.is_a?(Boolean)).to be true
+        expect(false.is_a?(Mongoid::Boolean)).to be true
       end
     end