wice_grid 3.2.0.pre1 → 3.2.0.pre2

data/README.rdoc

@@ -994,30 +994,33 @@ If you need to disable the default export icon in the grid, add
 
 === Detached Filters
 
-It is possible to detach filters and place them anywhere on the page.
-To do so, use parameter <tt>:detach_with_id</tt> for a column whose filter needs to
-be detached, with an arbitrary string or a symbol value which will be used
-later to identify the filter. As soon as there is one column with
-<tt>:detach_with_id</tt>, the behavior of the +grid+ helper changes - it
-becomes an <i>initializer</i> of the grid and doesn't output any HTML code.
-To render the grid, use <tt>grid</tt> for the second time without the block.
-To render a detached output filter, use helper <tt>grid_filter(grid_object, detached_filter_key)</tt>:
-
-<%= grid(@tasks_grid, :show_filters => :always) do |g|
-
-  g.column :name => 'Title', :attribute => 'title', :detach_with_id => :title_filter do |task|
-    link_to('Edit', edit_task_path(task.title))
-  end
+Filters can also be detached from the grid table and placed anywhere on page.
 
-  g.column  :name => 'Archived', :attribute => 'archived', :detach_with_id => :archived_filter do |task|
-    task.archived? ? 'Yes' : 'No'
-  end
+This is a 3-step process.
 
-  g.column :name => 'Added', :attribute => 'created_at', :detach_with_id => :created_at_filter do |task|
-    task.created_at.to_s(:short)
-  end
+First, define the grid with helper +define_grid+ instead of +grid+.
+Everything should be done the same way as with +grid+, but every column which will have an external filter,
+add <tt>:detach_with_id => :some_filter_name+</tt> in the column definition. The value of +:detach_with_id+ is an arbitrary string
+or a symbol value which will be used later to identify the filter.
+
+  <%= define_grid(@tasks_grid, :show_filters => :always) do |g|
+
+    g.column :name => 'Title', :attribute => 'title', :detach_with_id => :title_filter do |task|
+      link_to('Edit', edit_task_path(task.title))
+    end
+
+    g.column  :name => 'Archived', :attribute => 'archived', :detach_with_id => :archived_filter do |task|
+      task.archived? ? 'Yes' : 'No'
+    end
 
-end -%>
+    g.column :name => 'Added', :attribute => 'created_at', :detach_with_id => :created_at_filter do |task|
+      task.created_at.to_s(:short)
+    end
+
+  end -%>
+
+
+Then, use <tt>grid_filter(grid, :some_filter_name)</tt> to render filters:
 
   <% # rendering filter with key :title_filter %>
   <%= grid_filter @tasks_grid, :title_filter  %>
@@ -1031,34 +1034,21 @@ end -%>
   <% # Rendering the grid body %>
   <%= grid(@tasks_grid) %>
 
-It is important that the grid initializer goes first, the order of +grid_filter+ and
-the second call to +grid+ is of no importance.
+
+Finally, use <tt>render_grid(@grid)</tt> to actually output the grid table .
+
 
 Using custom submit and reset buttons together with <tt>:hide_submit_button => true</tt>
- and <tt>:hide_reset_button => true</tt>
+and <tt>:hide_reset_button => true</tt>
 allows to completely get rid
 of the default filter row and the default icons (see section 'Submit/Reset Buttons').
 
-For CSV export will continue functioning, just make sure the first call to +grid+
-is still in the template of its own and
-is inside of <tt><%= %></tt>, because when CSV is requested, the first  +grid+ works
-in the old fashioned way producing CSV formatted output.
 
 If a column was declared with <tt>:detach_with_id</tt>, but never output with +grid_filter+,
 filtering the grid in development mode will result
 in an warning javascript message and the missing filter will be ignored.
 There is no such message in production.
 
-<tt>grid</tt> parameter <tt>:show_filter</tt> must not be set to <tt>:no</tt> for detached filters to work.
-
-==== How Does It Work? (For the interested)
-
-When there is at least one column with <tt>:detach_with_id</tt>, the generated HTML code is
-stored in a buffer, code for detached filters is stored
-in buffers of their own identified by the given IDs, and nothing is returned to the view.
-When the helper is called for the second time, the buffer outputs its content.
-In a similar fashion, the +grid_filter+ helper outputs buffers for filters.
-
 
 
 === Access to Records From Outside The Grid

data/RELEASE_NOTES_3.2.pre2.rdoc

@@ -0,0 +1,6 @@
+1. +will_paginate+ is replaced by +kaminari+.
+2. The detached filter API has changed. No more magical invocation of the +grid+ helper two times.
+   First, +define_grid+ is used in the same way as +grid+, then +grid_filter+,
+   and then <tt>render_grid(@grid)</tt> to actually output the grid table .
+3. No more polluting core Ruby classes like Hash and Array with methods. All such methods
+   are now private to the plugin.

data/Rakefile

@@ -34,7 +34,7 @@ begin
     gem.email = "yuri.leikind@gmail.com"
     gem.homepage = "http://github.com/lekind/wice_grid"
     gem.authors = ["Yuri Leikind"]
-    gem.add_development_dependency "will_paginate", ">= 3.0.3"
+    gem.add_dependency "kaminari", ">= 0.13.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-3.2.0.pre1
+3.2.0.pre2

data/app/views/kaminari/wice_grid/_gap.html.haml

@@ -0,0 +1,2 @@
+%li.disabled
+  %a{:href=> '#'} ...

data/app/views/kaminari/wice_grid/_next_page.html.haml

@@ -0,0 +1,9 @@
+-#  Link to the "Next" page
+-#  available local variables
+-#    url:           url to the next page
+-#    current_page:  a page object for the currently displayed page
+-#    total_pages:   total number of pages
+-#    per_page:      number of items to fetch per page
+-#    remote:        data-remote
+%li
+  = link_to_unless current_page.last?, ::Wice::NlMessage['next_label'], url, :rel => 'next', :remote => remote

data/app/views/kaminari/wice_grid/_page.html.haml

@@ -0,0 +1,10 @@
+-#  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
+-#    total_pages:   total number of pages
+-#    per_page:      number of items to fetch per page
+-#    remote:        data-remote
+%li{:class => page.current? ? 'active' : nil}
+  = link_to page, url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil}

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

@@ -0,0 +1,17 @@
+-#  The container tag
+-#  available local variables
+-#    current_page:  a page object for the currently displayed page
+-#    total_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
+  .pagination
+    %ul
+      = 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?

data/app/views/kaminari/wice_grid/_prev_page.html.haml

@@ -0,0 +1,9 @@
+-#  Link to the "Previous" page
+-#  available local variables
+-#    url:           url to the previous page
+-#    current_page:  a page object for the currently displayed page
+-#    total_pages:   total number of pages
+-#    per_page:      number of items to fetch per page
+-#    remote:        data-remote
+%li
+  = link_to_unless current_page.first?, ::Wice::NlMessage['previous_label'], url, :rel => 'prev', :remote => remote

data/lib/grid_output_buffer.rb

@@ -3,27 +3,15 @@ module Wice
 
   class GridOutputBuffer < String #:nodoc:
 
-    attr_reader :stubborn_output_mode
     attr_accessor :return_empty_strings_for_nonexistent_filters
 
-    def stubborn_output_mode=(m)
-      @stubborn_output_mode = m
-    end
-
     def initialize(*attrs)
       super(*attrs)
       @filters = HashWithIndifferentAccess.new
-      @first_output = false
-      @stubborn_output_mode = false
     end
 
     def to_s
-      if @first_output || ! @stubborn_output_mode
-        super.html_safe_if_necessary
-      else
-        @first_output = true
-        ''
-      end
+      super.html_safe
     end
 
     def add_filter(detach_with_id, filter_code)

data/lib/grid_renderer.rb

@@ -296,7 +296,7 @@ module Wice
       end
 
       if options[:class]
-        options[:html].add_or_append_class_value!(options[:class])
+        Wice::WgHash.add_or_append_class_value!(options[:html], options[:class])
         options.delete(:class)
       end
 
@@ -333,13 +333,13 @@ module Wice
           elsif options[:custom_filter].class == Array
             if options[:custom_filter].empty?
               []
-            elsif options[:custom_filter].all_items_are_of_class(Symbol)
+            elsif Wice::WgEnumerable.all_items_are_of_class(options[:custom_filter], Symbol)
               lambda{ @grid.distinct_values_for_column_in_resultset(options[:custom_filter]) }
 
-            elsif options[:custom_filter].all_items_are_of_class(String) || options[:custom_filter].all_items_are_of_class(Numeric)
+            elsif Wice::WgEnumerable.all_items_are_of_class(options[:custom_filter], String) || WgEnumerable.all_items_are_of_class(options[:custom_filter], Numeric)
               options[:custom_filter].map{|i| [i,i]}
 
-            elsif options[:custom_filter].all_items_are_of_class(Array)
+            elsif Wice::WgEnumerable.all_items_are_of_class(options[:custom_filter], Array)
               options[:custom_filter]
             else
               raise WiceGridArgumentError.new(
@@ -436,7 +436,7 @@ module Wice
     end
 
     def base_link_for_filter(controller, extra_parameters = {})   #:nodoc:
-      new_params = controller.params.deep_clone_yl
+      new_params = Wice::WgHash.deep_clone controller.params
       new_params.merge!(extra_parameters)
 
       if new_params[@grid.name]
@@ -458,7 +458,7 @@ module Wice
 
 
     def link_for_export(controller, format, extra_parameters = {})   #:nodoc:
-      new_params = controller.params.deep_clone_yl
+      new_params = Wice::WgHash.deep_clone controller.params
       new_params.merge!(extra_parameters)
 
       new_params[@grid.name] = {} unless new_params[@grid.name]
@@ -482,14 +482,14 @@ module Wice
         @@order_direction_parameter_name => direction
       }}
 
-      cleaned_params =  params.deep_clone_yl
+      cleaned_params =  Wice::WgHash.deep_clone params
       cleaned_params.merge!(extra_parameters)
 
       cleaned_params.delete(:controller)
       cleaned_params.delete(:action)
 
 
-      query_params = cleaned_params.rec_merge(query_params)
+      query_params = Wice::WgHash.rec_merge(cleaned_params, query_params)
 
       '?' + query_params.to_query
     end

data/lib/helpers/wice_grid_misc_view_helpers.rb

@@ -14,7 +14,8 @@ module Wice
 
       grid.get_state_as_parameter_value_pairs(true).collect{|param_name, value|
         hidden_field_tag(param_name, value, :id => "hidden-#{param_name.gsub(/[\[\]]/, '-')}")
-      }.join("\n").html_safe_if_necessary
+      }.join("\n").html_safe
+
     end
 
     def dump_state(grid)  #:nodoc:

data/lib/helpers/wice_grid_view_helpers.rb

@@ -70,20 +70,23 @@ module Wice
     # Pease read documentation about the +column+ method to achieve the enlightenment.
 
     def grid(grid, opts = {}, &block)
+      raise WiceGridArgumentError.new('Missing block for the grid helper.' +
+        ' For detached filters use first define_grid with the same API as grid, ' +
+        'then grid_filter to add filters, and then render_grid to actually show the grid' ) if block.nil?
+      define_grid(grid, opts, &block)
+      render_grid(grid)
+    end
+
+    # Has the same parameters as <tt>grid</tt> but does not output the grid. After <tt>define_grid</tt>
+    # <tt>render_grid</tt> can be used to output the grid HTML code.
+    # Usually used with detached filters: first <tt>define_grid</tt>, then <tt>grid_filter</tt>s, and then
+    # <tt>render_grid</tt>
+    def define_grid(grid, opts = {}, &block)
       # strip the method from HTML stuff
       unless grid.class == WiceGrid
         raise WiceGridArgumentError.new("The first argument for the grid helper must be an instance of the WiceGrid class")
       end
 
-      if grid.output_buffer
-        if grid.output_buffer == true
-          raise  WiceGridException.new("Second occurence of grid helper with the same grid object. " +
-                                "Did you intend to use detached filters and forget to define them?")
-        else
-          return grid.output_buffer
-        end
-      end
-
       options = {
         :allow_showing_all_records     => Defaults::ALLOW_SHOWING_ALL_QUERIES,
         :class                         => nil,
@@ -114,25 +117,39 @@ module Wice
         Defaults::REUSE_LAST_COLUMN_FOR_FILTER_ICONS && rendering.last_column_for_html.capable_of_hosting_filter_related_icons?
 
       if grid.output_csv?
-        content = grid_csv(grid, rendering)
+        grid_csv(grid, rendering)
       else
         # If blank_slate is defined we don't show any grid at all
         if rendering.blank_slate_handler &&  grid.resultset.size == 0 && ! grid.filtering_on?
-          content = generate_blank_slate(grid, rendering)
-          return content
+          generate_blank_slate(grid, rendering)
+        else
+          grid_html(grid, options, rendering, reuse_last_column_for_filter_buttons)
         end
-
-        content = grid_html(grid, options, rendering, reuse_last_column_for_filter_buttons)
       end
 
       grid.view_helper_finished = true
-      content
+
+      grid.csv_tempfile ? grid.csv_tempfile.path : nil
+    end
+
+    # Used after <tt>define_grid</tt> to actually output the grid HTML code.
+    # Usually used with detached filters: first <tt>define_grid</tt>, then <tt>grid_filter</tt>s, and then
+    # <tt>render_grid</tt>
+    def render_grid(grid)
+      if grid.output_buffer
+        grid.output_buffer
+      elsif grid.csv_tempfile
+        grid.csv_tempfile.path
+      else
+        raise WiceGridException.new("Attempt to use 'render_grid' without 'define_grid' before.")
+      end
     end
 
+
     def generate_blank_slate(grid, rendering) #:nodoc:
-      buff = GridOutputBuffer.new
+      grid.output_buffer = GridOutputBuffer.new
 
-      buff <<  if rendering.blank_slate_handler.is_a?(Proc)
+      grid.output_buffer <<  if rendering.blank_slate_handler.is_a?(Proc)
         call_block(rendering.blank_slate_handler, nil)
       elsif rendering.blank_slate_handler.is_a?(Hash)
         render(rendering.blank_slate_handler)
@@ -141,11 +158,8 @@ module Wice
       end
 
       if rendering.find_one_for(:in_html){|column| column.detach_with_id}
-        buff.stubborn_output_mode = true
-        buff.return_empty_strings_for_nonexistent_filters = true
-        grid.output_buffer   = buff
+        grid.output_buffer.return_empty_strings_for_nonexistent_filters = true
       end
-      buff
     end
 
     def call_block(block, ar, extra_argument = nil)  #:nodoc:
@@ -157,32 +171,31 @@ module Wice
 
       table_html_attrs, header_tr_html = options[:html], options[:header_tr_html]
 
-      table_html_attrs.add_or_append_class_value!('wice-grid', true)
+      Wice::WgHash.add_or_append_class_value!(table_html_attrs, 'wice-grid', true)
 
       if Array === Defaults::DEFAULT_TABLE_CLASSES
         Defaults::DEFAULT_TABLE_CLASSES.each do |default_class|
-          table_html_attrs.add_or_append_class_value!(default_class, true)
+          Wice::WgHash.add_or_append_class_value!(table_html_attrs, default_class, true)
         end
       end
 
       if options[:class]
-        table_html_attrs.add_or_append_class_value!(options[:class])
+        Wice::WgHash.add_or_append_class_value!(table_html_attrs, options[:class])
         options.delete(:class)
       end
 
-
-
       cycle_class = nil
       sorting_dependant_row_cycling = options[:sorting_dependant_row_cycling]
 
-      content = GridOutputBuffer.new
+      grid.output_buffer = GridOutputBuffer.new
+
       # Ruby 1.9.x
-      content.force_encoding('UTF-8') if content.respond_to?(:force_encoding)
+      grid.output_buffer.force_encoding('UTF-8') if grid.output_buffer.respond_to?(:force_encoding)
 
-      content << %!<div class="wice-grid-container" id="#{grid.name}"><div id="#{grid.name}_title">!
-      content << content_tag(:h3, grid.saved_query.name) if grid.saved_query
-      content << "</div><table #{tag_options(table_html_attrs, true)}>"
-      content << "<thead>"
+      grid.output_buffer << %!<div class="wice-grid-container" id="#{grid.name}"><div id="#{grid.name}_title">!
+      grid.output_buffer << content_tag(:h3, grid.saved_query.name) if grid.saved_query
+      grid.output_buffer << "</div><table #{tag_options(table_html_attrs, true)}>"
+      grid.output_buffer << "<thead>"
 
       no_filters_at_all = (options[:show_filters] == :no || rendering.no_filter_needed?) ? true: false
 
@@ -201,7 +214,7 @@ module Wice
 
       pagination_panel_content_html, pagination_panel_content_js = nil, nil
       if options[:upper_pagination_panel]
-        content << rendering.pagination_panel(number_of_columns, options[:hide_csv_button]) do
+        grid.output_buffer << rendering.pagination_panel(number_of_columns, options[:hide_csv_button]) do
           pagination_panel_content_html =
             pagination_panel_content(grid, options[:extra_request_parameters], options[:allow_showing_all_records])
           pagination_panel_content_html
@@ -209,9 +222,9 @@ module Wice
       end
 
       title_row_attrs = header_tr_html.clone
-      title_row_attrs.add_or_append_class_value!('wice-grid-title-row', true)
+      Wice::WgHash.add_or_append_class_value!(title_row_attrs, 'wice-grid-title-row', true)
 
-      content << %!<tr #{tag_options(title_row_attrs, true)}>!
+      grid.output_buffer << %!<tr #{tag_options(title_row_attrs, true)}>!
 
       filter_row_id = grid.name + '_filter_row'
 
@@ -243,86 +256,82 @@ module Wice
             column_name,
             rendering.column_link(column, direction, params, options[:extra_request_parameters]),
             :class => link_style)
-          content << content_tag(:th, col_link, Hash.make_hash(:class, css_class))
+          grid.output_buffer << content_tag(:th, col_link, Wice::WgHash.make_hash(:class, css_class))
           column.css_class = css_class
         else
           if reuse_last_column_for_filter_buttons && last
-            content << content_tag(:th,
+            grid.output_buffer << content_tag(:th,
               hide_show_icon(filter_row_id, grid, filter_shown, no_filter_row, options[:show_filters], rendering)
             )
           else
-            content << content_tag(:th, column_name)
+            grid.output_buffer << content_tag(:th, column_name)
           end
         end
       end
 
-      content << content_tag(:th,
+      grid.output_buffer << content_tag(:th,
         hide_show_icon(filter_row_id, grid, filter_shown, no_filter_row, options[:show_filters], rendering)
       ) unless no_rightmost_column
 
-      content << '</tr>'
+      grid.output_buffer << '</tr>'
       # rendering first row end
 
 
       unless no_filters_at_all # there are filters, we don't know where, in the table or detached
         if no_filter_row # they are all detached
-          content.stubborn_output_mode = true
           rendering.each_column(:in_html) do |column|
             if column.filter_shown?
-              filter_html_code = column.render_filter
-              filter_html_code = filter_html_code.html_safe_if_necessary
-              content.add_filter(column.detach_with_id, filter_html_code)
+              filter_html_code = column.render_filter.html_safe
+              grid.output_buffer.add_filter(column.detach_with_id, filter_html_code)
             end
           end
 
         else # some filters are present in the table
 
           filter_row_attrs = header_tr_html.clone
-          filter_row_attrs.add_or_append_class_value!('wg-filter-row', true)
+          Wice::WgHash.add_or_append_class_value!(filter_row_attrs, 'wg-filter-row', true)
           filter_row_attrs['id'] = filter_row_id
 
-          content << %!<tr #{tag_options(filter_row_attrs, true)} !
-          content << 'style="display:none"' unless filter_shown
-          content << '>'
+          grid.output_buffer << %!<tr #{tag_options(filter_row_attrs, true)} !
+          grid.output_buffer << 'style="display:none"' unless filter_shown
+          grid.output_buffer << '>'
 
           rendering.each_column_aware_of_one_last_one(:in_html) do |column, last|
             if column.filter_shown?
 
-              filter_html_code = column.render_filter
-              filter_html_code = filter_html_code.html_safe_if_necessary
+              filter_html_code = column.render_filter.html_safe
               if column.detach_with_id
-                content.stubborn_output_mode = true
-                content << content_tag(:th, '', Hash.make_hash(:class, column.css_class))
-                content.add_filter(column.detach_with_id, filter_html_code)
+                grid.output_buffer << content_tag(:th, '', Wice::WgHash.make_hash(:class, column.css_class))
+                grid.output_buffer.add_filter(column.detach_with_id, filter_html_code)
               else
-                content << content_tag(:th, filter_html_code, Hash.make_hash(:class, column.css_class))
+                grid.output_buffer << content_tag(:th, filter_html_code, Wice::WgHash.make_hash(:class, column.css_class))
               end
             else
               if reuse_last_column_for_filter_buttons && last
-                content << content_tag(:th,
+                grid.output_buffer << content_tag(:th,
                   reset_submit_buttons(options, grid, rendering),
-                  Hash.make_hash(:class, column.css_class).add_or_append_class_value!('filter_icons')
+                  Wice::WgHash.add_or_append_class_value!(Wice::WgHash.make_hash(:class, column.css_class), 'filter_icons')
                 )
               else
-                content << content_tag(:th, '', Hash.make_hash(:class, column.css_class))
+                grid.output_buffer << content_tag(:th, '', Wice::WgHash.make_hash(:class, column.css_class))
               end
             end
           end
           unless no_rightmost_column
-            content << content_tag(:th, reset_submit_buttons(options, grid, rendering), :class => 'filter_icons' )
+            grid.output_buffer << content_tag(:th, reset_submit_buttons(options, grid, rendering), :class => 'filter_icons' )
           end
-          content << '</tr>'
+          grid.output_buffer << '</tr>'
         end
       end
 
       rendering.each_column(:in_html) do |column|
         unless column.css_class.blank?
-          column.html.add_or_append_class_value!(column.css_class)
+          Wice::WgHash.add_or_append_class_value!(column.html, column.css_class)
         end
       end
 
-      content << '</thead><tfoot>'
-      content << rendering.pagination_panel(number_of_columns, options[:hide_csv_button]) do
+      grid.output_buffer << '</thead><tfoot>'
+      grid.output_buffer << rendering.pagination_panel(number_of_columns, options[:hide_csv_button]) do
         if pagination_panel_content_html
           pagination_panel_content_html
         else
@@ -332,7 +341,7 @@ module Wice
         end
       end
 
-      content << '</tfoot><tbody>'
+      grid.output_buffer << '</tfoot><tbody>'
 
 
       # rendering  rows
@@ -388,7 +397,7 @@ module Wice
               additional_opts.delete('class')
             end
             opts.merge!(additional_opts)
-            opts.add_or_append_class_value!(additional_css_class) unless additional_css_class.blank?
+            Wice::WgHash.add_or_append_class_value!(opts, additional_css_class) unless additional_css_class.blank?
           end
 
           if sorting_dependant_row_cycling && column.attribute && grid.ordered_by?(column)
@@ -406,13 +415,13 @@ module Wice
           cycle_class = cycle('odd', 'even', :name => grid.name)
         end
 
-        row_attributes.add_or_append_class_value!(cycle_class)
+        Wice::WgHash.add_or_append_class_value!(row_attributes, cycle_class)
 
-        content << before_row_output if before_row_output
-        content << "<tr #{tag_options(row_attributes)}>#{row_content}"
-        content << content_tag(:td, '') unless no_rightmost_column
-        content << '</tr>'
-        content << after_row_output if after_row_output
+        grid.output_buffer << before_row_output if before_row_output
+        grid.output_buffer << "<tr #{tag_options(row_attributes)}>#{row_content}"
+        grid.output_buffer << content_tag(:td, '') unless no_rightmost_column
+        grid.output_buffer << '</tr>'
+        grid.output_buffer << after_row_output if after_row_output
       end
 
       last_row_output = if rendering.last_row_handler
@@ -421,9 +430,9 @@ module Wice
         nil
       end
 
-      content << last_row_output if last_row_output
+      grid.output_buffer << last_row_output if last_row_output
 
-      content << '</tbody></table>'
+      grid.output_buffer << '</tbody></table>'
 
       base_link_for_filter, base_link_for_show_all_records = rendering.base_link_for_filter(controller, options[:extra_request_parameters])
 
@@ -451,12 +460,12 @@ module Wice
 
       wg_data['data-foc'] = grid.status['foc'] if grid.status['foc']
 
-      content << content_tag(:div, '', wg_data)
+      grid.output_buffer << content_tag(:div, '', wg_data)
 
-      content << '</div>'
+      grid.output_buffer << '</div>'
 
       if Rails.env == 'development'
-        content  <<  javascript_tag(%/ $(document).ready(function(){ \n/ +
+        grid.output_buffer  <<  javascript_tag(%/ $(document).ready(function(){ \n/ +
           %$ if (typeof(WiceGridProcessor) == "undefined"){\n$ +
           %$   alert("wice_grid.js not loaded, WiceGrid cannot proceed!\\n" +\n$ +
           %$     "Make sure that you have loaded wice_grid.js.\\n" +\n$ +
@@ -466,14 +475,7 @@ module Wice
           %$ }) $)
       end
 
-      if content.stubborn_output_mode
-        grid.output_buffer = content
-      else
-        # this will serve as a flag that the grid helper has already processed the grid but in a normal mode,
-        # not in the mode with detached filters.
-        grid.output_buffer = true
-      end
-      return content
+      grid.output_buffer
     end
 
     def hide_show_icon(filter_row_id, grid, filter_shown, no_filter_row, show_filters, rendering)  #:nodoc:
@@ -504,7 +506,7 @@ module Wice
     end
 
     def reset_submit_buttons(options, grid, rendering)  #:nodoc:
-      (if options[:hide_submit_button]
+      if options[:hide_submit_button]
         ''
       else
         content_tag(:div, '',
@@ -512,7 +514,7 @@ module Wice
           :id => grid.name + '_submit_grid_icon',
           :class => 'submit clickable'
         )
-      end + ' ' +
+      end.html_safe + ' ' +
       if options[:hide_reset_button]
         ''
       else
@@ -522,7 +524,7 @@ module Wice
           :id => grid.name + '_reset_grid_icon',
           :class => 'reset clickable'
         )
-      end).html_safe_if_necessary
+      end.html_safe
     end
 
     # Renders a detached filter. The parameters are:
@@ -572,7 +574,6 @@ module Wice
         spreadsheet << row
       end
       grid.csv_tempfile = spreadsheet.tempfile
-      return grid.csv_tempfile.path
     end
 
     def pagination_panel_content(grid, extra_request_parameters, allow_showing_all_records) #:nodoc:
@@ -583,13 +584,13 @@ module Wice
 
       html = pagination_info(grid, allow_showing_all_records)
 
-      will_paginate(grid.resultset,
-        :previous_label => NlMessage['previous_label'],
-        :next_label     => NlMessage['next_label'],
-        :param_name     => "#{grid.name}[page]",
-        :renderer       => ::Wice::WillPaginatePaginator,
-        :params         => extra_request_parameters).to_s +
-        (' <div class="pagination_status">' + html + '</div>').html_safe_if_necessary
+      paginate(grid.resultset,
+        :theme         => 'wice_grid',
+        :param_name    => "#{grid.name}[page]",
+        :inner_window  => 4,
+        :outer_window  => 2
+      ) +
+        (' <div class="pagination_status">' + html + '</div>').html_safe
     end
 
 
@@ -622,19 +623,29 @@ module Wice
     end
 
     def pagination_info(grid, allow_showing_all_records)  #:nodoc:
+
+
       collection = grid.resultset
 
-      collection_total_entries = collection.total_entries
-      collection_total_entries_str = collection_total_entries.to_s
+      collection_total_entries = collection.total_count
+
+
+      current_page = grid.ar_options[:page].to_i
+      per_page = grid.ar_options[:per_page].to_i
+
+      first = collection.offset_value + 1
+      last = collection.last_page? ? collection.total_count : collection.offset_value + collection.limit_value
+
+
       parameters = grid.get_state_as_parameter_value_pairs
 
       js = ''
-      html = if (collection.total_pages < 2 && collection.length == 0)
+      html = if (collection.num_pages < 2 && collection.length == 0)
         '0'
       else
-        parameters << ["#{grid.name}[pp]", collection_total_entries_str]
+        parameters << ["#{grid.name}[pp]", collection_total_entries]
 
-        "#{collection.offset + 1}-#{collection.offset + collection.length} / #{collection_total_entries_str} " +
+        "#{first}-#{last} / #{collection_total_entries} " +
           if (! allow_showing_all_records) || collection_total_entries <= collection.length
             ''
           else

data/lib/kaminari_monkey_patching.rb

@@ -0,0 +1,13 @@
+# encoding: UTF-8
+# It is here only until this pull request is pulled: https://github.com/amatsuda/kaminari/pull/267
+module Kaminari
+  module Helpers
+    class Tag
+      def page_url_for(page)
+        current_page_params_as_query_string = @param_name.to_s + '=' + (page <= 1 ? nil : page).to_s
+        current_page_params_as_hash = Rack::Utils.parse_nested_query(current_page_params_as_query_string)
+        @template.url_for Wice::WgHash.rec_merge(@params, current_page_params_as_hash).symbolize_keys
+      end
+    end
+  end
+end

data/lib/view_columns/action_view_column.rb

@@ -7,7 +7,7 @@ module Wice
       @select_all_buttons   = select_all_buttons
       self.grid             = grid_obj
       self.html             = html
-      self.html.add_or_append_class_value!('sel')
+      Wice::WgHash.add_or_append_class_value!(self.html, 'sel')
       grid_name             = self.grid.name
       @param_name           = param_name
       @cell_rendering_block = lambda do |object, params|

data/lib/view_columns/view_column_custom_dropdown.rb

@@ -55,11 +55,10 @@ module Wice
 
       params_for_select = (params.is_a?(Hash) && params.empty?) ? [nil] : params
 
-      '<div class="custom-dropdown-container">'.html_safe_if_necessary +
+      '<div class="custom-dropdown-container">'.html_safe +
         content_tag(:select,
           options_for_select(@custom_filter, params_for_select),
-          select_options) +
-      select_toggle.html_safe_if_necessary + '</div>'.html_safe_if_necessary
+          select_options) +  select_toggle.html_safe + '</div>'.html_safe
     end
 
 

data/lib/wice_grid.rb

@@ -1,6 +1,5 @@
 # encoding: UTF-8
 
-require 'will_paginate.rb'
 require 'wice_grid_misc.rb'
 require 'wice_grid_core_ext.rb'
 require 'grid_renderer.rb'
@@ -16,7 +15,7 @@ require 'wice_grid_spreadsheet.rb'
 require 'wice_grid_serialized_queries_controller.rb'
 require 'view_columns/column_processor_index.rb'
 require 'view_columns.rb'
-
+require 'kaminari.rb'
 
 
 ActionController::Base.send(:helper_method, :wice_grid_custom_filter_params)
@@ -45,15 +44,13 @@ module Wice
           JsCalendarHelpers.send(:include, m)
         end
 
-        Wice::GridRenderer.send(:include, ::WillPaginate::ViewHelpers)
         ViewColumn.load_column_processors
         require 'wice_grid_serialized_query.rb'
-      end
-
-      require 'will_paginate_paginator.rb'
 
+        # It is here only until this pull request is pulled: https://github.com/amatsuda/kaminari/pull/267
+        require 'kaminari_monkey_patching.rb'
+      end
     end
-
   end
 
   class WiceGrid
@@ -110,7 +107,6 @@ module Wice
         :page                 => 1,
         :per_page             => Defaults::PER_PAGE,
         :saved_query          => nil,
-        :select               => nil,
         :total_entries        => nil,
         :with_paginated_resultset  => nil,
         :with_resultset       => nil
@@ -281,16 +277,31 @@ module Wice
       @ar_options[:joins]   = @options[:joins]
       @ar_options[:include] = @options[:include]
       @ar_options[:group] = @options[:group]
-      @ar_options[:select]  = @options[:select]
     end
 
+
+    # TO DO: what to do with other @ar_options values?
     def read  #:nodoc:
       form_ar_options
       @klass.unscoped do
         @resultset = if self.output_csv?
-          @relation.find(:all, @ar_options)
+          # @relation.find(:all, @ar_options)
+          @relation.
+            includes(@ar_options[:include]).
+            joins(   @ar_options[:joins]).
+            order(   @ar_options[:order]).
+            where(   @ar_options[:conditions])
+
         else
-          @relation.paginate(@ar_options)
+          # p @ar_options
+          @relation.
+            page(    @ar_options[:page]).
+            per(     @ar_options[:per_page]).
+            includes(@ar_options[:include]).
+            joins(   @ar_options[:joins]).
+            order(   @ar_options[:order]).
+            where(   @ar_options[:conditions])
+
         end
       end
       invoke_resultset_callbacks
@@ -355,7 +366,7 @@ module Wice
     def get_state_as_parameter_value_pairs(including_saved_query_request = false) #:nodoc:
       res = []
       unless status[:f].blank?
-        status[:f].parameter_names_and_values([name, 'f']).collect do |param_name, value|
+        Wice::WgHash.parameter_names_and_values(status[:f], [name, 'f']).collect do |param_name, value|
           if value.is_a?(Array)
             param_name_ar = param_name + '[]'
             value.each do |v|

data/lib/wice_grid_core_ext.rb

@@ -1,112 +1,121 @@
 # encoding: UTF-8
-module WGHashExtensions  #:nodoc:
 
-  def self.included(base)  #:nodoc:
-    base.extend(ClassMethods)
-  end
-
-
-  # if there's a hash of hashes, the original structure and the
-  # returned structure should not contain any shared deep hashes
-  def deep_clone_yl  #:nodoc:
-    cloned = self.clone
-    cloned.keys.each do |k|
-      if cloned[k].kind_of?(Hash)
-        cloned[k] = cloned[k].deep_clone_yl
+module Wice
+  module WgHash
+    class << self
+
+      # if there's a hash of hashes, the original structure and the
+      # returned structure should not contain any shared deep hashes
+      def deep_clone(hash)  #:nodoc:
+        cloned = hash.clone
+        cloned.keys.each do |k|
+          if cloned[k].kind_of?(Hash)
+            cloned[k] = Wice::WgHash.deep_clone cloned[k]
+          end
+        end
+        cloned
       end
-    end
-    cloned
-  end
 
-  # Used to modify options submitted to view helpers. If there is no :klass option,
-  # it will be added, if there is, the css class name will be appended to the existing
-  # class name(s)
-  def add_or_append_class_value!(klass_value, prepend = false) #:nodoc:
-    if self.has_key?('class')
-      self[:class] = self['class']
-      self.delete('class')
-    end
+      # Used to modify options submitted to view helpers. If there is no :klass option,
+      # it will be added, if there is, the css class name will be appended to the existing
+      # class name(s)
+      def add_or_append_class_value!(hash, klass_value, prepend = false) #:nodoc:
+        if hash.has_key?('class')
+          hash[:class] = hash['class']
+          hash.delete('class')
+        end
+
+        hash[:class] = if hash.has_key?(:class)
+          if prepend
+            "#{klass_value} #{hash[:class]}"
+          else
+            "#{hash[:class]} #{klass_value}"
+          end
+        else
+          klass_value
+        end
+
+        hash
+      end
 
-    self[:class] = if self.has_key?(:class)
-      if prepend
-        "#{klass_value} #{self[:class]}"
-      else
-        "#{self[:class]} #{klass_value}"
+      # Used mostly for submitting options to view helpers, that is, like this:
+      #   content_tag(:th, col_link, Wice::WgHash.make_hash(:class, css_class))
+      # In some it is important that if the value is empty, no option
+      # is submitted at all. Thus, there's a check for an empty value
+      def make_hash(key, value) #:nodoc:
+        value.blank? ? {} : {key => value}
       end
-    else
-      klass_value
-    end
 
-    return self
-  end
 
+      # A deep merge of two hashes.
+      # That is, if both hashes have the same key and the values are hashes, these two hashes should also be merged.
+      # Used for merging two sets of params.
+      def rec_merge(hash, other)  #:nodoc:
+        res = hash.clone
+        other.each do |key, other_value|
+          value = res[key]
+          if value.is_a?(Hash) && other_value.is_a?(Hash)
+            res[key] = rec_merge value, other_value
+          else
+            res[key] = other_value
+          end
+        end
+        res
+      end
 
-  # Used to transform a traditional params hash
-  # into an array of two element arrays where element zero is a parameter name as it appears in HTTP requests,
-  # and the first element is the value:
-  # { :a => { :b => 3, :c => 4, :d => { :e => 5 }} }.parameter_names_and_values #=>  [["a[d][e]", 5], ["a[b]", 3], ["a[c]", 4]]
-  # The parameter is an optional array of parameter names to prepend:
-  # { :a => { :b => 3, :c => 4, :d => { :e => 5 }} }.parameter_names_and_values(['foo', 'baz']) #=>
-  #                         [["foo[baz][a][d][e]", 5], ["foo[baz][a][b]", 3], ["foo[baz][a][c]", 4]]
-  def parameter_names_and_values(initial = []) #:nodoc:
-    res = []
-    recursively_gather_finite_non_hash_values_with_key_path(res, [])
-    res.collect do |parameter_struct|
-      parameter_struct[0] = initial + parameter_struct[0]
-      [parameter_struct[0].to_parameter_name, parameter_struct[1]]
-    end
-  end
+      # Used to transform a traditional params hash
+      # into an array of two element arrays where element zero is a parameter name as it appears in HTTP requests,
+      # and the first element is the value:
+      # { :a => { :b => 3, :c => 4, :d => { :e => 5 }} }.parameter_names_and_values #=>  [["a[d][e]", 5], ["a[b]", 3], ["a[c]", 4]]
+      # The parameter is an optional array of parameter names to prepend:
+      # { :a => { :b => 3, :c => 4, :d => { :e => 5 }} }.parameter_names_and_values(['foo', 'baz']) #=>
+      #                         [["foo[baz][a][d][e]", 5], ["foo[baz][a][b]", 3], ["foo[baz][a][c]", 4]]
+      def parameter_names_and_values(hash, initial = []) #:nodoc:
+        res = []
+        recursively_gather_finite_non_hash_values_with_key_path(hash, res, [])
+        res.collect do |parameter_struct|
+          parameter_struct[0] = initial + parameter_struct[0]
+          [Wice::WgArray.to_parameter_name(parameter_struct[0]), parameter_struct[1]]
+        end
+      end
 
+      protected
 
-  # A deep merge of two hashes.
-  # That is, if both hashes have the same key and the values are hashes, these two hashes should also be merged.
-  # Used for merging two sets of params.
-  def rec_merge(other)  #:nodoc:
-    res = self.clone
-    other.each do |key, other_value|
-      value = res[key]
-      if value.is_a?(Hash) && other_value.is_a?(Hash)
-        res[key] = value.rec_merge other_value
-      else
-        res[key] = other_value
+      def recursively_gather_finite_non_hash_values_with_key_path(hash, res, stack = []) #:nodoc:
+        hash.each do |key, value|
+          if value.kind_of?(Hash)
+            recursively_gather_finite_non_hash_values_with_key_path(value, res, stack + [key])
+          else
+            res << [stack + [key], value]
+          end
+        end
       end
+
     end
-    res
   end
 
 
-  module ClassMethods  #:nodoc:
+  module WgEnumerable #:nodoc:
 
-    # Used mostly for submitting options to view helpers, that is, like this:
-    #   content_tag(:th, col_link, Hash.make_hash(:class, css_class))
-    # In some it is important that if the value is empty, no option
-    # is submitted at all. Thus, there's a check for an empty value
-    def make_hash(key, value) #:nodoc:
-      value.blank? ? {} : {key => value}
+    # Used to check the validity of :custom_filter parameter of column
+    def self.all_items_are_of_class(enumerable, klass)  #:nodoc:
+      return false if enumerable.empty?
+      enumerable.inject(true){|memo, o| (o.is_a? klass) && memo}
     end
 
-
   end
 
-  protected
-
-  def recursively_gather_finite_non_hash_values_with_key_path(res, stack = []) #:nodoc:
-    self.each do |key, value|
-      if value.kind_of?(Hash)
-        value.recursively_gather_finite_non_hash_values_with_key_path(res, stack + [key])
-      else
-        res << [stack + [key], value]
-      end
+  module WgArray
+    # Only used by Hash#parameter_names_and_values
+    # Transforms ['foo', 'bar', 'baz'] to 'foo[bar][baz]'
+    def self.to_parameter_name(array) #:nodoc:
+      array[0].to_s + (array[1..-1] || []).collect{|k| '[' + k.to_s + ']'}.join('')
     end
   end
 
 end
 
 
-class Hash #:nodoc:
-  include WGHashExtensions
-end
-
 # tag_options is a Rails views private method that takes a hash op options for
 # an HTM hash and produces a string ready to be added to the tag.
 # Here we are changing its visibility in order to be able to use it.
@@ -119,17 +128,6 @@ module ActionView #:nodoc:
 end
 
 
-
-module Enumerable #:nodoc:
-
-  # Used to check the validity of :custom_filter parameter of column
-  def all_items_are_of_class(klass)  #:nodoc:
-    return false if self.empty?
-    self.inject(true){|memo, o| (o.is_a? klass) && memo}
-  end
-
-end
-
 module WGObjectExtensions #:nodoc:
 
   # takes a list of messages, sends message 1 to self, then message 2 is sent to the result of the first message, ans so on
@@ -152,28 +150,3 @@ class Object #:nodoc:
   include WGObjectExtensions
 end
 
-module WGArrayExtensions  #:nodoc:
-  # Only used by Hash#parameter_names_and_values
-  # Transforms ['foo', 'bar', 'baz'] to 'foo[bar][baz]'
-  def to_parameter_name #:nodoc:
-    self[0].to_s + (self[1..-1] || []).collect{|k| '[' + k.to_s + ']'}.join('')
-  end
-end
-
-class Array  #:nodoc:
-  include WGArrayExtensions
-end
-
-module StringExt #:nodoc:
-  def html_safe_if_necessary #:nodoc:
-    if respond_to?(:html_safe)
-      html_safe
-    else
-      self
-    end
-  end
-end
-
-class String #:nodoc:
-  include StringExt
-end

data/wice_grid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wice_grid"
-  s.version = "3.2.0.pre1"
+  s.version = "3.2.0.pre2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yuri Leikind"]
-  s.date = "2012-07-22"
+  s.date = "2012-08-04"
   s.description = "A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters "
   s.email = "yuri.leikind@gmail.com"
   s.extra_rdoc_files = [
@@ -20,9 +20,15 @@ Gem::Specification.new do |s|
     "MIT-LICENSE",
     "README.rdoc",
     "RELEASE_NOTES_3.2.pre1.rdoc",
+    "RELEASE_NOTES_3.2.pre2.rdoc",
     "Rakefile",
     "SAVED_QUERIES_HOWTO.rdoc",
     "VERSION",
+    "app/views/kaminari/wice_grid/_gap.html.haml",
+    "app/views/kaminari/wice_grid/_next_page.html.haml",
+    "app/views/kaminari/wice_grid/_page.html.haml",
+    "app/views/kaminari/wice_grid/_paginator.html.haml",
+    "app/views/kaminari/wice_grid/_prev_page.html.haml",
     "lib/generators/wice_grid/add_migration_for_serialized_queries_generator.rb",
     "lib/generators/wice_grid/install_generator.rb",
     "lib/generators/wice_grid/templates/create_wice_grid_serialized_queries.rb",
@@ -35,6 +41,7 @@ Gem::Specification.new do |s|
     "lib/helpers/wice_grid_misc_view_helpers.rb",
     "lib/helpers/wice_grid_serialized_queries_view_helpers.rb",
     "lib/helpers/wice_grid_view_helpers.rb",
+    "lib/kaminari_monkey_patching.rb",
     "lib/table_column_matrix.rb",
     "lib/view_columns.rb",
     "lib/view_columns/action_view_column.rb",
@@ -53,7 +60,6 @@ Gem::Specification.new do |s|
     "lib/wice_grid_serialized_queries_controller.rb",
     "lib/wice_grid_serialized_query.rb",
     "lib/wice_grid_spreadsheet.rb",
-    "lib/will_paginate_paginator.rb",
     "test/readme.txt",
     "vendor/assets/images/icons/grid/arrow_down.gif",
     "vendor/assets/images/icons/grid/arrow_up.gif",
@@ -82,12 +88,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<will_paginate>, [">= 3.0.3"])
+      s.add_runtime_dependency(%q<kaminari>, [">= 0.13.0"])
     else
-      s.add_dependency(%q<will_paginate>, [">= 3.0.3"])
+      s.add_dependency(%q<kaminari>, [">= 0.13.0"])
     end
   else
-    s.add_dependency(%q<will_paginate>, [">= 3.0.3"])
+    s.add_dependency(%q<kaminari>, [">= 0.13.0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wice_grid
 version: !ruby/object:Gem::Version
-  version: 3.2.0.pre1
+  version: 3.2.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-22 00:00:00.000000000 Z
+date: 2012-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: kaminari
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.3
-  type: :development
+        version: 0.13.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 0.13.0
 description: ! 'A Rails grid plugin to create grids with sorting, pagination, and
   (automatically generated) filters '
 email: yuri.leikind@gmail.com
@@ -39,9 +39,15 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - RELEASE_NOTES_3.2.pre1.rdoc
+- RELEASE_NOTES_3.2.pre2.rdoc
 - Rakefile
 - SAVED_QUERIES_HOWTO.rdoc
 - VERSION
+- app/views/kaminari/wice_grid/_gap.html.haml
+- app/views/kaminari/wice_grid/_next_page.html.haml
+- app/views/kaminari/wice_grid/_page.html.haml
+- app/views/kaminari/wice_grid/_paginator.html.haml
+- app/views/kaminari/wice_grid/_prev_page.html.haml
 - lib/generators/wice_grid/add_migration_for_serialized_queries_generator.rb
 - lib/generators/wice_grid/install_generator.rb
 - lib/generators/wice_grid/templates/create_wice_grid_serialized_queries.rb
@@ -54,6 +60,7 @@ files:
 - lib/helpers/wice_grid_misc_view_helpers.rb
 - lib/helpers/wice_grid_serialized_queries_view_helpers.rb
 - lib/helpers/wice_grid_view_helpers.rb
+- lib/kaminari_monkey_patching.rb
 - lib/table_column_matrix.rb
 - lib/view_columns.rb
 - lib/view_columns/action_view_column.rb
@@ -72,7 +79,6 @@ files:
 - lib/wice_grid_serialized_queries_controller.rb
 - lib/wice_grid_serialized_query.rb
 - lib/wice_grid_spreadsheet.rb
-- lib/will_paginate_paginator.rb
 - test/readme.txt
 - vendor/assets/images/icons/grid/arrow_down.gif
 - vendor/assets/images/icons/grid/arrow_up.gif

data/lib/will_paginate_paginator.rb

@@ -1,31 +0,0 @@
-module Wice
-  class WillPaginatePaginator < ::WillPaginate::ActionView::LinkRenderer
-    def html_container(html)
-      tag(:div,
-        tag(:ul, html),
-        container_attributes
-      )
-    end
-
-    def page_number(page)
-      if page == current_page
-        tag(:li, link(page, page, :rel => rel_value(page)), :class => 'active')
-      else
-        tag(:li, link(page, page, :rel => rel_value(page)))
-      end
-    end
-
-    def previous_or_next_page(page, text, classname)
-      if page
-        tag(:li, link(text, page))
-      else
-        tag(:li, link(text, page), :class => 'disabled')
-      end
-    end
-
-    def gap
-      '<li class="disabled"><a href="#">...</a></li>'
-    end
-
-  end
-end