RubyGems - will_paginate-bootstrap - Versions diffs - 0.2.3 → 0.2.4 - Mend

will_paginate-bootstrap 0.2.3 → 0.2.4

Files changed (6) hide show

data/README.markdown +17 -3
data/example/app.rb +39 -5
data/lib/bootstrap_pagination/bootstrap_renderer.rb +14 -10
data/lib/bootstrap_pagination/version.rb +1 -1
data/spec/pagination_spec.rb +24 -9
metadata +4 -4

data/README.markdown CHANGED Viewed

@@ -20,15 +20,29 @@ As with will_paginate itself, Rails and Sinatra are supported.
   1. Load the Bootstrap CSS in your template.
   2. In your view, use the `renderer: BootstrapPagination::Rails` option with the `will_paginate` helper, for example:
-`<%= will_paginate @collection, renderer: BootstrapPagination::Rails %>`
+```ruby
+<%= will_paginate @collection, renderer: BootstrapPagination::Rails %>
+```
 ### Sinatra
   1. Load the Bootstrap CSS in your template.
   2. `require "will_paginate-bootstrap"` in your Sinatra app.
-  3. In your view, use the `:renderer => BootstrapPagination::Sinatra` option with the `will_paginate` helper, for example:
+  3. In your view, use the `renderer: BootstrapPagination::Sinatra` option with the `will_paginate` helper, for example:
-`<%= will_paginate @collection, renderer: BootstrapPagination::Sinatra %>`
+```ruby
+<%= will_paginate @collection, renderer: BootstrapPagination::Sinatra %>
+```
+## Bootstrap 3
+For Bootstrap 3, the markup required has changed slightly from version 2. You can pass the `bootstrap` option with a value >= 3 when calling `will_paginate` to generate Bootstrap 3 compatible markup. For example:
+```ruby
+<%= will_paginate @collection, renderer: BootstrapPagination::Rails, bootstrap: 3 %>
+```
+By default version 2 compatible markup will be generated.
 ## Compatibility

data/example/app.rb CHANGED Viewed

@@ -2,18 +2,39 @@ require "sinatra"
 require "will_paginate-bootstrap"
 require "will_paginate/collection"
+CDN_PATHS = {
+  2 => "//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css",
+  3 => "//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/css/bootstrap.min.css"
+}
+$menu = <<EOHTML
+<html>
+<head>
+<title>will_paginate-boostrap Example App</title>
+</head>
+<body>
+<ul>
+<h1>Which Twitter Boostrap version?</h1>
+<li><a href="/2">Bootstrap 2</a></li>
+<li><a href="/3">Bootstrap 3</a></li>
+</ul>
+</body>
+</html>
+EOHTML
 $template = <<EOHTML
 <html>
 <head>
-<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.2.2/css/bootstrap-combined.min.css" rel="stylesheet">
+<title>will_paginate-boostrap Example App</title>
+<link href="<%= href %>" rel="stylesheet">
 </head>
 <body>
-<%= will_paginate @collection, :renderer => BootstrapPagination::Sinatra %>
+<%= will_paginate @collection, renderer: BootstrapPagination::Sinatra, bootstrap: version %>
 </body>
 </html>
 EOHTML
-get "/" do
+def build_collection
   page = if params[:page].to_i > 0
     params[:page].to_i
   else
@@ -21,5 +42,18 @@ get "/" do
   end
   @collection = WillPaginate::Collection.new page, 10, 100000
-  erb $template
-end
+end
+get "/" do
+  erb $menu
+end
+get "/2" do
+  build_collection
+  erb $template, locals: {href: CDN_PATHS[2], version: 2}
+end
+get "/3" do
+  build_collection
+  erb $template, locals: {href: CDN_PATHS[3], version: 3}
+end

data/lib/bootstrap_pagination/bootstrap_renderer.rb CHANGED Viewed

@@ -3,7 +3,7 @@ require "bootstrap_pagination/version"
 module BootstrapPagination
   # Contains functionality shared by all renderer classes.
   module BootstrapRenderer
-    ELLIPSIS = '&hellip;'
+    ELLIPSIS = "&hellip;"
     def to_html
       list_items = pagination.map do |item|
@@ -13,40 +13,44 @@ module BootstrapPagination
           else
             send(item)
         end
-      end
+      end.join(@options[:link_separator])
-      html_container(tag('ul', list_items.join(@options[:link_separator])))
+      if @options[:bootstrap].to_i >= 3
+        tag("ul", list_items, class: "pagination")
+      else
+        html_container(tag("ul", list_items))
+      end
     end
     protected
     def page_number(page)
       if page == current_page
-        tag('li', tag('span', page), :class => 'active')
+        tag("li", tag("span", page), class: "active")
       else
-        tag('li', link(page, page, :rel => rel_value(page)))
+        tag("li", link(page, page, :rel => rel_value(page)))
       end
     end
     def gap
-      tag('li', link(ELLIPSIS, '#'), :class => 'disabled')
+      tag("li", link(ELLIPSIS, "#"), class: "disabled")
     end
     def previous_page
       num = @collection.current_page > 1 && @collection.current_page - 1
-      previous_or_next_page(num, @options[:previous_label], 'prev')
+      previous_or_next_page(num, @options[:previous_label], "prev")
     end
     def next_page
       num = @collection.current_page < @collection.total_pages && @collection.current_page + 1
-      previous_or_next_page(num, @options[:next_label], 'next')
+      previous_or_next_page(num, @options[:next_label], "next")
     end
     def previous_or_next_page(page, text, classname)
       if page
-        tag('li', link(text, page), :class => classname)
+        tag("li", link(text, page), class: classname)
       else
-        tag('li', tag('span', text), :class => "%s disabled" % classname)
+        tag("li", tag("span", text), class: "%s disabled" % classname)
       end
     end
   end

data/lib/bootstrap_pagination/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module BootstrapPagination
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/pagination_spec.rb CHANGED Viewed

@@ -24,11 +24,12 @@ describe "Bootstrap Renderer" do
   let(:collection_size) { 15 }
   let(:page) { (collection_size / 2.0).to_i }
   let(:collection) { 1.upto(collection_size).to_a }
+  let(:version) { nil }
   let(:output) do
     will_paginate(
       collection.paginate(:page => page, :per_page => 1),
-      :renderer => MockRenderer
+      renderer: MockRenderer, bootstrap: version
     )
   end
@@ -42,14 +43,6 @@ describe "Bootstrap Renderer" do
     html.must_be_kind_of Nokogiri::HTML::DocumentFragment
   end
-  it "has an outer pagination div" do
-    html.at_css('div.pagination').wont_be_nil
-  end
-  it "has an unordered list within the pagination div" do
-    html.at_css('div.pagination ul').wont_be_nil
-  end
   it "has an active list item" do
     html.at_css('ul li.active').wont_be_nil
   end
@@ -77,4 +70,26 @@ describe "Bootstrap Renderer" do
   it "uses a span element for the active page" do
     html.at_css('ul li.active span').wont_be_nil
   end
+  describe "with markup for v2" do
+    it "has an outer pagination div" do
+      html.at_css('div.pagination').wont_be_nil
+    end
+    it "has an unordered list within the pagination div" do
+      html.at_css('div.pagination ul').wont_be_nil
+    end
+  end
+  describe "with markup for v3" do
+    let(:version) { 3 }
+    it "has no outer pagination div" do
+      html.at_css('div.pagination').must_be_nil
+    end
+    it "has an unordered list with the pagination class" do
+      html.at_css('ul.pagination').wont_be_nil
+    end
+  end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: will_paginate-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000 Z
+date: 2013-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
@@ -64,7 +64,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 463001071241710486
+      hash: 719611630819413183
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 463001071241710486
+      hash: 719611630819413183
 requirements: []
 rubyforge_project: will_paginate-bootstrap
 rubygems_version: 1.8.23