mongodoc 0.1.2 → 0.2.0

data/spec/criteria_spec.rb

@@ -1,32 +1,44 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper.rb"))
 
 describe MongoDoc::Criteria do
-  class CountryCode < MongoDoc::Document
+  class CountryCode
+    include MongoDoc::Document
+
     key :code
   end
 
-  class Phone < MongoDoc::Document
+  class Phone
+    include MongoDoc::Document
+
     key :number
     has_one :country_code
   end
 
-  class Animal < MongoDoc::Document
+  class Animal
+    include MongoDoc::Document
+
     key :name
   end
 
-  class Address < MongoDoc::Document
+  class Address
+    include MongoDoc::Document
+
     key :street
     key :city
     key :state
     key :post_code
   end
 
-  class Name < MongoDoc::Document
+  class Name
+    include MongoDoc::Document
+
     key :first_name
     key :last_name
   end
 
-  class Person < MongoDoc::Document
+  class Person
+    include MongoDoc::Document
+
     key :title
     key :terms
     key :age
@@ -50,57 +62,30 @@ describe MongoDoc::Criteria do
     def employer=(emp)
       self.employer_id = emp.id
     end
-
-    class << self
-      def accepted
-        criteria.where(:terms => true)
-      end
-      def knight
-        criteria.where(:title => "Sir")
-      end
-      def old
-        criteria.where(:age => { "$gt" => 50 })
-      end
-    end
-
   end
 
   before do
     @criteria = MongoDoc::Criteria.new(Person)
   end
 
-  describe "#aggregate" do
-
-    context "when klass provided" do
-
-      before do
-        @reduce = "function(obj, prev) { prev.count++; }"
-        @collection = mock
-        Animal.should_receive(:collection).and_return(@collection)
-      end
-
-      it "calls group on the collection with the aggregate js" do
-        @collection.should_receive(:group).with([:field1], {}, {:count => 0}, @reduce)
-        @criteria.select(:field1).aggregate(Animal)
-      end
-
+  describe "#all" do
+    it "calls collect" do
+      @criteria.should_receive(:collect).with(no_args)
+      @criteria.all
     end
+  end
 
-    context "when klass not provided" do
-
-      before do
-        @reduce = "function(obj, prev) { prev.count++; }"
-        @collection = mock
-        Person.should_receive(:collection).and_return(@collection)
-      end
-
-      it "calls group on the collection with the aggregate js" do
-        @collection.should_receive(:group).with([:field1], {}, {:count => 0}, @reduce)
-        @criteria.select(:field1).aggregate
-      end
-
+  describe "#aggregate" do
+    before do
+      @reduce = "function(obj, prev) { prev.count++; }"
+      @collection = mock
+      Person.should_receive(:collection).and_return(@collection)
     end
 
+    it "calls group on the collection with the aggregate js" do
+      @collection.should_receive(:group).with([:field1], {}, {:count => 0}, @reduce, true)
+      @criteria.only(:field1).aggregate
+    end
   end
 
   describe "#every" do
@@ -110,7 +95,7 @@ describe MongoDoc::Criteria do
       @criteria.selector.should == { :title => { "$all" => ["title1", "title2"] } }
     end
 
-    it "and_return self" do
+    it "returns self" do
       @criteria.every(:title => [ "title1" ]).should == @criteria
     end
 
@@ -124,7 +109,7 @@ describe MongoDoc::Criteria do
     end
 
     it "calls each" do
-      @cursor.should_receive(:each).and_return(@cursor)
+      @criteria.should_receive(:each).and_return(@criteria)
       @criteria.collect
     end
 
@@ -181,6 +166,12 @@ describe MongoDoc::Criteria do
         @criteria.each
       end
 
+      it "has memoized the result of execute" do
+        @criteria.stub(:execute).and_return(@cursor)
+        @criteria.each
+        @criteria.collection.should == @cursor
+      end
+
       it "returns self" do
         @criteria.stub(:execute).and_return(@cursor)
         @criteria.each.should == @criteria
@@ -188,7 +179,22 @@ describe MongoDoc::Criteria do
     end
 
     context "when a block is given" do
+      class CursorStub
+        include Enumerable
+
+        attr_accessor :data
+
+        def each(*args, &block)
+          data.each(*args, &block)
+        end
+      end
+
       context "when the criteria has not been executed" do
+        before do
+          @cursor = CursorStub.new
+          @cursor.data = [@person]
+        end
+
         it "executes the criteria" do
           @criteria.should_receive(:execute).and_return(@cursor)
           @criteria.each do |person|
@@ -204,6 +210,15 @@ describe MongoDoc::Criteria do
           @result.should == @person
         end
 
+        it "has memoized the cursor iteration" do
+          @criteria.stub(:execute).and_return(@cursor)
+          @criteria.each do |person|
+            @result = person
+          end
+          @criteria.collection.should == [@person]
+        end
+
+
         it "returns self" do
           @criteria.stub(:execute).and_return(@cursor)
           @criteria.each.should == @criteria
@@ -244,7 +259,7 @@ describe MongoDoc::Criteria do
       @criteria.selector.should == { :title => { "$ne" => "Bad Title"}, :text => { "$ne" => "Bad Text" } }
     end
 
-    it "and_return self" do
+    it "returns self" do
       @criteria.excludes(:title => "Bad").should == @criteria
     end
 
@@ -290,7 +305,7 @@ describe MongoDoc::Criteria do
       @criteria.options.should == { :skip => 10 }
     end
 
-    it "and_return self" do
+    it "returns self" do
       @criteria.extras({}).should == @criteria
     end
 
@@ -303,54 +318,36 @@ describe MongoDoc::Criteria do
   end
 
   describe "#group" do
-
     before do
       @grouping = [{ "title" => "Sir", "group" => [{ "title" => "Sir", "age" => 30 }] }]
+      @reduce = "function(obj, prev) { prev.group.push(obj); }"
+      @collection = mock
+      Person.should_receive(:collection).and_return(@collection)
     end
 
-    context "when klass provided" do
-
-      before do
-        @reduce = "function(obj, prev) { prev.group.push(obj); }"
-        @collection = mock
-        Animal.should_receive(:collection).and_return(@collection)
-      end
-
-      it "calls group on the collection with the aggregate js" do
-        @collection.should_receive(:group).with([:field1], {}, {:group => []}, @reduce).and_return(@grouping)
-        @criteria.select(:field1).group(Animal)
-      end
-
-    end
-
-    context "when klass not provided" do
-
-      before do
-        @reduce = "function(obj, prev) { prev.group.push(obj); }"
-        @collection = mock
-        Person.should_receive(:collection).and_return(@collection)
-      end
-
-      it "calls group on the collection with the aggregate js" do
-        @collection.should_receive(:group).with([:field1], {}, {:group => []}, @reduce).and_return(@grouping)
-        @criteria.select(:field1).group
-      end
-
+    it "calls group on the collection with the aggregate js" do
+      @collection.should_receive(:group).with([:field1], {}, {:group => []}, @reduce, true).and_return(@grouping)
+      @criteria.only(:field1).group
     end
-
   end
 
   describe "#id" do
 
-    it "adds the _id query to the selector" do
-      id = Mongo::ObjectID.new.to_s
+    it "adds the ObjectID as the _id query to the selector" do
+      id = Mongo::ObjectID.new
       @criteria.id(id)
       @criteria.selector.should == { :_id => id }
     end
 
-    it "and_return self" do
+    it "adds the string as the _id query to the selector" do
       id = Mongo::ObjectID.new.to_s
-      @criteria.id(id.to_s).should == @criteria
+      @criteria.id(id)
+      @criteria.selector.should == { :_id => id }
+    end
+
+    it "returns self" do
+      id = Mongo::ObjectID.new
+      @criteria.id(id).should == @criteria
     end
 
   end
@@ -362,7 +359,7 @@ describe MongoDoc::Criteria do
       @criteria.selector.should == { :title => { "$in" => ["title1", "title2"] }, :text => { "$in" => ["test"] } }
     end
 
-    it "and_return self" do
+    it "returns self" do
       @criteria.in(:title => ["title1"]).should == @criteria
     end
 
@@ -393,7 +390,7 @@ describe MongoDoc::Criteria do
         @collection.should_receive(:find_one).with(@criteria.selector, { :sort => [[:_id, :desc]] }).and_return(nil)
       end
 
-      it "and_return nil" do
+      it "returns nil" do
         @criteria.last.should be_nil
       end
 
@@ -435,82 +432,12 @@ describe MongoDoc::Criteria do
 
     end
 
-    it "and_return self" do
+    it "returns self" do
       @criteria.limit.should == @criteria
     end
 
   end
 
-  describe "#merge" do
-
-    before do
-      @criteria.where(:title => "Sir", :age => 30).skip(40).limit(20)
-    end
-
-    context "with another criteria" do
-
-      context "when the other has a selector and options" do
-
-        before do
-          @other = MongoDoc::Criteria.new(Person)
-          @other.where(:name => "Chloe").order_by([[:name, :asc]])
-          @selector = { :title => "Sir", :age => 30, :name => "Chloe" }
-          @options = { :skip => 40, :limit => 20, :sort => [[:name, :asc]] }
-        end
-
-        it "merges the selector and options hashes together" do
-          @criteria.merge(@other)
-          @criteria.selector.should == @selector
-          @criteria.options.should == @options
-        end
-
-      end
-
-      context "when the other has no selector or options" do
-
-        before do
-          @other = MongoDoc::Criteria.new(Person)
-          @selector = { :title => "Sir", :age => 30 }
-          @options = { :skip => 40, :limit => 20 }
-        end
-
-        it "merges the selector and options hashes together" do
-          @criteria.merge(@other)
-          @criteria.selector.should == @selector
-          @criteria.options.should == @options
-        end
-      end
-
-    end
-
-  end
-
-  describe "#method_missing" do
-
-    before do
-      @criteria.where(:title => "Sir")
-    end
-
-    it "merges the criteria with the next one" do
-      @new_criteria = @criteria.accepted
-      @new_criteria.selector.should == { :title => "Sir", :terms => true }
-    end
-
-    context "chaining more than one scope" do
-
-      before do
-        @criteria = Person.accepted.old.knight
-      end
-
-      it "and_return the final merged criteria" do
-        @criteria.selector.should ==
-          { :title => "Sir", :terms => true, :age => { "$gt" => 50 } }
-      end
-
-    end
-
-  end
-
   describe "#not_in" do
 
     it "adds the exclusion to the selector" do
@@ -518,7 +445,7 @@ describe MongoDoc::Criteria do
       @criteria.selector.should == { :title => { "$nin" => ["title1", "title2"] }, :text => { "$nin" => ["test"] } }
     end
 
-    it "and_return self" do
+    it "returns self" do
       @criteria.not_in(:title => ["title1"]).should == @criteria
     end
 
@@ -532,7 +459,7 @@ describe MongoDoc::Criteria do
         @criteria.extras({ :per_page => 20, :page => 3 })
       end
 
-      it "and_return the per_page option" do
+      it "returns the per_page option" do
         @criteria.offset.should == 40
       end
 
@@ -544,7 +471,7 @@ describe MongoDoc::Criteria do
         @criteria.extras({ :skip => 20 })
       end
 
-      it "and_return the skip option" do
+      it "returns the skip option" do
         @criteria.offset.should == 20
       end
 
@@ -558,7 +485,7 @@ describe MongoDoc::Criteria do
           @criteria.extras({ :page => 2 })
         end
 
-        it "adds the skip option to the options and and_return it" do
+        it "adds the skip option to the options and returns it" do
           @criteria.offset.should == 20
           @criteria.options[:skip].should == 20
         end
@@ -567,7 +494,7 @@ describe MongoDoc::Criteria do
 
       context "when page option does not exist" do
 
-        it "and_return nil" do
+        it "returns nil" do
           @criteria.offset.should be_nil
           @criteria.options[:skip].should be_nil
         end
@@ -621,7 +548,7 @@ describe MongoDoc::Criteria do
 
     end
 
-    it "and_return self" do
+    it "returns self" do
       @criteria.order_by.should == @criteria
     end
 
@@ -635,7 +562,7 @@ describe MongoDoc::Criteria do
         @criteria.extras({ :page => 5 })
       end
 
-      it "and_return the page option" do
+      it "returns the page option" do
         @criteria.page.should == 5
       end
 
@@ -656,7 +583,7 @@ describe MongoDoc::Criteria do
     before do
       @collection = mock
       Person.should_receive(:collection).and_return(@collection)
-      @criteria.select.where(:_id => "1").skip(60).limit(20)
+      @criteria.where(:_id => "1").skip(60).limit(20)
       @cursor = mock('cursor', :count => 20, :to_a => [])
       @collection.should_receive(:find).with({:_id => "1"}, :skip => 60, :limit => 20).and_return(@cursor)
       @results = @criteria.paginate
@@ -677,7 +604,7 @@ describe MongoDoc::Criteria do
         @criteria.extras({ :per_page => 10 })
       end
 
-      it "and_return the per_page option" do
+      it "returns the per_page option" do
         @criteria.per_page.should == 10
       end
 
@@ -693,17 +620,17 @@ describe MongoDoc::Criteria do
 
   end
 
-  describe "#select" do
+  describe "#only" do
 
     context "when args are provided" do
 
       it "adds the options for limiting by fields" do
-        @criteria.select(:title, :text)
+        @criteria.only(:title, :text)
         @criteria.options.should == { :fields => [ :title, :text ] }
       end
 
-      it "and_return self" do
-        @criteria.select.should == @criteria
+      it "returns self" do
+        @criteria.only.should == @criteria
       end
 
     end
@@ -711,7 +638,7 @@ describe MongoDoc::Criteria do
     context "when no args provided" do
 
       it "does not add the field option" do
-        @criteria.select
+        @criteria.only
         @criteria.options[:fields].should be_nil
       end
 
@@ -739,7 +666,7 @@ describe MongoDoc::Criteria do
 
     end
 
-    it "and_return self" do
+    it "returns self" do
       @criteria.skip.should == @criteria
     end
 
@@ -753,12 +680,12 @@ describe MongoDoc::Criteria do
         @id = Mongo::ObjectID.new.to_s
         @document = stub
         @criteria = mock
-        MongoDoc::Criteria.should_receive(:new).and_return(@criteria)
-        @criteria.should_receive(:id).with(@id).and_return(@criteria)
-        @criteria.should_receive(:one).and_return(@document)
       end
 
       it "creates a criteria for a string" do
+        MongoDoc::Criteria.should_receive(:new).and_return(@criteria)
+        @criteria.should_receive(:id).with(@id).and_return(@criteria)
+        @criteria.should_receive(:one).and_return(@document)
         MongoDoc::Criteria.translate(Person, @id)
       end
 
@@ -772,11 +699,11 @@ describe MongoDoc::Criteria do
           @criteria = MongoDoc::Criteria.translate(Person, :conditions => { :title => "Test" })
         end
 
-        it "and_return a criteria with a selector from the conditions" do
+        it "returns a criteria with a selector from the conditions" do
           @criteria.selector.should == { :title => "Test" }
         end
 
-        it "and_return a criteria with klass Person" do
+        it "returns a criteria with klass Person" do
           @criteria.klass.should == Person
         end
 
@@ -788,11 +715,11 @@ describe MongoDoc::Criteria do
           @criteria = MongoDoc::Criteria.translate(Person, :conditions => { :title => "Test" })
         end
 
-        it "and_return a criteria with a selector from the conditions" do
+        it "returns a criteria with a selector from the conditions" do
           @criteria.selector.should == { :title => "Test" }
         end
 
-        it "and_return a criteria with klass Person" do
+        it "returns a criteria with klass Person" do
           @criteria.klass.should == Person
         end
 
@@ -804,11 +731,11 @@ describe MongoDoc::Criteria do
           @criteria = MongoDoc::Criteria.translate(Person, :conditions => { :title => "Test" })
         end
 
-        it "and_return a criteria with a selector from the conditions" do
+        it "returns a criteria with a selector from the conditions" do
           @criteria.selector.should == { :title => "Test" }
         end
 
-        it "and_return a criteria with klass Person" do
+        it "returns a criteria with klass Person" do
           @criteria.klass.should == Person
         end
       end
@@ -823,11 +750,8 @@ describe MongoDoc::Criteria do
           @criteria.selector.should == { :title => "Test" }
           @criteria.options.should == { :skip => 10 }
         end
-
       end
-
     end
-
   end
 
   describe "#where" do
@@ -837,10 +761,23 @@ describe MongoDoc::Criteria do
       @criteria.selector.should == { :title => "Title", :text => "Text" }
     end
 
-    it "and_return self" do
+    it "accepts a js where clause" do
+      @criteria.where("this.a > 3")
+      @criteria.selector.should == { '$where' => "this.a > 3" }
+    end
+
+    it "and return self" do
       @criteria.where.should == @criteria
     end
 
-  end
+    it "#and is an alias for where" do
+      @criteria.and(:title => "Title", :text => "Text")
+      @criteria.selector.should == { :title => "Title", :text => "Text" }
+    end
 
+    it "#conditions is an alias for where" do
+      @criteria.conditions(:title => "Title", :text => "Text")
+      @criteria.selector.should == { :title => "Title", :text => "Text" }
+    end
+  end
 end

data/spec/cursor_spec.rb

@@ -6,10 +6,14 @@ describe "MongoDoc::Cursor" do
     @cursor = MongoDoc::Cursor.new(@mongo_cursor)
   end
 
+  it "is Enumerable" do
+    Enumerable.should === @cursor
+  end
+
   it ".new wraps a Mongo::Cursor" do
     @cursor._cursor.should == @mongo_cursor
   end
-  
+
   context "with the underlying cursor" do
     %w(close closed? count explain limit query_options_hash query_opts skip sort).each do |delegated_method|
       it "delegates #{delegated_method} to the Mongo::Cursor" do
@@ -18,7 +22,7 @@ describe "MongoDoc::Cursor" do
       end
     end
   end
-  
+
   context "#each" do
     it "delegates to the cursor" do
       @mongo_cursor.should_receive(:each)
@@ -31,7 +35,7 @@ describe "MongoDoc::Cursor" do
       MongoDoc::BSON.should_receive(:decode).with(bson)
       @cursor.each {}
     end
-    
+
     it "calls the block with the decoded return" do
       result = stub('bson')
       @cursor.stub(:_cursor).and_return([result])
@@ -40,42 +44,42 @@ describe "MongoDoc::Cursor" do
       @obj.should == result
     end
   end
-  
-  context "#next_object" do
+
+  context "#next_document" do
     it "delegates to the cursor" do
-      @mongo_cursor.should_receive(:next_object)
-      @cursor.next_object
+      @mongo_cursor.should_receive(:next_document)
+      @cursor.next_document
     end
-    
+
     it "decodes the return from the delegate" do
       bson = stub('bson')
-      @mongo_cursor.stub(:next_object).and_return(bson)
+      @mongo_cursor.stub(:next_document).and_return(bson)
       MongoDoc::BSON.should_receive(:decode).with(bson)
-      @cursor.next_object
+      @cursor.next_document
     end
-    
+
     it "returns nil if the delegate returns nil" do
-      @mongo_cursor.stub(:next_object)
-      @cursor.next_object.should be_nil
+      @mongo_cursor.stub(:next_document)
+      @cursor.next_document.should be_nil
     end
   end
-  
+
   context "#to_a" do
     it "delegates to the cursor" do
       @mongo_cursor.should_receive(:to_a)
       @cursor.to_a
     end
-    
+
     it "decodes the return from the delegate" do
       array = stub('array')
       @mongo_cursor.stub(:to_a).and_return(array)
       MongoDoc::BSON.should_receive(:decode).with(array)
       @cursor.to_a
     end
-    
+
     it "returns [] if the delegate returns []" do
       @mongo_cursor.stub(:to_a).and_return([])
       @cursor.to_a.should == []
     end
   end
-end
+end

data/spec/document_ext.rb

@@ -1,9 +1,9 @@
 module MongoDoc
-  class Document
+  module Document
     def errors_on(attribute)
       self.valid?
       [self.errors.on(attribute)].flatten.compact
     end
     alias :error_on :errors_on
   end
-end
+end