mongoid 1.1.4 → 1.2.0

data/spec/unit/mongoid/collections/mimic_spec.rb

@@ -0,0 +1,43 @@
+require "spec_helper"
+
+describe Mongoid::Collections::Mimic do
+
+  let(:mimic) do
+    klass = Class.new do
+      include Mongoid::Collections::Mimic
+    end
+    klass.new
+  end
+
+  describe "#attempt" do
+
+    before do
+      @operation = stub.quacks_like(Proc.new {})
+    end
+
+    context "when the call succeeds" do
+
+      it "returns the value" do
+        @operation.expects(:call).returns([])
+        mimic.attempt(@operation, Time.now).should == []
+      end
+    end
+
+    context "when the call fails" do
+
+      before do
+        Mongoid.reconnect_time = 0.10
+      end
+
+      after do
+        Mongoid.reconnect_time = 3
+      end
+
+      it "retries the call" do
+        @operation.expects(:call).at_least_once.raises(Mongo::ConnectionFailure.new)
+        lambda { mimic.attempt(@operation, Time.now) }.should raise_error
+      end
+    end
+
+  end
+end

data/spec/unit/mongoid/collections/slaves_spec.rb

@@ -0,0 +1,81 @@
+require "spec_helper"
+
+describe Mongoid::Collections::Master do
+
+  let(:collection) do
+    stub.quacks_like(Mongo::Collection.allocate)
+  end
+
+  let(:db) do
+    stub.quacks_like(Mongo::DB.allocate)
+  end
+
+  describe "#empty?" do
+
+    context "when the slaves exist" do
+
+      let(:slave) do
+        Mongoid::Collections::Slaves.new([ db ], "people")
+      end
+
+      before do
+        db.expects(:collection).with("people").returns(collection)
+      end
+
+      it "returns false" do
+        slave.should_not be_empty
+      end
+    end
+
+    context "when the slaves do not exist" do
+
+      let(:slave) do
+        Mongoid::Collections::Slaves.new([], "people")
+      end
+
+      it "returns true" do
+        slave.should be_empty
+      end
+    end
+
+    context "when the slaves are nil" do
+
+      let(:slave) do
+        Mongoid::Collections::Slaves.new(nil, "people")
+      end
+
+      it "returns true" do
+        slave.should be_empty
+      end
+    end
+  end
+
+  context "Mongo::Collection operations" do
+
+    let(:slave) do
+      Mongoid::Collections::Slaves.new([ db ], "people")
+    end
+
+    before do
+      db.expects(:collection).with("people").returns(collection)
+    end
+
+    Mongoid::Collections::Operations::READ.each do |name|
+
+      it "defines #{name}" do
+        slave.should respond_to(name)
+      end
+
+      describe "##{name}" do
+
+        before do
+          collection.expects(name)
+        end
+
+        it "delegates to the collection" do
+          slave.send(name)
+        end
+      end
+    end
+  end
+end

data/spec/unit/mongoid/commands_spec.rb

@@ -138,6 +138,13 @@ describe Mongoid::Commands do
       @person.update_attributes({})
     end
 
+    it "executes the before and after update callbacks" do
+      @person.expects(:run_callbacks).with(:before_update)
+      Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(true)
+      @person.expects(:run_callbacks).with(:after_update)
+      @person.update_attributes({})
+    end
+
   end
 
   describe "#update_attributes!" do

data/spec/unit/mongoid/config_spec.rb

@@ -8,7 +8,7 @@ describe Mongoid::Config do
 
   let(:config) { Mongoid::Config.instance }
 
-  describe ".database=" do
+  describe "#database=" do
 
     context "when object provided is not a Mongo::DB" do
 
@@ -20,6 +20,25 @@ describe Mongoid::Config do
 
   end
 
+  describe "#master=" do
+
+    context "when object provided is not a Mongo::DB" do
+
+      it "raises an error" do
+        lambda { config.master = "Test" }.should raise_error
+      end
+
+    end
+
+  end
+
+  describe "#parameterize_keys" do
+
+    it "defaults to true" do
+      config.parameterize_keys.should == true
+    end
+  end
+
   describe "#persist_in_safe_mode=" do
 
     context "when setting to true" do
@@ -76,6 +95,38 @@ describe Mongoid::Config do
 
   end
 
+  describe "#reconnect_time" do
+
+    it "defaults to 3" do
+      config.reconnect_time.should == 3
+    end
+
+  end
+
+  describe "#reconnect_time=" do
+
+    after do
+      config.reconnect_time = 3
+    end
+
+    it "sets the time" do
+      config.reconnect_time = 5
+      config.reconnect_time.should == 5
+    end
+  end
+
+  describe "#slaves=" do
+
+    context "when object provided is not a Mongo::DB" do
+
+      it "raises an error" do
+        lambda { config.slaves = ["Test"] }.should raise_error
+      end
+
+    end
+
+  end
+
   describe "#allow_dynamic_fields=" do
 
     context "when setting to true" do

data/spec/unit/mongoid/contexts/enumerable_spec.rb

@@ -8,7 +8,7 @@ describe Mongoid::Contexts::Enumerable do
     @melbourne = Address.new(:number => 20, :street => "Bourke Street")
     @new_york = Address.new(:number => 20, :street => "Broadway")
     @docs = [ @london, @shanghai, @melbourne, @new_york ]
-    @selector = { :street => "Bond Street" }
+    @selector = { :street => "Bourke Street" }
     @options = { :fields => [ :number ] }
     @context = Mongoid::Contexts::Enumerable.new(@selector, @options, @docs)
   end
@@ -41,15 +41,41 @@ describe Mongoid::Contexts::Enumerable do
   describe "#execute" do
 
     it "returns the matching documents from the array" do
-      @context.execute.should == [ @london ]
+      @context.execute.should == [ @melbourne ]
+    end
+
+    context "when selector is empty" do
+
+      before do
+        @context = Mongoid::Contexts::Enumerable.new({}, @options, @docs)
+      end
+
+      it "returns all the documents" do
+        @context.execute.should == @docs
+      end
+    end
+
+    context "when skip and limit are in the options" do
+
+      before do
+        @options = { :skip => 2, :limit => 2 }
+        @context = Mongoid::Contexts::Enumerable.new({}, @options, @docs)
+      end
+
+      it "properly narrows down the matching results" do
+        @context.execute.should == [ @melbourne, @new_york ]
+      end
     end
 
   end
 
   describe "#first" do
 
-    it "returns the first in the enumerable" do
-      @context.first.should == @london
+    context "when a selector is present" do
+
+      it "returns the first that matches the selector" do
+        @context.first.should == @melbourne
+      end
     end
 
   end
@@ -98,8 +124,8 @@ describe Mongoid::Contexts::Enumerable do
 
   describe "#last" do
 
-    it "returns the last in the enumerable" do
-      @context.last.should == @new_york
+    it "returns the last matching in the enumerable" do
+      @context.last.should == @melbourne
     end
 
   end
@@ -122,8 +148,8 @@ describe Mongoid::Contexts::Enumerable do
 
   describe "#one" do
 
-    it "returns the first in the enumerable" do
-      @context.one.should == @london
+    it "returns the first matching in the enumerable" do
+      @context.one.should == @melbourne
     end
 
   end
@@ -161,14 +187,14 @@ describe Mongoid::Contexts::Enumerable do
   describe "#paginate" do
 
     before do
-      @criteria = Person.where(:_id => "1").skip(60).limit(20)
-      @context = Mongoid::Contexts::Enumerable.new(@criteria.selector, @criteria.options, [])
+      @criteria = Person.criteria.skip(2).limit(2)
+      @context = Mongoid::Contexts::Enumerable.new({}, @criteria.options, @docs)
       @results = @context.paginate
     end
 
     it "executes and paginates the results" do
-      @results.current_page.should == 4
-      @results.per_page.should == 20
+      @results.current_page.should == 2
+      @results.per_page.should == 2
     end
 
   end

data/spec/unit/mongoid/contexts/mongo_spec.rb

@@ -65,32 +65,6 @@ describe Mongoid::Contexts::Mongo do
 
   end
 
-  describe "#group" do
-
-    before do
-      @selector = { :_type => { "$in" => ["Doctor", "Person"] } }
-      @options = { :fields => [ :field1 ] }
-      @grouping = [{ "title" => "Sir", "group" => [{ "title" => "Sir", "age" => 30, "_type" => "Person" }] }]
-      @context = Mongoid::Contexts::Mongo.new(@selector, @options, Person)
-    end
-
-    context "when klass provided" do
-
-      before do
-        @reduce = "function(obj, prev) { prev.group.push(obj); }"
-        @collection = mock
-        Person.expects(:collection).returns(@collection)
-      end
-
-      it "calls group on the collection with the aggregate js" do
-        @collection.expects(:group).with([:field1], {:_type => { "$in" => ["Doctor", "Person"] }}, {:group => []}, @reduce, true).returns(@grouping)
-        @context.group
-      end
-
-    end
-
-  end
-
   describe "#execute" do
 
     let(:selector) { { :field => "value"  } }
@@ -99,15 +73,23 @@ describe Mongoid::Contexts::Mongo do
     before do
       @cursor = stub(:count => 500)
       @collection = mock
-      @person = mock
       @klass = stub(:collection => @collection, :hereditary => false, :instantiate => @person)
       @context = Mongoid::Contexts::Mongo.new(selector, options, @klass)
     end
 
     it "calls find on the collection" do
       @collection.expects(:find).with(selector, options).returns(@cursor)
-      @cursor.expects(:collect).yields({ :title => "Sir" }).returns([@person])
-      @context.execute.should == [@person]
+      @context.execute.should == @cursor
+    end
+
+    context "when paginating" do
+
+      it "should find the count from the cursor" do
+        @collection.expects(:find).with(selector, options).returns(@cursor)
+        @context.execute(true).should == @cursor
+        @context.count.should == 500
+      end
+
     end
 
     context "when field options are supplied" do
@@ -121,8 +103,7 @@ describe Mongoid::Contexts::Mongo do
 
         it "adds _type to the fields" do
           @collection.expects(:find).with(selector, @expected_options).returns(@cursor)
-          @cursor.expects(:collect).yields({ :title => "Sir" }).returns([@person])
-          @context.execute.should == [@person]
+          @context.execute.should == @cursor
         end
 
       end
@@ -131,6 +112,32 @@ describe Mongoid::Contexts::Mongo do
 
   end
 
+  describe "#group" do
+
+    before do
+      @selector = { :_type => { "$in" => ["Doctor", "Person"] } }
+      @options = { :fields => [ :field1 ] }
+      @grouping = [{ "title" => "Sir", "group" => [{ "title" => "Sir", "age" => 30, "_type" => "Person" }] }]
+      @context = Mongoid::Contexts::Mongo.new(@selector, @options, Person)
+    end
+
+    context "when klass provided" do
+
+      before do
+        @reduce = "function(obj, prev) { prev.group.push(obj); }"
+        @collection = mock
+        Person.expects(:collection).returns(@collection)
+      end
+
+      it "calls group on the collection with the aggregate js" do
+        @collection.expects(:group).with([:field1], {:_type => { "$in" => ["Doctor", "Person"] }}, {:group => []}, @reduce, true).returns(@grouping)
+        @context.group
+      end
+
+    end
+
+  end
+
   describe ".initialize" do
 
     let(:selector) { { :field => "value"  } }

data/spec/unit/mongoid/criteria_spec.rb

@@ -11,7 +11,6 @@ describe Mongoid::Criteria do
 
     before do
       @sir = Person.new(:title => "Sir")
-      @madam = Person.new(:title => "Madam")
       @canvas = Canvas.new
     end
 
@@ -19,14 +18,15 @@ describe Mongoid::Criteria do
 
       before do
         @collection = mock
-        @cursor = stub(:count => 1, :collect => [ @sir, @madam ])
+        @cursor = stub(:count => 1)
+        @cursor.expects(:each).yields(@sir)
         Person.expects(:collection).returns(@collection)
         @collection.expects(:find).returns(@cursor)
       end
 
       it "executes the criteria and concats the results" do
         results = @criteria + [ @canvas ]
-        results.should == [ @sir, @madam, @canvas ]
+        results.should == [ @sir, @canvas ]
       end
 
     end
@@ -71,7 +71,8 @@ describe Mongoid::Criteria do
 
       before do
         @collection = mock
-        @cursor = stub(:count => 1, :collect => [ @sir, @sir, @madam ])
+        @cursor = stub(:count => 1)
+        @cursor.expects(:each).yields(@madam)
         Person.expects(:collection).returns(@collection)
         @collection.expects(:find).returns(@cursor)
       end
@@ -118,7 +119,8 @@ describe Mongoid::Criteria do
       @criteria.where(:title => "Sir")
       @collection = stub
       @person = Person.new(:title => "Sir")
-      @cursor = stub(:count => 10, :collect => [@person])
+      @cursor = stub(:count => 10)
+      @cursor.expects(:each).yields(@person)
     end
 
     context "when the criteria has not been executed" do
@@ -227,13 +229,14 @@ describe Mongoid::Criteria do
         @collection = mock
         Person.expects(:collection).returns(@collection)
         @criteria = Mongoid::Criteria.new(Person).extras(:page => 1, :per_page => 20)
-        @cursor = stub(:count => 44, :collect => [])
+        @cursor = stub(:count => 44)
+        @cursor.expects(:each)
         @collection.expects(:find).with(@criteria.selector, @criteria.options).returns(@cursor)
       end
 
-      it "adds the count instance variable" do
+      it "does not add the count instance variable" do
         @criteria.entries.should == []
-        @criteria.count.should == 44
+        @criteria.instance_variable_get(:@count).should be_nil
       end
 
     end
@@ -272,7 +275,7 @@ describe Mongoid::Criteria do
       @criteria.where(:title => "Sir")
       @collection = stub
       @person = Person.new(:title => "Sir")
-      @cursor = stub(:count => 10, :collect => [@person])
+      @cursor = stub(:count => 10)
     end
 
     context "when the criteria has not been executed" do
@@ -280,11 +283,12 @@ describe Mongoid::Criteria do
       before do
         Person.expects(:collection).returns(@collection)
         @collection.expects(:find).with({ :_type => { "$in" => ["Doctor", "Person"] }, :title => "Sir" }, {}).returns(@cursor)
+        @cursor.expects(:each).yields(@person)
       end
 
       it "executes the criteria" do
-        @criteria.each do |person|
-          person.should == @person
+        @criteria.each do |doc|
+          doc.should == @person
         end
       end
 
@@ -295,10 +299,10 @@ describe Mongoid::Criteria do
       before do
         Person.expects(:collection).returns(@collection)
         @collection.expects(:find).with({ :_type => { "$in" => ["Doctor", "Person"] }, :title => "Sir" }, {}).returns(@cursor)
+        @cursor.expects(:each).yields(@person)
       end
 
       it "calls each on the existing results" do
-        @criteria.each
         @criteria.each do |person|
           person.should == @person
         end
@@ -523,6 +527,10 @@ describe Mongoid::Criteria do
 
   end
 
+  describe "#offset" do
+
+  end
+
   describe "#one" do
 
     before do