RubyGems - will_paginate-bootstrap - Versions diffs - 0.2.1 → 0.2.2 - Mend

will_paginate-bootstrap 0.2.1 → 0.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

data/Gemfile +7 -3
data/README.markdown +2 -1
data/example/app.rb +25 -0
data/lib/bootstrap_pagination/bootstrap_renderer.rb +3 -3
data/lib/bootstrap_pagination/version.rb +1 -1
data/spec/pagination_spec.rb +30 -22
metadata +17 -5

data/Gemfile CHANGED

@@ -4,7 +4,11 @@ source "http://rubygems.org"
 gemspec
 group :development do
-  gem 'rake'
-  gem 'nokogiri'
-  gem 'minitest'
+  gem "rake"
+  gem "nokogiri"
+  gem "minitest"
+end
+group :example_app do
+  gem "sinatra"
 end

data/README.markdown CHANGED

@@ -23,7 +23,8 @@ As with will_paginate itself, Rails and Sinatra are supported.
 ### Sinatra
   1. Load the Bootstrap CSS in your template.
-  2. In your view, use the `:renderer => BootstrapPagination::Sinatra` option with the `will_paginate` helper, for example:
+  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:
 `<%= will_paginate @collection, :renderer => BootstrapPagination::Sinatra %>`

data/example/app.rb ADDED

@@ -0,0 +1,25 @@
+require "sinatra"
+require "will_paginate-bootstrap"
+require "will_paginate/collection"
+$template = <<EOHTML
+<html>
+<head>
+<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.2.2/css/bootstrap-combined.min.css" rel="stylesheet">
+</head>
+<body>
+<%= will_paginate @collection, :renderer => BootstrapPagination::Sinatra %>
+</body>
+</html>
+EOHTML
+get "/" do
+  page = if params[:page].to_i > 0
+    params[:page].to_i
+  else
+    1
+  end
+  @collection = WillPaginate::Collection.new page, 10, 100000
+  erb $template
+end

data/lib/bootstrap_pagination/bootstrap_renderer.rb CHANGED

@@ -22,7 +22,7 @@ module BootstrapPagination
     def page_number(page)
       if page == current_page
-        tag('li', link(page, page), :class => 'active')
+        tag('li', tag('span', page), :class => 'active')
       else
         tag('li', link(page, page, :rel => rel_value(page)))
       end
@@ -46,8 +46,8 @@ module BootstrapPagination
       if page
         tag('li', link(text, page), :class => classname)
       else
-        tag('li', link(text, '#'), :class => "%s disabled" % classname)
+        tag('li', tag('span', text), :class => "%s disabled" % classname)
       end
     end
   end
-end
+end

data/lib/bootstrap_pagination/version.rb CHANGED

@@ -1,3 +1,3 @@
 module BootstrapPagination
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/pagination_spec.rb CHANGED

@@ -18,55 +18,63 @@ class MockRenderer < WillPaginate::ViewHelpers::LinkRenderer
 end
 describe "Bootstrap Renderer" do
-  before do
-    # Render pagination for the middle page so that we can test for the presence of
-    # start, prev and next links. We should also be able to test for test for the
-    # presence of a "gap" item if the collection size is large enough.
-    collection_size = 15
-    page = (collection_size / 2.0).to_i
-    @collection = 1.upto(collection_size).to_a
-    @output = will_paginate(@collection.paginate(:page => page, :per_page => 1), :renderer => MockRenderer)
-    @html = Nokogiri::HTML.fragment(@output)
+  # Render pagination for the middle page so that we can test for the presence of
+  # start, prev and next links. We should also be able to test for test for the
+  # presence of a "gap" item if the collection size is large enough.
+  let(:collection_size) { 15 }
+  let(:page) { (collection_size / 2.0).to_i }
+  let(:collection) { 1.upto(collection_size).to_a }
+  let(:output) do
+    will_paginate(
+      collection.paginate(:page => page, :per_page => 1),
+      :renderer => MockRenderer
+    )
   end
+  let(:html) { Nokogiri::HTML.fragment(output) }
   it "returns a string" do
-    @output.must_be_kind_of String
+    output.must_be_kind_of String
   end
   it "returns a string containing HTML" do
-    @html.must_be_kind_of Nokogiri::HTML::DocumentFragment
+    html.must_be_kind_of Nokogiri::HTML::DocumentFragment
   end
   it "has an outer pagination div" do
-    @html.at_css('div.pagination').wont_be_nil
+    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
+    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
+    html.at_css('ul li.active').wont_be_nil
   end
   it "has a gap item with class disabled" do
-    @html.at_css('ul li.disabled').wont_be_nil
+    html.at_css('ul li.disabled').wont_be_nil
   end
   it "has one item with rel start value" do
-    @html.css('[rel~=start]').size.must_equal 1
+    html.css('[rel~=start]').size.must_equal 1
   end
   it "has two items with rel prev value" do
-    @html.css('[rel~=prev]').size.must_equal 2
+    html.css('[rel~=prev]').size.must_equal 2
   end
   it "has two items with rel next value" do
-    @html.css('[rel~=next]').size.must_equal 2
+    html.css('[rel~=next]').size.must_equal 2
+  end
+  it "has an anchor within each non-active list item" do
+    html.css('ul li:not(.active)').each { |li| li.at_css('a').wont_be_nil }
   end
-  it "has anchors within each list item" do
-    @html.css('ul li').each { |li| li.at_css('a').wont_be_nil }
+  it "uses a span element for the active page" do
+    html.at_css('ul li.active span').wont_be_nil
   end
-end
+end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: will_paginate-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease:
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70351248293000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70351248293000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.3
 description: This gem integrates the Twitter Bootstrap pagination component with the
   will_paginate pagination gem. Supports Rails and Sinatra.
 email:
@@ -35,6 +40,7 @@ files:
 - MIT-LICENSE
 - README.markdown
 - Rakefile
+- example/app.rb
 - lib/bootstrap_pagination/action_view.rb
 - lib/bootstrap_pagination/bootstrap_renderer.rb
 - lib/bootstrap_pagination/sinatra.rb
@@ -56,15 +62,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3359177914669589572
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3359177914669589572
 requirements: []
 rubyforge_project: will_paginate-bootstrap
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key:
 specification_version: 3
 summary: Integrates the Twitter Bootstrap pagination component with will_paginate