mongoid 6.4.2 → 7.0.3

data/spec/mongoid/criteria/scopable_spec.rb

@@ -388,4 +388,85 @@ describe Mongoid::Criteria::Scopable do
       end
     end
   end
+
+  describe 'scope and where' do
+    class ScopeWhereModel
+      include Mongoid::Document
+
+      scope :foo, -> { where(foo: true) }
+    end
+
+    shared_examples_for 'restricts to both' do
+      it 'restricts to both' do
+        expect(result.selector['foo']).to eq(true)
+        expect(result.selector['hello']).to eq('world')
+      end
+    end
+
+    context 'scope is given first' do
+      let(:result) { ScopeWhereModel.foo.where(hello: 'world') }
+
+      it_behaves_like 'restricts to both'
+    end
+
+    context 'where is given first' do
+      let(:result) { ScopeWhereModel.where(hello: 'world').foo }
+
+      it_behaves_like 'restricts to both'
+    end
+  end
+
+  describe 'scope with argument and where' do
+    class ArgumentScopeWhereModel
+      include Mongoid::Document
+
+      scope :my_text_search, ->(search) { where('$text' => {'$search' => search}) }
+    end
+
+    shared_examples_for 'restricts to both' do
+      it 'restricts to both' do
+        expect(result.selector['$text']).to eq({'$search' => 'bar'})
+        expect(result.selector['hello']).to eq('world')
+      end
+    end
+
+    context 'scope is given first' do
+      let(:result) { ArgumentScopeWhereModel.my_text_search('bar').where(hello: 'world') }
+
+      it_behaves_like 'restricts to both'
+    end
+
+    context 'where is given first' do
+      let(:result) { ArgumentScopeWhereModel.where(hello: 'world').my_text_search('bar') }
+
+      it_behaves_like 'restricts to both'
+    end
+  end
+
+  describe 'built in text search scope and where' do
+    class TextSearchScopeWhereModel
+      include Mongoid::Document
+
+      # using the default text_search scope
+    end
+
+    shared_examples_for 'restricts to both' do
+      it 'restricts to both' do
+        expect(result.selector['$text']).to eq({'$search' => 'bar'})
+        expect(result.selector['hello']).to eq('world')
+      end
+    end
+
+    context 'scope is given first' do
+      let(:result) { TextSearchScopeWhereModel.text_search('bar').where(hello: 'world') }
+
+      it_behaves_like 'restricts to both'
+    end
+
+    context 'where is given first' do
+      let(:result) { TextSearchScopeWhereModel.where(hello: 'world').text_search('bar') }
+
+      it_behaves_like 'restricts to both'
+    end
+  end
 end

data/spec/mongoid/criteria_spec.rb

@@ -285,8 +285,23 @@ describe Mongoid::Criteria do
       Band.where(name: "Depeche Mode")
     end
 
-    it "returns the criteria as a json hash" do
-      expect(criteria.as_json).to eq([ band.serializable_hash ])
+    # as_json changed in rails 6 to call as_json on serializable_hash.
+    # https://github.com/rails/rails/commit/2e5cb980a448e7f4ab00df6e9ad4c1cc456616aa
+
+    context 'rails < 6' do
+      max_rails_version '5.2'
+
+      it "returns the criteria as a json hash" do
+        expect(criteria.as_json).to eq([ band.serializable_hash ])
+      end
+    end
+
+    context 'rails >= 6' do
+      min_rails_version '6.0'
+
+      it "returns the criteria as a json hash" do
+        expect(criteria.as_json).to eq([ band.serializable_hash.as_json ])
+      end
     end
   end
 
@@ -1444,18 +1459,18 @@ describe Mongoid::Criteria do
       end
     end
 
-    context "when including the same metadata multiple times" do
+    context "when including the same association multiple times" do
 
       let(:criteria) do
         Person.all.includes(:posts, :posts).includes(:posts)
       end
 
-      let(:metadata) do
+      let(:association) do
         Person.reflect_on_association(:posts)
       end
 
-      it "does not duplicate the metadata in the inclusions" do
-        expect(criteria.inclusions).to eq([ metadata ])
+      it "does not duplicate the association in the inclusions" do
+        expect(criteria.inclusions).to eq([ association ])
       end
     end
 
@@ -2217,12 +2232,12 @@ describe Mongoid::Criteria do
       Band.includes(:records)
     end
 
-    let(:metadata) do
+    let(:association) do
       Band.relations["records"]
     end
 
     it "returns the inclusions" do
-      expect(criteria.inclusions).to eq([ metadata ])
+      expect(criteria.inclusions).to eq([ association ])
     end
   end
 
@@ -2232,16 +2247,16 @@ describe Mongoid::Criteria do
       Band.all
     end
 
-    let(:metadata) do
+    let(:association) do
       Band.relations["records"]
     end
 
     before do
-      criteria.inclusions = [ metadata ]
+      criteria.inclusions = [ association ]
     end
 
     it "sets the inclusions" do
-      expect(criteria.inclusions).to eq([ metadata ])
+      expect(criteria.inclusions).to eq([ association ])
     end
   end
 
@@ -2409,7 +2424,7 @@ describe Mongoid::Criteria do
         end
       end
 
-      let(:metadata) do
+      let(:association) do
         Band.relations["records"]
       end
 
@@ -2434,7 +2449,7 @@ describe Mongoid::Criteria do
       end
 
       it "merges the inclusions" do
-        expect(merged.inclusions).to eq([ metadata ])
+        expect(merged.inclusions).to eq([ association ])
       end
 
       it "returns a new criteria" do
@@ -2448,7 +2463,7 @@ describe Mongoid::Criteria do
         { klass: Band, includes: [ :records ] }
       end
 
-      let(:metadata) do
+      let(:association) do
         Band.relations["records"]
       end
 
@@ -2469,7 +2484,7 @@ describe Mongoid::Criteria do
       end
 
       it "merges the inclusions" do
-        expect(merged.inclusions).to eq([ metadata ])
+        expect(merged.inclusions).to eq([ association ])
       end
 
       it "returns a new criteria" do
@@ -2494,7 +2509,7 @@ describe Mongoid::Criteria do
       end
     end
 
-    let(:metadata) do
+    let(:association) do
       Band.relations["records"]
     end
 
@@ -2519,7 +2534,7 @@ describe Mongoid::Criteria do
     end
 
     it "merges the inclusions" do
-      expect(merged.inclusions).to eq([ metadata ])
+      expect(merged.inclusions).to eq([ association ])
     end
 
     it "returns the same criteria" do
@@ -3465,7 +3480,7 @@ describe Mongoid::Criteria do
       context "when querying on a big decimal" do
 
         let(:sales) do
-          BigDecimal.new('0.1')
+          BigDecimal('0.1')
         end
 
         let!(:band) do

data/spec/mongoid/document_spec.rb

@@ -15,12 +15,12 @@ describe Mongoid::Document do
   end
 
   describe "#_destroy" do
-  
+
     it "default to false" do
       expect(Person.new._destroy).to be false
     end
   end
-  
+
   describe ".included" do
 
     let(:models) do
@@ -94,11 +94,11 @@ describe Mongoid::Document do
     context "when the document is not subclassed" do
 
       let(:types) do
-        Address._types
+        Kangaroo._types
       end
 
       it "returns the document" do
-        expect(types).to eq([ "Address" ])
+        expect(types).to eq([ "Kangaroo" ])
       end
     end
 
@@ -385,6 +385,27 @@ describe Mongoid::Document do
       Person.new(title: "Sir")
     end
 
+    describe 'id' do
+      context 'rails < 6' do
+        max_rails_version '5.2'
+
+        it 'is a BSON::ObjectId' do
+          id = person.as_json['_id']
+          expect(id).to be_a(BSON::ObjectId)
+        end
+      end
+
+      context 'rails >= 6' do
+        min_rails_version '6.0'
+
+        it 'is a hash with $oid' do
+          id = person.as_json['_id']
+          expect(id).to be_a(Hash)
+          expect(id['$oid']).to be_a(String)
+        end
+      end
+    end
+
     context "when no options are provided" do
 
       it "does not apply any options" do
@@ -433,6 +454,64 @@ describe Mongoid::Document do
         end
       end
     end
+
+    context ':compact option' do
+      # Since rails 6 differs in how it treats id fields,
+      # run this test on one version of rails. Currently rails 6 is in beta,
+      # when it is released this version should be changed to 6.
+      max_rails_version '5.2'
+
+      before do
+        # These tests require a specific set of defined attributes
+        # on the model
+        expect(church.as_json.keys.sort).to eq(%w(_id location name))
+      end
+
+      context 'there is a nil valued attribute' do
+        let(:church) do
+          Church.create!(name: 'St. Basil')
+        end
+
+        it 'returns non-nil fields and _id only' do
+          actual = church.as_json(compact: true)
+          expect(actual).to eq('_id' => church.id, 'name' => 'St. Basil')
+        end
+      end
+
+      context 'all attrbutes are nil valued' do
+        let(:church) do
+          Church.create!
+        end
+
+        it 'returns a hash with _id only' do
+          actual = church.as_json(compact: true)
+          expect(actual).to eq('_id' => church.id)
+        end
+      end
+
+      context 'there are no nil valued attributes' do
+        let(:church) do
+          Church.create!(name: 'St. Basil', location: {})
+        end
+
+        it 'returns all fields and _id' do
+          actual = church.as_json(compact: true)
+          expect(actual).to eq('_id' => church.id, 'name' => 'St. Basil',
+            'location' => {})
+        end
+      end
+
+      context 'when option is specified as a truthy value' do
+        let(:church) do
+          Church.create!(name: 'St. Basil')
+        end
+
+        it 'returns non-nil fields and _id only' do
+          actual = church.as_json(compact: 1)
+          expect(actual).to eq('_id' => church.id, 'name' => 'St. Basil')
+        end
+      end
+    end
   end
 
   describe "#as_document" do

data/spec/mongoid/extensions/array_spec.rb

@@ -204,14 +204,10 @@ describe Mongoid::Extensions::Array do
 
     context "when the related model uses object ids" do
 
-      let(:metadata) do
+      let(:association) do
         Person.relations["preferences"]
       end
 
-      let(:constraint) do
-        metadata.constraint
-      end
-
       context "when provided an object id" do
 
         let(:object_id) do
@@ -219,7 +215,7 @@ describe Mongoid::Extensions::Array do
         end
 
         let(:fk) do
-          Array.__mongoize_fk__(constraint, object_id)
+          Array.__mongoize_fk__(association, object_id)
         end
 
         it "returns the object id as an array" do
@@ -234,7 +230,7 @@ describe Mongoid::Extensions::Array do
         end
 
         let(:fk) do
-          Array.__mongoize_fk__(constraint, [ object_id ])
+          Array.__mongoize_fk__(association, [ object_id ])
         end
 
         it "returns the object ids" do
@@ -251,7 +247,7 @@ describe Mongoid::Extensions::Array do
           end
 
           let(:fk) do
-            Array.__mongoize_fk__(constraint, object_id.to_s)
+            Array.__mongoize_fk__(association, object_id.to_s)
           end
 
           it "returns the object id in an array" do
@@ -266,7 +262,7 @@ describe Mongoid::Extensions::Array do
           end
 
           let(:fk) do
-            Array.__mongoize_fk__(constraint, string)
+            Array.__mongoize_fk__(association, string)
           end
 
           it "returns the string in an array" do
@@ -277,7 +273,7 @@ describe Mongoid::Extensions::Array do
         context "when the string is blank" do
 
           let(:fk) do
-            Array.__mongoize_fk__(constraint, "")
+            Array.__mongoize_fk__(association, "")
           end
 
           it "returns an empty array" do
@@ -289,7 +285,7 @@ describe Mongoid::Extensions::Array do
       context "when provided nil" do
 
         let(:fk) do
-          Array.__mongoize_fk__(constraint, nil)
+          Array.__mongoize_fk__(association, nil)
         end
 
         it "returns an empty array" do
@@ -306,7 +302,7 @@ describe Mongoid::Extensions::Array do
           end
 
           let(:fk) do
-            Array.__mongoize_fk__(constraint, [ object_id.to_s ])
+            Array.__mongoize_fk__(association, [ object_id.to_s ])
           end
 
           it "returns the object id in an array" do
@@ -321,7 +317,7 @@ describe Mongoid::Extensions::Array do
           end
 
           let(:fk) do
-            Array.__mongoize_fk__(constraint, [ string ])
+            Array.__mongoize_fk__(association, [ string ])
           end
 
           it "returns the string in an array" do
@@ -332,7 +328,7 @@ describe Mongoid::Extensions::Array do
         context "when the strings are blank" do
 
           let(:fk) do
-            Array.__mongoize_fk__(constraint, [ "", "" ])
+            Array.__mongoize_fk__(association, [ "", "" ])
           end
 
           it "returns an empty array" do
@@ -344,7 +340,7 @@ describe Mongoid::Extensions::Array do
       context "when provided nils" do
 
         let(:fk) do
-          Array.__mongoize_fk__(constraint, [ nil, nil, nil ])
+          Array.__mongoize_fk__(association, [ nil, nil, nil ])
         end
 
         it "returns an empty array" do

data/spec/mongoid/extensions/big_decimal_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Mongoid::Extensions::BigDecimal do
 
   let(:big_decimal) do
-    BigDecimal.new("123456.789")
+    BigDecimal("123456.789")
   end
 
   describe ".demongoize" do
@@ -26,7 +26,7 @@ describe Mongoid::Extensions::BigDecimal do
       end
 
       it "returns a BigDecimal" do
-        expect(BigDecimal.demongoize(string)).to eq(BigDecimal.new(string))
+        expect(BigDecimal.demongoize(string)).to eq(BigDecimal(string))
       end
     end
 
@@ -37,7 +37,7 @@ describe Mongoid::Extensions::BigDecimal do
       end
 
       it "returns a BigDecimal" do
-        expect(BigDecimal.demongoize(string)).to eq(BigDecimal.new(string))
+        expect(BigDecimal.demongoize(string)).to eq(BigDecimal(string))
       end
     end
 
@@ -48,7 +48,7 @@ describe Mongoid::Extensions::BigDecimal do
       end
 
       it "returns a BigDecimal" do
-        expect(BigDecimal.demongoize(string)).to eq(BigDecimal.new(string))
+        expect(BigDecimal.demongoize(string)).to eq(BigDecimal(string))
       end
     end
 
@@ -184,7 +184,7 @@ describe Mongoid::Extensions::BigDecimal do
     context "when the value is the BigDecimal zero" do
 
       let(:big_decimal) do
-        BigDecimal.new("0.0")
+        BigDecimal("0.0")
       end
 
       it "returns a BigDecimal" do
@@ -195,7 +195,7 @@ describe Mongoid::Extensions::BigDecimal do
     context "when the value is the BigDecimal negative zero" do
 
       let(:big_decimal) do
-        BigDecimal.new("-0.0")
+        BigDecimal("-0.0")
       end
 
       it "returns a BigDecimal" do
@@ -326,7 +326,7 @@ describe Mongoid::Extensions::BigDecimal do
     context "when the value is BigDecimal NaN" do
 
       let(:nan) do
-        BigDecimal.new("NaN")
+        BigDecimal("NaN")
       end
 
       it "returns a String" do
@@ -337,7 +337,7 @@ describe Mongoid::Extensions::BigDecimal do
     context "when the value is BigDecimal Infinity" do
 
       let(:infinity) do
-        BigDecimal.new("Infinity")
+        BigDecimal("Infinity")
       end
 
       it "returns a String" do
@@ -348,7 +348,7 @@ describe Mongoid::Extensions::BigDecimal do
     context "when the value is BigDecimal negative Infinity" do
 
       let(:neg_infinity) do
-        BigDecimal.new("-Infinity")
+        BigDecimal("-Infinity")
       end
 
       it "returns a String" do

data/spec/mongoid/extensions/hash_spec.rb

@@ -230,10 +230,27 @@ describe Mongoid::Extensions::Hash do
     it "should retrieve a nested value under the provided key" do
       expect(nested).to eq "hundred"
     end
+
+    context 'and the value is falsey' do
+      let(:hash) do
+        { "100" => { "name" => false } }
+      end
+      it "should retrieve the falsey nested value under the provided key" do
+        expect(nested).to eq false
+      end
+    end
+
+    context 'and the value is nil' do
+      let(:hash) do
+        { "100" => { 0 => "Please don't return this value!" } }
+      end
+      it "should retrieve the nil nested value under the provided key" do
+        expect(nested).to eq nil
+      end
+    end
   end
 
   context "when the hash key is an integer" do
-
     let(:hash) do
       { 100 => { "name" => "hundred" } }
     end

data/spec/mongoid/extensions/object_spec.rb

@@ -39,14 +39,10 @@ describe Mongoid::Extensions::Object do
 
     context "when the related model uses object ids" do
 
-      let(:metadata) do
+      let(:association) do
         Game.relations["person"]
       end
 
-      let(:constraint) do
-        metadata.constraint
-      end
-
       context "when provided an object id" do
 
         let(:object_id) do
@@ -54,7 +50,7 @@ describe Mongoid::Extensions::Object do
         end
 
         let(:fk) do
-          Object.__mongoize_fk__(constraint, object_id)
+          Object.__mongoize_fk__(association, object_id)
         end
 
         it "returns the object id" do
@@ -71,7 +67,7 @@ describe Mongoid::Extensions::Object do
           end
 
           let(:fk) do
-            Object.__mongoize_fk__(constraint, object_id.to_s)
+            Object.__mongoize_fk__(association, object_id.to_s)
           end
 
           it "returns the object id" do
@@ -86,7 +82,7 @@ describe Mongoid::Extensions::Object do
           end
 
           let(:fk) do
-            Object.__mongoize_fk__(constraint, string)
+            Object.__mongoize_fk__(association, string)
           end
 
           it "returns the string" do
@@ -97,7 +93,7 @@ describe Mongoid::Extensions::Object do
         context "when the string is blank" do
 
           let(:fk) do
-            Object.__mongoize_fk__(constraint, "")
+            Object.__mongoize_fk__(association, "")
           end
 
           it "returns nil" do
@@ -109,7 +105,7 @@ describe Mongoid::Extensions::Object do
       context "when provided nil" do
 
         let(:fk) do
-          Object.__mongoize_fk__(constraint, nil)
+          Object.__mongoize_fk__(association, nil)
         end
 
         it "returns nil" do
@@ -120,7 +116,7 @@ describe Mongoid::Extensions::Object do
       context "when provided an empty array" do
 
         let(:fk) do
-          Object.__mongoize_fk__(constraint, [])
+          Object.__mongoize_fk__(association, [])
         end
 
         it "returns an empty array" do

data/spec/mongoid/extensions/range_spec.rb

@@ -139,6 +139,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

@@ -35,6 +35,29 @@ describe Mongoid::Extensions::Regexp do
       it "returns the provided value as a regex" do
         expect(value).to eq(/[^abc]/)
       end
+
+
+      context "when the string is empty" do
+
+        let(:value) do
+          Regexp.mongoize("")
+        end
+
+        it "returns an empty regex" do
+          expect(value).to eq(//)
+        end
+      end
+    end
+
+    context "when the value is nil" do
+
+      let(:value) do
+        Regexp.mongoize(nil)
+      end
+
+      it "returns the nil" do
+        expect(value).to be_nil
+      end
     end
   end