move Array#paginate definition to will_paginate/array.rb

lib/will_paginate/array.rb

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

lib/will_paginate/core_ext.rb

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

test/array_pagination_test.rb

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