keep the whole Array if total_count is given

amatsuda · Aug 25, 2011 · b5e16c0 · b5e16c0
1 parent 6c0d1b6
commit b5e16c0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/kaminari/models/array_extension.rb b/lib/kaminari/models/array_extension.rb
@@ -11,7 +11,12 @@ class PaginatableArray < Array
     # * <tt>:total_count</tt> - total_count
     def initialize(original_array, options = {})
       @_original_array, @_limit_value, @_offset_value, @_total_count = original_array, (options[:limit] || default_per_page).to_i, options[:offset].to_i, options[:total_count]
-      super(original_array[@_offset_value, @_limit_value] || [])
+
+      if options[:total_count]
+        super original_array
+      else
+        super(original_array[@_offset_value, @_limit_value] || [])
+      end
     end
 
     # items at the specified "page"

diff --git a/spec/models/array_spec.rb b/spec/models/array_spec.rb
@@ -106,9 +106,9 @@
   end
 
   context 'when setting total count explicitly' do
-    subject { Kaminari::PaginatableArray.new((1..100).to_a, :total_count => 9999).page(5).per(10) }
+    subject { Kaminari::PaginatableArray.new((1..10).to_a, :total_count => 9999).page(5).per(10) }
     it { should have(10).items }
-    its(:first) { should == 41 }
+    its(:first) { should == 1 }
     its(:total_count) { should == 9999 }
   end
 end