mislav-will_paginate 2.3.7 → 2.3.8

data/Rakefile

@@ -32,18 +32,9 @@ desc %{Update ".manifest" with the latest list of project filenames. Respect\
 .gitignore by excluding everything that git ignores. Update `files` and\
 `test_files` arrays in "*.gemspec" file if it's present.}
 task :manifest do
-  list = Dir['**/*'].sort
-  spec_file = Dir['*.gemspec'].first
-  list -= [spec_file] if spec_file
+  list = `git ls-files --full-name --exclude=*.gemspec --exclude=.*`.chomp.split("\n")
   
-  File.read('.gitignore').each_line do |glob|
-    glob = glob.chomp.sub(/^\//, '')
-    list -= Dir[glob]
-    list -= Dir["#{glob}/**/*"] if File.directory?(glob) and !File.symlink?(glob)
-    puts "excluding #{glob}"
-  end
-
-  if spec_file
+  if spec_file = Dir['*.gemspec'].first
     spec = File.read spec_file
     spec.gsub! /^(\s* s.(test_)?files \s* = \s* )( \[ [^\]]* \] | %w\( [^)]* \) )/mx do
       assignment = $1
@@ -51,9 +42,9 @@ task :manifest do
       '%s%%w(%s)' % [assignment, bunch.join(' ')]
     end
       
-    File.open(spec_file,   'w') {|f| f << spec }
+    File.open(spec_file, 'w') { |f| f << spec }
   end
-  File.open('.manifest', 'w') {|f| f << list.join("\n") }
+  File.open('.manifest', 'w') { |f| f << list.join("\n") }
 end
 
 task :examples do

data/lib/will_paginate/version.rb

@@ -2,7 +2,7 @@ module WillPaginate
   module VERSION
     MAJOR = 2
     MINOR = 3
-    TINY  = 5
+    TINY  = 8
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/will_paginate/view_helpers.rb

@@ -321,8 +321,7 @@ module WillPaginate
         stringified_merge @url_params, @options[:params] if @options[:params]
         
         if complex = param_name.index(/[^\w-]/)
-          page_param = (defined?(CGIMethods) ? CGIMethods : ActionController::AbstractRequest).
-            parse_query_parameters("#{param_name}=#{page}")
+          page_param = parse_query_parameters("#{param_name}=#{page}")
           
           stringified_merge @url_params, page_param
         else
@@ -385,5 +384,19 @@ module WillPaginate
         end
       end
     end
+
+    def parse_query_parameters(params)
+      if defined?(CGIMethods)
+        CGIMethods.parse_query_parameters(params)
+      elsif defined?(ActionController::AbstractRequest)
+        ActionController::AbstractRequest.parse_query_parameters(params)
+      elsif defined?(ActionController::UrlEncodedPairParser)
+        # For Rails > 2.2
+        ActionController::UrlEncodedPairParser.parse_query_parameters(params)
+      else
+        # For Rails > 2.3
+        Rack::Utils.parse_nested_query(params)
+      end
+    end
   end
 end

data/test/helper.rb

@@ -29,7 +29,10 @@ end
 
 # Wrap tests that use Mocha and skip if unavailable.
 def uses_mocha(test_name)
-  require 'mocha' unless Object.const_defined?(:Mocha)
+  unless Object.const_defined?(:Mocha)
+    gem 'mocha', '>= 0.9.5'
+    require 'mocha'
+  end
 rescue LoadError => load_error
   $stderr.puts "Skipping #{test_name} tests. `gem install mocha` and try again."
 else

data/test/lib/activerecord_test_case.rb

@@ -1,6 +1,13 @@
 require 'lib/activerecord_test_connector'
 
 class ActiveRecordTestCase < Test::Unit::TestCase
+  if defined?(ActiveSupport::Testing::SetupAndTeardown)
+    include ActiveSupport::Testing::SetupAndTeardown
+  end
+
+  if defined?(ActiveRecord::TestFixtures)
+    include ActiveRecord::TestFixtures
+  end
   # Set our fixture path
   if ActiveRecordTestConnector.able_to_connect
     self.fixture_path = File.join(File.dirname(__FILE__), '..', 'fixtures')

data/test/lib/view_test_process.rb

@@ -17,6 +17,13 @@ end
 ActionController::Base.perform_caching = false
 
 class WillPaginate::ViewTestCase < Test::Unit::TestCase
+  if defined?(ActionController::TestCase::Assertions)
+    include ActionController::TestCase::Assertions
+  end
+  if defined?(ActiveSupport::Testing::Deprecation)
+    include ActiveSupport::Testing::Deprecation
+  end
+
   def setup
     super
     @controller  = DummyController.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mislav-will_paginate
 version: !ruby/object:Gem::Version 
-  version: 2.3.7
+  version: 2.3.8
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-10 00:00:00 -08:00
+date: 2009-03-09 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -29,15 +29,12 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- examples
 - examples/apple-circle.gif
 - examples/index.haml
 - examples/index.html
 - examples/pagination.css
 - examples/pagination.sass
 - init.rb
-- lib
-- lib/will_paginate
 - lib/will_paginate.rb
 - lib/will_paginate/array.rb
 - lib/will_paginate/collection.rb
@@ -47,13 +44,11 @@ files:
 - lib/will_paginate/named_scope_patch.rb
 - lib/will_paginate/version.rb
 - lib/will_paginate/view_helpers.rb
-- test
 - test/boot.rb
 - test/collection_test.rb
 - test/console
 - test/database.yml
 - test/finder_test.rb
-- test/fixtures
 - test/fixtures/admin.rb
 - test/fixtures/developer.rb
 - test/fixtures/developers_projects.yml
@@ -67,7 +62,6 @@ files:
 - test/fixtures/user.rb
 - test/fixtures/users.yml
 - test/helper.rb
-- test/lib
 - test/lib/activerecord_test_case.rb
 - test/lib/activerecord_test_connector.rb
 - test/lib/load_fixtures.rb
@@ -109,7 +103,6 @@ test_files:
 - test/console
 - test/database.yml
 - test/finder_test.rb
-- test/fixtures
 - test/fixtures/admin.rb
 - test/fixtures/developer.rb
 - test/fixtures/developers_projects.yml
@@ -123,7 +116,6 @@ test_files:
 - test/fixtures/user.rb
 - test/fixtures/users.yml
 - test/helper.rb
-- test/lib
 - test/lib/activerecord_test_case.rb
 - test/lib/activerecord_test_connector.rb
 - test/lib/load_fixtures.rb