0
@@ -1,22 +1,5 @@
0
 require 'set'
0
-require 'will_paginate/collection'
0
-
0
-unless Array.instance_methods.include? 'paginate'
0
-  # http://www.desimcadam.com/archives/8
0
-  Array.class_eval do
0
-    def paginate(options = {})
0
-      raise ArgumentError, "parameter hash expected (got #{options.inspect})" unless Hash === options
0
-      
0
-      WillPaginate::Collection.create(
0
-          options[:page] || 1,
0
-          options[:per_page] || 30,
0
-          options[:total_entries] || self.length
0
-      ) { |pager|
0
-        pager.replace self[pager.offset, pager.per_page].to_a
0
-      }
0
-    end
0
-  end
0
-end
0
+require 'will_paginate/array'
0
 
0
 unless Hash.instance_methods.include? 'except'
0
   Hash.class_eval do

0
@@ -1,5 +1,5 @@
0
 require File.dirname(__FILE__) + '/helper'
0
-require 'will_paginate/core_ext'
0
+require 'will_paginate/array'
0
 
0
 class ArrayPaginationTest < Test::Unit::TestCase
0
   def test_simple
0
@@ -11,7 +11,8 @@ class ArrayPaginationTest < Test::Unit::TestCase
0
      { :page => 3,  :per_page => 5,  :expected => [] },
0
     ].
0
     each do |conditions|
0
-      assert_equal conditions[:expected], collection.paginate(conditions.slice(:page, :per_page))
0
+      expected = conditions.delete :expected
0
+      assert_equal expected, collection.paginate(conditions)
0
     end
0
   end
0