wice_grid 3.5.0 → 3.6.0.pre1

data/lib/wice/helpers/bs_calendar_helpers.rb

@@ -1,7 +1,11 @@
+# encoding: utf-8
 module Wice #:nodoc:
   module BsCalendarHelpers #:nodoc:
 
-    class CalendarData
+    # A struct containing all data for rendering a calendar
+    class CalendarData #:nodoc:
+
+      # :nodoc:
       attr_accessor :name,
                     :date_string,
                     :dom_id,
@@ -14,16 +18,14 @@ module Wice #:nodoc:
     end
 
     def date_calendar_bs(calendar_data)  #:nodoc:
-
       text_field_tag_options = {
           :id                   => calendar_data.dom_id,
           'data-provide'        => 'datepicker',
           'data-date-language'  => I18n.locale,
           'data-date-autoclose' => true,
-          'data-date-format'    => Wice::ConfigurationProvider.value_for(:DATE_FORMAT_BOOTSTRAP),
+          'data-date-format'    => Wice::ConfigurationProvider.value_for(:DATE_FORMAT_BOOTSTRAP)
       }
 
-
       text_field_tag_options['class'] = 'form-control input-sm'
 
       if Rails.env.development?
@@ -48,11 +50,9 @@ module Wice #:nodoc:
     end
 
     def prepare_data_for_bscalendar(options)  #:nodoc:
-
       date_format = Wice::ConfigurationProvider.value_for(:DATE_FORMAT)
 
       CalendarData.new.tap do |calendar_data|
-
         calendar_data.name                      = options[:name]
         calendar_data.date_string               = options[:initial_date].nil? ? '' : options[:initial_date].strftime(date_format)
         calendar_data.dom_id                    = options[:name].gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '').gsub(/\./, '_').gsub(/_+/, '_')
@@ -62,6 +62,5 @@ module Wice #:nodoc:
         calendar_data.fire_event                = options[:fire_event]
       end
     end
-
   end
 end

data/lib/wice/helpers/js_calendar_helpers.rb

@@ -1,7 +1,11 @@
+# encoding: utf-8
 module Wice #:nodoc:
   module JsCalendarHelpers #:nodoc:
 
+    # A struct containing all data for rendering a calendar
     class CalendarData
+
+      # :nodoc:
       attr_accessor :name,
                     :date_string,
                     :dom_id,
@@ -15,12 +19,10 @@ module Wice #:nodoc:
     end
 
     def date_calendar_jquery(calendar_data)  #:nodoc:
-
       hidden_field_tag_options = {
         :id                 => calendar_data.dom_id,
         'data-locale'       => I18n.locale,
         'data-date-format'  => Wice::ConfigurationProvider.value_for(:DATE_FORMAT_JQUERY),
-        'data-button-image' => Wice::ConfigurationProvider.value_for(:CALENDAR_ICON),
         'data-button-text'  => calendar_data.title
       }
 
@@ -40,31 +42,33 @@ module Wice #:nodoc:
         hidden_field_tag_options['data-the-other-datepicker-id-from'] = calendar_data.the_other_datepicker_id_from
       end
 
-
       if year_range = ConfigurationProvider.value_for(:DATEPICKER_YEAR_RANGE)
         hidden_field_tag_options['data-date-year-range'] = year_range
       end
 
-
       date_picker = hidden_field_tag(calendar_data.name, calendar_data.date_string, hidden_field_tag_options) + ' ' +
 
-        link_to(calendar_data.date_string,
-          '#',
-          :id => calendar_data.date_span_id,
-          :class => 'date-label',
-          :title => ::Wice::NlMessage['date_string_tooltip'],
-          'data-dom-id' => calendar_data.dom_id
-        )
-
-      "<span id=\"#{calendar_data.datepicker_placeholder_id}\">#{date_picker}</span>"
+      link_to(
+        calendar_data.date_string,
+        '#',
+        :id           => calendar_data.date_span_id,
+        :class        => 'date-label',
+        :title        => ::Wice::NlMessage['date_string_tooltip'],
+        'data-dom-id' => calendar_data.dom_id
+      )
+
+      content_tag(
+        :span,
+        date_picker,
+        id:    calendar_data.datepicker_placeholder_id,
+        class: 'jq-datepicker-container'
+      )
     end
 
     def prepare_data_for_calendar(options)  #:nodoc:
-
       date_format = Wice::ConfigurationProvider.value_for(:DATE_FORMAT)
 
       CalendarData.new.tap do |calendar_data|
-
         calendar_data.name                      = options[:name]
         calendar_data.date_string               = options[:initial_date].nil? ? '' : options[:initial_date].strftime(date_format)
         calendar_data.dom_id                    = options[:name].gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '').gsub(/\./, '_').gsub(/_+/, '_')
@@ -73,9 +77,7 @@ module Wice #:nodoc:
         calendar_data.close_calendar_event_name =  "wg:calendarChanged_#{options[:grid_name]}"
         calendar_data.title                     = options[:title]
         calendar_data.fire_event                = options[:fire_event]
-
       end
     end
-
   end
 end

data/lib/wice/helpers/wice_grid_misc_view_helpers.rb

@@ -1,19 +1,20 @@
+# encoding: utf-8
 module Wice
-  module GridViewHelper
-
 
+  # Various grid related helpers
+  module GridViewHelper
     # This method dumps all HTTP parameters related to filtering and ordering of a certain grid as hidden form fields.
     # This might be required if you want to keep the state of a grid while reloading the page using other forms.
     #
     # The only parameter is a grid object returned by +initialize_grid+ in the controller.
     def dump_filter_parameters_as_hidden_fields(grid)
-      unless grid.kind_of? WiceGrid
-        raise WiceGridArgumentError.new("dump_filter_parameters_as_hidden_fields: the parameter must be a WiceGrid instance.")
+      unless grid.is_a? WiceGrid
+        fail WiceGridArgumentError.new('dump_filter_parameters_as_hidden_fields: the parameter must be a WiceGrid instance.')
       end
 
-      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
+      grid.get_state_as_parameter_value_pairs(true).collect do|param_name, value|
+        hidden_field_tag(param_name, value, id: "hidden-#{param_name.gsub(/[\[\]]/, '-')}")
+      end.join("\n").html_safe
     end
 
     # This method dumps all HTTP parameters related to filtering of a certain grid in the form of a hash.
@@ -23,7 +24,7 @@ module Wice
     #
     # The only parameter is a grid object returned by +initialize_grid+ in the controller.
     def filter_state_as_hash(grid)
-      {grid.name => {'f' => grid.status[:f]}}
+      { grid.name => { 'f' => grid.status[:f] } }
     end
 
     # This method dumps all HTTP parameters related to filtering and ordering of a certain grid in the form of a hash.
@@ -40,36 +41,35 @@ module Wice
       }
     end
 
+    # display the state of the grid
     def dump_state(grid)  #:nodoc:
-      debug(grid.get_state_as_parameter_value_pairs())
+      debug(grid.get_state_as_parameter_value_pairs)
     end
 
-
     # secret but stupid weapon - takes an ActiveRecord and using reflection tries to build all the column clauses by itself.
     # WiceGrid is not a scaffolding solution, I hate scaffolding and how certain idiots associate scaffolding with Rails,
     # so I do not document this method to avoid contributing to this misunderstanding.
     def scaffolded_grid(grid_obj, opts = {}) #:nodoc:
-      unless grid_obj.kind_of? WiceGrid
-        raise WiceGridArgumentError.new("scaffolded_grid: the parameter must be a WiceGrid instance.")
+      unless grid_obj.is_a? WiceGrid
+        fail WiceGridArgumentError.new('scaffolded_grid: the parameter must be a WiceGrid instance.')
       end
 
       # debug grid.klass.column_names
       columns = grid_obj.klass.column_names
       if opts[:reject_attributes].is_a? Proc
-        columns = columns.reject{|c| opts[:reject_attributes].call(c)}
+        columns = columns.reject { |c| opts[:reject_attributes].call(c) }
         opts.delete(:reject_attributes)
-      elsif
-        columns = columns.reject{|c| c =~ opts[:reject_attributes]}
+      else
+        columns = columns.reject { |c| c =~ opts[:reject_attributes] }
         opts.delete(:reject_attributes)
       end
       grid(grid_obj, opts) do |g|
         columns.each do |column_name|
-          g.column :name => column_name.humanize, :attribute => column_name  do |ar|
+          g.column name: column_name.humanize, attribute: column_name  do |ar|
             ar.send(column_name)
           end
         end
       end
     end
-
   end
-end
+end

data/lib/wice/helpers/wice_grid_serialized_queries_view_helpers.rb

@@ -1,17 +1,17 @@
+# encoding: utf-8
 module Wice
   module GridViewHelper
-
     # View helper to render the list of saved queries and the form to create a new query.
     # Parameters:
     # * <tt>:extra_parameters</tt> -  a hash of additional parameters to use when creating a new query object.
     # * <tt>:confirm</tt> -  A boolean value which turns on or off the JS confirm dialogs when deleting saved queries.
     # Read section "Adding Application Specific Logic to Saving/Restoring Queries" in README for more details.
     def saved_queries_panel(grid, opts = {})
-      unless grid.kind_of? WiceGrid
-        raise WiceGridArgumentError.new("saved_queries_panel: the parameter must be a WiceGrid instance.")
+      unless grid.is_a? WiceGrid
+        fail WiceGridArgumentError.new('saved_queries_panel: the parameter must be a WiceGrid instance.')
       end
 
-      options = {extra_parameters: {}, confirm: 1}
+      options = { extra_parameters: {}, confirm: 1 }
       opts.assert_valid_keys(options.keys)
       options.merge!(opts)
 
@@ -22,13 +22,13 @@ module Wice
       parameters = grid.get_state_as_parameter_value_pairs
 
       options[:extra_parameters].each do |k, v|
-        parameters << [ CGI.unescape({extra: {k => ''}}.to_query.sub(/=$/,'')) , v.to_s ]
+        parameters << [CGI.unescape({ extra: { k => '' } }.to_query.sub(/=$/, '')), v.to_s]
       end
-      parameters <<  ['authenticity_token', form_authenticity_token]
+      parameters << ['authenticity_token', form_authenticity_token]
       notification_messages_id = "#{grid_name}_notification_messages"
-      (%! <div class="wice-grid-query-panel well"><h3>#{NlMessage['saved_query_panel_title']}</h3>! +
+      (%( <div class="wice-grid-query-panel well"><h3>#{NlMessage['saved_query_panel_title']}</h3>) +
         saved_queries_list(grid_name, grid.saved_query, options[:extra_parameters], options[:confirm]) +
-        %!<div id="#{notification_messages_id}" ></div>! +
+        %(<div id="#{notification_messages_id}" ></div>) +
         if block_given?
           view, ids = yield
           view
@@ -36,9 +36,7 @@ module Wice
           ''
         end +
 
-        '<div class="form-horizontal"><div class="wg-saved-query-input-controls input-append">'+
-
-        text_field_tag(input_field_name,  '',  onkeydown: '', class: 'wice-grid-save-query-field form-control ') +
+        '<div class="form-horizontal"><div class="wg-saved-query-input-controls input-append">' + text_field_tag(input_field_name,  '',  onkeydown: '', class: 'wice-grid-save-query-field form-control ') +
         button_tag(
           NlMessage['save_query_button_label'],
           class: 'wice-grid-save-query-button btn btn-primary',
@@ -52,49 +50,46 @@ module Wice
     end
 
     def saved_queries_list(grid_name, saved_query = nil, extra_parameters = {}, confirm = 1)  #:nodoc:
-
       link_title            = NlMessage['saved_query_link_title']
       deletion_confirmation = confirm ? NlMessage['saved_query_deletion_confirmation'] : nil
       deletion_link_title   = NlMessage['saved_query_deletion_link_title']
 
-      query_store_model = ::Wice::get_query_store_model
+      query_store_model = ::Wice.get_query_store_model
       currently_loaded_query_id = saved_query ? saved_query.id : nil
-      with = extra_parameters.nil? ? nil : "'"  + {extra: extra_parameters}.to_query + "'"
+      # with = extra_parameters.nil? ? nil : "'"  + {extra: extra_parameters}.to_query + "'"
 
-      %!<ul id="#{grid_name}_query_list" class="query-list"> ! +
-      query_store_model.list(grid_name, controller).collect do |sq|
-        link_opts = {
-          class: 'wice-grid-query-load-link',
-          title: "#{link_title} #{sq.name}",
-          'data-query-id' => sq.id,
-          'data-grid-name' => grid_name
-        }
-        link_opts[:class] += ' current' if saved_query == sq
-        "<li>"+
-        link_to(
-          content_tag(:div, '', :class => 'delete-icon'),
-          delete_serialized_query_path(
-            grid_name: grid_name,
-            id:        sq.id,
-            current:   currently_loaded_query_id,
-            extra:     extra_parameters,
-            confirm:   confirm
-          ),
-          class:               'wice-grid-delete-query',
-          'data-wg-confirm' => deletion_confirmation,
-          'data-grid-name'  => grid_name,
-          title:               "#{deletion_link_title} #{sq.name}"
-        )  + ' &nbsp; ' +
-        link_to(h(sq.name), '#', link_opts) +
-        if sq.respond_to? :description
-          desc = sq.description
-          desc.blank? ? '' : " <i>#{desc}</i>"
-        else
-          ''
-        end +
-        '</li>'
-      end.join('') + '</ul>'
+      %(<ul id="#{grid_name}_query_list" class="query-list"> ) +
+        query_store_model.list(grid_name, controller).collect do |sq|
+          link_opts = {
+            class: 'wice-grid-query-load-link',
+            title: "#{link_title} #{sq.name}",
+            'data-query-id' => sq.id,
+            'data-grid-name' => grid_name
+          }
+          link_opts[:class] += ' current' if saved_query == sq
+          '<li>' + link_to(
+            content_tag(:i, '', class: 'fa fa-trash-o delete-icon'),
+            delete_serialized_query_path(
+              grid_name: grid_name,
+              id:        sq.id,
+              current:   currently_loaded_query_id,
+              extra:     extra_parameters,
+              confirm:   confirm
+            ),
+            class:               'wice-grid-delete-query',
+            'data-wg-confirm' => deletion_confirmation,
+            'data-grid-name'  => grid_name,
+            title:               "#{deletion_link_title} #{sq.name}"
+          ) + ' &nbsp; ' +
+            link_to(h(sq.name), '#', link_opts) +
+            if sq.respond_to? :description
+              desc = sq.description
+              desc.blank? ? '' : " <i>#{desc}</i>"
+            else
+              ''
+            end +
+            '</li>'
+        end.join('') + '</ul>'
     end
-
   end
-end
+end

data/lib/wice/helpers/wice_grid_view_helpers.rb

@@ -1,6 +1,6 @@
+# encoding: utf-8
 module Wice
   module GridViewHelper
-
     # View helper for rendering the grid.
     #
     # The first parameter is a grid object returned by +initialize_grid+ in the controller.
@@ -69,9 +69,9 @@ 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?
+      fail 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
@@ -83,7 +83,7 @@ module Wice
     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")
+        fail WiceGridArgumentError.new('The first argument for the grid helper must be an instance of the WiceGrid class')
       end
 
       options = {
@@ -107,7 +107,6 @@ module Wice
       options[:show_filters] = :no     if options[:show_filters] == false
       options[:show_filters] = :always if options[:show_filters] == true
 
-
       rendering = GridRenderer.new(grid, self)
 
       block.call(rendering) # calling block containing column() calls
@@ -119,7 +118,7 @@ module Wice
         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?
+        if rendering.blank_slate_handler && grid.resultset.size == 0 && !grid.filtering_on?
           generate_blank_slate(grid, rendering)
         else
           grid_html(grid, options, rendering, reuse_last_column_for_filter_buttons)
@@ -140,15 +139,14 @@ module Wice
       elsif grid.csv_tempfile
         grid.csv_tempfile.path
       else
-        raise WiceGridException.new("Attempt to use 'render_grid' without 'define_grid' before.")
+        fail WiceGridException.new("Attempt to use 'render_grid' without 'define_grid' before.")
       end
     end
 
-
     def generate_blank_slate(grid, rendering) #:nodoc:
       grid.output_buffer = GridOutputBuffer.new
 
-      grid.output_buffer <<  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)
@@ -156,7 +154,7 @@ module Wice
         rendering.blank_slate_handler
       end
 
-      if rendering.find_one_for(:in_html){|column| column.detach_with_id}
+      if rendering.find_one_for(:in_html) { |column| column.detach_with_id }
         grid.output_buffer.return_empty_strings_for_nonexistent_filters = true
       end
     end
@@ -165,7 +163,7 @@ module Wice
       extra_argument ? block.call(ar, extra_argument) : block.call(ar)
     end
 
-    def get_row_content(rendering, ar, sorting_dependant_row_cycling)
+    def get_row_content(rendering, ar, sorting_dependant_row_cycling) #:nodoc:
       cell_value_of_the_ordered_column = nil
       row_content = ''
       rendering.each_column(:in_html) do |column|
@@ -181,25 +179,25 @@ module Wice
           call_block(cell_block, ar)
         end
 
-        if column_block_output.kind_of?(Array)
+        if column_block_output.is_a?(Array)
 
           unless column_block_output.size == 2
-            raise WiceGridArgumentError.new('When WiceGrid column block returns an array it is expected to contain 2 elements only - '+
-                                            'the first is the contents of the table cell and the second is a hash containing HTML attributes for the <td> tag.')
+            fail WiceGridArgumentError.new('When WiceGrid column block returns an array it is expected to contain 2 elements only - ' \
+              'the first is the contents of the table cell and the second is a hash containing HTML attributes for the <td> tag.')
           end
 
           column_block_output, additional_opts = column_block_output
 
           unless additional_opts.is_a?(Hash)
-            raise WiceGridArgumentError.new('When WiceGrid column block returns an array its second element is expected to be a ' +
+            fail WiceGridArgumentError.new('When WiceGrid column block returns an array its second element is expected to be a ' \
                                             "hash containing HTML attributes for the <td> tag. The returned value is #{additional_opts.inspect}. Read documentation.")
           end
 
           additional_css_class = nil
-          if additional_opts.has_key?(:class)
+          if additional_opts.key?(:class)
             additional_css_class = additional_opts[:class]
             additional_opts.delete(:class)
-          elsif additional_opts.has_key?('class')
+          elsif additional_opts.key?('class')
             additional_css_class = additional_opts['class']
             additional_opts.delete('class')
           end
@@ -217,7 +215,6 @@ module Wice
 
     # the longest method? :(
     def grid_html(grid, options, rendering, reuse_last_column_for_filter_buttons) #:nodoc:
-
       table_html_attrs, header_tr_html = options[:html], options[:header_tr_html]
 
       Wice::WgHash.add_or_append_class_value!(table_html_attrs, 'wice-grid', true)
@@ -241,18 +238,18 @@ module Wice
       # Ruby 1.9.x
       grid.output_buffer.force_encoding('UTF-8') if grid.output_buffer.respond_to?(:force_encoding)
 
-      grid.output_buffer << %!<div class="wice-grid-container table-responsive" data-grid-name="#{grid.name}" id="#{grid.name}"><div id="#{grid.name}_title">!
+      grid.output_buffer << %(<div class="wice-grid-container table-responsive" data-grid-name="#{grid.name}" 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 << "</div><table #{public_tag_options(table_html_attrs, true)}>"
       grid.output_buffer << "<caption>#{rendering.kaption}</caption>" if rendering.kaption
-      grid.output_buffer << "<thead>"
+      grid.output_buffer << '<thead>'
 
       no_filters_at_all = (options[:show_filters] == :no || rendering.no_filter_needed?)
 
       if no_filters_at_all
         no_rightmost_column = no_filter_row = no_filters_at_all
       else
-        no_rightmost_column = no_filter_row = (options[:show_filters] == :no || rendering.no_filter_needed_in_main_table?) ? true: false
+        no_rightmost_column = no_filter_row = (options[:show_filters] == :no || rendering.no_filter_needed_in_main_table?) ? true : false
       end
 
       no_rightmost_column = true if reuse_last_column_for_filter_buttons
@@ -262,7 +259,7 @@ module Wice
 
       number_of_columns_for_extra_rows = number_of_columns + 1
 
-      pagination_panel_content_html, pagination_panel_content_js = nil, nil
+      pagination_panel_content_html = nil
       if options[:upper_pagination_panel]
         grid.output_buffer << rendering.pagination_panel(number_of_columns, options[:hide_csv_button]) do
           pagination_panel_content_html =
@@ -274,7 +271,7 @@ module Wice
       title_row_attrs = header_tr_html.clone
       Wice::WgHash.add_or_append_class_value!(title_row_attrs, 'wice-grid-title-row', true)
 
-      grid.output_buffer << %!<tr #{tag_options(title_row_attrs, true)}>!
+      grid.output_buffer << %(<tr #{public_tag_options(title_row_attrs, true)}>)
 
       filter_row_id = grid.name + '_filter_row'
 
@@ -287,7 +284,6 @@ module Wice
       end
 
       rendering.each_column_aware_of_one_last_one(:in_html) do |column, last|
-
         column_name = column.name
 
         opts = column.html
@@ -296,23 +292,43 @@ module Wice
 
         Wice::WgHash.add_or_append_class_value!(opts, column.css_class)
 
-
         if column.attribute && column.ordering
 
           column.add_css_class('active-filter') if grid.filtered_by?(column)
 
           direction = 'asc'
           link_style = nil
+          arrow_class = nil
+
           if grid.ordered_by?(column)
             column.add_css_class('sorted')
             Wice::WgHash.add_or_append_class_value!(opts, 'sorted')
             link_style = grid.order_direction
-            direction = 'desc' if grid.order_direction == 'asc'
+
+            case grid.order_direction
+            when 'asc'
+              direction = 'desc'
+              arrow_class = 'down'
+            when 'desc'
+              direction = 'asc'
+              arrow_class = 'up'
+            end
           end
 
           col_link = link_to(
-            column_name,
-            rendering.column_link(column, direction, params, options[:extra_request_parameters]),
+            (column_name +
+              if arrow_class
+                ' ' + content_tag(:i, '', class: "fa fa-arrow-#{arrow_class}")
+              else
+                ''
+              end).html_safe,
+
+            rendering.column_link(
+              column,
+              direction,
+              params,
+              options[:extra_request_parameters]
+            ),
             class: link_style)
 
           grid.output_buffer << content_tag(:th, col_link, opts)
@@ -320,7 +336,7 @@ module Wice
         else
           if reuse_last_column_for_filter_buttons && last
             grid.output_buffer << content_tag(:th,
-              hide_show_icon(filter_row_id, grid, filter_shown, no_filter_row, options[:show_filters], rendering), opts
+                                              hide_show_icon(filter_row_id, grid, filter_shown, no_filter_row, options[:show_filters], rendering), opts
             )
           else
             grid.output_buffer << content_tag(:th, column_name, opts)
@@ -329,13 +345,12 @@ module Wice
       end
 
       grid.output_buffer << content_tag(:th,
-        hide_show_icon(filter_row_id, grid, filter_shown, no_filter_row, options[:show_filters], rendering)
+                                        hide_show_icon(filter_row_id, grid, filter_shown, no_filter_row, options[:show_filters], rendering)
       ) unless no_rightmost_column
 
       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
           rendering.each_column(:in_html) do |column|
@@ -351,12 +366,11 @@ module Wice
           Wice::WgHash.add_or_append_class_value!(filter_row_attrs, 'wg-filter-row', true)
           filter_row_attrs['id'] = filter_row_id
 
-          grid.output_buffer << %!<tr #{tag_options(filter_row_attrs, true)} !
+          grid.output_buffer << %(<tr #{public_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|
-
             opts = column.html ? column.html.clone : {}
             Wice::WgHash.add_or_append_class_value!(opts, column.css_class)
 
@@ -372,8 +386,8 @@ module Wice
             else
               if reuse_last_column_for_filter_buttons && last
                 grid.output_buffer << content_tag(:th,
-                  reset_submit_buttons(options, grid, rendering),
-                  Wice::WgHash.add_or_append_class_value!(opts, 'filter_icons')
+                                                  reset_submit_buttons(options, grid, rendering),
+                                                  Wice::WgHash.add_or_append_class_value!(opts, 'filter_icons')
                 )
               else
                 grid.output_buffer << content_tag(:th, '', opts)
@@ -381,13 +395,12 @@ module Wice
             end
           end
           unless no_rightmost_column
-            grid.output_buffer << 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
           grid.output_buffer << '</tr>'
         end
       end
 
-
       grid.output_buffer << '</thead><tfoot>'
       grid.output_buffer << rendering.pagination_panel(number_of_columns, options[:hide_csv_button]) do
         if pagination_panel_content_html
@@ -401,36 +414,28 @@ module Wice
 
       grid.output_buffer << '</tfoot><tbody>'
 
-
       # rendering  rows
       cell_value_of_the_ordered_column = nil
       previous_cell_value_of_the_ordered_column = nil
 
       grid.each do |ar| # rows
-
         before_row_output = if rendering.before_row_handler
           call_block(rendering.before_row_handler, ar, number_of_columns_for_extra_rows)
-        else
-          nil
         end
 
         after_row_output = if rendering.after_row_handler
           call_block(rendering.after_row_handler, ar, number_of_columns_for_extra_rows)
-        else
-          nil
         end
 
         replace_row_output = if rendering.replace_row_handler
           call_block(rendering.replace_row_handler, ar, number_of_columns_for_extra_rows)
-        else
-          nil
         end
 
         row_content = if replace_row_output
           no_rightmost_column = true
           replace_row_output
         else
-          row_content, tmp_cell_value_of_the_ordered_column = get_row_content(rendering,ar,sorting_dependant_row_cycling)
+          row_content, tmp_cell_value_of_the_ordered_column = get_row_content(rendering, ar, sorting_dependant_row_cycling)
           cell_value_of_the_ordered_column = tmp_cell_value_of_the_ordered_column if tmp_cell_value_of_the_ordered_column
           row_content
         end
@@ -447,7 +452,7 @@ module Wice
         Wice::WgHash.add_or_append_class_value!(row_attributes, cycle_class)
 
         grid.output_buffer << before_row_output if before_row_output
-        grid.output_buffer << "<tr #{tag_options(row_attributes)}>#{row_content}"
+        grid.output_buffer << "<tr #{public_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
@@ -455,8 +460,6 @@ module Wice
 
       last_row_output = if rendering.last_row_handler
         call_block(rendering.last_row_handler, number_of_columns_for_extra_rows)
-      else
-        nil
       end
 
       grid.output_buffer << last_row_output if last_row_output
@@ -467,18 +470,24 @@ module Wice
 
       link_for_export      = rendering.link_for_export(controller, 'csv', options[:extra_request_parameters])
 
-      parameter_name_for_query_loading = {grid.name => {q: ''}}.to_query
-      parameter_name_for_focus = {grid.name => {foc: ''}}.to_query
+      parameter_name_for_query_loading = { grid.name => { q: '' } }.to_query
+      parameter_name_for_focus = { grid.name => { foc: '' } }.to_query
 
-      processor_initializer_arguments = [base_link_for_filter, base_link_for_show_all_records,
-        link_for_export, parameter_name_for_query_loading, parameter_name_for_focus, Rails.env]
+      processor_initializer_arguments = [
+        base_link_for_filter,
+        base_link_for_show_all_records,
+        link_for_export,
+        parameter_name_for_query_loading,
+        parameter_name_for_focus,
+        Rails.env
+      ]
 
       filter_declarations = if no_filters_at_all
         []
       else
         rendering.select_for(:in_html) do |vc|
           vc.attribute && vc.filter
-        end.collect{|column| column.yield_declaration}
+        end.collect(&:yield_declaration)
       end
 
       wg_data = {
@@ -493,95 +502,92 @@ module Wice
 
       grid.output_buffer << '</div>'
 
-
-
       if Rails.env.development?
-        grid.output_buffer  <<  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$ +
-          %$     "Add line\\n//= require wice_grid.js\\n" +\n$ +
+          %(     "Make sure that you have loaded wice_grid.js.\n" +
+) +
+          %(     "Add line\n//= require wice_grid.js\n" +
+) +
           %$     "to app/assets/javascripts/application.js")\n$ +
-          %$ }\n$ +
+          %( }
+) +
           %$ }) $)
       end
 
       grid.output_buffer
     end
 
-    def hide_show_icon(filter_row_id, grid, filter_shown, no_filter_row, show_filters, rendering)  #:nodoc:
-      grid_name = grid.name
+    def hide_show_icon(_filter_row_id, _grid, filter_shown, no_filter_row, show_filters, _rendering)  #:nodoc:
       no_filter_opening_closing_icon = (show_filters == :always) || no_filter_row
 
-      styles = ["display: block;", "display: none;"]
+      styles = ['display: block;', 'display: none;']
       styles.reverse! unless filter_shown
 
-
       if no_filter_opening_closing_icon
-        hide_icon = show_icon = ''
+        ''
       else
 
-        content_tag(:div, '',
-          title: NlMessage['hide_filter_tooltip'],
-          style: styles[0],
-          class: 'clickable  wg-hide-filter'
+        content_tag(:div, content_tag(:i, '', class: 'fa fa-eye-slash'),
+                    title: NlMessage['hide_filter_tooltip'],
+                    style: styles[0],
+                    class: 'clickable  wg-hide-filter'
         ) +
 
-        content_tag(:div, '',
-          title: NlMessage['show_filter_tooltip'],
-          style: styles[1],
-          class: 'clickable  wg-show-filter'
-        )
+          content_tag(:div, content_tag(:i, '', class: 'fa fa-eye'),
+                      title: NlMessage['show_filter_tooltip'],
+                      style: styles[1],
+                      class: 'clickable  wg-show-filter'
+          )
 
       end
     end
 
-    def reset_submit_buttons(options, grid, rendering)  #:nodoc:
+    def reset_submit_buttons(options, grid, _rendering)  #:nodoc:
       if options[:hide_submit_button]
         ''
       else
-        content_tag(:div, '',
-          title: NlMessage['filter_tooltip'],
-          id:    grid.name + '_submit_grid_icon',
-          class: 'submit clickable'
+        content_tag(:div, content_tag(:i, '', class: 'fa fa-filter'),
+                    title: NlMessage['filter_tooltip'],
+                    id:    grid.name + '_submit_grid_icon',
+                    class: 'submit clickable'
         )
       end.html_safe + ' ' +
-      if options[:hide_reset_button]
-        ''
-      else
+        if options[:hide_reset_button]
+          ''
+        else
 
-        content_tag(:div, '',
-          title: NlMessage['reset_filter_tooltip'],
-          id:    grid.name + '_reset_grid_icon',
-          class: 'reset clickable'
-        )
-      end.html_safe
+          content_tag(:div, content_tag(:i, '', class: 'fa fa-table'),
+                      title: NlMessage['reset_filter_tooltip'],
+                      id:    grid.name + '_reset_grid_icon',
+                      class: 'reset clickable'
+          )
+        end.html_safe
     end
 
     # Renders a detached filter. The parameters are:
     # * +grid+ the WiceGrid object
     # * +filter_key+ an identifier of the filter specified in the column declaration by parameter +:detach_with_id+
     def grid_filter(grid, filter_key)
-      unless grid.kind_of? WiceGrid
-        raise WiceGridArgumentError.new("grid_filter: the parameter must be a WiceGrid instance.")
+      unless grid.is_a? WiceGrid
+        fail WiceGridArgumentError.new('grid_filter: the parameter must be a WiceGrid instance.')
       end
       if grid.output_buffer.nil?
-        raise WiceGridArgumentError.new("grid_filter: You have attempted to run 'grid_filter' before 'grid'. Read about detached filters in the documentation.")
+        fail WiceGridArgumentError.new("grid_filter: You have attempted to run 'grid_filter' before 'grid'. Read about detached filters in the documentation.")
       end
       if grid.output_buffer == true
-        raise WiceGridArgumentError.new("grid_filter: You have defined no detached filters, or you try use detached filters with" +
-          ":show_filters => :no (set :show_filters to :always in this case). Read about detached filters in the documentation.")
+        fail WiceGridArgumentError.new('grid_filter: You have defined no detached filters, or you try use detached filters with' \
+          ':show_filters => :no (set :show_filters to :always in this case). Read about detached filters in the documentation.')
       end
 
       content_tag :span,
-        grid.output_buffer.filter_for(filter_key),
-        class: "wg-detached-filter #{grid.name}_detached_filter",
-        'data-grid-name' => grid.name
+                  grid.output_buffer.filter_for(filter_key),
+                  class: "wg-detached-filter #{grid.name}_detached_filter",
+                  'data-grid-name' => grid.name
     end
 
-
     def grid_csv(grid, rendering) #:nodoc:
-
       spreadsheet = ::Wice::Spreadsheet.new(grid.name, grid.csv_field_separator)
 
       # columns
@@ -596,8 +602,8 @@ module Wice
 
           column_block_output = call_block(cell_block, ar)
 
-          if column_block_output.kind_of?(Array)
-            column_block_output, additional_opts = column_block_output
+          if column_block_output.is_a?(Array)
+            column_block_output, _additional_opts = column_block_output
           end
 
           row << column_block_output
@@ -616,27 +622,25 @@ module Wice
       html = pagination_info(grid, allow_showing_all_records)
 
       paginate(grid.resultset,
-        theme:         'wice_grid',
-        param_name:    "#{grid.name}[page]",
-        params:        extra_request_parameters,
-        inner_window:  4,
-        outer_window:  2
+               theme:         'wice_grid',
+               param_name:    "#{grid.name}[page]",
+               params:        extra_request_parameters,
+               inner_window:  4,
+               outer_window:  2
       ) +
         (' <div class="pagination_status">' + html + '</div>').html_safe
     end
 
-
-    def show_all_link(collection_total_entries, parameters, grid_name) #:nodoc:
-
+    def show_all_link(collection_total_entries, parameters, _grid_name) #:nodoc:
       message = NlMessage['all_queries_warning']
       confirmation = collection_total_entries > Defaults::START_SHOWING_WARNING_FROM ? message : nil
 
       html = content_tag(:a, NlMessage['show_all_records_label'],
-        href:  "#",
-        title: NlMessage['show_all_records_tooltip'],
-        class: 'wg-show-all-link',
-        'data-grid-state'     => parameters.to_json,
-        'data-confim-message' => confirmation
+                         href:  '#',
+                         title: NlMessage['show_all_records_tooltip'],
+                         class: 'wg-show-all-link',
+                         'data-grid-state'     => parameters.to_json,
+                         'data-confim-message' => confirmation
       )
 
       [html, '']
@@ -644,25 +648,22 @@ module Wice
 
     def back_to_pagination_link(parameters, grid_name) #:nodoc:
       pagination_override_parameter_name = "#{grid_name}[pp]"
-      parameters = parameters.reject{|k, v| k == pagination_override_parameter_name}
+      parameters = parameters.reject { |k, _v| k == pagination_override_parameter_name }
 
       content_tag(:a, NlMessage['switch_back_to_paginated_mode_label'],
-        href:   "#",
-        title:  NlMessage['switch_back_to_paginated_mode_tooltip'],
-        class:  'wg-back-to-pagination-link',
-        'data-grid-state' => parameters.to_json
+                  href:   '#',
+                  title:  NlMessage['switch_back_to_paginated_mode_tooltip'],
+                  class:  'wg-back-to-pagination-link',
+                  'data-grid-state' => parameters.to_json
       )
     end
 
     def pagination_info(grid, allow_showing_all_records)  #:nodoc:
-
       collection = grid.resultset
 
       if grid.all_record_mode?
 
         collection_total_entries = collection.length
-        current_page = 1
-        per_page = collection_total_entries
 
         first = 1
         last = collection.size
@@ -681,8 +682,6 @@ module Wice
 
       else
         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
@@ -692,8 +691,7 @@ module Wice
 
       parameters = grid.get_state_as_parameter_value_pairs
 
-      js = ''
-      html = if (num_pages < 2 && collection.length == 0)
+      if num_pages < 2 && collection.length == 0
         '0'
       else
         parameters << ["#{grid.name}[pp]", collection_total_entries]
@@ -706,18 +704,17 @@ module Wice
 
         "#{first}-#{last} / #{collection_total_entries} " +
           if show_all_records_link
-            res, js = show_all_link(collection_total_entries, parameters, grid.name)
+            res, _js = show_all_link(collection_total_entries, parameters, grid.name)
             res
           else
             ''
           end
       end +
-      if grid.all_record_mode?
-        back_to_pagination_link(parameters, grid.name)
-      else
-        ''
-      end
+        if grid.all_record_mode?
+          back_to_pagination_link(parameters, grid.name)
+        else
+          ''
+        end
     end
-
   end
 end