mongoid 7.0.10 → 7.1.4

data/spec/mongoid/persistence_context_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::PersistenceContext do

data/spec/mongoid/positional_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Positional do

data/spec/mongoid/query_cache_middleware_spec.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require "spec_helper"
+
+describe Mongoid::QueryCache::Middleware do
+
+  let :middleware do
+    Mongoid::QueryCache::Middleware.new(app)
+  end
+
+  context "when not touching mongoid on the app" do
+
+    let(:app) do
+      ->(env) { @enabled = Mongoid::QueryCache.enabled?; [200, env, "app"] }
+    end
+
+    it "returns success" do
+      code, _ = middleware.call({})
+      expect(code).to eq(200)
+    end
+
+    it "enableds the query cache" do
+      middleware.call({})
+      expect(@enabled).to be true
+    end
+  end
+
+  context "when querying on the app" do
+
+    let(:app) do
+      ->(env) {
+        Band.all.to_a
+        [200, env, "app"]
+      }
+    end
+
+    it "returns success" do
+      code, _ = middleware.call({})
+      expect(code).to eq(200)
+    end
+
+    it "cleans the query cache after reponds" do
+      middleware.call({})
+      expect(Mongoid::QueryCache.cache_table).to be_empty
+    end
+  end
+end

data/spec/mongoid/query_cache_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::QueryCache do
@@ -558,47 +561,3 @@ describe Mongoid::QueryCache do
     end
   end
 end
-
-describe Mongoid::QueryCache::Middleware do
-
-  let :middleware do
-    Mongoid::QueryCache::Middleware.new(app)
-  end
-
-  context "when not touching mongoid on the app" do
-
-    let(:app) do
-      ->(env) { @enabled = Mongoid::QueryCache.enabled?; [200, env, "app"] }
-    end
-
-    it "returns success" do
-      code, _ = middleware.call({})
-      expect(code).to eq(200)
-    end
-
-    it "enableds the query cache" do
-      middleware.call({})
-      expect(@enabled).to be true
-    end
-  end
-
-  context "when querying on the app" do
-
-    let(:app) do
-      ->(env) {
-        Band.all.to_a
-        [200, env, "app"]
-      }
-    end
-
-    it "returns success" do
-      code, _ = middleware.call({})
-      expect(code).to eq(200)
-    end
-
-    it "cleans the query cache after reponds" do
-      middleware.call({})
-      expect(Mongoid::QueryCache.cache_table).to be_empty
-    end
-  end
-end

data/spec/mongoid/relations/proxy_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 # require "spec_helper"
 #
 # describe Mongoid::Relations::Proxy do

data/spec/mongoid/reloadable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Reloadable do

data/spec/mongoid/scopable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Scopable do

data/spec/mongoid/selectable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Selectable do

data/spec/mongoid/serializable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Serializable do
@@ -13,31 +16,117 @@ describe Mongoid::Serializable do
     end
   end
 
-  describe ".include_root_in_json" do
+  %i(include_root_in_json include_root_in_json?).each do |meth|
+    describe ".#{meth}" do
 
-    let(:person) do
-      Person.new
-    end
+      before do
+        reload_model(:Minim)
+      end
 
-    context "when config set to true" do
+      after do
+        Mongoid.include_root_in_json = false
+        reload_model(:Minim)
+      end
 
-      before do
-        Mongoid.include_root_in_json = true
+      context "when global config is set to true" do
+
+        before do
+          Mongoid.include_root_in_json = true
+        end
+
+        it "returns true" do
+          expect(Minim.public_send(meth)).to be true
+        end
+
+        context 'when value is overridden to false in the model class' do
+          before do
+            Minim.include_root_in_json = false
+          end
+
+          it 'returns false' do
+            expect(Minim.public_send(meth)).to be false
+          end
+        end
       end
 
-      it "returns true" do
-        expect(person.include_root_in_json).to be true
+      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
+
+        context 'when value is overridden to true in the model class' do
+          before do
+            Minim.include_root_in_json = true
+          end
+
+          it 'returns true' do
+            expect(Minim.public_send(meth)).to be true
+          end
+        end
       end
     end
 
-    context "when config set to false" do
+    describe "#include_root_in_json" do
 
       before do
+        reload_model(:Minim)
+      end
+
+      after do
         Mongoid.include_root_in_json = false
+        reload_model(:Minim)
       end
 
-      it "returns false" do
-        expect(person.include_root_in_json).to be false
+      let(:minim) do
+        Minim.new
+      end
+
+      context "when global config is set to true" do
+
+        before do
+          Minim.include_root_in_json.should be false
+          Mongoid.include_root_in_json = true
+        end
+
+        it "returns true" do
+          expect(minim.public_send(meth)).to be true
+        end
+
+        context 'when value is overridden to false in the model class' do
+          before do
+            Minim.include_root_in_json = false
+          end
+
+          it 'returns false' do
+            expect(minim.public_send(meth)).to be false
+          end
+        end
+      end
+
+      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
+
+        context 'when value is overridden to true in the model class' do
+          before do
+            Minim.include_root_in_json = true
+          end
+
+          it 'returns true' do
+            expect(minim.public_send(meth)).to be true
+          end
+        end
       end
     end
   end
@@ -770,32 +859,57 @@ describe Mongoid::Serializable do
 
   describe "#to_json" do
 
-    let(:person) do
-      Person.new
+    let(:account) do
+      Account.new
     end
 
-    context "when including root in json" do
+    context "when including root in json via Mongoid" do
 
       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(person.to_json).to include("person")
+        expect(JSON.parse(account.to_json)).to have_key("account")
+      end
+    end
+
+    context "when including root in json via class" do
+
+      before do
+        account.include_root_in_json.should be false
+        Account.include_root_in_json = true
+      end
+
+      after do
+        Account.include_root_in_json = false
+      end
+
+      it "uses the class configuration" do
+        expect(JSON.parse(account.to_json)).to have_key("account")
       end
     end
 
     context "when not including root in json" do
 
       before do
-        Mongoid.include_root_in_json = false
+        account.include_root_in_json.should be false
       end
 
       it "uses the mongoid configuration" do
-        expect(person.to_json).to_not include("person")
+        expect(JSON.parse(account.to_json)).not_to have_key("account")
       end
     end
 
+    let(:person) do
+      Person.new
+    end
+
     context "when serializing a relation directly" do
 
       context "when serializing an embeds many" do

data/spec/mongoid/shardable_models.rb

@@ -0,0 +1,61 @@
+class SmMovie
+  include Mongoid::Document
+
+  field :year, type: Integer
+
+  index year: 1
+  shard_key :year
+end
+
+class SmTrailer
+  include Mongoid::Document
+
+  index year: 1
+  shard_key 'year'
+end
+
+class SmActor
+  include Mongoid::Document
+
+  # This is not a usable shard configuration for the server.
+  # We just have it for unit tests.
+  shard_key age: 1, 'gender' => :hashed, 'hello' => :hashed
+end
+
+class SmAssistant
+  include Mongoid::Document
+
+  field :gender, type: String
+
+  index gender: 1
+  shard_key 'gender' => :hashed
+end
+
+class SmProducer
+  include Mongoid::Document
+
+  index age: 1, gender: 1
+  shard_key({age: 1, gender: 'hashed'}, unique: true, numInitialChunks: 2)
+end
+
+class SmDirector
+  include Mongoid::Document
+
+  belongs_to :agency
+
+  index age: 1
+  shard_key :agency
+end
+
+class SmDriver
+  include Mongoid::Document
+
+  belongs_to :agency
+
+  index age: 1, agency: 1
+  shard_key age: 1, agency: :hashed
+end
+
+class SmNotSharded
+  include Mongoid::Document
+end

data/spec/mongoid/shardable_spec.rb

@@ -1,4 +1,8 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
+require_relative './shardable_models'
 
 describe Mongoid::Shardable do
 
@@ -21,30 +25,82 @@ describe Mongoid::Shardable do
 
   describe ".shard_key" do
 
-    let(:klass) do
-      Band
-    end
+    context 'when full syntax is used' do
+      context 'with symbol value' do
+        it 'sets shard key fields to symbol value' do
+          SmProducer.shard_key_fields.should == %i(age gender)
+        end
 
-    before do
-      Band.shard_key(:name)
-    end
+        it 'sets shard config' do
+          SmProducer.shard_config.should == {
+            key: {age: 1, gender: 'hashed'},
+            options: {
+              unique: true,
+              numInitialChunks: 2,
+            },
+          }
+        end
 
-    it "specifies a shard key on the collection" do
-      expect(klass.shard_key_fields).to eq([:name])
-    end
+        it 'keeps hashed as string' do
+          SmProducer.shard_config[:key][:gender].should == 'hashed'
+        end
+      end
+
+      context 'with string value' do
+        it 'sets shard key fields to symbol value' do
+          SmActor.shard_key_fields.should == %i(age gender hello)
+        end
+
+        it 'sets shard config' do
+          SmActor.shard_config.should == {
+            key: {age: 1, gender: 'hashed', hello: 'hashed'},
+            options: {},
+          }
+        end
 
-    context 'when a relation is used as the shard key' do
+        it 'sets hashed to string' do
+          SmActor.shard_config[:key][:gender].should == 'hashed'
+        end
+      end
+
+      context 'when passed association name' do
+        it 'uses foreign key as shard key in shard config' do
+          SmDriver.shard_config.should == {
+            key: {age: 1, agency_id: 'hashed'},
+            options: {},
+          }
+        end
 
-      let(:klass) do
-        Game
+        it 'uses foreign key as shard key in shard key fields' do
+          SmDriver.shard_key_fields.should == %i(age agency_id)
+        end
       end
+    end
 
-      before do
-        Game.shard_key(:person)
+    context 'when shorthand syntax is used' do
+      context 'with symbol value' do
+        it 'sets shard key fields to symbol value' do
+          SmMovie.shard_key_fields.should == %i(year)
+        end
       end
 
-      it "converts the shard key to the foreign key field" do
-        expect(klass.shard_key_fields).to eq([:person_id])
+      context 'with string value' do
+        it 'sets shard key fields to symbol value' do
+          SmTrailer.shard_key_fields.should == %i(year)
+        end
+      end
+
+      context 'when passed association name' do
+        it 'uses foreign key as shard key in shard config' do
+          SmDirector.shard_config.should == {
+            key: {agency_id: 1},
+            options: {},
+          }
+        end
+
+        it 'uses foreign key as shard key in shard key fields' do
+          SmDirector.shard_key_fields.should == %i(agency_id)
+        end
       end
     end
   end