pagination 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/pagination.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pagination}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David"]
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/sinefunc/pagination}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A simplistic pagination library}
   s.test_files = [
     "test/helper.rb",

data/test/test_pagination_template.rb

@@ -9,16 +9,17 @@ class TestPaginationTemplate < Test::Unit::TestCase
     @dataset = ['one', 'two', 'three', 'four', 'five']
     @items = Pagination.paginate(@dataset, :per_page => 1, :page => 1)
   end
-  
+
+  def doc
+    Nokogiri(@render.call)
+  end
+ 
   describe "haml rendering option" do
     setup do
       Object.const_set(:Haml, HamlHere) unless defined?(Haml)
       @render = lambda { Pagination::Template.new(@items).render }
     end
     
-    def doc
-      Nokogiri(@render.call)
-    end
 
     should "be able to render using haml" do
       assert_nothing_raised do
@@ -26,50 +27,79 @@ class TestPaginationTemplate < Test::Unit::TestCase
       end
     end
 
-    should "have a ul > li.prev-link.disabled" do
-      assert_equal 1, 
-        doc.search('ul.pagination > li.prev-link.disabled > a').length
+    should "have no .pagination > a.prev-link" do
+      assert_equal 0, doc.search('.pagination > a.prev-link').length
     end
 
     should "have a ul > li.next-link with page=2" do
       assert_equal 1, 
-        doc.search('ul.pagination > li.next-link > a[href="?page=2"]').length
+        doc.search('div.pagination > a.next-link[href="?page=2"]').length
     end
 
-    should "display the first page as the curretn page" do
-      assert_equal 1, 
-        doc.search('ul.pagination > li > ul.page-numbers > li > span').length
+    should "display the first page as the current page" do
+      assert_equal 1, doc.search('div.pagination > ul > li > span').length
 
-      assert_equal '1', 
-        doc.search('ul.pagination > li > ul.page-numbers > li > span').text
+      assert_equal '1', doc.search('div.pagination > ul > li > span').text
     end
 
     should "display pages 2 to 5 as links" do
       (2..5).each do |page|
         assert_equal 1, 
-          doc.search(%(ul.pagination > li > 
-                       ul.page-numbers > li > a[href="?page=#{page}"])).length
+          doc.search(%(div.pagination > ul > li > 
+                       a[href="?page=#{page}"])).length
 
         assert_equal page.to_s, 
-          doc.search(%(ul.pagination > li > 
-                       ul.page-numbers > li > a[href="?page=#{page}"])).text
+          doc.search(%(div.pagination > ul > li > 
+                       a[href="?page=#{page}"])).text
       end
     end
   end
 
   describe "erb rendering option" do
     setup do
-      Object.send :remove_const, :Haml
+      if defined?(Haml)
+        Object.send :remove_const, :Haml
+      end
+
+      @template = Pagination::Template.new(@items)
+      @render = lambda { @template.render }
     end
   
     should "render without any errors" do
-      template = Pagination::Template.new(@items)
-      assert_kind_of ERB, template.send(:engine)
+      assert_kind_of ERB, @template.send(:engine)
 
       assert_nothing_raised do
-        template.render
+        @render.call
       end
     end
+
+    should "have no .pagination > a.prev-link" do
+      assert_equal 0, doc.search('.pagination > a.prev-link').length
+    end
+
+    should "have a ul > li.next-link with page=2" do
+      assert_equal 1, 
+        doc.search('div.pagination > a.next-link[href="?page=2"]').length
+    end
+
+    should "display the first page as the current page" do
+      assert_equal 1, doc.search('div.pagination > ul > li > span').length
+
+      assert_equal '1', doc.search('div.pagination > ul > li > span').text
+    end
+
+    should "display pages 2 to 5 as links" do
+      (2..5).each do |page|
+        assert_equal 1, 
+          doc.search(%(div.pagination > ul > li > 
+                       a[href="?page=#{page}"])).length
+
+        assert_equal page.to_s, 
+          doc.search(%(div.pagination > ul > li > 
+                       a[href="?page=#{page}"])).text
+      end
+    end
+
   end
 end
 

data/views/paginate.erb

@@ -1,3 +1,31 @@
+<% if items.render? %>
+  <div class="pagination">
+    <% if items.prev_page %>
+      <a class="prev-link" href="<%= '?page=%s' % items.prev_page %>">
+        <span>&larr; Previous</span>
+      </a>
+    <% end %>
+  
+    <ul>
+      <% items.displayed_pages.each do |page| %>
+        <% if items.current?(page) %>
+          <li class="active"><span><%= page %></span></li>
+        <% else %>
+          <li><a href="<%= '?page=%s' % page %>"><%= page %></a></li>
+        <% end %>
+      <% end %>
+    </ul>
+
+    <% if items.next_page %>
+      <a class="next-link" href="<%= '?page=%s' % items.next_page %>">
+        <span>Next &rarr;</span>
+      </a>
+    <% end %>
+  </div>
+<% end %>
+      
+
+
 <% if items.render? %>
   <ul class="pagination">
     <% if items.prev_page %>

data/views/paginate.haml

@@ -1,24 +1,19 @@
 - if items.render?
-  %ul.notList.pagination
+  %div.pagination
     - if items.prev_page
-      %li.prev-link
-        %a{:href => ("?page=%s" % items.prev_page)} « Prev
-    - else
-      %li.prev-link.disabled
-        %a(href='javascript:;') « Prev
-
-    %li
-      %ul.notList.page-numbers
-        - items.displayed_pages.each do |page|
+      %a.prev-link{:href => ("?page=%s" % items.prev_page)}
+        %span ← Previous
+      
+    %ul
+      - items.displayed_pages.each do |page|
+        - if items.current?(page)
+          %li.active
+            %span= page
+        - else
           %li
-            - if items.current?(page)
-              %span= page
-            - else
-              %a{:href => ("?page=%s" % page)}= page
+            %a{:href => ("?page=%s" % page)}= page
 
     - if items.next_page
-      %li.next-link
-        %a{:href => ("?page=%s" % items.next_page)} Next »
-    - else
-      %li.next-link.disabled
-        %a(href='javascript:;') Next »
+      %a.next-link{:href => ("?page=%s" % items.next_page)}
+        %span Next →
+

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: pagination
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Cyril David
@@ -14,24 +19,28 @@ default_executable: pagination
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: contest
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 description: Trying to make the pagination world a better place
 email: cyx.ucron@gmail.com
 executables: 
@@ -74,18 +83,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A simplistic pagination library