mongoid 7.1.1 → 8.1.0

data/spec/mongoid/scopable_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -111,6 +110,87 @@ describe Mongoid::Scopable do
         expect(Band).to be_default_scoping
       end
     end
+
+    context "when parent class has default scope" do
+
+      let (:selector) do
+        AudibleSound.all.selector
+      end
+
+      it "the subclass doesn't duplicate the default scope in the selector" do
+        expect(selector).to eq({'active' => true})
+      end
+    end
+
+    context "when the default scope is dotted" do
+
+      let(:criteria) do
+        Band.where('tags.foo' => 'bar')
+      end
+
+      before do
+        Band.default_scope ->{ criteria }
+      end
+
+      after do
+        Band.default_scoping = nil
+      end
+
+      let!(:band) do
+        Band.create!
+      end
+
+      it "adds the scope as a dotted key attribute" do
+        expect(band.attributes['tags.foo']).to eq('bar')
+      end
+
+      it "adds the default scope to the class" do
+        expect(Band.default_scoping.call).to eq(criteria)
+      end
+
+      it "flags as being default scoped" do
+        expect(Band).to be_default_scoping
+      end
+
+      it "does not find the correct document" do
+        expect(Band.count).to eq(0)
+      end
+    end
+
+    context "when the default scope is dotted with a query" do
+
+      let(:criteria) do
+        Band.where('tags.foo' => {'$eq' => 'bar'})
+      end
+
+      before do
+        Band.default_scope ->{ criteria }
+      end
+
+      after do
+        Band.default_scoping = nil
+      end
+
+      let!(:band) do
+        Band.create!('tags' => { 'foo' => 'bar' })
+      end
+
+      it "does not add the scope as a dotted key attribute" do
+        expect(band.attributes).to_not have_key('tags.foo')
+      end
+
+      it "adds the default scope to the class" do
+        expect(Band.default_scoping.call).to eq(criteria)
+      end
+
+      it "flags as being default scoped" do
+        expect(Band).to be_default_scoping
+      end
+
+      it "finds the correct document" do
+        expect(Band.where.first).to eq(band)
+      end
+    end
   end
 
   describe ".default_scopable?" do
@@ -178,7 +258,7 @@ describe Mongoid::Scopable do
         context "when scopes are chained" do
 
           let(:person) do
-            Person.create
+            Person.create!
           end
 
           it "constructs a criteria for an embedded relation" do
@@ -230,11 +310,12 @@ describe Mongoid::Scopable do
 
     context "when provided a criteria" do
 
-      context 'when a collation is defined on the criteria', if: collation_supported? do
+      context 'when a collation is defined on the criteria' do
+        min_server_version '3.4'
 
         before do
           Band.scope(:tests, ->{ Band.where(name: 'TESTING').collation(locale: 'en_US', strength: 2) })
-          Band.create(name: 'testing')
+          Band.create!(name: 'testing')
         end
 
         it 'applies the collation' do
@@ -431,13 +512,9 @@ describe Mongoid::Scopable do
       context "when the name conflict with an existing method" do
 
         context "when raising an error" do
-
-          before do
-            Mongoid.scope_overwrite_exception = true
-          end
+          config_override :scope_overwrite_exception, true
 
           after do
-            Mongoid.scope_overwrite_exception = false
             class << Band
               undef_method :active
             end
@@ -453,9 +530,9 @@ describe Mongoid::Scopable do
         end
 
         context "when not raising an error" do
+          config_override :scope_overwrite_exception, false
 
           after do
-            Mongoid.scope_overwrite_exception = false
             class << Band
               undef_method :active
             end
@@ -474,27 +551,45 @@ describe Mongoid::Scopable do
 
       context "when a block is provided" do
 
-        before do
-          Band.scope(:active, ->{ Band.where(active: true) }) do
-            def add_origin
-              tap { |c| c.selector[:origin] = "Deutschland" }
-            end
+        context "when with optional and keyword arguments" do
+          before do
+            Band.scope(:named_by, ->(name, deleted: false) {
+              Band.where(name: name, deleted: deleted)
+            })
           end
-        end
 
-        after do
-          class << Band
-            undef_method :active
+          let(:scope) do
+            Band.named_by("Emily", deleted: true)
           end
-          Band._declared_scopes.clear
-        end
 
-        let(:scope) do
-          Band.active.add_origin
+          it "sets the conditions from keyword arguments" do
+            scope.selector.should == {'name' => 'Emily', 'deleted' => true}
+          end
         end
 
-        it "adds the extension to the scope" do
-          expect(scope.selector).to eq({ "active" => true, "origin" => "Deutschland" })
+        context "when without arguments" do
+          before do
+            Band.scope(:active, ->{ Band.where(active: true) }) do
+              def add_origin
+                tap { |c| c.selector[:origin] = "Deutschland" }
+              end
+            end
+          end
+
+          after do
+            class << Band
+              undef_method :active
+            end
+            Band._declared_scopes.clear
+          end
+
+          let(:scope) do
+            Band.active.add_origin
+          end
+
+          it "adds the extension to the scope" do
+            expect(scope.selector).to eq({ "active" => true, "origin" => "Deutschland" })
+          end
         end
       end
 
@@ -659,12 +754,12 @@ describe Mongoid::Scopable do
                 where(:author_id.in => author_ids)
               })
 
-              Author.create(author: true, id: 1)
-              Author.create(author: true, id: 2)
-              Author.create(author: true, id: 3)
-              Article.create(author_id: 1, public: true)
-              Article.create(author_id: 2, public: true)
-              Article.create(author_id: 3, public: false)
+              Author.create!(author: true, id: 1)
+              Author.create!(author: true, id: 2)
+              Author.create!(author: true, id: 3)
+              Article.create!(author_id: 1, public: true)
+              Article.create!(author_id: 2, public: true)
+              Article.create!(author_id: 3, public: false)
             end
 
             after do
@@ -706,13 +801,9 @@ describe Mongoid::Scopable do
       context "when the name conflict with an existing method" do
 
         context "when raising an error" do
-
-          before do
-            Mongoid.scope_overwrite_exception = true
-          end
+          config_override :scope_overwrite_exception, true
 
           after do
-            Mongoid.scope_overwrite_exception = false
             class << Band
               undef_method :active
             end
@@ -728,9 +819,9 @@ describe Mongoid::Scopable do
         end
 
         context "when not raising an error" do
+          config_override :scope_overwrite_exception, false
 
           after do
-            Mongoid.scope_overwrite_exception = false
             class << Band
               undef_method :active
             end
@@ -780,9 +871,11 @@ describe Mongoid::Scopable do
             "$or" => [
               { "ccc" => nil },
               { "ccc" => { "$gt" => 1.0 }},
+            ],
+            '$and' => ['$or' => [
               { "aaa" => { "$gt" => 0.0 }},
               { "bbb" => { "$gt" => 0.0 }}
-            ]
+            ]],
           })
         end
       end
@@ -857,7 +950,7 @@ describe Mongoid::Scopable do
         Circle._declared_scopes.clear
       end
 
-      it "uses sublcass context for all the other used scopes" do
+      it "uses subclass context for all the other used scopes" do
         expect(Circle.visible.selector).to eq("radius" => 5)
       end
     end
@@ -1126,6 +1219,65 @@ describe Mongoid::Scopable do
         expect(Mongoid::Threaded.current_scope(Band)).to be_nil
       end
     end
+
+    context 'when nesting with_scope calls' do
+      let(:c1) { Band.where(active: true) }
+      let(:c2) { Band.where(active: false) }
+
+      context "when the broken_scoping is not set" do
+        config_override :broken_scoping, false
+
+        it 'restores previous scope' do
+          Band.with_scope(c1) do |crit|
+            Band.with_scope(c2) do |crit2|
+              Mongoid::Threaded.current_scope(Band).selector.should == {
+                'active' => true,
+                '$and' => ['active' => false],
+              }
+            end
+
+            Mongoid::Threaded.current_scope(Band).selector.should == {
+              'active' => true,
+            }
+          end
+        end
+      end
+
+      context "when the broken_scoping is set" do
+        config_override :broken_scoping, true
+
+        it 'does not restore previous scope' do
+          Band.with_scope(c1) do |crit|
+            Band.with_scope(c2) do |crit2|
+              Mongoid::Threaded.current_scope(Band).selector.should == {
+                'active' => true,
+                '$and' => ['active' => false],
+              }
+            end
+
+            Mongoid::Threaded.current_scope(Band).should be_nil
+          end
+        end
+      end
+    end
+
+    context 'when nesting unscoped under with_scope' do
+      let(:c1) { Band.where(active: true) }
+
+      it 'restores previous scope' do
+        pending 'MONGOID-5214'
+
+        Band.with_scope(c1) do |crit|
+          Band.unscoped do |crit2|
+            Mongoid::Threaded.current_scope(Band).should be nil
+          end
+
+          Mongoid::Threaded.current_scope(Band).selector.should == {
+            'active' => true,
+          }
+        end
+      end
+    end
   end
 
   describe ".without_default_scope" do

data/spec/mongoid/selectable_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -12,7 +11,7 @@ describe Mongoid::Selectable do
       context "when the document has a shard key" do
 
         let(:profile) do
-          Profile.create(name: "google")
+          Profile.create!(name: "google")
         end
 
         let!(:selector) do
@@ -29,7 +28,7 @@ describe Mongoid::Selectable do
         context "when using object ids" do
 
           let(:band) do
-            Band.create
+            Band.create!
           end
 
           let(:selector) do
@@ -44,7 +43,7 @@ describe Mongoid::Selectable do
         context "when using a custom id" do
 
           let(:account) do
-            Account.create(name: "savings")
+            Account.create!(name: "savings")
           end
 
           let(:selector) do
@@ -76,7 +75,7 @@ describe Mongoid::Selectable do
     context "when the document is embedded" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       context "when the document is an embeds one" do
@@ -95,7 +94,7 @@ describe Mongoid::Selectable do
       context "when the document is an embeds many" do
 
         let(:address) do
-          person.addresses.create(street: "kreuzbergstr")
+          person.addresses.create!(street: "kreuzbergstr")
         end
 
         it "returns the hash with the selector" do
@@ -118,7 +117,7 @@ describe Mongoid::Selectable do
         context "when the document is embedded multiple levels" do
 
           let(:location) do
-            address.locations.create
+            address.locations.create!
           end
 
           it "returns a hash with the selector" do

data/spec/mongoid/serializable_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -7,12 +6,30 @@ describe Mongoid::Serializable do
 
   describe "#field_names" do
 
-    let(:band) do
-      Band.new
+    let(:guitar) do
+      Guitar.new
     end
 
     it "does not duplicate fields" do
-      expect(band.send(:field_names, {})).to eq(band.fields.except("_type").keys.sort)
+      expect(guitar.send(:field_names, {})).to eq(guitar.fields.except("_type").keys.sort)
+    end
+
+    context "when using a custom discriminator_key" do
+      before do
+        Instrument.discriminator_key = "dkey"
+      end
+
+      after do
+        Instrument.discriminator_key = nil
+      end
+
+      let(:guitar) do
+        Guitar.new
+      end
+
+      it "includes _type but does not include the new discriminator key" do
+        expect(guitar.send(:field_names, {})).to eq(guitar.fields.except("dkey").keys.sort)
+      end
     end
   end
 
@@ -24,15 +41,11 @@ describe Mongoid::Serializable do
       end
 
       after do
-        Mongoid.include_root_in_json = false
         reload_model(:Minim)
       end
 
       context "when global config is set to true" do
-
-        before do
-          Mongoid.include_root_in_json = true
-        end
+        config_override :include_root_in_json, true
 
         it "returns true" do
           expect(Minim.public_send(meth)).to be true
@@ -50,10 +63,7 @@ describe Mongoid::Serializable do
       end
 
       context "when global config set to false" do
-
-        before do
-          Mongoid.include_root_in_json = false
-        end
+        config_override :include_root_in_json, false
 
         it "returns false" do
           expect(Minim.public_send(meth)).to be false
@@ -72,13 +82,13 @@ describe Mongoid::Serializable do
     end
 
     describe "#include_root_in_json" do
+      config_override :include_root_in_json, false
 
       before do
         reload_model(:Minim)
       end
 
       after do
-        Mongoid.include_root_in_json = false
         reload_model(:Minim)
       end
 
@@ -110,10 +120,6 @@ describe Mongoid::Serializable do
 
       context "when global config set to false" do
 
-        before do
-          Mongoid.include_root_in_json = false
-        end
-
         it "returns false" do
           expect(minim.public_send(meth)).to be false
         end
@@ -280,14 +286,7 @@ describe Mongoid::Serializable do
       end
 
       context "when include_type_for_serialization is true" do
-
-        before do
-          Mongoid.include_type_for_serialization = true
-        end
-
-        after do
-          Mongoid.include_type_for_serialization = false
-        end
+        config_override :include_type_for_serialization, true
 
         it "includes _type field" do
           expect(person.serializable_hash.keys).to include '_type'
@@ -323,7 +322,7 @@ describe Mongoid::Serializable do
 
       context "when only two attributes are loaded" do
         before do
-          person.save
+          person.save!
         end
 
         let(:from_db) do
@@ -390,7 +389,7 @@ describe Mongoid::Serializable do
       context "when the model is saved before the relation is added" do
 
         before do
-          person.save
+          person.save!
         end
 
         context "when a model has an embeds many" do
@@ -400,7 +399,7 @@ describe Mongoid::Serializable do
           end
 
           before do
-            person.save
+            person.save!
           end
 
           it "includes the relation" do
@@ -414,7 +413,7 @@ describe Mongoid::Serializable do
           end
 
           before do
-            person.save
+            person.save!
           end
 
           it "includes the relation" do
@@ -432,7 +431,7 @@ describe Mongoid::Serializable do
           end
 
           before do
-            person.save
+            person.save!
           end
 
           it "includes the relation" do
@@ -446,7 +445,7 @@ describe Mongoid::Serializable do
           end
 
           before do
-            person.save
+            person.save!
           end
 
           it "includes the relation" do
@@ -486,7 +485,7 @@ describe Mongoid::Serializable do
           context "when the ids were not loaded" do
 
             before do
-              person.save
+              person.save!
             end
 
             let(:from_db) do
@@ -594,10 +593,10 @@ describe Mongoid::Serializable do
                 end
 
                 before do
-                  person.save
+                  person.save!
                 end
 
-                it "includes the specific ralations" do
+                it "includes the specific relations" do
                   expect(relation_hash[0]["locations"].map do |location|
                     location["name"]
                   end).to include "Home"
@@ -864,16 +863,13 @@ describe Mongoid::Serializable do
     end
 
     context "when including root in json via Mongoid" do
+      config_override :include_root_in_json, false
 
       before do
         account.include_root_in_json.should be false
         Mongoid.include_root_in_json = true
       end
 
-      after do
-        Mongoid.include_root_in_json = false
-      end
-
       it "uses the mongoid configuration" do
         expect(JSON.parse(account.to_json)).to have_key("account")
       end

data/spec/mongoid/shardable_models.rb

@@ -19,7 +19,7 @@ class SmActor
 
   # This is not a usable shard configuration for the server.
   # We just have it for unit tests.
-  shard_key age: 1, 'gender' => :hashed
+  shard_key age: 1, 'gender' => :hashed, 'hello' => :hashed
 end
 
 class SmAssistant
@@ -59,3 +59,17 @@ end
 class SmNotSharded
   include Mongoid::Document
 end
+
+class SmReviewAuthor
+  include Mongoid::Document
+  embedded_in :review, class_name: "SmReview", touch: false
+  field :name, type: String
+end
+
+class SmReview
+  include Mongoid::Document
+
+  embeds_one :author, class_name: "SmReviewAuthor"
+
+  shard_key "author.name" => 1
+end