mongoid 5.0.0 → 5.0.1

data/spec/mongoid/attributes_spec.rb

@@ -1465,7 +1465,7 @@ describe Mongoid::Attributes do
         expect(product.cost).to eq(500)
       end
 
-      it "aliases the existance check" do
+      it "aliases the existence check" do
         expect(product.cost?).to be true
       end
 
@@ -1506,7 +1506,7 @@ describe Mongoid::Attributes do
         expect(product.price).to eq(500)
       end
 
-      it "aliases the existance check" do
+      it "aliases the existence check" do
         expect(product.price?).to be true
       end
 

data/spec/mongoid/clients/options_spec.rb

@@ -8,6 +8,10 @@ describe Mongoid::Clients::Options do
 
       let(:options) { { database: 'test' } }
 
+      let!(:cluster) do
+        Band.mongo_client.cluster
+      end
+
       let!(:klass) do
         Band.with(options)
       end
@@ -33,6 +37,17 @@ describe Mongoid::Clients::Options do
         it "keeps the options" do
           expect(klass.persistence_options).to eq(options)
         end
+
+        context 'when changing the collection' do
+
+          let(:options) do
+            { collection: 'other' }
+          end
+
+          it 'uses that collection' do
+            expect(klass.collection.name).to eq(options[:collection])
+          end
+        end
       end
 
       context "when returning a criteria" do

data/spec/mongoid/clients_spec.rb

@@ -413,7 +413,7 @@ describe Mongoid::Clients do
     context "when no client exists with the key" do
 
       before(:all) do
-        Band.store_in(client: :nonexistant)
+        Band.store_in(client: :nonexistent)
       end
 
       let(:band) do
@@ -469,7 +469,7 @@ describe Mongoid::Clients do
     context "when no client exists with the key" do
 
       before(:all) do
-        Band.store_in(client: :nonexistant)
+        Band.store_in(client: :nonexistent)
       end
 
       it "raises an error" do
@@ -749,6 +749,10 @@ describe Mongoid::Clients do
           expect(sess[:bands].find(name: "Tool")).to_not be_nil
         end
       end
+
+      it 'uses that database for the model mongo_client' do
+        expect(Band.mongo_client.database.name).to eq('mongoid_optional')
+      end
     end
   end
 end

data/spec/mongoid/config_spec.rb

@@ -197,7 +197,8 @@ describe Mongoid::Config do
             end
 
             it "sets the read option" do
-              expect(options["read"]).to eq({ "mode" => :primary })
+              expect(options["read"]).to eq({ "mode" => :primary_preferred,
+                                              "tag_sets" => [{ "use" => "web" }]})
             end
           end
         end
@@ -218,7 +219,7 @@ describe Mongoid::Config do
       end
     end
 
-    context "when provided a non-existant option" do
+    context "when provided a non-existent option" do
 
       it "raises an error" do
         expect {

data/spec/mongoid/contextual/aggregable/mongo_spec.rb

@@ -145,7 +145,7 @@ describe Mongoid::Contextual::Aggregable::Mongo do
       context "when the field does not exist" do
 
         let(:aggregates) do
-          context.aggregates(:non_existant)
+          context.aggregates(:non_existent)
         end
 
         it "returns an avg" do
@@ -234,7 +234,7 @@ describe Mongoid::Contextual::Aggregable::Mongo do
         end
 
         let(:aggregates) do
-          context.aggregates(:non_existant)
+          context.aggregates(:non_existent)
         end
 
         it "returns nil" do
@@ -302,6 +302,29 @@ describe Mongoid::Contextual::Aggregable::Mongo do
 
   describe "#max" do
 
+    context 'when the field does not exist in any document' do
+
+      let!(:depeche) do
+        Band.create(name: "Depeche Mode", likes: 1000)
+      end
+
+      let(:criteria) do
+        Band.all
+      end
+
+      let(:context) do
+        Mongoid::Contextual::Mongo.new(criteria)
+      end
+
+      let(:max) do
+        context.max(:non_existent)
+      end
+
+      it 'returns nil' do
+        expect(max).to be(nil)
+      end
+    end
+
     context "when provided a single field" do
 
       let!(:depeche) do

data/spec/mongoid/contextual/atomic_spec.rb

@@ -254,7 +254,7 @@ describe Mongoid::Contextual::Atomic do
       expect(depeche_mode.reload.members).to eq([ "Dave" ])
     end
 
-    it "does not error on non existant fields" do
+    it "does not error on non existent fields" do
       expect(smiths.reload.members).to be_nil
     end
   end
@@ -285,7 +285,7 @@ describe Mongoid::Contextual::Atomic do
       expect(depeche_mode.reload.members).to eq([ "Fletch" ])
     end
 
-    it "does not error on non existant fields" do
+    it "does not error on non existent fields" do
       expect(smiths.reload.members).to be_nil
     end
   end
@@ -316,7 +316,7 @@ describe Mongoid::Contextual::Atomic do
       expect(depeche_mode.reload.members).to eq([ "Dave", "Alan" ])
     end
 
-    it "pushes to non existant fields" do
+    it "pushes to non existent fields" do
       expect(smiths.reload.members).to eq([ "Alan" ])
     end
   end
@@ -347,7 +347,7 @@ describe Mongoid::Contextual::Atomic do
       expect(depeche_mode.reload.members).to eq([ "Dave", "Alan", "Fletch" ])
     end
 
-    it "pushes to non existant fields" do
+    it "pushes to non existent fields" do
       expect(smiths.reload.members).to eq([ "Alan", "Fletch" ])
     end
   end
@@ -378,7 +378,7 @@ describe Mongoid::Contextual::Atomic do
       expect(depeche_mode.reload.artists).to eq([ "Dave" ])
     end
 
-    it "does not rename non existant fields" do
+    it "does not rename non existent fields" do
       expect(smiths.reload).to_not respond_to(:artists)
     end
   end
@@ -409,7 +409,7 @@ describe Mongoid::Contextual::Atomic do
       expect(depeche_mode.reload.name).to eq("Recoil")
     end
 
-    it "sets non existant fields" do
+    it "sets non existent fields" do
       expect(smiths.reload.name).to eq("Recoil")
     end
   end

data/spec/mongoid/contextual/mongo_spec.rb

@@ -757,7 +757,7 @@ describe Mongoid::Contextual::Mongo do
 
         context "when subsequently calling #last" do
 
-          it "returns the correnct document" do
+          it "returns the correct document" do
             expect(context.send(method)).to eq(new_order)
             expect(context.last).to eq(depeche_mode)
           end
@@ -783,7 +783,7 @@ describe Mongoid::Contextual::Mongo do
 
         context "when subsequently calling #last" do
 
-          it "returns the correnct document" do
+          it "returns the correct document" do
             expect(context.send(method)).to eq(new_order)
             expect(context.last).to eq(depeche_mode)
           end
@@ -854,79 +854,6 @@ describe Mongoid::Contextual::Mongo do
     end
   end
 
-  pending "#last" do
-
-    context "when no default scope" do
-
-      let!(:depeche_mode) do
-        Band.create(name: "Depeche Mode")
-      end
-
-      let!(:new_order) do
-        Band.create(name: "New Order")
-      end
-
-      let(:criteria) do
-        Band.all
-      end
-
-      let(:context) do
-        described_class.new(criteria)
-      end
-
-      it "returns the last matching document" do
-        expect(context.last).to eq(new_order)
-      end
-    end
-
-    context "when default scope" do
-
-      let!(:palm) do
-        Tree.create(name: "Palm")
-      end
-
-      let!(:maple) do
-        Tree.create(name: "Maple")
-      end
-
-      let(:criteria) do
-        Tree.all
-      end
-
-      let(:context) do
-        described_class.new(criteria)
-      end
-
-      it "respects default scope" do
-        expect(context.last).to eq(palm)
-      end
-    end
-
-    context "when subsequently calling #first" do
-
-      let!(:depeche_mode) do
-        Band.create(name: "Depeche Mode")
-      end
-
-      let!(:new_order) do
-        Band.create(name: "New Order")
-      end
-
-      let(:criteria) do
-        Band.asc(:name)
-      end
-
-      let(:context) do
-        described_class.new(criteria)
-      end
-
-      it "returns the correnct document" do
-        expect(context.last).to eq(new_order)
-        expect(context.first).to eq(depeche_mode)
-      end
-    end
-  end
-
   [ :length, :size ].each do |method|
 
     describe "##{method}" do
@@ -1805,4 +1732,30 @@ describe Mongoid::Contextual::Mongo do
       end
     end
   end
+
+  describe '#pipeline' do
+
+    context 'when the criteria has a selector' do
+
+      let(:criteria) do
+        Band.where(name: "New Order")
+      end
+
+      let(:context) do
+        described_class.new(criteria)
+      end
+
+      let(:matches_operators) do
+        context.send(:pipeline, 'name').select { |o| o['$match'] }
+      end
+
+      it 'creates a pipeline with the selector as one of the $match criteria' do
+        expect(matches_operators).to include('$match' => criteria.selector)
+      end
+
+      it 'creates a pipeline with the $exists operator as one of the $match criteria' do
+        expect(matches_operators).to include('$match' => { 'name' => { '$exists' => true } })
+      end
+    end
+  end
 end

data/spec/mongoid/criteria_spec.rb

@@ -2821,6 +2821,60 @@ describe Mongoid::Criteria do
             expect(criteria.first.likes).to eq(3)
           end
         end
+
+        context 'when the field is a subdocument' do
+
+          let(:criteria) do
+            Band.where(name: 'FKA Twigs')
+          end
+
+          context 'when a top-level field and a subdocument field are plucked' do
+
+            before do
+              Band.create(name: 'FKA Twigs')
+              Band.create(name: 'FKA Twigs', records: [ Record.new(name: 'LP1') ])
+            end
+
+            let(:embedded_pluck) do
+              criteria.pluck(:name, 'records.name')
+            end
+
+            let(:expected) do
+              [
+                ["FKA Twigs", nil],
+                ['FKA Twigs', [{ "name" => "LP1" }]]
+              ]
+            end
+
+            it 'returns the list of top-level field and subdocument values' do
+              expect(embedded_pluck). to eq(expected)
+            end
+          end
+
+          context 'when only a subdocument field is plucked' do
+
+            before do
+              Band.create(name: 'FKA Twigs')
+              Band.create(name: 'FKA Twigs', records: [ Record.new(name: 'LP1') ])
+            end
+
+            let(:embedded_pluck) do
+              criteria.pluck('records.name')
+            end
+
+            let(:expected) do
+              [
+                nil,
+                [{ "name" => "LP1" }]
+              ]
+            end
+
+            it 'returns the list of subdocument values' do
+              expect(embedded_pluck). to eq(expected)
+            end
+          end
+
+        end
       end
 
       context "when plucking mult-fields" do

data/spec/mongoid/fields/standard_spec.rb

@@ -123,7 +123,7 @@ describe Mongoid::Fields::Standard do
       end
     end
 
-    context "when getting a non existant value" do
+    context "when getting a non existent value" do
 
       it "returns nil" do
         expect(hash[:key]).to be_nil

data/spec/mongoid/fields_spec.rb

@@ -895,7 +895,7 @@ describe Mongoid::Fields do
         (person.testing = expect("Testy")).to eq("Testy")
       end
 
-      it "adds an existance method" do
+      it "adds an existence method" do
         expect(Person.new.testing?).to be false
       end
 

data/spec/mongoid/indexable/specification_spec.rb

@@ -96,7 +96,7 @@ describe Mongoid::Indexable::Specification do
     end
 
     it "normalizes the options" do
-      expect(spec.options).to eq(background: true, dropDups: true)
+      expect(spec.options).to eq(background: true, drop_dups: true)
     end
   end
 end

data/spec/mongoid/indexable_spec.rb

@@ -192,8 +192,8 @@ describe Mongoid::Indexable do
         klass.index_specification(name: 1).options
       end
 
-      it "sets the index with dropDups options" do
-        expect(options).to eq(dropDups: true)
+      it "sets the index with drop_dups option" do
+        expect(options).to eq(drop_dups: true)
       end
     end
 
@@ -327,7 +327,7 @@ describe Mongoid::Indexable do
       end
     end
 
-    context "when providing a geo haystack index" do
+    context "when providing a geo haystack index with a bucket_size" do
 
       before do
         klass.index({ location: "geoHaystack" }, { min: -200, max: 200, bucket_size: 0.5 })
@@ -337,8 +337,8 @@ describe Mongoid::Indexable do
         klass.index_specification(location: "geoHaystack").options
       end
 
-      it "sets the geo haystack index" do
-        expect(options).to eq({ min: -200, max: 200, bucketSize: 0.5 })
+      it "sets the geo haystack index with the bucket_size option" do
+        expect(options).to eq({ min: -200, max: 200, bucket_size: 0.5 })
       end
     end
 
@@ -490,8 +490,8 @@ describe Mongoid::Indexable do
         klass.index_specification(name: 1).options
       end
 
-      it "sets the index with sparse options" do
-        expect(options).to eq(expireAfterSeconds: 3600)
+      it "sets the index with expire_after option" do
+        expect(options).to eq(expire_after: 3600)
       end
     end