mongoid 7.0.13 → 7.1.0.rc0

data/spec/mongoid/contextual/memory_spec.rb

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

data/spec/mongoid/contextual/mongo_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Contextual::Mongo do
@@ -168,8 +171,7 @@ describe Mongoid::Contextual::Mongo do
       end
     end
 
-    context 'when a collation is specified' do
-      min_server_version '3.4'
+    context 'when a collation is specified', if: collation_supported? do
 
       let(:context) do
         described_class.new(criteria)
@@ -230,8 +232,7 @@ describe Mongoid::Contextual::Mongo do
           expect(deleted).to eq(1)
         end
 
-        context 'when the criteria has a collation' do
-          min_server_version '3.4'
+        context 'when the criteria has a collation', if: collation_supported? do
 
           let(:criteria) do
             Band.where(name: "DEPECHE MODE").collation(locale: 'en_US', strength: 2)
@@ -335,8 +336,7 @@ describe Mongoid::Contextual::Mongo do
           expect(destroyed).to eq(1)
         end
 
-        context 'when the criteria has a collation' do
-          min_server_version '3.4'
+        context 'when the criteria has a collation', if: collation_supported? do
 
           let(:criteria) do
             Band.where(name: "DEPECHE MODE").collation(locale: 'en_US', strength: 2)
@@ -458,8 +458,7 @@ describe Mongoid::Contextual::Mongo do
       end
     end
 
-    context 'when a collation is specified' do
-      min_server_version '3.4'
+    context 'when a collation is specified', if: collation_supported? do
 
       before do
         Band.create(name: 'DEPECHE MODE')
@@ -497,8 +496,7 @@ describe Mongoid::Contextual::Mongo do
       described_class.new(criteria)
     end
 
-    context 'when the criteria has a collation' do
-      min_server_version '3.4'
+    context 'when the criteria has a collation', if: collation_supported? do
 
       let(:criteria) do
         Band.where(name: "DEPECHE MODE").collation(locale: 'en_US', strength: 2)
@@ -855,8 +853,7 @@ describe Mongoid::Contextual::Mongo do
         end
       end
 
-      context 'when a collation is specified on the criteria' do
-        min_server_version '3.4'
+      context 'when a collation is specified on the criteria', if: collation_supported? do
 
         let(:criteria) do
           Band.where(name: "DEPECHE MODE").collation(locale: 'en_US', strength: 2)
@@ -1009,8 +1006,7 @@ describe Mongoid::Contextual::Mongo do
         end
       end
 
-      context 'when a collation is specified on the criteria' do
-        min_server_version '3.4'
+      context 'when a collation is specified on the criteria', if: collation_supported? do
 
         let(:criteria) do
           Band.where(name: "DEPECHE MODE").collation(locale: 'en_US', strength: 2)
@@ -1084,8 +1080,7 @@ describe Mongoid::Contextual::Mongo do
         }.to raise_error(Mongoid::Errors::DocumentNotFound)
       end
 
-      context 'when a collation is specified on the criteria' do
-        min_server_version '3.4'
+      context 'when a collation is specified on the criteria', if: collation_supported? do
 
         let(:criteria) do
           Band.where(name: "DEPECHE MODE").collation(locale: 'en_US', strength: 2)
@@ -1157,8 +1152,7 @@ describe Mongoid::Contextual::Mongo do
           expect(context.send(method)).to eq(depeche_mode)
         end
 
-        context 'when the criteria has a collation' do
-          min_server_version '3.4'
+        context 'when the criteria has a collation', if: collation_supported? do
 
           let(:criteria) do
             Band.where(name: "DEPECHE MODE").collation(locale: 'en_US', strength: 2)
@@ -1562,10 +1556,6 @@ describe Mongoid::Contextual::Mongo do
       }}
     end
 
-    let(:ordered_results) do
-      results['results'].sort_by { |doc| doc['_id'] }
-    end
-
     context "when no selection is provided" do
 
       let(:criteria) do
@@ -1597,40 +1587,36 @@ describe Mongoid::Contextual::Mongo do
       end
 
       it "contains the entire raw results" do
-        expect(ordered_results).to eq([
+        expect(results["results"]).to eq([
           { "_id" => "Depeche Mode", "value" => { "likes" => 200 }},
           { "_id" => "Tool", "value" => { "likes" => 100 }}
         ])
       end
 
-      context 'when statistics are available' do
-        max_server_version '4.2'
-
-        it "contains the execution time" do
-          expect(results.time).to_not be_nil
-        end
+      it "contains the execution time" do
+        expect(results.time).to_not be_nil
+      end
 
-        it "contains the count statistics" do
-          expect(results["counts"]).to eq({
-            "input" => 2, "emit" => 2, "reduce" => 0, "output" => 2
-          })
-        end
+      it "contains the count statistics" do
+        expect(results["counts"]).to eq({
+          "input" => 2, "emit" => 2, "reduce" => 0, "output" => 2
+        })
+      end
 
-        it "contains the input count" do
-          expect(results.input).to eq(2)
-        end
+      it "contains the input count" do
+        expect(results.input).to eq(2)
+      end
 
-        it "contains the emitted count" do
-          expect(results.emitted).to eq(2)
-        end
+      it "contains the emitted count" do
+        expect(results.emitted).to eq(2)
+      end
 
-        it "contains the reduced count" do
-          expect(results.reduced).to eq(0)
-        end
+      it "contains the reduced count" do
+        expect(results.reduced).to eq(0)
+      end
 
-        it "contains the output count" do
-          expect(results.output).to eq(2)
-        end
+      it "contains the output count" do
+        expect(results.output).to eq(2)
       end
     end
 
@@ -1659,39 +1645,35 @@ describe Mongoid::Contextual::Mongo do
       end
 
       it "contains the entire raw results" do
-        expect(ordered_results).to eq([
+        expect(results["results"]).to eq([
           { "_id" => "Depeche Mode", "value" => { "likes" => 200 }}
         ])
       end
 
-      context 'when statistics are available' do
-        max_server_version '4.2'
-
-        it "contains the execution time" do
-          expect(results.time).to_not be_nil
-        end
+      it "contains the execution time" do
+        expect(results.time).to_not be_nil
+      end
 
-        it "contains the count statistics" do
-          expect(results["counts"]).to eq({
-            "input" => 1, "emit" => 1, "reduce" => 0, "output" => 1
-          })
-        end
+      it "contains the count statistics" do
+        expect(results["counts"]).to eq({
+          "input" => 1, "emit" => 1, "reduce" => 0, "output" => 1
+        })
+      end
 
-        it "contains the input count" do
-          expect(results.input).to eq(1)
-        end
+      it "contains the input count" do
+        expect(results.input).to eq(1)
+      end
 
-        it "contains the emitted count" do
-          expect(results.emitted).to eq(1)
-        end
+      it "contains the emitted count" do
+        expect(results.emitted).to eq(1)
+      end
 
-        it "contains the reduced count" do
-          expect(results.reduced).to eq(0)
-        end
+      it "contains the reduced count" do
+        expect(results.reduced).to eq(0)
+      end
 
-        it "contains the output count" do
-          expect(results.output).to eq(1)
-        end
+      it "contains the output count" do
+        expect(results.output).to eq(1)
       end
     end
 
@@ -1731,7 +1713,7 @@ describe Mongoid::Contextual::Mongo do
       end
 
       it "contains the entire raw results" do
-        expect(ordered_results).to eq([
+        expect(results["results"]).to eq([
           { "_id" => "Depeche Mode", "value" => { "likes" => 200 }},
           { "_id" => "Tool", "value" => { "likes" => 100 }}
         ])
@@ -1848,6 +1830,8 @@ describe Mongoid::Contextual::Mongo do
     end
 
     context "when the output specifies a different db" do
+      # Limit is not supported in sharded clusters
+      require_topology :single, :replica_set
 
       let(:criteria) do
         Band.limit(1)
@@ -2182,8 +2166,7 @@ describe Mongoid::Contextual::Mongo do
       end
     end
 
-    context 'when provided array filters' do
-      min_server_version '3.6'
+    context 'when provided array filters', if: array_filters_supported? do
 
       before do
         Band.delete_all
@@ -2355,8 +2338,7 @@ describe Mongoid::Contextual::Mongo do
       end
     end
 
-    context 'when provided array filters' do
-      min_server_version '3.6'
+    context 'when provided array filters', if: array_filters_supported? do
 
       before do
         Band.delete_all
@@ -2394,7 +2376,7 @@ describe Mongoid::Contextual::Mongo do
 
   describe '#pipeline' do
 
-    context 'when the criteria has a selector' do
+    context 'when the criteria has a selector', if: non_legacy_server? do
 
       before do
         Artist.index(name: "text")

data/spec/mongoid/contextual/none_spec.rb

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

data/spec/mongoid/copyable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 # -*- coding: utf-8 -*-
 require "spec_helper"
 

data/spec/mongoid/copyable_spec_models.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module CopyableSpec
   class A
     include Mongoid::Document

data/spec/mongoid/criteria/findable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Criteria::Findable do
@@ -35,6 +38,42 @@ describe Mongoid::Criteria::Findable do
           expect(found).to eq(band)
         end
       end
+
+      context 'when criteria has additional conditions' do
+        let(:band) do
+          Band.create(name: "Tool")
+        end
+
+        let(:found) do
+          Band.where(name: 'Blah').find(band.id)
+        end
+
+        it 'respects conditions' do
+          expect do
+            found
+          end.to raise_error(Mongoid::Errors::DocumentNotFound)
+        end
+      end
+
+      context 'when criteria has additional conditions on id' do
+        let(:band) do
+          Band.create(name: "Tool")
+        end
+
+        let(:other) do
+          Band.create(name: "Other")
+        end
+
+        let(:found) do
+          Band.where(id: other.id).find(band.id)
+        end
+
+        it 'respects both conditions' do
+          expect do
+            found
+          end.to raise_error(Mongoid::Errors::DocumentNotFound)
+        end
+      end
     end
 
     context "when using object ids" do
@@ -1196,4 +1235,23 @@ describe Mongoid::Criteria::Findable do
       end
     end
   end
+
+  describe '#from_database_selector' do
+    let(:criteria) { Mongoid::Criteria.new(Band) }
+    let(:result) { criteria.send(:from_database_selector, [1]) }
+
+    context 'when criteria is empty' do
+      it 'adds id' do
+        expect(result.selector).to eq('_id' => 1)
+      end
+    end
+
+    context 'when criteria is restricted by id' do
+      let(:criteria) { Mongoid::Criteria.new(Band).where(id: 2) }
+
+      it 'adds id' do
+        expect(result.selector).to eq('_id' => 2, '$and' => [{'_id' => 1}])
+      end
+    end
+  end
 end

data/spec/mongoid/criteria/inspectable_spec.rb

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

data/spec/mongoid/criteria/marshalable_spec.rb

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

data/spec/mongoid/criteria/modifiable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Criteria::Modifiable do
@@ -1773,7 +1776,7 @@ describe Mongoid::Criteria::Modifiable do
           end
         end
 
-        context 'when a write method is chained' do
+        context 'when a write method is chained producing conflicting criteria' do
 
           let(:new_person) do
             criteria.create_with(attrs).find_or_create_by(query)
@@ -1797,9 +1800,10 @@ describe Mongoid::Criteria::Modifiable do
               criteria.create_with(attrs).find_or_create_by(query)
             end
 
-            it 'finds the matching document' do
+            it 'creates a new document' do
               person
-              expect(found_person.id).to eq(person.id)
+              expect(found_person.id).not_to eq(person.id)
+              expect(found_person.id > person.id).to be true
             end
           end
         end

data/spec/mongoid/criteria/options_spec.rb

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

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

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

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

@@ -0,0 +1,135 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require "spec_helper"
+
+describe Mongoid::Criteria::Queryable::Expandable do
+
+  let(:query) do
+    Mongoid::Query.new
+  end
+
+  describe '#expand_condition' do
+
+    let(:expanded) do
+      query.send(:expand_condition, condition)
+    end
+
+    context 'field name => value' do
+      shared_examples_for 'expands' do
+
+        it 'expands' do
+          expanded.should == {'foo' => 'bar'}
+        end
+      end
+
+      context 'string key' do
+        let(:condition) do
+          {'foo' => 'bar'}
+        end
+
+        it_behaves_like 'expands'
+      end
+
+      context 'symbol key' do
+        let(:condition) do
+          {foo: 'bar'}
+        end
+
+        it_behaves_like 'expands'
+      end
+    end
+
+    context 'Key instance => value' do
+      let(:key) do
+        Mongoid::Criteria::Queryable::Key.new(:foo, :__override__, '$gt')
+      end
+
+      let(:condition) do
+        {key => 'bar'}
+      end
+
+      it 'expands' do
+        expanded.should == {'foo' => {'$gt' => 'bar'}}
+      end
+    end
+
+=begin
+    context 'operator => operator value expression' do
+      shared_examples_for 'expands' do
+
+        it 'expands' do
+          expanded.should == {'foo' => 'bar'}
+        end
+      end
+
+      context 'string key' do
+        let(:condition) do
+          {'$in' => %w(bar)}
+        end
+
+        it_behaves_like 'expands'
+      end
+
+      context 'symbol key' do
+        let(:condition) do
+          {:$in => %w(bar)}
+        end
+
+        it_behaves_like 'expands'
+      end
+    end
+=end
+  end
+
+  describe '#expand_condition_to_array_values' do
+    shared_examples_for 'expands' do
+
+      it 'expands' do
+        query.send(:expand_condition_to_array_values, criterion).should == expected
+      end
+
+      context 'when input is frozen' do
+        before do
+          criterion.freeze
+        end
+
+        it 'expands' do
+          query.send(:expand_condition_to_array_values, criterion).should == expected
+        end
+      end
+
+      it 'does not modify input' do
+        criterion_copy = criterion.dup.freeze
+
+        query.send(:expand_condition_to_array_values, criterion).should == expected
+
+        expect(criterion).to eq(criterion_copy)
+      end
+    end
+
+    context 'literal value' do
+      let(:criterion) do
+        {foo: 4}
+      end
+
+      let(:expected) do
+        {foo: [4]}
+      end
+
+      it_behaves_like 'expands'
+    end
+
+    context 'Range value' do
+      let(:criterion) do
+        {foo: 1..4}
+      end
+
+      let(:expected) do
+        {foo: [1, 2, 3, 4]}
+      end
+
+      it_behaves_like 'expands'
+    end
+  end
+end