paginate 2.0.0 → 3.0.0

data/spec/paginate/activerecord_spec.rb

@@ -1,24 +1,24 @@
 require "spec_helper"
 
 describe Thing do
-  let!(:things) { Array.new(15) {|i| Thing.create!(:name => "THING") } }
+  let!(:things) { Array.new(15) {|i| Thing.create!(name: "THING") } }
   before { Paginate::Config.size = 10 }
 
   it { expect(Thing).to respond_to(:paginate) }
 
   it "uses default options" do
-    items = Thing.limit(11).all
-    expect(Thing.paginate.all).to eql(items)
+    items = Thing.limit(11).to_a
+    expect(Thing.paginate.to_a).to eql(items)
 
-    items = Thing.limit(11).offset(10).all
-    expect(Thing.paginate(:page => 2).all).to eql(items)
+    items = Thing.limit(11).offset(10).to_a
+    expect(Thing.paginate(page: 2).to_a).to eql(items)
   end
 
   it "uses custom options" do
-    items = Thing.limit(6).all
-    expect(Thing.paginate(:size => 5).all).to eql(items)
+    items = Thing.limit(6).to_a
+    expect(Thing.paginate(size: 5).to_a).to eql(items)
 
-    items = Thing.limit(6).offset(5).all
-    expect(Thing.paginate(:size => 5, :page => 2).all).to eql(items)
+    items = Thing.limit(6).offset(5).to_a
+    expect(Thing.paginate(size: 5, page: 2).to_a).to eql(items)
   end
 end

data/spec/paginate/base_spec.rb

@@ -1,68 +1,70 @@
 require "spec_helper"
 
 describe Paginate::Base do
+  let(:scope) { double }
+
   it "returns page from integer" do
-    expect(Paginate::Base.new(12).page).to eql(12)
+    expect(Paginate::Base.new(scope, 12).page).to eql(12)
   end
 
   it "returns page from string" do
-    expect(Paginate::Base.new("12").page).to eql(12)
+    expect(Paginate::Base.new(scope, "12").page).to eql(12)
   end
 
   it "defaults to page 1" do
-    expect(Paginate::Base.new.page).to eql(1)
+    expect(Paginate::Base.new(scope).page).to eql(1)
   end
 
   it "returns page from options" do
-    expect(Paginate::Base.new(:page => 12).page).to eql(12)
+    expect(Paginate::Base.new(scope, page: 12).page).to eql(12)
   end
 
   it "returns limit from configuration" do
     Paginate::Config.size = 25
-    expect(Paginate::Base.new.limit).to eql(26)
+    expect(Paginate::Base.new(scope).limit).to eql(26)
   end
 
   it "returns limit from options" do
     Paginate::Config.size = 25
-    expect(Paginate::Base.new(:size => 13).limit).to eql(14)
+    expect(Paginate::Base.new(scope, size: 13).limit).to eql(14)
   end
 
   it "returns default limit" do
     Paginate::Config.size = nil
-    expect(Paginate::Base.new.limit).to eql(11)
+    expect(Paginate::Base.new(scope).limit).to eql(11)
   end
 
   it "returns offset from configuration" do
     Paginate::Config.size = 15
-    expect(Paginate::Base.new(:page => 2).offset).to eql(15)
+    expect(Paginate::Base.new(scope, page: 2).offset).to eql(15)
   end
 
   it "returns offset from options" do
-    expect(Paginate::Base.new(:page => 2, :size => 5).offset).to eql(5)
+    expect(Paginate::Base.new(scope, page: 2, size: 5).offset).to eql(5)
   end
 
   it "returns finder options" do
-    actual = Paginate::Base.new(:page => 3, :size => 5).to_options
-    expected = {:limit => 6, :offset => 10}
+    actual = Paginate::Base.new(scope, page: 3, size: 5).to_options
+    expected = {limit: 6, offset: 10}
 
     expect(actual).to eql(expected)
   end
 
   specify {
-    Paginate::Base.new(:page => 1, :size => 5, :collection => Array.new(6))
+    Paginate::Base.new(scope, page: 1, size: 5, collection: Array.new(6))
       .should have_next_page
   }
 
   specify {
-    Paginate::Base.new(:page => 1, :size => 5, :collection => Array.new(5))
+    Paginate::Base.new(scope, page: 1, size: 5, collection: Array.new(5))
       .should_not have_next_page
   }
 
   specify {
-    Paginate::Base.new(:page => 2).should have_previous_page
+    Paginate::Base.new(scope, page: 2).should have_previous_page
   }
 
   specify {
-    Paginate::Base.new(:page => 1).should_not have_previous_page
+    Paginate::Base.new(scope, page: 1).should_not have_previous_page
   }
 end

data/spec/paginate/config_spec.rb

@@ -1,6 +1,16 @@
 require "spec_helper"
 
 describe Paginate::Config do
+  context "sets default configuration" do
+    before do
+      load "paginate.rb"
+    end
+
+    it { expect(Paginate::Config.param_name).to eql(:page) }
+    it { expect(Paginate::Config.renderer).to eql(Paginate::Renderer::List) }
+    it { expect(Paginate::Config.size).to eql(10) }
+  end
+
   it "yields configuration class" do
     Paginate.configure do |config|
       config.param_name = :p
@@ -15,9 +25,15 @@ describe Paginate::Config do
     Paginate.configure do |config|
       config.param_name = :p
       config.size = 25
+      config.renderer = Paginate::Renderer::List
     end
 
-    options = {:param_name => :p, :size => 25}
+    options = {
+      param_name: :p,
+      size: 25,
+      renderer: Paginate::Renderer::List
+    }
+
     expect(Paginate::Config.to_hash).to eql(options)
   end
 end

data/spec/paginate/{renderer_spec.rb → renderer/base_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Paginate::Renderer do
+describe Paginate::Renderer::Base do
   before do
     Paginate.configure do |config|
       config.param_name = :page
@@ -9,15 +9,13 @@ describe Paginate::Renderer do
 
     I18n.locale = :en
 
-    @renderer = Paginate::Renderer.new({
-      :collection => Array.new(11),
-      :page => 1,
-      :fullpath => "/some/path"
+    @renderer = Paginate::Renderer::Base.new(nil, {
+      collection: Array.new(11),
+      page: 1,
+      fullpath: "/some/path"
     })
   end
 
-  specify { @renderer.render.should be_html_safe }
-
   it "parses simple url" do
     @renderer.options[:url] = "/some/path"
     expect(@renderer.url_for(1)).to eql("/some/path?page=1")

data/spec/paginate/renderer/list_spec.rb

@@ -0,0 +1,111 @@
+# -*- encoding: utf-8 -*-
+require "spec_helper"
+
+describe Paginate::Renderer::List do
+  before do
+    Paginate.configure do |config|
+      config.param_name = :page
+      config.size  = 10
+    end
+
+    I18n.locale = :en
+
+    @renderer = Paginate::Renderer::List.new(nil, {
+      collection: Array.new(11),
+      page: 1,
+      fullpath: "/some/path"
+    })
+  end
+
+  it { expect(@renderer.render).to be_html_safe }
+  it { expect(@renderer.previous_label).to eql(I18n.t("paginate.previous")) }
+  it { expect(@renderer.next_label).to eql(I18n.t("paginate.next")) }
+  it { expect(@renderer.page_label).to eql(I18n.t("paginate.page", page: 1)) }
+
+  it "displays current page" do
+    @renderer.processor.stub page: 1234
+
+    html = Nokogiri::HTML(@renderer.render)
+    span = html.css("li.page > span").first
+
+    expect(span).to be
+    expect(span.text).to eql("Page 1234")
+  end
+
+  it "translates strings" do
+    I18n.locale = "pt-BR"
+    @renderer.processor.stub page: 10
+
+    html = Nokogiri::HTML(@renderer.render)
+
+    expect(html.css("li.page > span").text).to eql("Página 10")
+    expect(html.css("li.next-page > a").text).to eql("Próxima página")
+    expect(html.css("li.previous-page > a").text).to eql("Página anterior")
+  end
+
+  it "displays previous page link" do
+    @renderer.processor.stub page: 2
+
+    html = Nokogiri::HTML(@renderer.render)
+    link = html.css("li.previous-page > a").first
+
+    expect(link).to be
+    expect(link["href"]).to eql("/some/path?page=1")
+    expect(link.text).to eql("Previous page")
+  end
+
+  it "displays next page link" do
+    @renderer.processor.stub page: 1
+
+    html = Nokogiri::HTML(@renderer.render)
+    link = html.css("li.next-page > a").first
+
+    expect(link).to be
+    expect(link["href"]).to eql("/some/path?page=2")
+    expect(link.text).to eql("Next page")
+  end
+
+  it "displays pagination list" do
+    html = Nokogiri::HTML(@renderer.render)
+
+    expect(html.css("ul.paginate").count).to eql(1)
+    expect(html.css("ul.paginate > li").count).to eql(3)
+  end
+
+  context "when have no items" do
+    it "adds .disabled class to the list" do
+      @renderer.processor.stub next_page?: false, previous_page?: false
+
+      html = Nokogiri::HTML(@renderer.render)
+      expect(html.css("ul.paginate.disabled").first).to be
+    end
+  end
+
+  context "when have no next page" do
+    it "disables the element" do
+      @renderer.processor.stub :next_page?
+
+      html = Nokogiri::HTML(@renderer.render)
+      link = html.css("li.next-page > a").first
+      span = html.css("li.next-page.disabled > span").first
+
+      expect(link).not_to be
+      expect(span).to be
+      expect(span.text).to eql("Next page")
+    end
+  end
+
+  context "when no previous page" do
+    it "disables the element" do
+      @renderer.processor.stub :previous_page?
+
+      html = Nokogiri::HTML(@renderer.render)
+      link = html.css("li.previous-page > a").first
+      span = html.css("li.previous-page.disabled > span").first
+
+      expect(link).not_to be
+      expect(span).to be
+      expect(span.text).to eql("Previous page")
+    end
+  end
+end

data/spec/paginate/renderer/more_spec.rb

@@ -0,0 +1,38 @@
+require "spec_helper"
+
+describe Paginate::Renderer::More do
+  before do
+    Paginate.configure do |config|
+      config.param_name = :page
+      config.size  = 10
+    end
+
+    I18n.locale = :en
+
+    @renderer = Paginate::Renderer::More.new(nil, {
+      collection: Array.new(11),
+      page: 1,
+      fullpath: "/some/path"
+    })
+  end
+
+  it { expect(@renderer.render).to be_html_safe }
+  it { expect(@renderer.more_label).to eql(I18n.t("paginate.more")) }
+
+  context "when have no next page" do
+    it "returns nil" do
+      @renderer.processor.stub :next_page?
+      expect(@renderer.render).to be_nil
+    end
+  end
+
+  context "when have next page" do
+    it "returns html" do
+      html = Nokogiri::HTML(@renderer.render)
+      selector = "p.paginate > a.more"
+
+      expect(html.css(selector).text).to eql(@renderer.more_label)
+      expect(html.css(selector).first[:href]).to eql(@renderer.next_url)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,23 +1,25 @@
-require "bundler"
-Bundler.setup
-Bundler.require(:default, :development)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+require "bundler/setup"
 
+require "logger"
 require "rspec"
 require "nokogiri"
 require "ostruct"
 require "sqlite3"
 require "test_notifier/runner/rspec"
+require "rails"
 
+require "active_record"
 require "active_support/all"
 require "action_view"
 require "action_controller"
-
-ActiveRecord::Base
-  .establish_connection(:adapter => "sqlite3", :database => ":memory:")
-Rails = OpenStruct.new(:version => ActiveRecord::VERSION::STRING)
-
 require "paginate"
 
+ActiveRecord::Base.establish_connection(
+  adapter: "sqlite3",
+  database: ":memory:"
+)
+
 load "spec/schema.rb"
 
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|file| require file}

data/spec/support/translations.yml

@@ -3,9 +3,11 @@ en:
     next: "Next page"
     previous: "Previous page"
     page: "Page %{page}"
+    more: "Load more"
 
 pt-BR:
   paginate:
     next: "Próxima página"
     previous: "Página anterior"
     page: "Página %{page}"
+    more: "Carregar mais"

data/spec/support/views/application/_render.erb

@@ -1 +1 @@
-<%= render items, :paginate => true, :partial => "number" %>
+<%= render items, paginate: true, partial: "number" %>

metadata

@@ -1,142 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: paginate
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 3.0.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test_notifier
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0.rc1
 - !ruby/object:Gem::Dependency
   name: pry-meta
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Paginate collections using SIZE+1 to determine if there is a next page.
@@ -149,24 +104,32 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
-- README.rdoc
+- README.md
 - Rakefile
+- gemfiles/rails3.gemfile
+- gemfiles/rails3.gemfile.lock
 - lib/paginate.rb
 - lib/paginate/action_controller.rb
 - lib/paginate/active_record.rb
 - lib/paginate/base.rb
 - lib/paginate/config.rb
+- lib/paginate/extension.rb
 - lib/paginate/helper.rb
 - lib/paginate/renderer.rb
+- lib/paginate/renderer/list.rb
+- lib/paginate/renderer/more.rb
 - lib/paginate/version.rb
 - paginate.gemspec
 - spec/paginate/action_view_spec.rb
 - spec/paginate/activerecord_spec.rb
 - spec/paginate/base_spec.rb
 - spec/paginate/config_spec.rb
-- spec/paginate/renderer_spec.rb
+- spec/paginate/renderer/base_spec.rb
+- spec/paginate/renderer/list_spec.rb
+- spec/paginate/renderer/more_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb
 - spec/support/controller.rb
@@ -179,27 +142,26 @@ files:
 - spec/support/views/application/_render.erb
 homepage: http://rubygems.org/gems/paginate
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Paginate collections using SIZE+1 to determine if there is a next page. Includes
   ActiveRecord and ActionView support.
 test_files: []