mongoid 4.0.0.alpha1 → 4.0.0.alpha2

data/spec/mongoid/contextual/none_spec.rb

@@ -0,0 +1,127 @@
+require "spec_helper"
+
+describe Mongoid::Contextual::None do
+
+  describe "#==" do
+
+    let!(:band) do
+      Band.create(name: "Depeche Mode")
+    end
+
+    let(:context) do
+      described_class.new(Band.where(name: "Depeche Mode"))
+    end
+
+    context "when the other is a none" do
+
+      let(:other) do
+        described_class.new(Band.where(name: "Depeche Mode"))
+      end
+
+      it "returns true" do
+        expect(context).to eq(other)
+      end
+    end
+
+    context "when the other is not a none" do
+
+      let(:other) do
+        Mongoid::Contextual::Memory.new(Band.where(name: "Depeche Mode"))
+      end
+
+      it "returns false" do
+        expect(context).to_not eq(other)
+      end
+    end
+  end
+
+  describe "#each" do
+
+    let!(:band) do
+      Band.create(name: "Depeche Mode")
+    end
+
+    let(:context) do
+      described_class.new(Band.where(name: "Depeche Mode"))
+    end
+
+    it "iterates over no documents" do
+      expect(context.each.entries).to be_empty
+    end
+  end
+
+  describe "#exists?" do
+
+    let!(:band) do
+      Band.create(name: "Depeche Mode")
+    end
+
+    let(:context) do
+      described_class.new(Band.where(name: "Depeche Mode"))
+    end
+
+    it "returns false" do
+      expect(context).to_not be_exists
+    end
+  end
+
+  describe "#first" do
+
+    let!(:band) do
+      Band.create(name: "Depeche Mode")
+    end
+
+    let(:context) do
+      described_class.new(Band.where(name: "Depeche Mode"))
+    end
+
+    it "returns nil" do
+      expect(context.first).to be_nil
+    end
+  end
+
+  describe "#last" do
+
+    let!(:band) do
+      Band.create(name: "Depeche Mode")
+    end
+
+    let(:context) do
+      described_class.new(Band.where(name: "Depeche Mode"))
+    end
+
+    it "returns nil" do
+      expect(context.last).to be_nil
+    end
+  end
+
+  describe "#length" do
+
+    let!(:band) do
+      Band.create(name: "Depeche Mode")
+    end
+
+    let(:context) do
+      described_class.new(Band.where(name: "Depeche Mode"))
+    end
+
+    it "returns zero" do
+      expect(context.length).to eq(0)
+    end
+  end
+
+  describe "#size" do
+
+    let!(:band) do
+      Band.create(name: "Depeche Mode")
+    end
+
+    let(:context) do
+      described_class.new(Band.where(name: "Depeche Mode"))
+    end
+
+    it "returns zero" do
+      expect(context.size).to eq(0)
+    end
+  end
+end

data/spec/mongoid/criteria/scopable_spec.rb

@@ -11,7 +11,7 @@ describe Mongoid::Criteria::Scopable do
       end
 
       before do
-        Band.default_scope scope
+        Band.default_scope ->{ scope }
       end
 
       after do
@@ -40,7 +40,7 @@ describe Mongoid::Criteria::Scopable do
       end
 
       before do
-        Band.default_scope scope
+        Band.default_scope ->{ scope }
       end
 
       after do
@@ -69,7 +69,7 @@ describe Mongoid::Criteria::Scopable do
       end
 
       before do
-        Band.default_scope scope
+        Band.default_scope ->{ scope }
       end
 
       after do
@@ -241,7 +241,7 @@ describe Mongoid::Criteria::Scopable do
       end
 
       before do
-        Band.default_scope criteria
+        Band.default_scope ->{ criteria }
       end
 
       after do
@@ -318,7 +318,7 @@ describe Mongoid::Criteria::Scopable do
     end
 
     before do
-      Band.default_scope criteria
+      Band.default_scope ->{ criteria }
     end
 
     after do
@@ -370,7 +370,7 @@ describe Mongoid::Criteria::Scopable do
       context "when a named scope is called in the block" do
 
         before do
-          Band.scope(:skipped, Band.skip(10))
+          Band.scope(:skipped, ->{ Band.skip(10) })
         end
 
         after do

data/spec/mongoid/criteria_spec.rb

@@ -362,7 +362,7 @@ describe Mongoid::Criteria do
       end
 
       it "does not hit the database after first iteration" do
-        criteria.context.query.should_receive(:each).never
+        expect(criteria.context.query).to receive(:each).never
         criteria.each do |doc|
           expect(doc).to eq(person)
         end
@@ -380,7 +380,7 @@ describe Mongoid::Criteria do
       end
 
       it "does not hit the database after first iteration" do
-        criteria.context.query.should_receive(:each).never
+        expect(criteria.context.query).to receive(:each).never
         criteria.each do |doc|
           expect(doc).to eq(person)
         end
@@ -1571,7 +1571,7 @@ describe Mongoid::Criteria do
     context "when providing inclusions to the default scope" do
 
       before do
-        Person.default_scope(Person.includes(:posts))
+        Person.default_scope(->{ Person.includes(:posts) })
       end
 
       after do
@@ -1623,7 +1623,7 @@ describe Mongoid::Criteria do
           end
 
           before do
-            new_context.should_receive(:eager_load_one).with(person).once.and_call_original
+            expect(new_context).to receive(:eager_load_one).with(person).once.and_call_original
           end
 
           let!(:from_db) do
@@ -1674,7 +1674,7 @@ describe Mongoid::Criteria do
         end
 
         before do
-          context.should_receive(:eager_load_one).with(person).once.and_call_original
+          expect(context).to receive(:eager_load_one).with(person).once.and_call_original
         end
 
         let!(:from_db) do
@@ -1934,7 +1934,7 @@ describe Mongoid::Criteria do
         end
 
         before do
-          context.should_receive(:eager_load).with([ person ]).once.and_call_original
+          expect(context).to receive(:eager_load).with([ person ]).once.and_call_original
         end
 
         let!(:documents) do
@@ -1968,7 +1968,7 @@ describe Mongoid::Criteria do
         end
 
         before do
-          context.should_receive(:eager_load).with([ person ]).once.and_call_original
+          expect(context).to receive(:eager_load).with([ person ]).once.and_call_original
         end
 
         let!(:documents) do
@@ -1999,7 +1999,7 @@ describe Mongoid::Criteria do
         end
 
         before do
-          context.should_receive(:eager_load).with([ person ]).once.and_call_original
+          expect(context).to receive(:eager_load).with([ person ]).once.and_call_original
         end
 
         let!(:documents) do
@@ -2037,11 +2037,7 @@ describe Mongoid::Criteria do
         end
 
         before do
-          context.
-            should_receive(:eager_load).
-            with([ game_one, game_two ]).
-            once.
-            and_call_original
+          expect(context).to receive(:eager_load).with([ game_one, game_two ]).once.and_call_original
         end
 
         let!(:documents) do
@@ -2064,7 +2060,7 @@ describe Mongoid::Criteria do
         end
 
         before do
-          context.should_receive(:eager_load).with([ game_one ]).once.and_call_original
+          expect(context).to receive(:eager_load).with([ game_one ]).once.and_call_original
         end
 
         let!(:documents) do
@@ -2104,7 +2100,7 @@ describe Mongoid::Criteria do
       end
 
       before do
-        context.should_receive(:eager_load).with([ person ]).once.and_call_original
+        expect(context).to receive(:eager_load).with([ person ]).once.and_call_original
       end
 
       let!(:documents) do
@@ -2217,15 +2213,29 @@ describe Mongoid::Criteria do
       Band.create(name: "Tool", likes: 100)
     end
 
-    let(:map_reduce) do
-      Band.limit(2).map_reduce(map, reduce).out(inline: 1)
+    context "when no timeout options are provided" do
+
+      let(:map_reduce) do
+        Band.limit(2).map_reduce(map, reduce).out(inline: 1)
+      end
+
+      it "returns the map/reduce results" do
+        expect(map_reduce).to eq([
+          { "_id" => "Depeche Mode", "value" => { "likes" => 200 }},
+          { "_id" => "Tool", "value" => { "likes" => 100 }}
+        ])
+      end
     end
 
-    it "returns the map/reduce results" do
-      expect(map_reduce).to eq([
-        { "_id" => "Depeche Mode", "value" => { "likes" => 200 }},
-        { "_id" => "Tool", "value" => { "likes" => 100 }}
-      ])
+    context "when timeout options are provided" do
+
+      let(:map_reduce) do
+        Band.limit(2).no_timeout.map_reduce(map, reduce).out(replace: "test_bands")
+      end
+
+      it "sets the timeout option on the query" do
+        expect(map_reduce.send(:documents).operation.flags).to eq([ :no_cursor_timeout ])
+      end
     end
   end
 
@@ -3254,7 +3264,7 @@ describe Mongoid::Criteria do
     context "when the method exists on the class" do
 
       before do
-        Person.should_receive(:minor).and_call_original
+        expect(Person).to receive(:minor).and_call_original
       end
 
       it "calls the method on the class" do
@@ -3265,7 +3275,7 @@ describe Mongoid::Criteria do
     context "when the method exists on the criteria" do
 
       before do
-        criteria.should_receive(:to_criteria).and_call_original
+        expect(criteria).to receive(:to_criteria).and_call_original
       end
 
       it "calls the method on the criteria" do
@@ -3276,7 +3286,7 @@ describe Mongoid::Criteria do
     context "when the method exists on array" do
 
       before do
-        criteria.should_receive(:entries).and_call_original
+        expect(criteria).to receive(:entries).and_call_original
       end
 
       it "calls the method on the criteria" do
@@ -3287,7 +3297,7 @@ describe Mongoid::Criteria do
     context "when the method does not exist" do
 
       before do
-        criteria.should_receive(:entries).never
+        expect(criteria).to receive(:entries).never
       end
 
       it "raises an error" do
@@ -3332,81 +3342,27 @@ describe Mongoid::Criteria do
     end
   end
 
-  describe "#within_box" do
-
-    before do
-      Bar.create_indexes
-    end
-
-    let!(:match) do
-      Bar.create(location: [ 52.30, 13.25 ])
-    end
+  describe "#geo_spacial" do
 
-    let(:criteria) do
-      Bar.within_box(location: [[ 50, 10 ], [ 60, 20 ]])
-    end
+    context "when checking within a polygon" do
 
-    it "returns the matching documents" do
-      expect(criteria).to eq([ match ])
-    end
-  end
-
-  describe "#within_circle" do
-
-    before do
-      Bar.create_indexes
-    end
-
-    let!(:match) do
-      Bar.create(location: [ 52.30, 13.25 ])
-    end
-
-    let(:criteria) do
-      Bar.within_circle(location: [[ 52, 13 ], 0.5 ])
-    end
-
-    it "returns the matching documents" do
-      expect(criteria).to eq([ match ])
-    end
-  end
-
-  describe "#within_polygon" do
-
-    before do
-      Bar.create_indexes
-    end
-
-    let!(:match) do
-      Bar.create(location: [ 52.30, 13.25 ])
-    end
-
-    let(:criteria) do
-      Bar.within_polygon(
-        location: [[ 50, 10 ], [ 50, 20 ], [ 60, 20 ], [ 60, 10 ]]
-      )
-    end
-
-    it "returns the matching documents" do
-      expect(criteria).to eq([ match ])
-    end
-  end
-
-  describe "#within_spherical_circle" do
-
-    before do
-      Bar.create_indexes
-    end
+      before do
+        Bar.create_indexes
+      end
 
-    let!(:match) do
-      Bar.create(location: [ 52.30, 13.25 ])
-    end
+      let!(:match) do
+        Bar.create(location: [ 52.30, 13.25 ])
+      end
 
-    let(:criteria) do
-      Bar.within_spherical_circle(location: [[ 52, 13 ], 0.5 ])
-    end
+      let(:criteria) do
+        Bar.geo_spacial(
+          :location.within_polygon => [[[ 50, 10 ], [ 50, 20 ], [ 60, 20 ], [ 60, 10 ], [ 50, 10 ]]]
+        )
+      end
 
-    it "returns the matching documents" do
-      expect(criteria).to eq([ match ])
+      it "returns the matching documents" do
+        expect(criteria).to eq([ match ])
+      end
     end
   end
 

data/spec/mongoid/errors/invalid_scope_spec.rb

@@ -16,13 +16,13 @@ describe Mongoid::Errors::InvalidScope do
 
     it "contains the summary in the message" do
       expect(error.message).to include(
-        "Scopes in Mongoid must be either criteria objects or procs that wrap"
+        "Scopes in Mongoid must be procs that wrap"
       )
     end
 
     it "contains the resolution in the message" do
       expect(error.message).to include(
-        "Change the scope to be a criteria or proc wrapped critera."
+        "Change the scope to be a proc wrapped critera."
       )
     end
   end