kaminari 0.5.0 → 0.6.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.6.0
+
+* Hamlized paginator templates
+
 == 0.5.0
 
 * reset content_for :kaminari_paginator_tags before rendering #1 [hsbt]

data/README.rdoc

@@ -12,7 +12,7 @@ Does not globally pollute Array, Hash, Object or AR::Base.
 Just bundle the gem, then your models are ready to be paginated. No configuration. Don't have to define anything in your models or helpers.
 
 * Scope based simple API
-Everything is method chainable. No Hash for the query. You know, that's the Rails 3 way.
+Everything is method chainable with less Hasheritis. You know, that's the Rails 3 way.
 No special collection class or something for the paginated values but uses a general AR::Relation instance. So, of course you can chain any other conditions before or after the paginator scope.
 
 * Engine based customizable helper
@@ -35,23 +35,29 @@ Then bundle:
 
 == Usage
 
+=== Query Basics
+
 * Fetch the 7th page of the users (per_page = 25 by default)
 
-  @users = User.page(7)
+  User.page(7)
 
 * Show a lot more users per each page (change the per_page value)
 
-  @users = User.page(7).per(50)
+  User.page(7).per(50)
+
+=== Controllers
 
 * Typically, your controller code will look like this:
 
-  @users = User.page params[:page]
+  @users = User.order(:name).page params[:page]
 
-* In your view
+=== Views
+
+* Just call the "paginate" helper
 
   <%= paginate @users %>
 
-* Specify the "window" size
+* Specifing the "window" size
 
   # "inner window" (4 by default)
 
@@ -65,11 +71,19 @@ Then bundle:
 
   <%= paginate @users, :left => 0, :right => 2 %>
 
-* Customize the pagination helper
+=== Customizing the pagination helper
+
+* The generator
 
   % rails g kaminari:views
 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.
+
+  % rails g kaminari:views -e haml
+
 
 == Contributing to Kaminari
 

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

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

@@ -0,0 +1,2 @@
+%span.page.current
+  = page

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

@@ -0,0 +1,2 @@
+%span.page.first
+  = link_to page, page_url

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

@@ -0,0 +1,2 @@
+%span.page.last
+  = link_to page, page_url

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

@@ -0,0 +1,2 @@
+%span.next
+  = link_to_if (current_page < num_pages), raw('Next &raquo;'), next_url, :class => 'next', :rel => 'next'

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

@@ -0,0 +1 @@
+%span.next

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

@@ -0,0 +1,2 @@
+%span.page
+  = link_to page, page_url

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

@@ -0,0 +1,2 @@
+.pagination
+  = content_for :kaminari_paginator_tags

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

@@ -0,0 +1,2 @@
+%span.prev
+  = link_to_if (current_page > 1), raw('« Prev'), prev_url, :class => 'prev', :rel => 'prev'

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

@@ -0,0 +1 @@
+%span.prev

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

@@ -0,0 +1,2 @@
+%span.page
+  \...

data/kaminari.gemspec

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

data/lib/generators/kaminari/views_generator.rb

@@ -1,11 +1,20 @@
 module Kaminari
   module Generators
     class ViewsGenerator < Rails::Generators::Base
-      source_root File.expand_path('../../../../app/views', __FILE__)
+      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 copy_views
-        directory 'kaminari', 'app/views/kaminari'
+        Dir.glob(filename_pattern).map {|f| File.basename f}.each do |f|
+          copy_file f, "app/views/kaminari/#{f}"
+        end
+      end
+
+      private
+      def filename_pattern
+        File.join self.class.source_root, "*.html.#{options[:template_engine] || 'erb'}"
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaminari
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Akira Matsuda
@@ -219,15 +219,25 @@ files:
 - TODO.txt
 - VERSION
 - app/views/kaminari/_current_page.html.erb
+- app/views/kaminari/_current_page.html.haml
 - app/views/kaminari/_first_page_link.html.erb
+- app/views/kaminari/_first_page_link.html.haml
 - app/views/kaminari/_last_page_link.html.erb
+- app/views/kaminari/_last_page_link.html.haml
 - app/views/kaminari/_next_link.html.erb
+- app/views/kaminari/_next_link.html.haml
 - app/views/kaminari/_next_span.html.erb
+- app/views/kaminari/_next_span.html.haml
 - app/views/kaminari/_page_link.html.erb
+- app/views/kaminari/_page_link.html.haml
 - app/views/kaminari/_paginator.html.erb
+- app/views/kaminari/_paginator.html.haml
 - app/views/kaminari/_prev_link.html.erb
+- app/views/kaminari/_prev_link.html.haml
 - app/views/kaminari/_prev_span.html.erb
+- app/views/kaminari/_prev_span.html.haml
 - app/views/kaminari/_truncated_span.html.erb
+- app/views/kaminari/_truncated_span.html.haml
 - kaminari.gemspec
 - lib/generators/kaminari/views_generator.rb
 - lib/kaminari.rb