kaminari 0.3.0 → 0.4.0

data/TODO.txt

@@ -1,5 +1,3 @@
-* partialize the outer div
-
 * add generator option to copy particular template
 
 * add Haml generator

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

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

@@ -0,0 +1,3 @@
+<div class='pagination'>
+  <%= content_for :kaminari_paginator_tags %>
+</div>

data/kaminari.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kaminari}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akira Matsuda"]
-  s.date = %q{2011-02-06}
+  s.date = %q{2011-02-07}
   s.description = %q{Kaminari is a Scope & Engine based clean and powerful and customizable and sophisticated paginator for Rails 3}
   s.email = %q{ronnie@dio.jp}
   s.extra_rdoc_files = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "app/views/kaminari/_next_link.html.erb",
     "app/views/kaminari/_next_span.html.erb",
     "app/views/kaminari/_page_link.html.erb",
+    "app/views/kaminari/_paginator.html.erb",
     "app/views/kaminari/_prev_link.html.erb",
     "app/views/kaminari/_prev_span.html.erb",
     "app/views/kaminari/_truncated_span.html.erb",

data/lib/kaminari/helpers.rb

@@ -54,6 +54,9 @@ module Kaminari
     class TruncatedSpan < Tag
     end
 
+    class Paginator < Tag
+    end
+
     class PaginationRenderer
       attr_reader :options
 
@@ -62,15 +65,7 @@ module Kaminari
         @left, @window, @right = (options[:left] || options[:outer_window] || 1), (options[:window] || options[:inner_window] || 4), (options[:right] || options[:outer_window] || 1)
       end
 
-      def to_s
-        suppress_logging_render_partial do
-          @template.content_tag :div, :class => 'pagination' do
-            tagify.join("\n").html_safe
-          end
-        end
-      end
-
-      def tagify
+      def tagify_links
         num_pages, current_page, left, window, right = @options[:num_pages], @options[:current_page], @left, @window, @right
 
         tags = []
@@ -94,6 +89,13 @@ module Kaminari
         tags << (num_pages > current_page ? NextLink.new(self) : NextSpan.new(self))
       end
 
+      def to_s
+        suppress_logging_render_partial do
+          @template.content_for :kaminari_paginator_tags, tagify_links.join("\n").html_safe
+          Paginator.new(self).to_s
+        end
+      end
+
       private
       def method_missing(meth, *args, &blk)
         @template.send meth, *args, &blk

data/spec/helpers/helpers_spec.rb

@@ -10,9 +10,9 @@ describe 'Kaminari::Helpers::PaginationRenderer' do
     end
     r
   end
-  describe '#tagify' do
+  describe '#tagify_links' do
     def tags_with(options)
-      PaginationRenderer.new(renderer, options).tagify
+      PaginationRenderer.new(renderer, options).tagify_links
     end
 
     context 'first page' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaminari
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Akira Matsuda
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 +09:00
+date: 2011-02-07 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -223,6 +223,7 @@ files:
 - app/views/kaminari/_next_link.html.erb
 - app/views/kaminari/_next_span.html.erb
 - app/views/kaminari/_page_link.html.erb
+- app/views/kaminari/_paginator.html.erb
 - app/views/kaminari/_prev_link.html.erb
 - app/views/kaminari/_prev_span.html.erb
 - app/views/kaminari/_truncated_span.html.erb