kaminari 0.16.0 → 0.16.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 117c68d8324470079a8c8a6eeaa3810f85c12db6
+  data.tar.gz: 7b2782d769a5f11cdae40b5235d32f52a38cb0b7
+SHA512:
+  metadata.gz: 2c4e2d2cec8d2b0590956a935271d45277843a3acf507848be5c76098f79d072574f06447c76fbd5398bbf212be3b37bfd0c104d6568ca7a52a09f51cc233010
+  data.tar.gz: 5f4bfd98606eddfffa12c4b52a004183a110ac9c7b32c6b80f28fd58f7265379c8b55e3d2a258cfb31e3459e97fd694aa9bec62e5f1d0aad051517bbca33ec62

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.16.1
+
+* Fix a bug where :theme option for #paginate method doesn't work properly
+#566 [commstratdev]
+
 == 0.16.0
 
 * Add support for mongoid max_scan option #500 [aptx4869]

data/lib/kaminari/helpers/paginator.rb

@@ -25,7 +25,7 @@ module Kaminari
           h[:right] = outer_window if h[:right] == 0
         end
         @template, @options = template, options
-        @theme = @options.delete(:theme)
+        @theme = @options[:theme]
         @views_prefix = @options[:views_prefix]
         @window_options.merge! @options
         @window_options[:current_page] = @options[:current_page] = PageProxy.new(@window_options, @options[:current_page], nil)

data/lib/kaminari/helpers/tags.rb

@@ -17,7 +17,7 @@ module Kaminari
         @template, @options = template, options.dup
         @param_name = @options.delete(:param_name) || Kaminari.config.param_name
         @theme = @options.delete(:theme)
-        @views_prefix = @options[:views_prefix]
+        @views_prefix = @options.delete(:views_prefix)
         @params = @options[:params] ? template.params.merge(@options.delete :params) : template.params
       end
 

data/lib/kaminari/version.rb

@@ -1,3 +1,3 @@
 module Kaminari
-  VERSION = '0.16.0'
+  VERSION = '0.16.1'
 end

data/spec/fake_app/views/kaminari/bootstrap/_page.html.erb

@@ -0,0 +1 @@
+<li class="bootstrap-page-link"><%= link_to page, url %></li>

data/spec/fake_app/views/kaminari/bootstrap/_paginator.html.erb

@@ -0,0 +1,7 @@
+<div class="bootstrap-paginator">
+<%= paginator.render do -%>
+<%    each_page do |page| %>
+<%=     page_tag(page) -%>
+<%    end %>
+<%  end %>
+</div>

data/spec/helpers/action_view_extension_spec.rb

@@ -16,6 +16,13 @@ describe 'Kaminari::ActionViewExtension', :if => defined?(Rails)do
       end
     end
 
+    context 'accepts :theme option' do
+      before { helper.controller.append_view_path "spec/fake_app/views" }
+      subject { helper.paginate @users, :theme => "bootstrap", :params => {:controller => 'users', :action => 'index'} }
+      it { should match(/bootstrap-paginator/) }
+      it { should match(/bootstrap-page-link/) }
+    end
+
     context 'accepts :view_prefix option' do
       before { helper.controller.append_view_path "spec/fake_app/views" }
       subject { helper.paginate @users, :views_prefix => "alternative/", :params => {:controller => 'users', :action => 'index'} }

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaminari
 version: !ruby/object:Gem::Version
-  version: 0.16.0
-  prerelease: 
+  version: 0.16.1
 platform: ruby
 authors:
 - Akira Matsuda
@@ -12,166 +11,146 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-08 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Kaminari is a Scope & Engine based, clean, powerful, agnostic, customizable
@@ -183,11 +162,11 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .document
-- .gemtest
-- .gitignore
-- .rspec
-- .travis.yml
+- ".document"
+- ".gemtest"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.rdoc
 - Gemfile
 - MIT-LICENSE
@@ -270,6 +249,8 @@ files:
 - spec/fake_app/sinatra_app.rb
 - spec/fake_app/views/alternative/kaminari/_first_page.html.erb
 - spec/fake_app/views/alternative/kaminari/_paginator.html.erb
+- spec/fake_app/views/kaminari/bootstrap/_page.html.erb
+- spec/fake_app/views/kaminari/bootstrap/_paginator.html.erb
 - spec/fake_gem.rb
 - spec/generators/views_generator_spec.rb
 - spec/helpers/action_view_extension_spec.rb
@@ -291,27 +272,26 @@ files:
 homepage: https://github.com/amatsuda/kaminari
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: kaminari
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A pagination engine plugin for Rails 3+ and other modern frameworks
 test_files:
 - spec/config/config_spec.rb
@@ -327,6 +307,8 @@ test_files:
 - spec/fake_app/sinatra_app.rb
 - spec/fake_app/views/alternative/kaminari/_first_page.html.erb
 - spec/fake_app/views/alternative/kaminari/_paginator.html.erb
+- spec/fake_app/views/kaminari/bootstrap/_page.html.erb
+- spec/fake_app/views/kaminari/bootstrap/_paginator.html.erb
 - spec/fake_gem.rb
 - spec/generators/views_generator_spec.rb
 - spec/helpers/action_view_extension_spec.rb