kaminari 0.9.0 → 0.9.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.9.1
+
+* googlish template theme
+
 == 0.9.0
 
 * added "per_page" to the template local variables #3 [hsbt]

data/README.rdoc

@@ -81,16 +81,32 @@ This will render several "?page=N" pagination links surrounded by an HTML5 <nav>
 
 === Customizing the pagination helper
 
-* The generator
+Kaminari includes a handy template generator.
 
-  % rails g kaminari:views
+* The default generator
+
+  % rails g kaminari:views default
 Then edit the partials in your app's app/views/kaminari/ directory.
 
 * For Haml users
 
-Haml templates generator is also available by adding "-e haml" option.
+Haml templates generator is also available by adding "-e haml" option (this would actually be automatically invoked while the default template_engine is set to Haml).
+
+  % rails g kaminari:views default -e haml
+
+* themes
+
+Kaminari is shipped with template themes in addition to the "default" one, which will help you creating a nice looking paginator.
+
+  % rails g kaminari:views THEME
+
+To see the full list of avaliable themes, just hit the generator without specifying THEME argument.
+  % rails g kaminari:views
+
+
+== Questions, Feedbacks
 
-  % rails g kaminari:views -e haml
+Feel free to message me on Github (amatsuda) or Twitter (@a_matsuda)  :)
 
 
 == Contributing to Kaminari

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/app/views/kaminari/_next_link.html.erb

@@ -6,5 +6,5 @@
   remote:        data-remote
 -%>
 <span class="next">
-  <%= link_to_if (current_page < num_pages), raw('Next &raquo;'), next_url, :class => 'next', :rel => 'next', :remote => remote %>
+  <%= link_to raw('Next &raquo;'), next_url, :class => 'next', :rel => 'next', :remote => remote %>
 </span>

data/app/views/kaminari/_next_link.html.haml

@@ -5,4 +5,4 @@
   per_page:      number of items to fetch per page
   remote:        data-remote
 %span.next
-  = link_to_if (current_page < num_pages), raw('Next &raquo;'), next_url, :class => 'next', :rel => 'next', :remote => remote
+  = link_to raw('Next &raquo;'), next_url, :class => 'next', :rel => 'next', :remote => remote

data/app/views/kaminari/_prev_link.html.erb

@@ -6,5 +6,5 @@
   remote:        data-remote
 -%>
 <span class="prev">
-  <%= link_to_if (current_page > 1), raw('&laquo; Prev'), prev_url, :class => 'prev', :rel => 'prev', :remote => remote %>
+  <%= link_to raw('&laquo; Prev'), prev_url, :class => 'prev', :rel => 'prev', :remote => remote %>
 </span>

data/app/views/kaminari/_prev_link.html.haml

@@ -5,4 +5,4 @@
   per_page:      number of items to fetch per page
   remote:        data-remote
 %span.prev
-  = link_to_if (current_page > 1), raw('« Prev'), prev_url, :class => 'prev', :rel => 'prev', :remote => remote
+  = link_to raw('« Prev'), prev_url, :class => 'prev', :rel => 'prev', :remote => remote

data/app/views/kaminari/google/_current_page.html.erb

@@ -0,0 +1,9 @@
+<%# available local variables:
+  page:          the page number of this page
+  page_url:      url to this page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
+<td class="cur"><span class="csb" style="background-position:-53px 0;width:20px"></span><%= page %></td>

data/app/views/kaminari/google/_current_page.html.haml

@@ -0,0 +1,10 @@
+-# available local variables:
+  page:          the page number of this page
+  page_url:      url to this page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+%td.cur
+  %span.csb{:style => 'background-position:-53px 0;width:20px'}
+  = page

data/app/views/kaminari/google/_first_page_link.html.erb

@@ -0,0 +1,10 @@
+<%# available local variables:
+  page:          the page number of this page
+  page_url:      url to this page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
+<%# this kind of works even though looks a bit hackish... -%>
+<%= render :partial => 'kaminari/page_link', :locals => @_partial_renderer.instance_variable_get('@locals') %>

data/app/views/kaminari/google/_first_page_link.html.haml

@@ -0,0 +1,9 @@
+-# available local variables:
+  page:          the page number of this page
+  page_url:      url to this page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-# this kind of works even though looks a bit hackish...
+= render :partial => 'kaminari/page_link', :locals => @_partial_renderer.instance_variable_get('@locals')

data/app/views/kaminari/google/_last_page_link.html.erb

@@ -0,0 +1,10 @@
+<%# available local variables:
+  page:          the page number of this page
+  page_url:      url to this page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
+<%# this kind of works even though looks a bit hackish... -%>
+<%= render :partial => 'kaminari/page_link', :locals => @_partial_renderer.instance_variable_get('@locals') %>

data/app/views/kaminari/google/_last_page_link.html.haml

@@ -0,0 +1,9 @@
+-# available local variables:
+  page:          the page number of this page
+  page_url:      url to this page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-# this kind of works even though looks a bit hackish...
+= render :partial => 'kaminari/page_link', :locals => @_partial_renderer.instance_variable_get('@locals')

data/app/views/kaminari/google/_next_link.html.erb

@@ -0,0 +1,8 @@
+<%# available local variables:
+  next_url:      url to the next page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
+<td class="b"><%= link_to raw('<span class="csb ch" style="background-position:-96px 0;width:71px"></span><span style="display:block;margin-left:53px;text-decoration:underline">Next</span>'), next_url, :class => 'pn knavi', :id => 'pnnext', :style => 'text-align:left;text-decoration:none', :remote => remote %></td>

data/app/views/kaminari/google/_next_link.html.haml

@@ -0,0 +1,8 @@
+-# available local variables:
+  next_url:      url to the next page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+%td.b
+  = link_to raw('<span class="csb ch" style="background-position:-96px 0;width:71px"></span><span style="display:block;margin-left:53px;text-decoration:underline">Next</span>'), next_url, :class => 'pn knavi', :id => 'pnnext', :style => 'text-align:left;text-decoration:none', :remote => remote

data/app/views/kaminari/google/_next_span.html.erb

@@ -0,0 +1,7 @@
+<%# available local variables:
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
+<td class="b"><span class="csb" style="background-position:-96px 0;width:45px"></span></td>

data/app/views/kaminari/google/_next_span.html.haml

@@ -0,0 +1,7 @@
+-# available local variables:
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+%td.b
+  %span.csb{:style => 'background-position:-96px 0;width:45px'

data/app/views/kaminari/google/_page_link.html.erb

@@ -0,0 +1,9 @@
+<%# available local variables:
+  page:          the page number of this page
+  page_url:      url to this page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
+<td><%= link_to raw(%Q[<span class="csb ch" style="background-position:-74px 0;width:20px"></span>#{page}]), page_url, :class => 'fl', :remote => remote %></td>

data/app/views/kaminari/google/_page_link.html.haml

@@ -0,0 +1,9 @@
+-# available local variables:
+  page:          the page number of this page
+  page_url:      url to this page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+%td
+  = link_to raw(%Q[<span class="csb ch" style="background-position:-74px 0;width:20px"></span>#{page}]), page_url, :class => 'fl', :remote => remote

data/app/views/kaminari/google/_paginator.html.erb

@@ -0,0 +1,19 @@
+<%# available local variables:
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
+<style>
+#nav a{display:block}
+#nav td{padding:0;text-align:center}
+.cur {font-weight:bold}
+.csb {background:url(http://www.google.co.jp/images/srpr/nav_logo27.png) no-repeat;overflow:hidden;background-position:0 0;height:40px;display:block}
+#nav {font-family: arial,sans-serif; font-size:small}
+#nav a:link {text-decoration:none; color:#4496d3}
+#nav a:hover {text-decoration:underline}
+#nav a:active {color:#c11}
+#nav a:visited {color:#2200C1}
+.b {font-weight:bold}
+</style>
+<table id="nav" style="border-collapse:collapse;text-align:left;direction:ltr;margin:17px auto 0"><tbody><tr valign="top"><%= content_for :kaminari_paginator_tags %></tr></tbody></table>

data/app/views/kaminari/google/_paginator.html.haml

@@ -0,0 +1,20 @@
+-# available local variables:
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+:css
+  #nav a{display:block}
+  #nav td{padding:0;text-align:center}
+  .cur {font-weight:bold}
+  .csb {background:url(http://www.google.co.jp/images/srpr/nav_logo27.png) no-repeat;overflow:hidden;background-position:0 0;height:40px;display:block}
+  #nav {font-family: arial,sans-serif; font-size:small}
+  #nav a:link {text-decoration:none; color:#4496d3}
+  #nav a:hover {text-decoration:underline}
+  #nav a:active {color:#c11}
+  #nav a:visited {color:#2200C1}
+  .b {font-weight:bold}
+%table#nav{:style => 'border-collapse:collapse;text-align:left;direction:ltr;margin:17px auto 0'}
+  %tbody
+    %tr{:valign => 'top'}
+      = content_for :kaminari_paginator_tags

data/app/views/kaminari/google/_prev_link.html.erb

@@ -0,0 +1,8 @@
+<%# available local variables:
+  prev_url:      url to the previous page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
+<td class="b"><%= link_to raw('<span class="csb ch" style="background-position:0 0;float:right;width:53px"></span><span style="display:block;margin-right:35px;clear:right;text-decoration:underline">Previous</span>'), prev_url, :class => 'pn knavi', :id => 'pnprev', :style => 'text-decoration:none', :remote => remote %></td>

data/app/views/kaminari/google/_prev_link.html.haml

@@ -0,0 +1,8 @@
+-# available local variables:
+  prev_url:      url to the previous page
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+%td.b
+  = link_to raw('<span class="csb ch" style="background-position:0 0;float:right;width:53px"></span><span style="display:block;margin-right:35px;clear:right;text-decoration:underline">Previous</span>'), prev_url, :class => 'pn knavi', :id => 'pnprev', :style => 'text-decoration:none', :remote => remote

data/app/views/kaminari/google/_prev_span.html.erb

@@ -0,0 +1,7 @@
+<%# available local variables:
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
+<td class="b"><span class="csb" style="background-position:-24px 0;width:28px"></span></td>

data/app/views/kaminari/google/_prev_span.html.haml

@@ -0,0 +1,7 @@
+-# available local variables:
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+%td.b
+  %span.csb{:style => 'background-position:-24px 0;width:28px'}

data/app/views/kaminari/google/_truncated_span.html.erb

@@ -0,0 +1,7 @@
+<%# available local variables:
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-%>
+<%# Nothing! -%>

data/app/views/kaminari/google/_truncated_span.html.haml

@@ -0,0 +1,6 @@
+-# available local variables:
+  current_page:  the page number of currently displayed page
+  num_pages:     total number of pages
+  per_page:      number of items to fetch per page
+  remote:        data-remote
+-# Nothing!

data/kaminari.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kaminari}
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akira Matsuda"]
@@ -47,6 +47,26 @@ Gem::Specification.new do |s|
     "app/views/kaminari/_prev_span.html.haml",
     "app/views/kaminari/_truncated_span.html.erb",
     "app/views/kaminari/_truncated_span.html.haml",
+    "app/views/kaminari/google/_current_page.html.erb",
+    "app/views/kaminari/google/_current_page.html.haml",
+    "app/views/kaminari/google/_first_page_link.html.erb",
+    "app/views/kaminari/google/_first_page_link.html.haml",
+    "app/views/kaminari/google/_last_page_link.html.erb",
+    "app/views/kaminari/google/_last_page_link.html.haml",
+    "app/views/kaminari/google/_next_link.html.erb",
+    "app/views/kaminari/google/_next_link.html.haml",
+    "app/views/kaminari/google/_next_span.html.erb",
+    "app/views/kaminari/google/_next_span.html.haml",
+    "app/views/kaminari/google/_page_link.html.erb",
+    "app/views/kaminari/google/_page_link.html.haml",
+    "app/views/kaminari/google/_paginator.html.erb",
+    "app/views/kaminari/google/_paginator.html.haml",
+    "app/views/kaminari/google/_prev_link.html.erb",
+    "app/views/kaminari/google/_prev_link.html.haml",
+    "app/views/kaminari/google/_prev_span.html.erb",
+    "app/views/kaminari/google/_prev_span.html.haml",
+    "app/views/kaminari/google/_truncated_span.html.erb",
+    "app/views/kaminari/google/_truncated_span.html.haml",
     "kaminari.gemspec",
     "lib/generators/kaminari/views_generator.rb",
     "lib/kaminari.rb",

data/lib/generators/kaminari/views_generator.rb

@@ -1,20 +1,38 @@
 module Kaminari
   module Generators
-    class ViewsGenerator < Rails::Generators::Base
+    class ViewsGenerator < Rails::Generators::NamedBase
       source_root File.expand_path('../../../../app/views/kaminari', __FILE__)
 
       class_option :template_engine, :type => :string, :aliases => '-e', :desc => 'Template engine for the views. Available options are "erb" and "haml".'
 
-      desc 'Copies all paginator partials to your application.'
+      def self.banner
+        <<-BANNER.chomp
+rails g kaminari:views THEME [options]
+
+    Copies all paginator partial templates to your application.
+    You can choose a template THEME by specifying one from the list below:
+
+        default: The default one.
+                 This one is used internally while you don't override the partials.
+        google:  Looks googlish! (note that this is just an example...)
+                 Make sure to specify a very big number (like 65536) for the "window" value.
+BANNER
+      end
+
+      desc ''
       def copy_views
         Dir.glob(filename_pattern).map {|f| File.basename f}.each do |f|
-          copy_file f, "app/views/kaminari/#{f}"
+          copy_file File.join([template_name.presence, f].compact), "app/views/kaminari/#{f}"
         end
       end
 
       private
+      def template_name
+        (f = file_name.downcase) == 'default' ? '' : f
+      end
+
       def filename_pattern
-        File.join self.class.source_root, "*.html.#{options[:template_engine] || 'erb'}"
+        File.join self.class.source_root, template_name, "*.html.#{options[:template_engine].try(:to_s).try(:downcase) || 'erb'}"
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaminari
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Akira Matsuda
@@ -273,6 +273,26 @@ files:
 - app/views/kaminari/_prev_span.html.haml
 - app/views/kaminari/_truncated_span.html.erb
 - app/views/kaminari/_truncated_span.html.haml
+- app/views/kaminari/google/_current_page.html.erb
+- app/views/kaminari/google/_current_page.html.haml
+- app/views/kaminari/google/_first_page_link.html.erb
+- app/views/kaminari/google/_first_page_link.html.haml
+- app/views/kaminari/google/_last_page_link.html.erb
+- app/views/kaminari/google/_last_page_link.html.haml
+- app/views/kaminari/google/_next_link.html.erb
+- app/views/kaminari/google/_next_link.html.haml
+- app/views/kaminari/google/_next_span.html.erb
+- app/views/kaminari/google/_next_span.html.haml
+- app/views/kaminari/google/_page_link.html.erb
+- app/views/kaminari/google/_page_link.html.haml
+- app/views/kaminari/google/_paginator.html.erb
+- app/views/kaminari/google/_paginator.html.haml
+- app/views/kaminari/google/_prev_link.html.erb
+- app/views/kaminari/google/_prev_link.html.haml
+- app/views/kaminari/google/_prev_span.html.erb
+- app/views/kaminari/google/_prev_span.html.haml
+- app/views/kaminari/google/_truncated_span.html.erb
+- app/views/kaminari/google/_truncated_span.html.haml
 - kaminari.gemspec
 - lib/generators/kaminari/views_generator.rb
 - lib/kaminari.rb