mongomodel 0.2.14 → 0.2.15

data/lib/mongomodel/concerns/associations/has_many_by_foreign_key.rb

@@ -111,7 +111,7 @@ module MongoModel
       
       class Proxy < Base::Proxy
         # Pass these methods to the scope rather than the Array target
-        OVERRIDE_METHODS = [ :find ]
+        OVERRIDE_METHODS = [ :find, :first, :last, :count ]
         
         delegate :ensure_class, :to => :association
         

data/lib/mongomodel/support/scope/finder_methods.rb

@@ -21,19 +21,19 @@ module MongoModel
         end
       end
       
-      def first
+      def first(count=nil)
         if loaded?
-          @documents.first
+          count ? to_a.first(count) : to_a.first
         else
-          @first ||= limit(1).to_a[0]
+          count ? limit(count).to_a : limit(1).to_a[0]
         end
       end
       
-      def last
+      def last(count=nil)
         if loaded?
-          @documents.last
+          count ? to_a.last(count) : to_a.last
         else
-          @last ||= reverse_order.limit(1).to_a[0]
+          count ? reverse_order.limit(count).to_a : reverse_order.limit(1).to_a[0]
         end
       end
       

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.2.14"
+  VERSION = "0.2.15"
 end

data/spec/mongomodel/support/scope_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'active_support/time'
 
 module MongoModel
   describe Scope do
@@ -316,47 +317,78 @@ module MongoModel
       end
       
       describe "#first" do
-        context "when no matching documents exist" do
-          before(:each) { model.stub_find([]) }
+        context "with count argument" do
+          context "when no matching documents exist" do
+            before(:each) { model.stub_find([]) }
           
-          always do
-            it "should return nil" do
-              subject.first.should be_nil
+            always do
+              it "should return an empty array" do
+                subject.first(3).should == []
+              end
             end
-          end
           
-          subject_loaded do
-            it "should not perform a find" do
-              model.should_not_find do
-                subject.first
+            subject_loaded do
+              it "should not perform a find" do
+                model.should_not_find { subject.first(3) }
+              end
+            end
+          
+            subject_not_loaded do
+              it "should find with a limit of 3" do
+                model.should_find(finder_options.merge(:limit => 3), []) { subject.first(3) }
               end
             end
           end
+        
+          context "when matching documents exist" do
+            before(:each) { model.stub_find([posts[0], posts[1], posts[2]]) }
           
-          subject_not_loaded do
-            it "should find with a limit of 1" do
-              model.should_find(finder_options.merge(:limit => 1), []) do
-                subject.first
+            always do
+              it "should return the first documents in an array" do
+                subject.first(3).should == [posts[0], posts[1], posts[2]]
               end
             end
           end
         end
         
-        context "when matching documents exist" do
-          let(:post) { posts.first }
-          before(:each) { model.stub_find([post]) }
+        context "with no argument" do
+          context "when no matching documents exist" do
+            before(:each) { model.stub_find([]) }
           
-          always do
-            it "should return the first document" do
-              subject.first.should == post
+            always do
+              it "should return nil" do
+                subject.first.should be_nil
+              end
+            end
+          
+            subject_loaded do
+              it "should not perform a find" do
+                model.should_not_find { subject.first }
+              end
+            end
+          
+            subject_not_loaded do
+              it "should find with a limit of 1" do
+                model.should_find(finder_options.merge(:limit => 1), []) { subject.first }
+              end
             end
           end
+        
+          context "when matching documents exist" do
+            before(:each) { model.stub_find([posts[0]]) }
+          
+            always do
+              it "should return the first document" do
+                subject.first.should == posts[0]
+              end
+            end
 
-          subject_not_loaded do
-            it "should cache find result" do
-              model.should_find(finder_options.merge(:limit => 1), [post]) do
-                subject.first
-                subject.first
+            subject_not_loaded do
+              it "should cache find result" do
+                model.should_find(finder_options.merge(:limit => 1), [posts[0]]) do
+                  subject.first
+                  subject.first
+                end
               end
             end
           end
@@ -369,47 +401,79 @@ module MongoModel
           finder_options.merge(:order => order.reverse.to_a)
         end
         
-        context "when no matching documents exist" do
-          before(:each) { model.stub_find([]) }
+        context "with count argument" do
+          context "when no matching documents exist" do
+            before(:each) { model.stub_find([]) }
           
-          always do
-            it "should return nil" do
-              subject.last.should be_nil
+            always do
+              it "should return an empty array" do
+                subject.last(2).should == []
+              end
             end
-          end
           
-          subject_loaded do
-            it "should not perform a find" do
-              model.should_not_find do
-                subject.last
+            subject_loaded do
+              it "should not perform a find" do
+                model.should_not_find { subject.last(2) }
+              end
+            end
+          
+            subject_not_loaded do
+              it "should find with a limit of 2" do
+                model.should_find(reversed_finder_options.merge(:limit => 2), []) { subject.last(2) }
               end
             end
           end
+        
+          context "when matching documents exist" do
+            before(:each) { model.stub_find([posts[0], posts[1]]) }
           
-          subject_not_loaded do
-            it "should find with a limit of 1" do
-              model.should_find(reversed_finder_options.merge(:limit => 1), []) do
-                subject.last
+            always do
+              it "should return the last documents in an array" do
+                subject.last(2).should == [posts[0], posts[1]]
               end
             end
           end
         end
         
-        context "when matching documents exist" do
-          let(:post) { posts.last }
-          before(:each) { model.stub_find([post]) }
+        context "with no argument" do
+          context "when no matching documents exist" do
+            before(:each) { model.stub_find([]) }
           
-          always do
-            it "should return the last document" do
-              subject.last.should == post
+            always do
+              it "should return nil" do
+                subject.last.should be_nil
+              end
+            end
+          
+            subject_loaded do
+              it "should not perform a find" do
+                model.should_not_find { subject.last }
+              end
+            end
+          
+            subject_not_loaded do
+              it "should find with a limit of 1" do
+                model.should_find(reversed_finder_options.merge(:limit => 1), []) { subject.last }
+              end
             end
           end
+        
+          context "when matching documents exist" do
+            let(:post) { posts.last }
+            before(:each) { model.stub_find([post]) }
+          
+            always do
+              it "should return the last document" do
+                subject.last.should == post
+              end
+            end
 
-          subject_not_loaded do
-            it "should cache find result" do
-              model.should_find(reversed_finder_options.merge(:limit => 1), [post]) do
-                subject.last
-                subject.last
+            subject_not_loaded do
+              it "should cache find result" do
+                model.should_find(reversed_finder_options.merge(:limit => 1), [post]) do
+                  subject.last
+                  subject.last
+                end
               end
             end
           end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongomodel
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 2
-  - 14
-  version: 0.2.14
+  - 15
+  version: 0.2.15
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 +10:30
+date: 2010-12-23 00:00:00 +10:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency