@@ -22,10 +22,12 @@ module Videojuicer end def page_count + return 1 if limit.nil? (total.to_f/limit.to_f).ceil end def page_number + return 1 if limit.nil? (offset.to_f/limit.to_f).ceil end lib/videojuicer/resource/collection.rb @@ -22,4 +22,10 @@ describe Videojuicer::Resource::Collection do @collection.page_number.should == 2 end + it "pagination copes with a nil limit" do + collection = Videojuicer::Resource::Collection.new(@objects[0..9], 155, 17, nil) + collection.page_count.should == 1 + collection.page_number.should == 1 + end + end \ No newline at end of file spec/collection_spec.rb @@ -85,9 +85,6 @@ shared_examples_for "a RESTFUL resource model" do it "should return a collection object" do @list.should be_kind_of(Videojuicer::Resource::Collection) end - it "should add the pagination options to the collection object" do - @list.limit.should be_kind_of(Numeric) - end describe "with pagination settings" do before(:all) do spec/shared/resource_spec.rb 7f33d10537be7d7942d9d87b988624a34f06104c Andre Ben Hamou andre@bluetheta.com http://github.com/videojuicer/core-sdk/commit/2e45e084077093c30284a1c7e093ab55041e7528 2e45e084077093c30284a1c7e093ab55041e7528 2009-10-07T03:51:08-07:00 2009-10-07T03:51:08-07:00 SDK now properly adapted to the fact that limits are nil by default e94e6d3d1c39cbc09a74c678263857011f755d32 Andre Ben Hamou andre@bluetheta.com