kaminari 0.12.0 → 0.12.1

data/CHANGELOG

@@ -1,3 +1,17 @@
+== 0.12.1
+
+* Slim template support #93 [detrain]
+
+* Use Kaminari.config to specify default value for param_name #94 [avsej]
+
+* Fixed "super called outside of method" error happened in particular versions
+of Ruby 1.8.7 #91 [Skulli]
+
+* _paginate.html.erb isn't rendered with custom theme #97 [danlunde]
+
+* I don't know why but this version seems like working with Haml 3.1.0 #96
+[FlyboyArt]
+
 == 0.12.0
 
 * General configuration options #41 #62 [javierv, iain]
@@ -6,7 +20,7 @@
   Also, here comes a generator command that generates the default
   configuration file into your app's config/initilizers directory.
 
-* Generic pagination support for Array object #47 #68 #74 [lda ened jianlin]
+* Generic pagination support for Array object #47 #68 #74 [lda, ened, jianlin]
   You can now paginate through any kind of Arrayish object in this way:
     Kaminari.paginate_array(my_array_object).page(params[:page]).per(10)
 

data/app/views/kaminari/_first_page.html.slim

@@ -0,0 +1,10 @@
+/ Link to the "First" page
+  - available local variables
+    url          : url to the first page
+    current_page : a page object for the currently displayed page
+    num_pages    : total number of pages
+    per_page     : number of items to fetch per page
+    remote       : data-remote
+span.first
+  == link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote
+'

data/app/views/kaminari/_gap.html.slim

@@ -0,0 +1,9 @@
+/ Non-link tag that stands for skipped pages...
+  - available local variables
+    current_page : a page object for the currently displayed page
+    num_pages    : total number of pages
+    per_page     : number of items to fetch per page
+    remote       : data-remote
+span.page.gap
+  == raw(t 'views.pagination.truncate')
+'

data/app/views/kaminari/_last_page.html.slim

@@ -0,0 +1,10 @@
+/ Link to the "Last" page
+  - available local variables
+    url          : url to the last page
+    current_page : a page object for the currently displayed page
+    num_pages    : total number of pages
+    per_page     : number of items to fetch per page
+    remote       : data-remote
+span.last
+	== link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote}
+'

data/app/views/kaminari/_next_page.html.slim

@@ -0,0 +1,10 @@
+/ Link to the "Next" page
+	- available local variables
+    url          : url to the next page
+    current_page : a page object for the currently displayed page
+    num_pages    : total number of pages
+    per_page     : number of items to fetch per page
+    remote       : data-remote
+span.next
+  == link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote
+'

data/app/views/kaminari/_page.html.slim

@@ -0,0 +1,11 @@
+/ Link showing page number
+  - available local variables
+    page         : a page object for "this" page
+    url          : url to this page
+    current_page : a page object for the currently displayed page
+    num_pages    : total number of pages
+    per_page     : number of items to fetch per page
+    remote       : data-remote
+span class="page#{' current' if page.current?}"
+  == link_to_unless page.current?, page, url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil}
+'

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

@@ -0,0 +1,19 @@
+/ The container tag
+  - available local variables
+    current_page : a page object for the currently displayed page
+    num_pages    : total number of pages
+    per_page     : number of items to fetch per page
+    remote       : data-remote
+    paginator    : the paginator that renders the pagination tags inside
+
+== paginator.render do
+  nav.pagination
+    == first_page_tag unless current_page.first?
+    == prev_page_tag unless current_page.first?
+    - each_page do |page|
+      - if page.left_outer? || page.right_outer? || page.inside_window?
+        == page_tag page
+      - elsif !page.was_truncated?
+        == gap_tag
+    == next_page_tag unless current_page.last?
+    == last_page_tag unless current_page.last?

data/app/views/kaminari/_prev_page.html.slim

@@ -0,0 +1,10 @@
+/ Link to the "Previous" page
+  - available local variables
+    url          : url to the previous page
+    current_page : a page object for the currently displayed page
+    num_pages    : total number of pages
+    per_page     : number of items to fetch per page
+    remote       : data-remote
+span.prev
+  == link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote
+'

data/lib/generators/kaminari/templates/kaminari_config.rb

@@ -4,4 +4,5 @@ Kaminari.configure do |config|
   # config.outer_window = 0
   # config.left = 0
   # config.right = 0
+  # config.param_name = :page
 end

data/lib/kaminari/config.rb

@@ -22,6 +22,7 @@ module Kaminari
     config_accessor :outer_window
     config_accessor :left
     config_accessor :right
+    config_accessor :param_name
   end
 
   # this is ugly. why can't we pass the default value to config_accessor...?
@@ -31,5 +32,6 @@ module Kaminari
     config.outer_window = 0
     config.left = 0
     config.right = 0
+    config.param_name = :page
   end
 end

data/lib/kaminari/helpers/action_view_extension.rb

@@ -18,7 +18,7 @@ module Kaminari
       # * <tt>:remote</tt> - Ajax? (false by default)
       # * <tt>:ANY_OTHER_VALUES</tt> - Any other hash key & values would be directly passed into each tag as :locals value.
       def paginate(scope, options = {}, &block)
-        Kaminari::Helpers::Paginator.new self, options.reverse_merge(:current_page => scope.current_page, :num_pages => scope.num_pages, :per_page => scope.limit_value, :param_name => :page, :remote => false)
+        Kaminari::Helpers::Paginator.new self, options.reverse_merge(:current_page => scope.current_page, :num_pages => scope.num_pages, :per_page => scope.limit_value, :param_name => Kaminari.config.param_name, :remote => false)
       end
     end
   end

data/lib/kaminari/helpers/paginator.rb

@@ -14,6 +14,7 @@ module Kaminari
           h[:right] = outer_window if h[:right] == 0
         end
         @template, @options = template, options
+        @theme = @options[:theme] ? "#{@options[:theme]}/" : ''
         @options[:current_page] = PageProxy.new @window_options.merge(@options), @options[:current_page], nil
         # so that this instance can actually "render". Black magic?
         @output_buffer = ActionView::OutputBuffer.new
@@ -47,29 +48,23 @@ module Kaminari
       end
 
       def to_s #:nodoc:
-        suppress_logging_render_partial do
-          super @window_options.merge(@options).merge :paginator => self
+        subscriber = ActionView::LogSubscriber.log_subscribers.detect {|ls| ls.is_a? ActionView::LogSubscriber}
+        return super @window_options.merge(@options).merge :paginator => self unless subscriber
+
+        # dirty hack to suppress logging render_partial
+        class << subscriber
+          alias_method :render_partial_with_logging, :render_partial
+          # do nothing
+          def render_partial(event); end
         end
-      end
 
-      private
-      # dirty hack
-      def suppress_logging_render_partial(&blk)
-        if subscriber = ActionView::LogSubscriber.log_subscribers.detect {|ls| ls.is_a? ActionView::LogSubscriber}
-          class << subscriber
-            alias_method :render_partial_with_logging, :render_partial
-            # do nothing
-            def render_partial(event); end
-          end
-          ret = blk.call
-          class << subscriber
-            alias_method :render_partial, :render_partial_with_logging
-            undef :render_partial_with_logging
-          end
-          ret
-        else
-          blk.call
+        ret = super @window_options.merge(@options).merge :paginator => self
+
+        class << subscriber
+          alias_method :render_partial, :render_partial_with_logging
+          undef :render_partial_with_logging
         end
+        ret
       end
 
       # Wraps a "page number" and provides some utility methods

data/lib/kaminari/models/array_extension.rb

@@ -7,7 +7,7 @@ module Kaminari
 
     def initialize(original_array, limit_val = default_per_page, offset_val = 0) #:nodoc:
       @_original_array, @_limit_value, @_offset_value = original_array, limit_val, offset_val
-      super (original_array[offset_val, limit_val] || [])
+      super(original_array[offset_val, limit_val] || [])
     end
 
     # items at the specified "page"

data/lib/kaminari/version.rb

@@ -1,3 +1,3 @@
 module Kaminari
-  VERSION = '0.12.0'
+  VERSION = '0.12.1'
 end

data/spec/config/config_spec.rb

@@ -40,4 +40,10 @@ describe Kaminari::Configuration do
       its(:right) { should == 0 }
     end
   end
+
+  describe 'param_name' do
+    context 'by default' do
+      its(:param_name) { should == :page }
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaminari
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 0
   - 12
-  - 0
-  version: 0.12.0
+  - 1
+  version: 0.12.1
 platform: ruby
 authors: 
 - Akira Matsuda
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 Z
+date: 2011-04-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -182,18 +182,25 @@ files:
 - Rakefile
 - app/views/kaminari/_first_page.html.erb
 - app/views/kaminari/_first_page.html.haml
+- app/views/kaminari/_first_page.html.slim
 - app/views/kaminari/_gap.html.erb
 - app/views/kaminari/_gap.html.haml
+- app/views/kaminari/_gap.html.slim
 - app/views/kaminari/_last_page.html.erb
 - app/views/kaminari/_last_page.html.haml
+- app/views/kaminari/_last_page.html.slim
 - app/views/kaminari/_next_page.html.erb
 - app/views/kaminari/_next_page.html.haml
+- app/views/kaminari/_next_page.html.slim
 - app/views/kaminari/_page.html.erb
 - app/views/kaminari/_page.html.haml
+- app/views/kaminari/_page.html.slim
 - app/views/kaminari/_paginator.html.erb
 - app/views/kaminari/_paginator.html.haml
+- app/views/kaminari/_paginator.html.slim
 - app/views/kaminari/_prev_page.html.erb
 - app/views/kaminari/_prev_page.html.haml
+- app/views/kaminari/_prev_page.html.slim
 - config/locales/kaminari.yml
 - kaminari.gemspec
 - lib/generators/kaminari/config_generator.rb