rails_pagination 2.0.6 → 2.0.7

data/README.rdoc

@@ -16,35 +16,19 @@ Then bundle:
 
 The same approach as kaminari:
   Model.page(1).per(20)
-  
-But doesn't force you to use any markup, just use the methods of the pager object in your views:
-  - pager = paginate(@collection)
-  - if pager.has_multiple_pages?
-    #pager
-      - if pager.has_first_page?
-        %a.first{:href => pager.first_page_path}= t('pager.first')
-      - if pager.has_previous_page?
-        %a.previous{:href => pager.previous_page_path}= t('pager.previous')
-      - if pager.navigation.has_less_pages?
-        %span.ellipsis ...
-      - for page in pager.navigation.pages
-        - if pager.is_current_page? page
-          %span.page.current= page     
-        - else
-          %a.page{:href => pager.page_path(page)}= page 
-      - if pager.navigation.has_more_pages?
-        %span.ellipsis ...  
-      - if pager.has_next_page?
-        %a.next{:href => pager.next_page_path}= t('pager.next')    
-      - if pager.has_last_page?
-        %a.last{:href => pager.last_page_path}= t('pager.last')
+
+You can use the default html with this helper:
+  pager @collection
+
+Or you can make your own just paginating the collection:
+  paginate @collection # Loot at app/views/rails_pagination/_pager.html.erb
 
 = Configuration
 
 == Default param name
 
-If you want to change the default parameter name or the default navigation length call paginate method this way:
-  paginate(@collection, :navigation => 3, :parameter => :p)
+If you want to change the default parameter name or the default navigation length call pager/paginate this way:
+  pager @collection, navigation: 3, parameter: :p
 Or to set it globally put this in your application.rb:
   config.pagination.default_parameter = :p
   config.pagination.default_navigation = 5

data/Rakefile

@@ -20,6 +20,8 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+APP_RAKEFILE = File.expand_path('../test/dummy/Rakefile', __FILE__)
+load 'rails/tasks/engine.rake'
 
 
 

data/app/views/rails_pagination/_pager.html.erb

@@ -0,0 +1,23 @@
+<% if pagination.has_multiple_pages? %>
+  <div class="pager">
+    <% if pagination.has_first_page? %>
+      <%= link_to t('pager.first'), pagination.first_page_path, class: 'first' %>
+    <% end %>
+    <% if pagination.has_previous_page? %>
+      <%= link_to t('pager.previous'), pagination.previous_page_path, class: 'previous' %>
+    <% end %>
+    <% pagination.navigation.pages.each do |page| %>
+      <% if pagination.is_current_page? page %>
+        <span class="page current"><%= page %></span>
+      <% else %>
+        <%= link_to page, pagination.page_path(page), class: 'page' %>
+      <% end %>
+    <% end %>
+    <% if pagination.has_next_page? %>
+      <%= link_to t('pager.next'), pagination.next_page_path, class: 'next' %> 
+    <% end %>
+    <% if pagination.has_last_page? %>
+      <%= link_to t('pager.last'), pagination.last_page_path, class: 'last' %>
+    <% end %>
+  </div>
+<% end %>

data/config/locales/en.yml

@@ -0,0 +1,6 @@
+en:
+  pager:
+    first: "First"
+    previous: "Previous"
+    next: "Next"
+    last: "Last"

data/config/locales/es.yml

@@ -0,0 +1,6 @@
+es:
+  pager:
+    first: "Primero"
+    previous: "Anterior"
+    next: "Siguiente"
+    last: "Último"

data/lib/rails_pagination/action_view/base.rb

@@ -3,7 +3,11 @@ module RailsPagination
     module Base
 
       def paginate(*args)
-        Pager.new *args.unshift(self)
+        Pagination.new *args.unshift(request)
+      end
+
+      def pager(*args)
+        render partial: 'rails_pagination/pager', locals: { pagination: paginate(*args) }
       end
 
     end

data/lib/rails_pagination/engine.rb

@@ -0,0 +1,7 @@
+module RailsPagination
+  class Engine < Rails::Engine
+
+    isolate_namespace RailsPagination
+
+  end
+end

data/lib/rails_pagination/{pager.rb → pagination.rb}

@@ -1,9 +1,9 @@
 module RailsPagination
-  class Pager
+  class Pagination
     
     def initialize(*args)
       options = args.extract_options!
-      @template = args[0]
+      @request = args[0]
       @collection = args[1]
       @parameter = options[:parameter] || Rails.application.config.pagination.default_parameter 
       @navigation = Navigation.new(args[1], options[:navigation] || Rails.application.config.pagination.default_navigation)
@@ -46,11 +46,11 @@ module RailsPagination
     end
 
     def page_path(page)
-      @template.request.path + '?' + @template.request.query_parameters.merge(@parameter => page).to_query
+      @request.path + '?' + @request.query_parameters.merge(@parameter => page).to_query
     end
 
     def page_url(page)
-      @template.request.protocol + @template.request.host_with_port + page_path(page)
+      @request.protocol + @request.host_with_port + page_path(page)
     end
 
     def current_page_path

data/lib/rails_pagination/version.rb

@@ -1,5 +1,5 @@
 module RailsPagination
 
-  VERSION = '2.0.6'
+  VERSION = '2.0.7'
 
 end

data/lib/rails_pagination.rb

@@ -2,7 +2,8 @@ require 'rails_pagination/action_view/base'
 require 'rails_pagination/active_record/base'
 require 'rails_pagination/active_record/relation'
 require 'rails_pagination/navigation'
-require 'rails_pagination/pager'
+require 'rails_pagination/pagination'
+require 'rails_pagination/engine'
 require 'rails_pagination/railtie'
 require 'rails_pagination/version'
 

data/test/collection_empty_test.rb

@@ -2,7 +2,9 @@ require 'test_helper'
 
 class CollectionEmptyTest < ActiveSupport::TestCase
 
-  setup :create_records
+  setup do
+    @collection = Model.page(1).per(2)
+  end
 
   test "should have 1 page" do
     assert_equal @collection.total_pages, 1
@@ -32,10 +34,4 @@ class CollectionEmptyTest < ActiveSupport::TestCase
     assert !@collection.out_of_bounds?
   end
 
-  protected
-
-  def create_records
-    @collection = Model.page(1).per(2)
-  end
-
 end

data/test/collection_first_test.rb

@@ -2,7 +2,10 @@ require 'test_helper'
 
 class CollectionFirstTest < ActiveSupport::TestCase
 
-  setup :create_records
+  setup do
+    10.times.each { |id| Model.create title: "Record #{id}" }
+    @collection = Model.page(1).per(2)
+  end
 
   test "should have 5 pages" do
     assert_equal @collection.total_pages, 5
@@ -32,11 +35,4 @@ class CollectionFirstTest < ActiveSupport::TestCase
     assert !@collection.out_of_bounds?
   end
 
-  protected
-
-  def create_records
-    10.times.each { |id| Model.create :title => "Record #{id}" }
-    @collection = Model.page(1).per(2)
-  end
-
 end

data/test/collection_last_test.rb

@@ -2,7 +2,10 @@ require 'test_helper'
 
 class CollectionLastTest < ActiveSupport::TestCase
 
-  setup :create_records
+  setup do
+    10.times.each { |id| Model.create title: "Record #{id}" }
+    @collection = Model.page(5).per(2)
+  end
 
   test "should have 5 pages" do
     assert_equal @collection.total_pages, 5
@@ -32,11 +35,4 @@ class CollectionLastTest < ActiveSupport::TestCase
     assert !@collection.out_of_bounds?
   end
 
-  protected
-
-  def create_records
-    10.times.each { |id| Model.create :title => "Record #{id}" }
-    @collection = Model.page(5).per(2)
-  end
-
 end

data/test/collection_middle_test.rb

@@ -2,7 +2,10 @@ require 'test_helper'
 
 class CollectionMiddleTest < ActiveSupport::TestCase
 
-  setup :create_records
+  setup do
+    10.times.each { |id| Model.create title: "Record #{id}" }
+    @collection = Model.page(3).per(2)
+  end
 
   test "should have 5 pages" do
     assert_equal @collection.total_pages, 5
@@ -32,11 +35,4 @@ class CollectionMiddleTest < ActiveSupport::TestCase
     assert !@collection.out_of_bounds?
   end
 
-  protected
-
-  def create_records
-    10.times.each { |id| Model.create :title => "Record #{id}" }
-    @collection = Model.page(3).per(2)
-  end
-
 end

data/test/collection_padding_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class CollectionPaddingTest < ActiveSupport::TestCase
   
   test "negative padding should have 1 page" do
-    11.times.each { |id| Model.create :title => "Record #{id}" }
+    11.times.each { |id| Model.create title: "Record #{id}" }
     
     @collection = Model.page(1).per(15).pad(-4)
     assert_equal @collection.total_pages, 1
@@ -16,7 +16,7 @@ class CollectionPaddingTest < ActiveSupport::TestCase
   end
 
   test "negative padding should have 2 pages" do
-    12.times.each { |id| Model.create :title => "Record #{id}" }
+    12.times.each { |id| Model.create title: "Record #{id}" }
     
     @collection = Model.page(1).per(15).pad(-4)
     assert_equal @collection.total_pages, 2
@@ -29,7 +29,7 @@ class CollectionPaddingTest < ActiveSupport::TestCase
   end
   
   test "negative padding should have 3 pages" do
-    27.times.each { |id| Model.create :title => "Record #{id}" }
+    27.times.each { |id| Model.create title: "Record #{id}" }
     
     @collection = Model.page(1).per(15).pad(-4)
     assert_equal @collection.total_pages, 3
@@ -42,7 +42,7 @@ class CollectionPaddingTest < ActiveSupport::TestCase
   end
   
   test "positive padding should have 1 page" do
-    15.times.each { |id| Model.create :title => "Record #{id}" }
+    15.times.each { |id| Model.create title: "Record #{id}" }
     
     @collection = Model.page(1).per(15).pad(4)
     assert_equal @collection.total_pages, 1
@@ -55,7 +55,7 @@ class CollectionPaddingTest < ActiveSupport::TestCase
   end
 
   test "positive padding should have 2 pages" do
-    16.times.each { |id| Model.create :title => "Record #{id}" }
+    16.times.each { |id| Model.create title: "Record #{id}" }
     
     @collection = Model.page(1).per(15).pad(4)
     assert_equal @collection.total_pages, 2
@@ -68,7 +68,7 @@ class CollectionPaddingTest < ActiveSupport::TestCase
   end
   
   test "positive padding should have 3 pages" do
-    31.times.each { |id| Model.create :title => "Record #{id}" }
+    31.times.each { |id| Model.create title: "Record #{id}" }
     
     @collection = Model.page(1).per(15).pad(4)
     assert_equal @collection.total_pages, 3

data/test/dummy/app/views/layouts/application.html.erb

@@ -2,13 +2,11 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", :media => "all" %>
-  <%= javascript_include_tag "application" %>
+  <%= stylesheet_link_tag 'application', media: 'all' %>
+  <%= javascript_include_tag 'application' %>
   <%= csrf_meta_tags %>
 </head>
 <body>
-
-<%= yield %>
-
+  <%= yield %>
 </body>
 </html>

data/test/dummy/app/views/test/index.html.erb

@@ -1,30 +1 @@
-<% pager = paginate(@collection) %>
-<% if pager.has_multiple_pages? %>
-  <div id="pager">
-    <% if pager.has_first_page? %>
-      <a class="first" href="<%= pager.first_page_path %>"><%= t('pager.first') %></a>
-    <% end %>
-    <% if pager.has_previous_page? %>
-      <a class="previous" href="<%= pager.previous_page_path %>"><%= t('pager.previous') %></a>
-    <% end %>
-    <% if pager.navigation.has_less_pages? %>
-      <span class="ellipsis">...</span>
-    <% end %>
-    <% for page in pager.navigation.pages %>
-      <% if pager.is_current_page? page %>
-        <span class="page current"><%= page %></span>     
-      <% else %>
-        <a class="page" href="<%= pager.page_path(page) %>"><%= page %></a>
-      <% end %>
-    <% end %>
-    <% if pager.navigation.has_more_pages? %>
-      <span class="ellipsis">...</span>  
-    <% end %>
-    <% if pager.has_next_page? %>
-      <a class="next" href="<%= pager.next_page_path %>"><%= t('pager.next') %></a>
-    <% end %>
-    <% if pager.has_last_page? %>
-      <a class="last" href="<%= pager.last_page_path %>"><%= t('pager.last') %></a>
-    <% end %>
-  </div>
-<% end %>
+<%= pager @collection %>