mongoid 4.0.2 → 5.0.0.beta

data/spec/mongoid/config/environment_spec.rb

@@ -11,21 +11,24 @@ describe Mongoid::Config::Environment do
 
     context "when using rails" do
 
-      before do
-        module Rails
-          class << self
-            def env; "production"; end
+      context "when an environment exists" do
+
+        before do
+          module Rails
+            class << self
+              def env; "production"; end
+            end
           end
         end
-      end
 
-      after do
-        RailsTemp = Rails
-        Object.send(:remove_const, :Rails)
-      end
+        after do
+          RailsTemp = Rails
+          Object.send(:remove_const, :Rails)
+        end
 
-      it "returns the rails environment" do
-        expect(described_class.env_name).to eq("production")
+        it "returns the rails environment" do
+          expect(described_class.env_name).to eq("production")
+        end
       end
     end
 

data/spec/mongoid/config_spec.rb

@@ -15,7 +15,7 @@ describe Mongoid::Config do
       described_class.connect_to(database_id, read: :primary)
     end
 
-    context "when a default session config exists" do
+    context "when a default client config exists" do
 
       context "when a default database is configured" do
 
@@ -23,13 +23,13 @@ describe Mongoid::Config do
           {
             default: {
               database: database_id,
-              hosts: [ "localhost:27017" ]
+              hosts: [ "127.0.0.1:27017" ]
             }
           }
         end
 
         before do
-          described_class.sessions = config
+          described_class.send(:clients=, config)
         end
 
         it "returns true" do
@@ -38,10 +38,10 @@ describe Mongoid::Config do
       end
     end
 
-    context "when no default session config exists" do
+    context "when no default client config exists" do
 
       before do
-        described_class.sessions.clear
+        described_class.clients.clear
       end
 
       it "returns false" do
@@ -73,19 +73,19 @@ describe Mongoid::Config do
       File.join(File.dirname(__FILE__), "..", "config", "mongoid.yml")
     end
 
-    context "when existing sessions exist in the configuration" do
+    context "when existing clients exist in the configuration" do
 
-      let(:session) do
-        Moped::Session.new([ "127.0.0.1:27017" ])
+      let(:client) do
+        Mongo::Client.new([ "127.0.0.1:27017" ])
       end
 
       before do
-        Mongoid::Threaded.sessions[:test] = session
+        Mongoid::Clients.clients[:test] = client
         described_class.load!(file, :test)
       end
 
-      it "clears the previous sessions" do
-        expect(Mongoid::Threaded.sessions[:test]).to be_nil
+      it "clears the previous clients" do
+        expect(Mongoid::Clients.clients[:test]).to be_nil
       end
     end
 
@@ -174,7 +174,7 @@ describe Mongoid::Config do
         end
       end
 
-      context "when session configurations are provided" do
+      context "when client configurations are provided" do
 
         context "when a default is provided" do
 
@@ -183,7 +183,7 @@ describe Mongoid::Config do
           end
 
           let(:default) do
-            described_class.sessions[:default]
+            described_class.clients[:default]
           end
 
           it "sets the default hosts" do
@@ -197,25 +197,10 @@ describe Mongoid::Config do
             end
 
             it "sets the read option" do
-              expect(options["read"]).to eq("primary")
+              expect(options["read"]).to eq({ "mode" => "primary" })
             end
           end
         end
-
-        context "when a secondary is provided", config: :mongohq do
-
-          before do
-            described_class.load!(file)
-          end
-
-          let(:secondary) do
-            described_class.sessions[:mongohq_single]
-          end
-
-          it "sets the secondary host" do
-            expect(secondary["hosts"]).to eq([ ENV["MONGOHQ_SINGLE_URL"] ])
-          end
-        end
       end
     end
   end
@@ -243,66 +228,66 @@ describe Mongoid::Config do
     end
   end
 
-  describe "#sessions=" do
+  describe "#clients=" do
 
-    context "when no sessions configuration exists" do
+    context "when no clients configuration exists" do
 
       it "raises an error" do
         expect {
-          described_class.sessions = nil
-        }.to raise_error(Mongoid::Errors::NoSessionsConfig)
+          described_class.send(:clients=, nil)
+        }.to raise_error(Mongoid::Errors::NoClientsConfig)
       end
     end
 
-    context "when no default session exists" do
+    context "when no default client exists" do
 
       it "raises an error" do
         expect {
-          described_class.sessions = {}
-        }.to raise_error(Mongoid::Errors::NoDefaultSession)
+          described_class.send(:clients=, {})
+        }.to raise_error(Mongoid::Errors::NoDefaultClient)
       end
     end
 
-    context "when a default session exists" do
+    context "when a default client exists" do
 
       context "when no hosts are provided" do
 
-        let(:sessions) do
+        let(:clients) do
           { "default" => { database: database_id }}
         end
 
         it "raises an error" do
           expect {
-            described_class.sessions = sessions
-          }.to raise_error(Mongoid::Errors::NoSessionHosts)
+            described_class.send(:clients=, clients)
+          }.to raise_error(Mongoid::Errors::NoClientHosts)
         end
       end
 
       context "when no database is provided" do
 
-        let(:sessions) do
-          { "default" => { hosts: [ "localhost:27017" ] }}
+        let(:clients) do
+          { "default" => { hosts: [ "127.0.0.1:27017" ] }}
         end
 
         it "raises an error" do
           expect {
-            described_class.sessions = sessions
-          }.to raise_error(Mongoid::Errors::NoSessionDatabase)
+            described_class.send(:clients=, clients)
+          }.to raise_error(Mongoid::Errors::NoClientDatabase)
         end
       end
 
       context "when a uri and standard options are provided" do
 
-        let(:sessions) do
+        let(:clients) do
           { "default" =>
-            { hosts: [ "localhost:27017" ], uri: "mongodb://localhost:27017" }
+            { hosts: [ "127.0.0.1:27017" ], uri: "mongodb://127.0.0.1:27017" }
           }
         end
 
         it "raises an error" do
           expect {
-            described_class.sessions = sessions
-          }.to raise_error(Mongoid::Errors::MixedSessionConfiguration)
+            described_class.send(:clients=, clients)
+          }.to raise_error(Mongoid::Errors::MixedClientConfiguration)
         end
       end
     end

data/spec/mongoid/contextual/atomic_spec.rb

@@ -81,10 +81,6 @@ describe Mongoid::Contextual::Atomic do
       Band.create(likes: 60)
     end
 
-    let!(:smiths) do
-      Band.create
-    end
-
     let(:criteria) do
       Band.all
     end
@@ -102,10 +98,6 @@ describe Mongoid::Contextual::Atomic do
       it "performs the bitwise operation on initialized fields" do
         expect(depeche_mode.reload.likes).to eq(12)
       end
-
-      it "does not error on non initialized fields" do
-        expect(smiths.reload.likes).to eq(0)
-      end
     end
 
     context "when performing a bitwise or" do
@@ -117,10 +109,6 @@ describe Mongoid::Contextual::Atomic do
       it "performs the bitwise operation on initialized fields" do
         expect(depeche_mode.reload.likes).to eq(61)
       end
-
-      it "does not error on non initialized fields" do
-        expect(smiths.reload.likes).to eq(13)
-      end
     end
 
     context "when chaining bitwise operations" do
@@ -132,12 +120,8 @@ describe Mongoid::Contextual::Atomic do
       it "performs the bitwise operation on initialized fields" do
         expect(depeche_mode.reload.likes).to eq(14)
       end
-
-      it "does not error on non initialized fields" do
-        expect(smiths.reload.likes).to eq(10)
-      end
     end
-  end if mongodb_version > "2.5"
+  end
 
   describe "#inc" do
 

data/spec/mongoid/contextual/geo_near_spec.rb

@@ -317,6 +317,41 @@ describe Mongoid::Contextual::GeoNear do
     end
   end
 
+  describe "#min_distance" do
+
+    let!(:collection) do
+      Pub.collection
+    end
+
+    before do
+      Pub.create_indexes
+    end
+
+    let!(:bar_one) do
+      Pub.create(location: [ 52.30, 13.25 ])
+    end
+
+    let!(:bar_two) do
+      Pub.create(location: [ 52.30, 13.35 ])
+    end
+
+    context "when results are returned" do
+
+      let(:criteria) do
+        Pub.all
+      end
+
+      let(:geo_near) do
+        described_class.new(collection, criteria, [ 52, 13 ]).spherical.min_distance(0.0)
+      end
+
+      it "sets the min distance" do
+        expect(geo_near.to_a).to include(bar_one)
+        expect(geo_near.to_a).to include(bar_two)
+      end
+    end
+  end
+
   describe "#inspect" do
 
     let!(:collection) do

data/spec/mongoid/contextual/mongo_spec.rb

@@ -107,7 +107,7 @@ describe Mongoid::Contextual::Mongo do
       end
 
       before do
-        expect(context.query).to receive(:count).once.and_return(1)
+        expect(context.view).to receive(:count).once.and_return(1)
       end
 
       it "returns the count cached value after first call" do
@@ -164,18 +164,18 @@ describe Mongoid::Contextual::Mongo do
       end
     end
 
-    context "when provided limit true" do
+    context "when provided limit" do
 
       before do
         2.times { Band.create(name: "Depeche Mode") }
       end
 
       let(:context) do
-        described_class.new(criteria.limit(2))
+        described_class.new(criteria)
       end
 
       let(:count) do
-        context.count(true)
+        context.count(limit: 2)
       end
 
       it "returns the number of documents that match" do
@@ -497,7 +497,7 @@ describe Mongoid::Contextual::Mongo do
         end
 
         it "hits the database again" do
-          expect(context).to receive(:query).once.and_call_original
+          expect(context).to receive(:view).once.and_call_original
           expect(context).to be_exists
         end
       end
@@ -520,7 +520,7 @@ describe Mongoid::Contextual::Mongo do
         end
 
         it "does not hit the database" do
-          expect(context).to receive(:query).never
+          expect(context).to receive(:view).never
           expect(context).to be_exists
         end
       end
@@ -534,7 +534,7 @@ describe Mongoid::Contextual::Mongo do
           end
 
           it "does not hit the database" do
-            expect(context).to receive(:query).never
+            expect(context).to receive(:view).never
             expect(context).to be_exists
           end
         end
@@ -553,11 +553,11 @@ describe Mongoid::Contextual::Mongo do
     end
 
     it "returns the criteria explain path" do
-      expect(context.explain["cursor"]).to eq("BasicCursor")
+      expect(context.explain).to_not be_empty
     end
   end
 
-  describe "#find_and_modify" do
+  describe "#find_one_and_update" do
 
     let!(:depeche) do
       Band.create(name: "Depeche Mode")
@@ -580,7 +580,7 @@ describe Mongoid::Contextual::Mongo do
         end
 
         let!(:result) do
-          context.find_and_modify("$inc" => { likes: 1 })
+          context.find_one_and_update("$inc" => { likes: 1 })
         end
 
         it "returns the first matching document" do
@@ -603,7 +603,7 @@ describe Mongoid::Contextual::Mongo do
         end
 
         let!(:result) do
-          context.find_and_modify("$inc" => { likes: 1 })
+          context.find_one_and_update("$inc" => { likes: 1 })
         end
 
         it "returns the first matching document" do
@@ -626,7 +626,7 @@ describe Mongoid::Contextual::Mongo do
         end
 
         let!(:result) do
-          context.find_and_modify("$inc" => { likes: 1 })
+          context.find_one_and_update("$inc" => { likes: 1 })
         end
 
         it "returns the first matching document" do
@@ -653,7 +653,7 @@ describe Mongoid::Contextual::Mongo do
         end
 
         let!(:result) do
-          context.find_and_modify({ "$inc" => { likes: 1 }}, new: true)
+          context.find_one_and_update({ "$inc" => { likes: 1 }}, return_document: :after)
         end
 
         it "returns the first matching document" do
@@ -676,7 +676,7 @@ describe Mongoid::Contextual::Mongo do
         end
 
         let!(:result) do
-          context.find_and_modify({}, remove: true)
+          context.find_one_and_delete
         end
 
         it "returns the first matching document" do
@@ -702,7 +702,7 @@ describe Mongoid::Contextual::Mongo do
       end
 
       let(:result) do
-        context.find_and_modify("$inc" => { likes: 1 })
+        context.find_one_and_update("$inc" => { likes: 1 })
       end
 
       it "returns nil" do
@@ -807,7 +807,7 @@ describe Mongoid::Contextual::Mongo do
           end
 
           it "returns the first document without touching the database" do
-            expect(context).to receive(:query).never
+            expect(context).to receive(:view).never
             expect(context.send(method)).to eq(depeche_mode)
           end
         end
@@ -819,7 +819,7 @@ describe Mongoid::Contextual::Mongo do
           end
 
           it "returns the first document without touching the database" do
-            expect(context).to receive(:query).never
+            expect(context).to receive(:view).never
             expect(context.send(method)).to eq(depeche_mode)
           end
         end
@@ -845,20 +845,16 @@ describe Mongoid::Contextual::Mongo do
       expect(context.klass).to eq(Band)
     end
 
-    it "sets the query" do
-      expect(context.query).to be_a(Moped::Query)
-    end
-
-    it "sets the query selector" do
-      expect(context.query.selector).to eq({ "name" => "Depeche Mode" })
+    it "sets the view" do
+      expect(context.view).to be_a(Mongo::Collection::View)
     end
 
-    it "sets timeout options" do
-      expect(context.query.operation.flags).to eq([ :no_cursor_timeout ])
+    it "sets the view selector" do
+      expect(context.view.selector).to eq({ "name" => "Depeche Mode" })
     end
   end
 
-  describe "#last" do
+  pending "#last" do
 
     context "when no default scope" do
 
@@ -957,7 +953,7 @@ describe Mongoid::Contextual::Mongo do
         context "when calling more than once" do
 
           before do
-            expect(context.query).to receive(:count).once.and_return(2)
+            expect(context.view).to receive(:count).once.and_return(2)
           end
 
           it "returns the cached value for subsequent calls" do
@@ -969,7 +965,7 @@ describe Mongoid::Contextual::Mongo do
 
           before do
             context.entries
-            expect(context.query).to receive(:count).once.and_return(2)
+            expect(context.view).to receive(:count).once.and_return(2)
           end
 
           it "returns the cached value for all calls" do
@@ -1006,7 +1002,7 @@ describe Mongoid::Contextual::Mongo do
         context "when calling more than once" do
 
           before do
-            expect(context.query).to receive(:count).once.and_return(1)
+            expect(context.view).to receive(:count).once.and_return(1)
           end
 
           it "returns the cached value for subsequent calls" do
@@ -1018,7 +1014,7 @@ describe Mongoid::Contextual::Mongo do
 
           before do
             context.entries
-            expect(context.query).to receive(:count).once.and_return(1)
+            expect(context.view).to receive(:count).once.and_return(1)
           end
 
           it "returns the cached value for all calls" do
@@ -1517,59 +1513,6 @@ describe Mongoid::Contextual::Mongo do
     end
   end
 
-  describe "#text_search" do
-
-    let(:criteria) do
-      Word.all
-    end
-
-    let(:context) do
-      described_class.new(criteria)
-    end
-
-    before do
-      Word.with(database: "admin").mongo_session.command(setParameter: 1, textSearchEnabled: true)
-      Word.create_indexes
-      Word.create!(name: "phase", origin: "latin")
-    end
-
-    after(:all) do
-      Word.remove_indexes
-    end
-
-    context "when the search is projecting" do
-
-      let(:search) do
-        context.text_search("phase").project(name: 1)
-      end
-
-      let(:documents) do
-        search.entries
-      end
-
-      it "limits the fields to the projection" do
-        expect {
-          documents.first.origin
-        }.to raise_error(ActiveModel::MissingAttributeError)
-      end
-    end
-
-    context "when the search is not projecting" do
-
-      let(:search) do
-        context.text_search("phase")
-      end
-
-      let(:documents) do
-        search.entries
-      end
-
-      it "returns all fields" do
-        expect(documents.first.origin).to eq("latin")
-      end
-    end
-  end
-
   describe "#update" do
 
     let!(:depeche_mode) do