mongoid 8.1.4 → 9.0.0

data/spec/mongoid/criteria/queryable/key_spec.rb

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

data/spec/mongoid/criteria/queryable/mergeable_spec.rb

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

data/spec/mongoid/criteria/queryable/optional_spec.rb

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

data/spec/mongoid/criteria/queryable/options_spec.rb

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

data/spec/mongoid/criteria/queryable/pipeline_spec.rb

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

data/spec/mongoid/criteria/queryable/queryable_spec.rb

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

data/spec/mongoid/criteria/queryable/selectable_logical_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -1662,7 +1663,7 @@ describe Mongoid::Criteria::Queryable::Selectable do
             # Date instance is converted to a Time instance in local time,
             # because we are querying on a Time field and dates are interpreted
             # in local time when assigning to Time fields
-            {'published' => {'$gt' => Time.local(2020, 2, 3)}},
+            {'published' => {'$gt' => Time.zone.local(2020, 2, 3)}},
           ]}
         end
       end
@@ -2426,7 +2427,7 @@ describe Mongoid::Criteria::Queryable::Selectable do
 
       context 'when a criterion has an aliased field' do
         let(:selection) { query.none_of({ id: 1 }) }
-        
+
         it 'adds the $nor selector and aliases the field' do
           expect(selection.selector).to eq('$nor' => [{ '_id' => 1 }])
         end
@@ -2513,7 +2514,7 @@ describe Mongoid::Criteria::Queryable::Selectable do
             # Date instance is converted to a Time instance in local time,
             # because we are querying on a Time field and dates are interpreted
             # in local time when assigning to Time fields
-            {'published' => {'$gt' => Time.local(2020, 2, 3) } },
+            {'published' => {'$gt' => Time.zone.local(2020, 2, 3) } },
           ] }
         end
       end

data/spec/mongoid/criteria/queryable/selectable_shared_examples.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 shared_examples_for "returns a cloned query" do
 

data/spec/mongoid/criteria/queryable/selectable_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 require_relative './selectable_shared_examples'
@@ -479,24 +480,10 @@ describe Mongoid::Criteria::Queryable::Selectable do
           query.elem_match(users: { name: "value" })
         end
 
-        context "when overwrite_chained_operators is false" do
-          config_override :overwrite_chained_operators, false
-
-          it "adds the $elemMatch expression" do
-            expect(selection.selector).to eq({
-              "users" => { "$elemMatch" => { "name" => "value" }}
-            })
-          end
-        end
-
-        context "when overwrite_chained_operators is true" do
-          config_override :overwrite_chained_operators, true
-
-          it "adds the $elemMatch expression" do
-            expect(selection.selector).to eq({
-              "users" => { "$elemMatch" => { name: "value" }}
-            })
-          end
+        it "adds the $elemMatch expression" do
+          expect(selection.selector).to eq({
+            "users" => { "$elemMatch" => { "name" => "value" }}
+          })
         end
 
         it "returns a cloned query" do
@@ -537,26 +524,11 @@ describe Mongoid::Criteria::Queryable::Selectable do
           )
         end
 
-        context "when overwrite_chained_operators is false" do
-          config_override :overwrite_chained_operators, false
-
-          it "adds the $elemMatch expression" do
-            expect(selection.selector).to eq({
-              "users" => { "$elemMatch" => { "name" => "value" }},
-              "comments" => { "$elemMatch" => { "text" => "value" }}
-            })
-          end
-        end
-
-        context "when overwrite_chained_operators is true" do
-          config_override :overwrite_chained_operators, true
-
-          it "adds the $elemMatch expression" do
-            expect(selection.selector).to eq({
-              "users" => { "$elemMatch" => { name: "value" }},
-              "comments" => { "$elemMatch" => { text: "value" }}
-            })
-          end
+        it "adds the $elemMatch expression" do
+          expect(selection.selector).to eq({
+            "users" => { "$elemMatch" => { "name" => "value" }},
+            "comments" => { "$elemMatch" => { "text" => "value" }}
+          })
         end
 
         it "returns a cloned query" do
@@ -575,26 +547,11 @@ describe Mongoid::Criteria::Queryable::Selectable do
             elem_match(comments: { text: "value" })
         end
 
-        context "when overwrite_chained_operators is false" do
-          config_override :overwrite_chained_operators, false
-
-          it "adds the $elemMatch expression" do
-            expect(selection.selector).to eq({
-              "users" => { "$elemMatch" => { "name" => "value" }},
-              "comments" => { "$elemMatch" => { "text" => "value" }}
-            })
-          end
-        end
-
-        context "when overwrite_chained_operators is true" do
-          config_override :overwrite_chained_operators, true
-
-          it "adds the $elemMatch expression" do
-            expect(selection.selector).to eq({
-              "users" => { "$elemMatch" => { name: "value" }},
-              "comments" => { "$elemMatch" => { text: "value" }}
-            })
-          end
+        it "adds the $elemMatch expression" do
+          expect(selection.selector).to eq({
+            "users" => { "$elemMatch" => { "name" => "value" }},
+            "comments" => { "$elemMatch" => { "text" => "value" }}
+          })
         end
 
         it "returns a cloned query" do
@@ -610,25 +567,11 @@ describe Mongoid::Criteria::Queryable::Selectable do
             elem_match(users: { state: "new" })
         end
 
-        context "when overwrite_chained_operators is false" do
-          config_override :overwrite_chained_operators, false
-
-          it "adds an $elemMatch expression" do
-            expect(selection.selector).to eq({
-              "users" => { "$elemMatch" => { "name" => "value" } },
-              "$and" => [ { "users" => { "$elemMatch" => { "state" => "new" } } } ],
-            })
-          end
-        end
-
-        context "when overwrite_chained_operators is true" do
-          config_override :overwrite_chained_operators, true
-
-          it "overrides the $elemMatch expression" do
-            expect(selection.selector).to eq({
-              "users" => { "$elemMatch" => { state: "new" }}
-            })
-          end
+        it "adds an $elemMatch expression" do
+          expect(selection.selector).to eq({
+            "users" => { "$elemMatch" => { "name" => "value" } },
+            "$and" => [ { "users" => { "$elemMatch" => { "state" => "new" } } } ],
+          })
         end
 
         it "returns a cloned query" do
@@ -938,40 +881,19 @@ describe Mongoid::Criteria::Queryable::Selectable do
 
       context "when the criterion are on the same field" do
 
-        context "when overwrite_chained_operators is true" do
-          config_override :overwrite_chained_operators, true
-
-          let(:selection) do
-            query.gt(first: 10).gt(first: 15)
-          end
-
-          it "overwrites the first $gt selector" do
-            expect(selection.selector).to eq({
-              "first" => { "$gt" => 15 },
-              })
-          end
-
-          it "returns a cloned query" do
-            expect(selection).to_not equal(query)
-          end
+        let(:selection) do
+          query.gt(first: 10).gt(first: 15)
         end
 
-        context "when overwrite_chained_operators is false" do
-          config_override :overwrite_chained_operators, false
-          let(:selection) do
-            query.gt(first: 10).gt(first: 15)
-          end
-
-          it "overwrites the first $gt selector" do
-            expect(selection.selector).to eq({
-              "first" => { "$gt" => 10 },
-              "$and" => [{ "first" => { "$gt" => 15 } }]
-              })
-          end
+        it "adds a second $gt selector" do
+          expect(selection.selector).to eq({
+            "first" => { "$gt" => 10 },
+            "$and" => [{ "first" => { "$gt" => 15 } }]
+            })
+        end
 
-          it "returns a cloned query" do
-            expect(selection).to_not equal(query)
-          end
+        it "returns a cloned query" do
+          expect(selection).to_not equal(query)
         end
       end
     end
@@ -1048,25 +970,11 @@ describe Mongoid::Criteria::Queryable::Selectable do
           query.gte(first: 10).gte(first: 15)
         end
 
-        context "when overwrite_chained_operators is false" do
-          config_override :overwrite_chained_operators, false
-
-          it "adds a second $gte selector" do
-            expect(selection.selector).to eq({
-              "first" =>  { "$gte" => 10 },
-              "$and" => [ { "first" => { "$gte" => 15 } } ]
-            })
-          end
-        end
-
-        context "when overwrite_chained_operators is true" do
-          config_override :overwrite_chained_operators, true
-
-          it "overwrites the first $gte selector" do
-            expect(selection.selector).to eq({
-              "first" =>  { "$gte" => 15 }
-            })
-          end
+        it "adds a second $gte selector" do
+          expect(selection.selector).to eq({
+            "first" =>  { "$gte" => 10 },
+            "$and" => [ { "first" => { "$gte" => 15 } } ]
+          })
         end
 
         it "returns a cloned query" do
@@ -1240,25 +1148,11 @@ describe Mongoid::Criteria::Queryable::Selectable do
           query.lt(first: 10).lt(first: 15)
         end
 
-        context "when overwrite_chained_operators is false" do
-          config_override :overwrite_chained_operators, false
-
-          it "adds a second $lt selector" do
-            expect(selection.selector).to eq({
-              "first" =>  { "$lt" => 10 },
-              "$and" => [ { "first" => { "$lt" => 15 } } ]
-            })
-          end
-        end
-
-        context "when overwrite_chained_operators is true" do
-          config_override :overwrite_chained_operators, true
-
-          it "overwrites the first $lt selector" do
-            expect(selection.selector).to eq({
-              "first" =>  { "$lt" => 15 }
-            })
-          end
+        it "adds a second $lt selector" do
+          expect(selection.selector).to eq({
+            "first" =>  { "$lt" => 10 },
+            "$and" => [ { "first" => { "$lt" => 15 } } ]
+          })
         end
 
         it "returns a cloned query" do
@@ -1339,25 +1233,11 @@ describe Mongoid::Criteria::Queryable::Selectable do
           query.lte(first: 10).lte(first: 15)
         end
 
-        context "when overwrite_chained_operators is false" do
-          config_override :overwrite_chained_operators, false
-
-          it "adds a second $lte selector" do
-            expect(selection.selector).to eq({
-              "first" =>  { "$lte" => 10 },
-              "$and" => [ { "first" => { "$lte" => 15 } } ]
-            })
-          end
-        end
-
-        context "when overwrite_chained_operators is true" do
-          config_override :overwrite_chained_operators, true
-
-          it "overwrites the first $lte selector" do
-            expect(selection.selector).to eq({
-              "first" =>  { "$lte" => 15 }
-            })
-          end
+        it "adds a second $lte selector" do
+          expect(selection.selector).to eq({
+            "first" =>  { "$lte" => 10 },
+            "$and" => [ { "first" => { "$lte" => 15 } } ]
+          })
         end
 
         it "returns a cloned query" do
@@ -2413,7 +2293,7 @@ describe Mongoid::Criteria::Queryable::Selectable do
     end
   end
 
-  describe "Mongoid.overwrite_chained_operators" do
+  describe "chained operators" do
     [ :eq, :elem_match, :gt, :gte, :lt, :lte, :mod, :ne, :near, :near_sphere ].each do |meth|
 
       context "when chaining the #{meth} method when using the same field" do
@@ -2436,25 +2316,11 @@ describe Mongoid::Criteria::Queryable::Selectable do
           Band.send(meth, {views: 1}).send(meth, {views:2})
         end
 
-        context "when overwrite_chained_operators is true" do
-          config_override :overwrite_chained_operators, true
-
-          it "overrides the previous operators" do
-            expect(criteria.selector).to eq({
-              "views" => { op => 2 },
-            })
-          end
-        end
-
-        context "when overwrite_chained_operators is false" do
-          config_override :overwrite_chained_operators, false
-
-          it "overrides the previous operators" do
-            expect(criteria.selector).to eq({
-              "views" => { op => 1 },
-              "$and" => [{ "views" => { op => 2 } }]
-            })
-          end
+        it "is and-ed with the previous operators" do
+          expect(criteria.selector).to eq({
+            "views" => { op => 1 },
+            "$and" => [{ "views" => { op => 2 } }]
+          })
         end
       end
     end

data/spec/mongoid/criteria/queryable/selectable_where_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 require_relative './selectable_shared_examples'

data/spec/mongoid/criteria/queryable/selector_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -476,6 +477,43 @@ describe Mongoid::Criteria::Queryable::Selector do
             end
           end
         end
+
+        context "when providing a Mongoid::RawValue" do
+
+          context "and raw_value is a string" do
+
+            before do
+              selector.send(method, "key", Mongoid::RawValue("Foo"))
+            end
+
+            it "returns the raw_value" do
+              expect(selector["key"]).to eq("Foo")
+            end
+          end
+
+          context "and raw_value cannot be converted by bson-ruby" do
+
+            before do
+              selector.send(method, "key", Mongoid::RawValue(4..5))
+            end
+
+            it "returns the raw_value without conversion" do
+              expect(selector["key"]).to eq(4..5)
+            end
+          end
+
+          context "and raw_value is a complex type" do
+            config_override :map_big_decimal_to_decimal128, true
+
+            before do
+              selector.send(method, "key", Mongoid::RawValue([{ foo: 1, "Bar" => [/baz/, BigDecimal('2'), 4..5] }, 3]))
+            end
+
+            it "returns the raw_value" do
+              expect(selector["key"]).to eq([{ foo: 1, "Bar" => [/baz/, BigDecimal('2'), 4..5] }, 3])
+            end
+          end
+        end
       end
 
       context "when serializers are provided" do
@@ -676,6 +714,64 @@ describe Mongoid::Criteria::Queryable::Selector do
                   end
                 end
               end
+
+              context "when the criterion is a Mongoid::RawValue" do
+
+                context "and raw_value is a serializable string" do
+
+                  before do
+                    selector.send(method, "key", Mongoid::RawValue("1"))
+                  end
+
+                  it "returns the raw_value" do
+                    expect(selector["key"]).to eq("1")
+                  end
+                end
+
+                context "and raw_value is a serializable type" do
+
+                  before do
+                    selector.send(method, "key", Mongoid::RawValue(BigDecimal('2')))
+                  end
+
+                  it "returns the raw_value" do
+                    expect(selector["key"]).to eq(BigDecimal('2'))
+                  end
+                end
+
+                context "and raw_value is a non-serializable string" do
+
+                  before do
+                    selector.send(method, "key", Mongoid::RawValue("Foo"))
+                  end
+
+                  it "returns the raw_value" do
+                    expect(selector["key"]).to eq("Foo")
+                  end
+                end
+
+                context "and raw_value cannot be converted by bson-ruby" do
+
+                  before do
+                    selector.send(method, "key", Mongoid::RawValue(4..5))
+                  end
+
+                  it "returns the raw_value without conversion" do
+                    expect(selector["key"]).to eq(4..5)
+                  end
+                end
+
+                context "and raw_value is a complex type" do
+
+                  before do
+                    selector.send(method, "key", Mongoid::RawValue([{ foo: "1", "Bar" => [/baz/, BigDecimal('2'), 4..5] }, 3]))
+                  end
+
+                  it "returns the raw_value" do
+                    expect(selector["key"]).to eq([{ foo: "1", "Bar" => [/baz/, BigDecimal('2'), 4..5] }, 3])
+                  end
+                end
+              end
             end
           end
         end

data/spec/mongoid/criteria/queryable/smash_spec.rb

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

data/spec/mongoid/criteria/queryable/storable_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -67,41 +68,18 @@ describe Mongoid::Criteria::Queryable::Storable do
         end
       end
 
-      context "when broken_and feature flag is not set" do
-        config_override :broken_and, false
-
-        context '$and to query with $and onto query whose first one is not $and' do
-          let(:query) do
-            Mongoid::Query.new.where({'foo' => 'baz'}).where('$and' => [{zoom: 'zoom'}])
-          end
-
-          let(:modified) do
-            query.send(query_method, '$and', [{'foo' => 'bar'}])
-          end
-
-          it 'adds to existing $and' do
-            modified.selector.should == {
-              '$and' => [{'zoom' => 'zoom'}, {'foo' => 'bar'}], 'foo' => 'baz'}
-          end
+      context '$and to query with $and onto query whose first one is not $and' do
+        let(:query) do
+          Mongoid::Query.new.where({'foo' => 'baz'}).where('$and' => [{zoom: 'zoom'}])
         end
-      end
-
-      context "when broken_and feature flag is set" do
-        config_override :broken_and, true
 
-        context '$and to query with $and onto query whose first one is not $and' do
-          let(:query) do
-            Mongoid::Query.new.where({'foo' => 'baz'}).where('$and' => [{zoom: 'zoom'}])
-          end
-
-          let(:modified) do
-            query.send(query_method, '$and', [{'foo' => 'bar'}])
-          end
+        let(:modified) do
+          query.send(query_method, '$and', [{'foo' => 'bar'}])
+        end
 
-          it 'does not add to existing $and' do
-            modified.selector.should == {
-              '$and' => [{'foo' => 'bar'}], 'foo' => 'baz'}
-          end
+        it 'adds to existing $and' do
+          modified.selector.should == {
+            '$and' => [{'zoom' => 'zoom'}, {'foo' => 'bar'}], 'foo' => 'baz'}
         end
       end
     end

data/spec/mongoid/criteria/scopable_spec.rb

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

data/spec/mongoid/criteria/translator_spec.rb

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

data/spec/mongoid/criteria_projection_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -21,7 +22,7 @@ describe Mongoid::Criteria do
         it "limits the returned fields" do
           expect {
             criteria.first.name
-          }.to raise_error(ActiveModel::MissingAttributeError)
+          }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'name' on Band which was not loaded/)
         end
 
         it "does not add _type to the fields" do
@@ -55,7 +56,7 @@ describe Mongoid::Criteria do
         it "excludes the non included fields" do
           expect {
             criteria.first.active
-          }.to raise_error(ActiveModel::MissingAttributeError)
+          }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'active' on Band which was not loaded/)
         end
 
         it "does not add _type to the fields" do
@@ -211,8 +212,8 @@ describe Mongoid::Criteria do
           expect(dictionary.description_translations.keys).to_not include('de', 'en')
         end
 
-        it 'raises an ActiveModel::MissingAttributeError when attempting to access the field' do
-          expect{dictionary.description}.to raise_error ActiveModel::MissingAttributeError
+        it 'raises an Mongoid::Errors::AttributeNotLoaded when attempting to access the field' do
+          expect{dictionary.description}.to raise_error Mongoid::Errors::AttributeNotLoaded
         end
       end
 
@@ -356,7 +357,7 @@ describe Mongoid::Criteria do
         it 'does not return id' do
           lambda do
             instance.id
-          end.should raise_error(ActiveModel::MissingAttributeError)
+          end.should raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'id' on Shirt which was not loaded/)
         end
       end