just_paginate 0.0.7 → 0.0.8

data/lib/just_paginate.rb

@@ -1,70 +1,57 @@
 # -*- coding: utf-8 -*-
 module JustPaginate
 
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 
   def self.page_value(page)
     if page.nil?
       1
-    else 
+    else
       page.to_i
     end
   end
 
   def self.paginate(curr_page, per_page, total_entry_count,  &selection_strategy)
-    raise "Pagination just supplies index range, expects a selection strategy" if selection_strategy.nil? 
-    
-    entries = yield(index_range(curr_page, per_page, total_entry_count)) || []    
+    raise "Pagination just supplies index range, expects a selection strategy" if selection_strategy.nil?
+
+    entries = yield(index_range(curr_page, per_page, total_entry_count)) || []
     return entries, total_page_number(total_entry_count, per_page)
   end
 
   def self.total_page_number(total_entry_count, per_page)
     (total_entry_count.to_f / per_page).ceil
   end
-  
+
   def self.index_range(curr_page, per_page, total_entry_count)
     start_index = ((curr_page-1)*per_page)
     end_index = (start_index+per_page)-1
-    
+
     if(start_index>total_entry_count)
       raise "Pagination is out of bounds, beyond total entry size"
     end
-    
+
     if end_index>total_entry_count
       end_index = total_entry_count
     end
-    
+
     Range.new(start_index, end_index)
   end
 
-  def self.page_navigation(curr_page, total_page_count, &page_link_constructor)   
+  def self.beyond_page_range?(curr_page, per_page, total_entry_count)
+    start_index = ((curr_page-1)*per_page)
+    end_index = (start_index+per_page)-1
+    start_index > total_entry_count
+  end
+
+  def self.page_navigation(curr_page, total_page_count, &page_link_constructor)
     links = page_links(curr_page.to_i, total_page_count, &page_link_constructor)
     return "<div class='pagination'>#{links}</div>"
   end
 
-# Create gitorous-style-pagination until we move to Bootstrap
-# <div class="pagination">
-# <a href="/projects?page=24" class="prev_page" rel="prev">Previous</a> 
-# <a href="/projects?page=1" rel="start">1</a> 
-# <span class="gap">…</span> 
-# <a href="/projects?page=21">21</a> 
-# <a href="/projects?page=22">22</a> 
-# <a href="/projects?page=23">23</a> 
-# <a href="/projects?page=24" rel="prev">24</a> <span class="current">25</span> 
-# <a href="/projects?page=26" rel="next">26</a> 
-# <a href="/projects?page=27">27</a> 
-# <a href="/projects?page=28">28</a> 
-# <a href="/projects?page=29">29</a> 
-# <span class="gap">…</span> 
-# <a href="/projects?page=1446">1446</a> 
-# <a href="/projects?page=26" class="next_page" rel="next">Next</a>
-# </div>
-
-
   def self.page_links(curr_page, total_page_count, &page_link_constructor)
     page_labels(curr_page, total_page_count).map do |label|
       page_element = ""
-      
+
       if label == "..."
         page_element = "<span class='gap'>#{label}</span>"
       elsif label == "<"
@@ -84,14 +71,14 @@ module JustPaginate
 
     end.join(" ")
   end
-  
+
   def self.page_labels(current, total)
     max_visible = 10
     labels = []
 
     if total <= max_visible
       1.upto(total).each {|n| labels.push(n.to_s)}
-    else 
+    else
       if current > max_visible
         labels = ["<", "1", "..."]
       else
@@ -106,10 +93,10 @@ module JustPaginate
 
       if (current <= (total-max_visible))
         labels.concat ["...", "#{total}", ">"]
-      end 
+      end
     end
 
     return labels
-  end  
-  
+  end
+
 end

data/test/test_just_paginate.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class JustPaginateTest < Test::Unit::TestCase
-  
-  context "The backend pagination function" do    
+
+  context "The backend pagination function" do
     should "basically work like this" do
       paged_collection = [1,2,3,4,5,6,7,8,9,10]
 
@@ -26,12 +26,18 @@ class JustPaginateTest < Test::Unit::TestCase
         JustPaginate.index_range(7,2,4)
       end
     end
-  
+
+    should "provide predicate to check if pagination would exceed total pagecount" do
+      assert JustPaginate.beyond_page_range?(7,2,4)
+      assert !JustPaginate.beyond_page_range?(1,20,100)
+    end
+
+
     should "calculate correct total page count" do
       assert_equal 25, JustPaginate.total_page_number(500, 20)
       assert_equal 25, JustPaginate.total_page_number(498, 20)
     end
-  
+
     should "correctly apply the supplied selection strategy" do
       ran = false
       sliced_entries, page_count = JustPaginate.paginate(1, 5, 10) do |index_range|
@@ -41,7 +47,7 @@ class JustPaginateTest < Test::Unit::TestCase
       end
       assert ran, "selection block didn't run"
     end
-    
+
     should "calculate correct index ranges" do
       assert_equal 0..1, JustPaginate.index_range(1,2,4)
       assert_equal 2..3, JustPaginate.index_range(2,2,4)
@@ -64,7 +70,7 @@ class JustPaginateTest < Test::Unit::TestCase
       assert_equal 480..499, JustPaginate.index_range(25,20,500)
     end
   end
-  
+
   context "The frontend pagination html helper" do
     should "basically work like this" do
       generated = JustPaginate.page_navigation(1, 10) { |page_no| "/projects/index?page=#{page_no}" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: just_paginate
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000Z
+date: 2012-11-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &22540540 !ruby/object:Gem::Requirement
+  requirement: &19002240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22540540
+  version_requirements: *19002240
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &22539900 !ruby/object:Gem::Requirement
+  requirement: &19001720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22539900
+  version_requirements: *19001720
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &22539340 !ruby/object:Gem::Requirement
+  requirement: &19001220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22539340
+  version_requirements: *19001220
 description: Framework-agnostic support for paginating collections of things, and
   linking to paginated things in your webpage
 email: