rails_paginate 0.0.6 → 0.0.7

data/Gemfile

@@ -1,5 +1,5 @@
 source "http://rubygems.org"
-gem "rails", "~> 3.0.0"
+gem "rails", ">= 3.0.0"
 
 group :development do
   gem "autotest"

data/Gemfile.lock

@@ -1,35 +1,35 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.5.0)
+    ZenTest (4.6.1)
     abstract (1.0.0)
-    actionmailer (3.0.4)
-      actionpack (= 3.0.4)
-      mail (~> 2.2.15)
-    actionpack (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
+    actionmailer (3.0.10)
+      actionpack (= 3.0.10)
+      mail (~> 2.2.19)
+    actionpack (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
+      rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.4)
-      activesupport (= 3.0.4)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-      arel (~> 2.0.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-    activesupport (3.0.4)
-    arel (2.0.8)
+    activeresource (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+    activesupport (3.0.10)
+    arel (2.0.10)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     builder (2.1.2)
@@ -37,58 +37,61 @@ GEM
     erubis (2.6.6)
       abstract (>= 1.0.0)
     git (1.2.5)
-    hpricot (0.8.3)
-    hpricot (0.8.3-java)
+    hpricot (0.8.4)
+    hpricot (0.8.4-java)
     i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    mail (2.2.15)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    polyglot (0.3.2)
+    rack (1.2.3)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.4)
-      actionmailer (= 3.0.4)
-      actionpack (= 3.0.4)
-      activerecord (= 3.0.4)
-      activeresource (= 3.0.4)
-      activesupport (= 3.0.4)
+    rails (3.0.10)
+      actionmailer (= 3.0.10)
+      actionpack (= 3.0.10)
+      activerecord (= 3.0.10)
+      activeresource (= 3.0.10)
+      activesupport (= 3.0.10)
       bundler (~> 1.0)
-      railties (= 3.0.4)
-    railties (3.0.4)
-      actionpack (= 3.0.4)
-      activesupport (= 3.0.4)
+      railties (= 3.0.10)
+    railties (3.0.10)
+      actionpack (= 3.0.10)
+      activesupport (= 3.0.10)
       rake (>= 0.8.7)
+      rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    rake (0.9.2)
+    rdoc (3.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-hpricot-matchers (0.0.3)
       hpricot
-    rspec-mocks (2.5.0)
-    simplecov (0.4.0)
-      simplecov-html (~> 0.4.0)
-    simplecov-html (0.4.3)
-    sqlite3 (1.3.3)
+    rspec-mocks (2.6.0)
+    simplecov (0.4.2)
+      simplecov-html (~> 0.4.4)
+    simplecov-html (0.4.5)
+    sqlite3 (1.3.4)
     thor (0.14.6)
-    treetop (1.4.9)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
-    yard (0.6.4)
+    tzinfo (0.3.29)
+    yard (0.7.2)
 
 PLATFORMS
   java
@@ -98,7 +101,7 @@ DEPENDENCIES
   autotest
   bundler
   jeweler
-  rails (~> 3.0.0)
+  rails (>= 3.0.0)
   rspec
   rspec-hpricot-matchers
   simplecov

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/generators/templates/config/locales/de.yml

@@ -1,7 +1,7 @@
 de:
   paginate:
-    first_page_label: Anfang
-    last_page_label: Ende
+    first_page_label: "Anfang"
+    last_page_label: "Ende"
     previous_page_label: "« Zurück"
     next_page_label: "Weiter »"
-    pager: %{page}
+    pager: "%{page}"

data/lib/generators/templates/config/locales/en.yml

@@ -1,7 +1,7 @@
-de:
+en:
   paginate:
-    first_page_label: first
-    last_page_label: last
+    first_page_label: "first"
+    last_page_label: "last"
     previous_page_label: "« previous"
     next_page_label: "next »"
-    pager: %{page}
+    pager: "%{page}"

data/lib/rails_paginate/renderers/base.rb

@@ -16,7 +16,7 @@ module RailsPaginate::Renderers
 
     # build url
     def url_for_page(page)
-      view.url_for(view.default_url_options.merge({page_param.to_sym => page}))
+      view.url_for(view.default_url_options.merge({page_param.to_sym => page}).merge(options[:params] || {}))
     end
 
     # abstrack renderer

data/rails_paginate.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_paginate}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Marco Scholl"]
-  s.date = %q{2011-02-22}
+  s.authors = [%q{Marco Scholl}]
+  s.date = %q{2011-08-18}
   s.description = %q{a new rails 3 paginate plugin as will_paginate replacement}
   s.email = %q{develop@marco-scholl.de}
   s.extra_rdoc_files = [
@@ -57,28 +57,16 @@ Gem::Specification.new do |s|
     "spec/support/10_active_record.rb"
   ]
   s.homepage = %q{http://github.com/phatworx/rails_paginate}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{a new rails 3 paginate plugin}
-  s.test_files = [
-    "spec/helpers/action_view_spec.rb",
-    "spec/helpers/active_record_spec.rb",
-    "spec/helpers/array_spec.rb",
-    "spec/pagers/base_spec.rb",
-    "spec/pagers/slider_spec.rb",
-    "spec/rails_paginate_spec.rb",
-    "spec/renderers/base_spec.rb",
-    "spec/renderers/html_default_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/support/10_active_record.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["~> 3.0.0"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
       s.add_development_dependency(%q<autotest>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -88,7 +76,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, ["~> 3.0.0"])
+      s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<autotest>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -99,7 +87,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, ["~> 3.0.0"])
+    s.add_dependency(%q<rails>, [">= 3.0.0"])
     s.add_dependency(%q<autotest>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/spec/renderers/html_default_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe RailsPaginate::Renderers::HtmlDefault do
-
+  before { RailsPaginate.setup { |setup| setup.per_page = 20 } }
 
   context "empty collection" do
     let(:collection) { [].paginate }
@@ -30,7 +30,7 @@ describe RailsPaginate::Renderers::HtmlDefault do
 
         it("should not have the div at first") { subject.should_not have_tag('> div', :count => 1) }
         it("should have one ul") { subject.should have_tag('ul') }
-        it("should have one li") { subject.should have_tag('ul > li', :count => 9) }
+        it("should have 9 li") { subject.should have_tag('ul > li', :count => 9) }
         [:first_page, :previous_page, :first_pager, :last_pager, :next_page, :last_page].each do |class_attr|
           it("should have one li.#{class_attr}") { subject.should have_tag("ul > li.#{class_attr}", :count => 1) }
         end

metadata

@@ -1,127 +1,123 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rails_paginate
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.7
   prerelease: 
-  version: 0.0.6
 platform: ruby
-authors: 
+authors:
 - Marco Scholl
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-22 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-18 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &20140820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *20140820
+- !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &20140340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *20140340
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &20139860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *20139860
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &20139340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *20139340
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &20138840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *20138840
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &20138320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *20138320
+- !ruby/object:Gem::Dependency
   name: rspec-hpricot-matchers
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &20137700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *20137700
+- !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &20137220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *20137220
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &20136740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *20136740
 description: a new rails 3 paginate plugin as will_paginate replacement
 email: develop@marco-scholl.de
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .autotest
 - .document
 - .rspec
@@ -160,45 +156,32 @@ files:
 - spec/renderers/html_default_spec.rb
 - spec/spec_helper.rb
 - spec/support/10_active_record.rb
-has_rdoc: true
 homepage: http://github.com/phatworx/rails_paginate
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -1494463850570476169
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2323189727369116543
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: a new rails 3 paginate plugin
-test_files: 
-- spec/helpers/action_view_spec.rb
-- spec/helpers/active_record_spec.rb
-- spec/helpers/array_spec.rb
-- spec/pagers/base_spec.rb
-- spec/pagers/slider_spec.rb
-- spec/rails_paginate_spec.rb
-- spec/renderers/base_spec.rb
-- spec/renderers/html_default_spec.rb
-- spec/spec_helper.rb
-- spec/support/10_active_record.rb
+test_files: []