mongoid 5.4.0 → 6.4.8

data/spec/mongoid/extensions/string_spec.rb

@@ -277,28 +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".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".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".numeric?).to eq(true)
       end
     end
   end

data/spec/mongoid/extensions/time_spec.rb

@@ -204,12 +204,8 @@ describe Mongoid::Extensions::Time do
 
       context "when the string is an invalid time" do
 
-        let(:epoch) do
-          Time.utc(1970, 1, 1, 0, 0, 0, 0)
-        end
-
-        it "converts the time to epoch" do
-          expect(Time.mongoize("time")).to eq(epoch)
+        it "converts the time to nil" do
+          expect(Time.mongoize("time")).to eq(nil)
         end
       end
 

data/spec/mongoid/extensions/time_with_zone_spec.rb

@@ -204,12 +204,8 @@ describe Mongoid::Extensions::TimeWithZone do
 
       context "when the string is an invalid time" do
 
-        let(:epoch) do
-          Time.utc(1970, 1, 1, 0, 0, 0)
-        end
-
-        it "returns epoch" do
-          expect(ActiveSupport::TimeWithZone.mongoize("time")).to eq(epoch)
+        it "returns nil" do
+          expect(ActiveSupport::TimeWithZone.mongoize("time")).to eq(nil)
         end
       end
 

data/spec/mongoid/factory_spec.rb

@@ -88,6 +88,17 @@ describe Mongoid::Factory do
         expect(person.title).to eq("Sir")
       end
     end
+
+    context "when the type is a symbol" do
+
+      let(:person) do
+        described_class.build(Person, {:_type => "Doctor"})
+      end
+
+      it "instantiates the subclass" do
+        expect(person.class).to eq(Doctor)
+      end
+    end
   end
 
   describe ".from_db" do

data/spec/mongoid/fields_spec.rb

@@ -1171,7 +1171,7 @@ describe Mongoid::Fields do
     end
 
     let(:decimal) do
-      BigDecimal.new("1000000.00")
+      BigDecimal("1000000.00")
     end
 
     context "when setting to a big decimal" do

data/spec/mongoid/findable_spec.rb

@@ -10,7 +10,7 @@ describe Mongoid::Findable do
     end
 
     it "returns the distinct values for the field" do
-      expect(Band.distinct(:name)).to eq([ "Tool", "Photek" ])
+      expect(Band.distinct(:name).sort).to eq([ "Photek", "Tool" ])
     end
   end
 
@@ -476,7 +476,7 @@ describe Mongoid::Findable do
     end
   end
 
-  Origin::Selectable.forwardables.each do |method|
+  Mongoid::Criteria::Queryable::Selectable.forwardables.each do |method|
 
     describe "##{method}" do
 
@@ -485,4 +485,49 @@ describe Mongoid::Findable do
       end
     end
   end
+
+  context 'when Mongoid is configured to use activesupport time zone' do
+
+    before do
+      Mongoid.use_utc = false
+      Mongoid.use_activesupport_time_zone = true
+      Time.zone = "Asia/Kolkata"
+    end
+
+    let!(:time) do
+      Time.zone.now.tap do |t|
+        User.create(last_login: t, name: 'Tom')
+      end
+    end
+
+    it 'uses activesupport time zone' do
+      expect(User.distinct(:last_login).first.to_s).to eql(time.in_time_zone('Asia/Kolkata').to_s)
+    end
+
+    it 'loads other fields accurately' do
+      expect(User.distinct(:name)).to match_array(['Tom'])
+    end
+  end
+
+  context 'when Mongoid is not configured to use activesupport time zone' do
+
+    before do
+      Mongoid.use_utc = true
+      Mongoid.use_activesupport_time_zone = false
+    end
+
+    let!(:time) do
+      Time.now.tap do |t|
+        User.create(last_login: t, name: 'Tom')
+      end
+    end
+
+    it 'uses utc' do
+      expect(User.distinct(:last_login).first.to_s).to eql(time.utc.to_s)
+    end
+
+    it 'loads other fields accurately' do
+      expect(User.distinct(:name)).to match_array(['Tom'])
+    end
+  end
 end

data/spec/mongoid/indexable_spec.rb

@@ -2,6 +2,10 @@ require "spec_helper"
 
 describe Mongoid::Indexable do
 
+  after do
+    Person.collection.drop
+  end
+
   describe ".included" do
 
     let(:klass) do
@@ -58,7 +62,9 @@ describe Mongoid::Indexable do
       end
 
       let(:indexes) do
-        klass.with(database: "mongoid_optional").collection.indexes
+        klass.with(database: "mongoid_optional") do |klass|
+          klass.collection.indexes
+        end
       end
 
       it "creates the indexes" do
@@ -107,7 +113,9 @@ describe Mongoid::Indexable do
       end
 
       let(:indexes) do
-        klass.with(database: "mongoid_optional").collection.indexes
+        klass.with(database: "mongoid_optional") do |klass|
+          klass.collection.indexes
+        end
       end
 
       it "creates the indexes" do
@@ -121,7 +129,7 @@ describe Mongoid::Indexable do
         Class.new do
           include Mongoid::Document
           store_in collection: "test_db_indexes"
-          index({name: 1}, {collation: {locale: 'en_US', strength: 2}})
+          index({ name: 1 }, { collation: { locale: 'en_US', strength: 2 }})
         end
       end
 
@@ -181,6 +189,10 @@ describe Mongoid::Indexable do
       end
     end
 
+    after do
+      klass.collection.drop
+    end
+
     context "when indexing a field that is aliased" do
 
       before do

data/spec/mongoid/interceptable_spec.rb

@@ -280,13 +280,18 @@ describe Mongoid::Interceptable do
       end
     end
 
-    context "callback returns false" do
+    context "callback aborts the callback chain" do
 
       before do
-        expect(artist).to receive(:before_create_stub).once.and_return(false)
+        Artist.before_create(:before_create_fail_stub)
+        expect(artist).to receive(:before_create_fail_stub).once.and_call_original
         artist.save
       end
 
+      after do
+        Artist.reset_callbacks(:create)
+      end
+
       it "does not get saved" do
         expect(artist.persisted?).to be false
       end
@@ -316,13 +321,18 @@ describe Mongoid::Interceptable do
         end
       end
 
-      context "when callback returns false" do
+      context "when callback halts the callback chain" do
 
         before do
-          expect(artist).to receive(:before_save_stub).once.and_return(false)
+          Artist.before_save(:before_save_fail_stub)
+        end
+
+        after do
+          Artist.reset_callbacks(:save)
         end
 
         it "the save returns false" do
+          expect(artist).to receive(:before_save_fail_stub).once.and_call_original
           expect(artist.save).to be false
         end
       end
@@ -343,7 +353,7 @@ describe Mongoid::Interceptable do
       context "when the callback returns true" do
 
         before do
-          expect(artist).to receive(:before_save_stub).once.and_return(true)
+          expect(artist).to receive(:before_update_stub).once.and_return(true)
         end
 
         it "the save returns true" do
@@ -351,13 +361,18 @@ describe Mongoid::Interceptable do
         end
       end
 
-      context "when the callback returns false" do
+      context "when the callback halts the callback chain" do
 
         before do
-          expect(artist).to receive(:before_save_stub).once.and_return(false)
+          Artist.before_update(:before_update_fail_stub)
+        end
+
+        after do
+          Artist.reset_callbacks(:update)
         end
 
         it "the save returns false" do
+          expect(artist).to receive(:before_update_fail_stub).once.and_call_original
           expect(artist.save).to be false
         end
       end
@@ -389,13 +404,18 @@ describe Mongoid::Interceptable do
       end
     end
 
-    context "when the callback returns false" do
+    context "when the callback halts the callback chain" do
 
       before do
-        expect(artist).to receive(:before_destroy_stub).once.and_return(false)
+        Artist.before_destroy(:before_destroy_fail_stub)
+      end
+
+      after do
+        Artist.reset_callbacks(:destroy)
       end
 
       it "the destroy returns false" do
+        expect(artist).to receive(:before_destroy_fail_stub).once.and_call_original
         expect(artist.destroy).to be false
       end
     end
@@ -464,32 +484,40 @@ describe Mongoid::Interceptable do
 
       context "when the child does not have the same callback defined" do
 
-        let(:band) do
-          Band.new
+        let(:exhibition) do
+          Exhibition.new
         end
 
-        let!(:record) do
-          band.records.build
+        let!(:exhibitor) do
+          exhibition.exhibitors.build
         end
 
         context "when running the callbacks directly" do
 
           before(:all) do
-            Band.define_model_callbacks(:rearrange)
-            Band.after_rearrange { }
+            Exhibition.define_model_callbacks(:rearrange)
+            Exhibition.after_rearrange { }
           end
 
           after(:all) do
-            Band.reset_callbacks(:rearrange)
+            Exhibition.reset_callbacks(:rearrange)
           end
 
           it "does not cascade to the child" do
-            expect(band.run_callbacks(:rearrange)).to be true
+            expect(exhibition.run_callbacks(:rearrange)).to be true
           end
         end
 
         context "when the callbacks get triggered by a destroy" do
 
+          let(:band) do
+            Band.new
+          end
+
+          let!(:record) do
+            band.records.build
+          end
+
           before(:all) do
             Band.define_model_callbacks(:rearrange)
             Band.set_callback(:validation, :before) do
@@ -498,7 +526,7 @@ describe Mongoid::Interceptable do
           end
 
           after(:all) do
-            Band.reset_callbacks(:rearrange)
+            begin; Band.reset_callbacks(:rearrange); rescue; end
           end
 
           let(:attributes) do
@@ -1132,6 +1160,25 @@ describe Mongoid::Interceptable do
               expect(band.reload.records.first.before_validation_called).to be true
             end
           end
+
+          context 'when the parent is updated' do
+
+            let(:band) do
+              Band.create(name: "Moderat")
+            end
+
+            before do
+              band.update(records: [ { name: 'Black on Both Sides' }])
+            end
+
+            it 'executes the callback' do
+              expect(band.records.first.before_validation_called).to be true
+            end
+
+            it 'persists the change' do
+              expect(band.reload.records.first.before_validation_called).to be true
+            end
+          end
         end
 
         context "when the child is persisted" do
@@ -1434,6 +1481,25 @@ describe Mongoid::Interceptable do
         end
       end
 
+      describe '#after_destroy' do
+
+        context 'when the parent is updated in a child after_destroy callback' do
+
+          let!(:person) do
+            Person.create!(ordered_posts: [OrderedPost.new])
+          end
+
+          before do
+            post = OrderedPost.first
+            post.destroy
+          end
+
+          it 'updates the parent' do
+            expect(person.reload.title).to eq('Minus one ordered post.')
+          end
+        end
+      end
+
       describe "#before_validation" do
 
         context "when the child is new" do
@@ -1544,7 +1610,7 @@ describe Mongoid::Interceptable do
 
     before(:all) do
       Person.before_save do |doc|
-        doc.mode != :prevent_save
+        throw(:abort) if doc.mode == :prevent_save
       end
     end
 

data/spec/mongoid/matchable/all_spec.rb

@@ -6,25 +6,25 @@ describe Mongoid::Matchable::All do
     described_class.new(["first", "second", "third"])
   end
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context "when the attribute includes all of the values" do
 
       it "returns true" do
-        expect(matcher.matches?("$all" => ["first", /\Asec.*\z/])).to be true
+        expect(matcher._matches?("$all" => ["first", /\Asec.*\z/])).to be true
       end
     end
 
     context "when the attributes doesn't include all of the values" do
 
       it "returns false" do
-        expect(matcher.matches?("$all" => ["second", "third", "fourth"])).to be false
+        expect(matcher._matches?("$all" => ["second", "third", "fourth"])).to be false
       end
     end
 
     context "when the value is empty" do
       it "returns false" do
-        expect(matcher.matches?("$all" => [])).to be false
+        expect(matcher._matches?("$all" => [])).to be false
       end
     end
   end

data/spec/mongoid/matchable/and_spec.rb

@@ -10,7 +10,7 @@ describe Mongoid::Matchable::And do
     described_class.new("value", person)
   end
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context "when provided a simple expression" do
 
@@ -19,7 +19,7 @@ describe Mongoid::Matchable::And do
         context "when the value matches" do
 
           let(:matches) do
-            matcher.matches?([ { title: "Sir" } ])
+            matcher._matches?([ { title: "Sir" } ])
           end
 
           before do
@@ -34,7 +34,7 @@ describe Mongoid::Matchable::And do
         context "when the expression is a $not" do
 
           let(:matches) do
-            matcher.matches?([ { title: {:$not => /Foobar/ } }])
+            matcher._matches?([ { title: {:$not => /Foobar/ } }])
           end
 
           context "when the value matches" do
@@ -59,7 +59,7 @@ describe Mongoid::Matchable::And do
         context "when the value does not match" do
 
           let(:matches) do
-            matcher.matches?([ { title: "Sir" } ])
+            matcher._matches?([ { title: "Sir" } ])
           end
 
           it "returns false" do
@@ -73,7 +73,7 @@ describe Mongoid::Matchable::And do
         context "when all of the values are equal" do
 
           let(:matches) do
-            matcher.matches?(
+            matcher._matches?(
               [ { title: "Sir" }, { _id: person.id } ]
             )
           end
@@ -90,7 +90,7 @@ describe Mongoid::Matchable::And do
         context "when one of the values does not match" do
 
           let(:matches) do
-            matcher.matches?(
+            matcher._matches?(
               [ { title: "Sir" }, { _id: BSON::ObjectId.new } ]
             )
           end
@@ -107,7 +107,7 @@ describe Mongoid::Matchable::And do
         context "when provided no expressions" do
 
           let(:matches) do
-            matcher.matches?([])
+            matcher._matches?([])
           end
 
           it "returns true" do
@@ -122,7 +122,7 @@ describe Mongoid::Matchable::And do
       context "when all of the values are equal" do
 
         let(:matches) do
-          matcher.matches?(
+          matcher._matches?(
             [
               { title: { "$in" => [ "Sir", "Madam" ] } },
               { _id: person.id }
@@ -142,7 +142,7 @@ describe Mongoid::Matchable::And do
       context "when one of the values does not match" do
 
         let(:matches) do
-          matcher.matches?(
+          matcher._matches?(
             [
               { title: { "$in" => [ "Prince", "Madam" ] } },
               { _id: BSON::ObjectId.new }
@@ -164,7 +164,7 @@ describe Mongoid::Matchable::And do
         context "when all the expressions match" do
 
           let(:matches) do
-            matcher.matches?(
+            matcher._matches?(
               [
                 { title: "Sir", age: 23 },
                 { _id: person.id }

data/spec/mongoid/matchable/default_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Mongoid::Matchable::Default do
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context "when comparing strings" do
 
@@ -13,14 +13,14 @@ describe Mongoid::Matchable::Default do
       context "when the values are equal" do
 
         it "returns true" do
-          expect(matcher.matches?("Testing")).to be true
+          expect(matcher._matches?("Testing")).to be true
         end
       end
 
       context "when the values are not equal" do
 
         it "returns false" do
-          expect(matcher.matches?("Other")).to be false
+          expect(matcher._matches?("Other")).to be false
         end
       end
     end
@@ -38,14 +38,14 @@ describe Mongoid::Matchable::Default do
       context "when the values are equal" do
 
         it "returns true" do
-          expect(matcher.matches?(object_id)).to be true
+          expect(matcher._matches?(object_id)).to be true
         end
       end
 
       context "when the values are not equal" do
 
         it "returns false" do
-          expect(matcher.matches?(BSON::ObjectId.new)).to be false
+          expect(matcher._matches?(BSON::ObjectId.new)).to be false
         end
       end
     end
@@ -61,14 +61,14 @@ describe Mongoid::Matchable::Default do
         context "when the value is a string" do
 
           it "returns true" do
-            expect(matcher.matches?("Test1")).to be true
+            expect(matcher._matches?("Test1")).to be true
           end
         end
 
         context "when the value is a regexp" do
 
           it "returns true" do
-            expect(matcher.matches?(/^Test[3-5]$/)).to be true
+            expect(matcher._matches?(/^Test[3-5]$/)).to be true
           end
         end
       end
@@ -76,7 +76,7 @@ describe Mongoid::Matchable::Default do
       context "when the attribute does not contain the value" do
 
         it "returns false" do
-          expect(matcher.matches?("Test4")).to be false
+          expect(matcher._matches?("Test4")).to be false
         end
       end
     end
@@ -94,14 +94,14 @@ describe Mongoid::Matchable::Default do
       context "when the attribute contains the value" do
 
         it "returns true" do
-          expect(matcher.matches?(object_id)).to be true
+          expect(matcher._matches?(object_id)).to be true
         end
       end
 
       context "when the attribute does not contain the value" do
 
         it "returns false" do
-          expect(matcher.matches?(BSON::ObjectId.new)).to be false
+          expect(matcher._matches?(BSON::ObjectId.new)).to be false
         end
       end
     end
@@ -115,14 +115,14 @@ describe Mongoid::Matchable::Default do
       context "when the attribute contains the value" do
 
         it "returns true" do
-          expect(matcher.matches?(["Test1", "Test2", "Test3"])).to be true
+          expect(matcher._matches?(["Test1", "Test2", "Test3"])).to be true
         end
       end
 
       context "when the attribute does not contain the value" do
 
         it "returns false" do
-          expect(matcher.matches?(["Test1", "Test2"])).to be false
+          expect(matcher._matches?(["Test1", "Test2"])).to be false
         end
       end
     end