wice_grid 3.4.8 → 3.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56c4efa80c0a6215fc1061dd5194651b13628416
-  data.tar.gz: 8f53a3c0bc5c10ab9792f9fbefab14072b6b0aa6
+  metadata.gz: c4ac301670447bdd79518dfa9a759e2907862e99
+  data.tar.gz: 3ce402160cbecb319f1a323b20f8165a5b1abc32
 SHA512:
-  metadata.gz: 57575d15eabd156f2a51c9ccf88d0ba2992ccd2170dcb482d39a924989324ca676f556f2aefc9d47bd1ffea8bd4ee2c7b3353ae175a11919fa8aba7d41af5357
-  data.tar.gz: 068a7f6eb8d7680534ba57fc81946930ecda55b4453097c644f5bf751e06214b53af0aca848638cf39c42b0af57970a60806dbbeb65148bdcf8d7d931bedac9c
+  metadata.gz: 22cb097711ef784200fc1a5d3c168c6468f85550af82c920d65b3a9ff2d9e88e27f4b9c26f72fa60ea4f72ec7aba54dad8912bf4ea8d76e3f5b4c353568109f3
+  data.tar.gz: a46bdb7761ffd3c52b67039d2b0eeadedc5ade9ddb341f8ead7b7fd75b2898fd323436822af1ec58124faea50848f4367e2f65d346d9e12b4f66d8cc49c872df

data/README.rdoc

@@ -1,6 +1,6 @@
 = WiceGrid
 
-Version:: 3.4.8
+Version:: 3.4.9
 Author::  Yuri Leikind
 Sources:: https://github.com/leikind/wice_grid/
 Examples online:: http://wicegrid.herokuapp.com
@@ -8,12 +8,10 @@ News:: http://leikind.org/tag/wicegrid/
 Email::   "Yuri Leikind" <yuri.leikind at gmail dot com>
 
 
-The main supported branch is +rails3+.
+The main supported branch is +rails3+. Rails 3 and Rails 4 are supported.
 
 For rails 2 use the +master+ branch:  https://github.com/leikind/wice_grid/tree/master
 
-Rails 4 is supported beginning with version 3.4.x.
-
 
 == Intro
 
@@ -709,7 +707,7 @@ jQuery +datepicker+ uses a different format flavor, therefore there is an additi
 for presenting initial date values in filters, so make sure that +DATE_FORMAT_JQUERY+ and +DATE_FORMAT+
 result in an identical date representation.
 
-Constant +DATEPICKER_YEAR_RANGE+ defined the range of years in the Datepicker year dropdown. Alternatively,
+Constant +DATEPICKER_YEAR_RANGE+ defines the range of years in the Datepicker year dropdown. Alternatively,
 you can always change this range dynamically with the following javascript:
 
   $( ".hasDatepicker" ).datepicker( "option", "yearRange", "2000:2042" );

data/Rakefile

@@ -1,7 +1,7 @@
 require "bundler/gem_tasks"
 require 'rdoc/task'
 
-task :default => :rdoc
+task default: :rdoc
 
 desc 'Generate documentation for the wice_grid plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|

data/lib/generators/wice_grid/templates/wice_grid.css.scss

@@ -37,11 +37,11 @@
     }
 
     .collapse-multi-select-icon{
-      background: transparent url(/assets/icons/grid/collapse.gif) no-repeat;
+      background: transparent image-url("icons/grid/collapse.gif") no-repeat;
     }
 
     .expand-multi-select-icon{
-      background: transparent url(/assets/icons/grid/expand.gif) no-repeat;
+      background: transparent image-url("icons/grid/expand.gif") no-repeat;
     }
 
   }
@@ -56,43 +56,43 @@
   }
 
   .desc {
-    background: transparent url(/assets/icons/grid/arrow_down.gif) right no-repeat
+    background: transparent image-url("icons/grid/arrow_down.gif") right no-repeat
   }
   .asc  {
-    background: transparent url(/assets/icons/grid/arrow_up.gif)   right no-repeat
+    background: transparent image-url("icons/grid/arrow_up.gif")   right no-repeat
   }
 
   .submit.clickable{
-    background: transparent url(/assets/icons/grid/table_refresh.png) no-repeat;
+    background: transparent image-url("icons/grid/table_refresh.png") no-repeat;
     @include icon-dimensions;
   }
 
   .reset.clickable{
-    background: transparent url(/assets/icons/grid/table.png) no-repeat;
+    background: transparent image-url("icons/grid/table.png") no-repeat;
     @include icon-dimensions;
   }
 
 
   .wg-show-filter.clickable,
   .wg-hide-filter.clickable{
-    background: transparent url(/assets/icons/grid/page_white_find.png) no-repeat;
+    background: transparent image-url("icons/grid/page_white_find.png") no-repeat;
     @include icon-dimensions;
   }
 
 
   .export-to-csv-button.clickable{
-    background: transparent url(/assets/icons/grid/page_white_excel.png) no-repeat;
+    background: transparent image-url("icons/grid/page_white_excel.png") no-repeat;
     @include icon-dimensions;
   }
 
   .clickable.select-all{
-    background: transparent url(/assets/icons/grid/tick_all.png) no-repeat;
+    background: transparent image-url("icons/grid/tick_all.png") no-repeat;
     @include icon-dimensions;
     float:left;
   }
 
   .clickable.deselect-all{
-    background: transparent url(/assets/icons/grid/untick_all.png) no-repeat;
+    background: transparent image-url("icons/grid/untick_all.png") no-repeat;
     @include icon-dimensions;
     float:left;
   }
@@ -126,7 +126,7 @@
   ul {margin-left: 0 }
 
   a.wice-grid-delete-query .delete-icon{
-    background: transparent url(/assets/icons/grid/delete.png) no-repeat;
+    background: transparent image-url("icons/grid/delete.png") no-repeat;
     float: left;
     @include icon-dimensions;
   }

data/lib/wice/active_record_column_wrapper.rb

@@ -30,7 +30,7 @@ module Wice
 
       # Preprocess incoming parameters for datetime, if what's coming in is
       # a datetime (with custom_filter it can be anything else, and not
-      # the datetime hash {:fr => ..., :to => ...})
+      # the datetime hash {fr: ..., to: ...})
       if @request_params
         if (@column.type == :datetime || @column.type == :timestamp) && @request_params.is_a?(Hash)
           [:fr, :to].each do |sym|
@@ -47,7 +47,7 @@ module Wice
 
         # Preprocess incoming parameters for date, if what's coming in is
         # a date (with custom_filter it can be anything else, and not
-        # the date hash {:fr => ..., :to => ...})
+        # the date hash {fr: ..., to: ...})
         if @column.type == :date && @request_params.is_a?(Hash)
           [:fr, :to].each do |sym|
             if @request_params[sym]

data/lib/wice/columns/column_action.rb

@@ -18,7 +18,7 @@ module Wice
             ''
           else
             selected = params[grid_name] && params[grid_name][param_name] && params[grid_name][param_name].index(object.send(object_property).to_s)
-            check_box_tag("#{grid_name}[#{param_name}][]", object.send(object_property), selected, :id => nil)
+            check_box_tag("#{grid_name}[#{param_name}][]", object.send(object_property), selected, id: nil)
           end
         end
       end
@@ -35,12 +35,11 @@ module Wice
         return '' unless @select_all_buttons
 
         content_tag(:div, '',
-          :class => 'clickable select-all',
-          :title => NlMessage['select_all']) + ' ' +
+          class: 'clickable select-all',
+          title: NlMessage['select_all']) + ' ' +
         content_tag(:div, '',
-          :class => 'clickable deselect-all',
-          :title => NlMessage['deselect_all'])
-
+          class: 'clickable deselect-all',
+          title: NlMessage['deselect_all'])
       end
 
     end

data/lib/wice/columns/column_custom_dropdown.rb

@@ -16,14 +16,12 @@ module Wice
         @custom_filter = @custom_filter.call if @custom_filter.kind_of? Proc
 
         if @custom_filter.kind_of? Array
-
           @custom_filter = [[@filter_all_label, nil]] + @custom_filter.map{|label, value|
             [label.to_s, value.to_s]
           }
-
         end
 
-        select_options = {:name => @parameter_name + '[]', :id => @dom_id, :class => 'custom-dropdown form-control'}
+        select_options = {name: @parameter_name + '[]', id: @dom_id, class: 'custom-dropdown form-control'}
 
         if @turn_off_select_toggling
           select_toggle = ''
@@ -35,14 +33,14 @@ module Wice
             expand_icon_style, collapse_icon_style = collapse_icon_style, expand_icon_style if select_options[:multiple]
 
             select_toggle = content_tag(:span, '',
-              :title => NlMessage['expand'],
-              :class => 'expand-multi-select-icon clickable',
-              :style => expand_icon_style
+              title: NlMessage['expand'],
+              class: 'expand-multi-select-icon clickable',
+              style: expand_icon_style
             ) +
             content_tag(:span, '',
-              :title => NlMessage['collapse'],
-              :class => 'collapse-multi-select-icon clickable',
-              :style => collapse_icon_style
+              title: NlMessage['collapse'],
+              class: 'collapse-multi-select-icon clickable',
+              style: collapse_icon_style
             )
           else
             select_options[:multiple] = false
@@ -65,8 +63,8 @@ module Wice
 
       def yield_declaration_of_column_filter #:nodoc:
         {
-          :templates => [@query_without_equals_sign],
-          :ids       => [@dom_id]
+          templates: [@query_without_equals_sign],
+          ids:       [@dom_id]
         }
       end
 

data/lib/wice/columns/column_date.rb

@@ -9,8 +9,8 @@ module Wice
 
       def render_standard_filter_internal(params) #:nodoc:
         '<div class="date-filter">' +
-        select_date(params[:fr], {:include_blank => true, :prefix => @name1, :id => @dom_id}) + '<br/>' +
-        select_date(params[:to], {:include_blank => true, :prefix => @name2, :id => @dom_id2}) +
+        select_date(params[:fr], {include_blank: true, prefix: @name1, id: @dom_id}) + '<br/>' +
+        select_date(params[:to], {include_blank: true, prefix: @name2, id: @dom_id2}) +
         '</div>'
       end
 

data/lib/wice/columns/column_datetime.rb

@@ -27,14 +27,14 @@ module Wice
 
         @queris_ids = x.call(:fr) + x.call(:to)
 
-        _, _, @name1, _ = form_parameter_name_id_and_query({:fr => ''})
-        _, _, @name2, _ = form_parameter_name_id_and_query({:to => ''})
+        _, _, @name1, _ = form_parameter_name_id_and_query({fr: ''})
+        _, _, @name2, _ = form_parameter_name_id_and_query({to: ''})
       end
 
 
       def prepare_for_calendar_filter #:nodoc:
-        query, _, @name1, @dom_id = form_parameter_name_id_and_query(:fr => '')
-        query2, _, @name2, @dom_id2 = form_parameter_name_id_and_query(:to => '')
+        query, _, @name1, @dom_id = form_parameter_name_id_and_query(fr: '')
+        query2, _, @name2, @dom_id2 = form_parameter_name_id_and_query(to: '')
 
         @queris_ids = [[query, @dom_id], [query2, @dom_id2] ]
       end
@@ -42,27 +42,27 @@ module Wice
 
       def render_standard_filter_internal(params) #:nodoc:
         '<div class="date-filter">' +
-        select_datetime(params[:fr], {:include_blank => true, :prefix => @name1}) + '<br/>' +
-        select_datetime(params[:to], {:include_blank => true, :prefix => @name2}) +
+        select_datetime(params[:fr], {include_blank: true, prefix: @name1}) + '<br/>' +
+        select_datetime(params[:to], {include_blank: true, prefix: @name2}) +
         '</div>'
       end
 
       def render_calendar_filter_internal(params) #:nodoc:
 
         calendar_data_from = prepare_data_for_calendar(
-          :initial_date => params[:fr],
-          :title        => NlMessage['date_selector_tooltip_from'],
-          :name         => @name1,
-          :fire_event   => auto_reload,
-          :grid_name    => self.grid.name
+          initial_date: params[:fr],
+          title:        NlMessage['date_selector_tooltip_from'],
+          name:         @name1,
+          fire_event:   auto_reload,
+          grid_name:    self.grid.name
         )
 
         calendar_data_to = prepare_data_for_calendar(
-          :initial_date => params[:to],
-          :title        => NlMessage['date_selector_tooltip_to'],
-          :name         => @name2,
-          :fire_event   => auto_reload,
-          :grid_name    => self.grid.name
+          initial_date: params[:to],
+          title:        NlMessage['date_selector_tooltip_to'],
+          name:         @name2,
+          fire_event:   auto_reload,
+          grid_name:    self.grid.name
         )
 
         calendar_data_from.the_other_datepicker_id_to   = calendar_data_to.dom_id
@@ -89,8 +89,8 @@ module Wice
 
       def yield_declaration_of_column_filter #:nodoc:
         {
-          :templates => @queris_ids.collect{|tuple|  tuple[0] },
-          :ids       => @queris_ids.collect{|tuple|  tuple[1] }
+          templates: @queris_ids.collect{|tuple|  tuple[0] },
+          ids:       @queris_ids.collect{|tuple|  tuple[1] }
         }
       end
 

data/lib/wice/columns/column_integer.rb

@@ -8,9 +8,9 @@ module Wice
       def render_filter_internal(params) #:nodoc:
         @contains_a_text_input = true
 
-        @query, _, parameter_name, @dom_id = form_parameter_name_id_and_query(:eq => '')
+        @query, _, parameter_name, @dom_id = form_parameter_name_id_and_query(eq: '')
 
-        opts = {:size => 3, :id => @dom_id,  :class => 'range-start'}
+        opts = {size: 3, id: @dom_id, class: 'range-start'}
 
         opts[:class] += ' form-control input-sm'
 
@@ -23,8 +23,8 @@ module Wice
 
       def yield_declaration_of_column_filter #:nodoc:
         {
-          :templates => [@query],
-          :ids       => [@dom_id]
+          templates: [@query],
+          ids:       [@dom_id]
         }
       end
 

data/lib/wice/columns/column_range.rb

@@ -8,11 +8,11 @@ module Wice
       def render_filter_internal(params) #:nodoc:
         @contains_a_text_input = true
 
-        @query,  _, parameter_name,  @dom_id  = form_parameter_name_id_and_query(:fr => '')
-        @query2, _, parameter_name2, @dom_id2 = form_parameter_name_id_and_query(:to => '')
+        @query,  _, parameter_name,  @dom_id  = form_parameter_name_id_and_query(fr: '')
+        @query2, _, parameter_name2, @dom_id2 = form_parameter_name_id_and_query(to: '')
 
-        opts1 = {:size => 2, :id => @dom_id,  :class => 'form-control input-sm range-start'}
-        opts2 = {:size => 2, :id => @dom_id2, :class => 'form-control input-sm range-end'}
+        opts1 = {size: 2, id: @dom_id,  class: 'form-control input-sm range-start'}
+        opts2 = {size: 2, id: @dom_id2, class: 'form-control input-sm range-end'}
 
         if auto_reload
           opts1[:class] += ' auto-reload'
@@ -22,13 +22,13 @@ module Wice
         content_tag(
           :div,
           text_field_tag(parameter_name,  params[:fr], opts1) + text_field_tag(parameter_name2, params[:to], opts2),
-          :class => 'form-inline')
+          class: 'form-inline')
       end
 
       def yield_declaration_of_column_filter #:nodoc:
         {
-          :templates => [@query, @query2],
-          :ids       => [@dom_id, @dom_id2]
+          templates: [@query, @query2],
+          ids:       [@dom_id, @dom_id2]
         }
       end
 

data/lib/wice/columns/column_string.rb

@@ -14,24 +14,24 @@ module Wice
         if negation
           self.auto_reloading_input_with_negation_checkbox = true if auto_reload
 
-          @query, _, parameter_name, @dom_id = form_parameter_name_id_and_query(:v => '')
-          @query2, _, parameter_name2, @dom_id2 = form_parameter_name_id_and_query(:n => '')
+          @query, _, parameter_name, @dom_id = form_parameter_name_id_and_query(v: '')
+          @query2, _, parameter_name2, @dom_id2 = form_parameter_name_id_and_query(n: '')
 
           '<div class="text-filter-container">' +
-            text_field_tag(parameter_name, params[:v], :size => 8, :id => @dom_id, :class => css_class) +
+            text_field_tag(parameter_name, params[:v], size: 8, id: @dom_id, class: css_class) +
             if defined?(Wice::Defaults::NEGATION_CHECKBOX_LABEL) && ! Wice::ConfigurationProvider.value_for(:NEGATION_CHECKBOX_LABEL).blank?
               Wice::ConfigurationProvider.value_for(:NEGATION_CHECKBOX_LABEL)
             else
               ''
             end +
             check_box_tag(parameter_name2, '1', (params[:n] == '1'),
-              :id => @dom_id2,
-              :title => NlMessage['negation_checkbox_title'],
-              :class => "negation-checkbox #{css_class}") +
+              id: @dom_id2,
+              title: NlMessage['negation_checkbox_title'],
+              class: "negation-checkbox #{css_class}") +
             '</div>'
         else
           @query, _, parameter_name, @dom_id = form_parameter_name_id_and_query('')
-          text_field_tag(parameter_name, (params.blank? ? '' : params), :size => 8, :id => @dom_id, :class => css_class)
+          text_field_tag(parameter_name, (params.blank? ? '' : params), size: 8, id: @dom_id, class: css_class)
         end
       end
 
@@ -39,13 +39,13 @@ module Wice
       def yield_declaration_of_column_filter #:nodoc:
         if negation
           {
-            :templates => [@query, @query2],
-            :ids       => [@dom_id, @dom_id2]
+            templates: [@query, @query2],
+            ids:       [@dom_id, @dom_id2]
           }
         else
           {
-            :templates => [@query],
-            :ids       => [@dom_id]
+            templates: [@query],
+            ids:       [@dom_id]
           }
         end
       end

data/lib/wice/columns.rb

@@ -165,9 +165,9 @@ module Wice #:nodoc:
         declaration = yield_declaration_of_column_filter
         if declaration
           {
-            :filterName => self.name,
-            :detached    => detachness,
-            :declaration => declaration
+            filterName:  self.name,
+            detached:    detachness,
+            declaration: declaration
           }
         end
       end
@@ -245,7 +245,7 @@ module Wice #:nodoc:
       protected
 
       def form_parameter_template(v) #:nodoc:
-        {@grid.name => {:f => {self.attribute_name_fully_qualified_for_all_but_main_table_columns => v}}}.to_query
+        {@grid.name => {f: {self.attribute_name_fully_qualified_for_all_but_main_table_columns => v}}}.to_query
       end
 
       def form_parameter_name(v) #:nodoc:

data/lib/wice/grid_renderer.rb

@@ -92,8 +92,8 @@ module Wice
 
     def csv_export_icon #:nodoc:
       content_tag(:div, '',
-        :title => NlMessage['csv_export_tooltip'],
-        :class => 'clickable export-to-csv-button'
+        title: NlMessage['csv_export_tooltip'],
+        class: 'clickable export-to-csv-button'
       )
     end
 
@@ -146,10 +146,10 @@ module Wice
       end
 
       options = {
-        :param_name     => :selected,
-        :html           => {},
-        :select_all_buttons => true,
-        :object_property => :id
+        param_name:          :selected,
+        html:                {},
+        select_all_buttons:  true,
+        object_property:     :id
       }
 
       opts.assert_valid_keys(options.keys)
@@ -157,8 +157,15 @@ module Wice
       @action_column_present = true
       column_processor_klass = Columns.get_view_column_processor(:action)
 
-      @columns << column_processor_klass.new(@grid, options[:html], options[:param_name],
-            options[:select_all_buttons], options[:object_property], @view, block)
+      @columns << column_processor_klass.new(
+        @grid,
+        options[:html],
+        options[:param_name],
+        options[:select_all_buttons],
+        options[:object_property],
+        @view,
+        block
+      )
     end
 
     # Defines everything related to a column in a grid - column name, filtering, rendering cells, etc.
@@ -170,7 +177,7 @@ module Wice
     #
     # * <tt>:name</tt> - Name of the column.
     # * <tt>:html</tt> - a hash of HTML attributes to be included into the <tt>td</tt> tag.
-    # * <tt>:class</tt> - a shortcut for <tt>:html => {:class => 'css_class'}</tt>
+    # * <tt>:class</tt> - a shortcut for <tt>html: {class: 'css_class'}</tt>
     # * <tt>:attribute</tt> - name of a database column (which normally correspond to a model attribute with the
     #   same name). By default the field is assumed to belong to the default table (see documentation for the
     #   +initialize_grid+ method). Parameter <tt>:model</tt> allows to specify another table. Presence of
@@ -273,26 +280,26 @@ module Wice
 
     def column(opts = {}, &block)
       options = {
-        :allow_multiple_selection   => Defaults::ALLOW_MULTIPLE_SELECTION,
-        :ordering                   => true,
-        :attribute                  => nil,
-        :auto_reload                => Defaults::AUTO_RELOAD,
-        :boolean_filter_false_label => NlMessage['boolean_filter_false_label'],
-        :boolean_filter_true_label  => NlMessage['boolean_filter_true_label'],
-        :class                      => nil,
-        :name                       => '',
-        :custom_filter              => nil,
-        :detach_with_id             => nil,
-        :filter_all_label           => Defaults::CUSTOM_FILTER_ALL_LABEL,
-        :helper_style               => Defaults::HELPER_STYLE,
-        :in_csv                     => true,
-        :in_html                    => true,
-        :model                      => nil,
-        :negation                   => Defaults::NEGATION_IN_STRING_FILTERS,
-        :filter                     => true,
-        :filter_type                => nil,
-        :table_alias                => nil,
-        :html                       => {}
+        allow_multiple_selection:    Defaults::ALLOW_MULTIPLE_SELECTION,
+        ordering:                    true,
+        attribute:                   nil,
+        auto_reload:                 Defaults::AUTO_RELOAD,
+        boolean_filter_false_label:  NlMessage['boolean_filter_false_label'],
+        boolean_filter_true_label:   NlMessage['boolean_filter_true_label'],
+        class:                       nil,
+        name:                        '',
+        custom_filter:               nil,
+        detach_with_id:              nil,
+        filter_all_label:            Defaults::CUSTOM_FILTER_ALL_LABEL,
+        helper_style:                Defaults::HELPER_STYLE,
+        in_csv:                      true,
+        in_html:                     true,
+        model:                       nil,
+        negation:                    Defaults::NEGATION_IN_STRING_FILTERS,
+        filter:                      true,
+        filter_type:                 nil,
+        table_alias:                 nil,
+        html:                        {}
       }
 
       opts.assert_valid_keys(options.keys)
@@ -426,14 +433,14 @@ module Wice
     # and there are no records to render.
     # In addition to the block style two other variants are accepted:
     # *   <tt>g.blank_slate "some text to be rendered"</tt>
-    # *   <tt>g.blank_slate :partial => "partial_name"</tt>
+    # *   <tt>g.blank_slate partial: "partial_name"</tt>
     def blank_slate(opts = nil, &block)
       if (opts.is_a?(Hash) && opts.has_key?(:partial) && block.nil?) || (opts.is_a?(String) && block.nil?)
         @blank_slate_handler = opts
       elsif opts.nil? && block
         @blank_slate_handler = block
       else
-        raise WiceGridArgumentError.new("blank_slate accepts only a string, a block, or :template => 'path_to_template' ")
+        raise WiceGridArgumentError.new("blank_slate accepts only a string, a block, or template: 'path_to_template' ")
       end
     end
 
@@ -501,7 +508,7 @@ module Wice
       end
 
       query_params = {@grid.name => {
-        @@order_parameter_name => column_attribute_name,
+        @@order_parameter_name           => column_attribute_name,
         @@order_direction_parameter_name => direction
       }}
 

data/lib/wice/wice_grid_controller.rb

@@ -90,7 +90,7 @@ module Wice
     # This convention can be easily overridden by supplying a hash parameter to +export_grid_if_requested+ where each key is the name of
     # a grid, and the value is the name of the template (like it is specified for +render+, i.e. without '_' and extensions):
     #
-    #   export_grid_if_requested(:grid => 'orders', 'grid2' => 'invoices')
+    #   export_grid_if_requested(grid: => 'orders', 'grid2' => 'invoices')
     #
     # If the request is not a CSV export request, the method does nothing and returns +false+, if it is a CSV export request,
     # the method returns +true+.
@@ -98,12 +98,12 @@ module Wice
     # If the action has no explicit +render+ call, it's OK to just place +export_grid_if_requested+ as the last line of the action. Otherwise,
     # to avoid double rendering, use the return value of the method to conditionally call your +render+ :
     #
-    #    export_grid_if_requested || render(:action => 'index')
+    #    export_grid_if_requested || render(action: 'index')
     #
     # It's also possible to supply a block which will be called if no CSV export is requested:
     #
     #    export_grid_if_requested do
-    #     render(:action => 'index')
+    #     render(action: 'index')
     #    end
 
     def export_grid_if_requested(opts = {})
@@ -112,11 +112,11 @@ module Wice
       if grid
         template_name = opts[grid.name] || opts[grid.name.intern]
         template_name ||= grid.name + '_grid'
-        temp_filename = render_to_string(:partial => template_name)
+        temp_filename = render_to_string(partial: template_name)
         temp_filename = temp_filename.strip
         filename = (grid.csv_file_name || grid.name ) + '.csv'
         grid.csv_tempfile.close
-        send_file_rails2 temp_filename, :filename => filename, :type => 'text/csv; charset=utf-8'
+        send_file_rails2 temp_filename, filename: filename, type: 'text/csv; charset=utf-8'
         grid.csv_tempfile = nil
         true
       else
@@ -137,10 +137,12 @@ module Wice
     #   <tt>:model</tt> of the column declaration with the target custom filter.
     # * <tt>:value</tt> - the value of the column filter.
     def wice_grid_custom_filter_params(opts = {})
-      options = {:grid_name => 'grid',
-                 :attribute => nil,
-                 :model => nil,
-                 :value => nil}
+      options = {
+        :grid_name => 'grid',
+        :attribute => nil,
+        :model => nil,
+        :value => nil
+      }
       options.merge!(opts)
 
       [:attribute, :value].each do |key|
@@ -173,16 +175,16 @@ module Wice
       @performed_render = false
 
       logger.info "Sending file #{path}" unless logger.nil?
-      File.open(path, 'rb') { |file| render :status => options[:status], :text => file.read }
+      File.open(path, 'rb') { |file| render status: options[:status], text: file.read }
     end
 
 
     DEFAULT_SEND_FILE_OPTIONS_RAILS2 = { #:nodoc:
-      :type         => 'application/octet-stream'.freeze,
-      :disposition  => 'attachment'.freeze,
-      :stream       => true,
-      :buffer_size  => 4096,
-      :x_sendfile   => false
+      type:         'application/octet-stream'.freeze,
+      disposition:  'attachment'.freeze,
+      stream:       true,
+      buffer_size:  4096,
+      x_sendfile:   false
     }.freeze
 
     def send_file_headers_rails2!(options) #:nodoc:

data/lib/wice/wice_grid_core_ext.rb

@@ -66,9 +66,9 @@ module Wice
       # 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]]
+      # { 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']) #=>
+      # { 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 = []

data/lib/wice/wice_grid_misc.rb

@@ -86,7 +86,7 @@ module Wice
     class << self
 
       def [](key) #:nodoc:
-        translated = I18n.t(key, :scope => 'wice_grid')
+        translated = I18n.t(key, scope: 'wice_grid')
       end
 
     end

data/lib/wice/wice_grid_serialized_queries_controller.rb

@@ -11,22 +11,22 @@ module Wice
       # if Rails.version[0..1] == '3.'
 
       #   map.match '/wice_grid_serialized_queries/:grid_name',
-      #     :to => "#{controller}#create",
-      #     :as => 'create_serialized_query'
+      #     to: "#{controller}#create",
+      #     as: 'create_serialized_query'
 
       #   map.match '/wice_grid_serialized_queries/:grid_name/:id',
-      #     :to => "#{controller}#delete",
-      #     :as => 'delete_serialized_query'
+      #     to: "#{controller}#delete",
+      #     as: 'delete_serialized_query'
 
       # else
 
         map.post '/wice_grid_serialized_queries/:grid_name',
-          :to => "#{controller}#create_saved_query",
-          :as => 'create_serialized_query'
+          to: "#{controller}#create_saved_query",
+          as: 'create_serialized_query'
 
         map.post '/wice_grid_serialized_queries/:grid_name/:id',
-          :to => "#{controller}#delete_saved_query",
-          :as => 'delete_serialized_query'
+          to: "#{controller}#delete_saved_query",
+          as: 'delete_serialized_query'
 
       # end
     end
@@ -84,10 +84,10 @@ module Wice
     protected
 
     def render_asyns_result
-      render :json => {
-        'error_messages' => @error_messages,
+      render json: {
+        'error_messages'        => @error_messages,
         'notification_messages' => @notification_messages,
-        'query_list' => render_to_string(:inline => '<%=saved_queries_list(@grid_name, @saved_query, controller.extra, @confirm).html_safe%>')
+        'query_list'            => render_to_string(inline: '<%=saved_queries_list(@grid_name, @saved_query, controller.extra, @confirm).html_safe%>')
       }
     end
 

data/lib/wice/wice_grid_serialized_query.rb

@@ -2,13 +2,12 @@
 class WiceGridSerializedQuery < ActiveRecord::Base  #:nodoc:
   serialize :query
 
-  validates_uniqueness_of :name, :scope => :grid_name, :on => :create,
-    :message => 'A query with this name already exists'
+  validates_uniqueness_of :name, scope: :grid_name, on: :create, message: 'A query with this name already exists'
 
-  validates_presence_of :name, :message => 'Please submit the name of the custom query'
+  validates_presence_of :name, message: 'Please submit the name of the custom query'
 
   def self.list(name, controller)
-    conditions = {:grid_name => name}
+    conditions = {grid_name: name}
     self.where(conditions).to_a
   end
 

data/lib/wice/wice_grid_spreadsheet.rb

@@ -5,29 +5,15 @@ module Wice
   class Spreadsheet  #:nodoc:
 
     attr_reader :tempfile
-    # CSV in 1.9.1 is a version of FasterCSV
-    if RUBY_VERSION =~ /^1\.9\./ || RUBY_VERSION =~ /^2\./
 
-      def initialize(name, field_separator)  #:nodoc:
-        @tempfile = Tempfile.new(name)
-        @csv = CSV.new(@tempfile, :col_sep => field_separator)
-      end
-
-      def << (row)  #:nodoc:
-        @csv << row
-      end
-
-    else
-      def initialize(name, field_separator)  #:nodoc:
-        @tempfile = Tempfile.new(name)
-        @field_separator = field_separator
-      end
+    def initialize(name, field_separator)  #:nodoc:
+      @tempfile = Tempfile.new(name)
+      @csv = CSV.new(@tempfile, col_sep: field_separator)
+    end
 
-      def << (row)  #:nodoc:
-        CSV::Writer.generate(@tempfile, @field_separator) do |csv|
-           csv << row.map(&:to_s)
-        end
-      end
+    def << (row)  #:nodoc:
+      @csv << row
     end
+
   end
 end

data/lib/wice_grid.rb

@@ -52,6 +52,10 @@ module Wice
         require 'wice/kaminari_monkey_patching.rb'
       end
     end
+
+    initializer "wice_grid_railtie.configure_rails_assets_precompilation" do |app|
+      app.config.assets.precompile << 'icons/grid/*'
+    end
   end
 
   class WiceGrid
@@ -95,24 +99,24 @@ module Wice
       begin
         # options that are understood
         @options = {
-          :conditions           => nil,
-          :csv_file_name        => nil,
-          :csv_field_separator  => Defaults::CSV_FIELD_SEPARATOR,
-          :custom_order         => {},
-          :enable_export_to_csv => Defaults::ENABLE_EXPORT_TO_CSV,
-          :group                => nil,
-          :include              => nil,
-          :joins                => nil,
-          :name                 => Defaults::GRID_NAME,
-          :order                => nil,
-          :order_direction      => Defaults::ORDER_DIRECTION,
-          :page                 => 1,
-          :page_method_name     => Defaults::PAGE_METHOD_NAME,
-          :per_page             => Defaults::PER_PAGE,
-          :saved_query          => nil,
-          :total_entries        => nil,
-          :with_paginated_resultset  => nil,
-          :with_resultset       => nil
+          conditions:                 nil,
+          csv_file_name:              nil,
+          csv_field_separator:        Defaults::CSV_FIELD_SEPARATOR,
+          custom_order:               {},
+          enable_export_to_csv:       Defaults::ENABLE_EXPORT_TO_CSV,
+          group:                      nil,
+          include:                    nil,
+          joins:                      nil,
+          name:                       Defaults::GRID_NAME,
+          order:                      nil,
+          order_direction:            Defaults::ORDER_DIRECTION,
+          page:                       1,
+          page_method_name:           Defaults::PAGE_METHOD_NAME,
+          per_page:                   Defaults::PER_PAGE,
+          saved_query:                nil,
+          total_entries:              nil,
+          with_paginated_resultset:   nil,
+          with_resultset:             nil
         }
       rescue NameError
         raise NameError.new('A constant is missing in wice_grid_config.rb: ' + $!.message +
@@ -258,9 +262,11 @@ module Wice
       end
 
       # conditions
-      if @table_column_matrix.generated_conditions.size == 0
-        @status.delete(:f)
-      end
+      # do not delete for a while
+      # https://github.com/leikind/wice_grid/issues/144
+      # if @table_column_matrix.generated_conditions.size == 0
+      #   @status.delete(:f)
+      # end
 
       @ar_options[:conditions] = klass.send(:merge_conditions, @status[:conditions], * @table_column_matrix.conditions )
 
@@ -407,8 +413,13 @@ module Wice
     end
 
     def count  #:nodoc:
-      form_ar_options(:skip_ordering => true, :forget_generated_options => true)
-      @relation.count(:conditions => @ar_options[:conditions], :joins => @ar_options[:joins], :include => @ar_options[:include], :group => @ar_options[:group])
+      form_ar_options(skip_ordering: true, forget_generated_options: true)
+      @relation.count(
+        conditions: @ar_options[:conditions],
+        joins:      @ar_options[:joins],
+        include:    @ar_options[:include],
+        group:      @ar_options[:group]
+      )
     end
 
     alias_method :size, :count
@@ -559,10 +570,10 @@ module Wice
     #   form_ar_options
     #   @klass.unscoped do
     #     @relation.count(
-    #       :joins => @ar_options[:joins],
-    #       :include => @ar_options[:include],
-    #       :group => @ar_options[:group],
-    #       :conditions => @options[:conditions]
+    #       joins:      @ar_options[:joins],
+    #       include:    @ar_options[:include],
+    #       group:      @ar_options[:group],
+    #       conditions: @options[:conditions]
     #     )
     #   end
     # end

data/wice_grid.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name          = 'wice_grid'
-  s.version       = '3.4.8'
+  s.version       = '3.4.9'
   s.homepage      = 'https://github.com/leikind/wice_grid'
-  s.date          = '2014-08-27'
+  s.date          = '2014-08-03'
   s.summary       = 'A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters.'
   s.description   = 'A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters.' +
                     'One of the goals of this plugin was to allow the programmer to define the contents of the cell by himself, '  +
@@ -22,11 +22,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(kaminary, [kaminary_version])
+      s.add_runtime_dependency('coffee-rails')
     else
       s.add_dependency(kaminari, [kaminary_version])
+      s.add_dependency('coffee-rails')
     end
   else
     s.add_dependency(kaminari, [kaminary_version])
+    s.add_dependency('coffee-rails')
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wice_grid
 version: !ruby/object:Gem::Version
-  version: 3.4.8
+  version: 3.4.9
 platform: ruby
 authors:
 - Yuri Leikind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.0
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Rails grid plugin to create grids with sorting, pagination, and (automatically
   generated) filters.One of the goals of this plugin was to allow the programmer to
   define the contents of the cell by himself, just like one does when rendering a
@@ -72,7 +86,6 @@ files:
 - lib/wice/helpers/wice_grid_serialized_queries_view_helpers.rb
 - lib/wice/helpers/wice_grid_view_helpers.rb
 - lib/wice/kaminari_monkey_patching.rb
-- lib/wice/memory_adapter.rb
 - lib/wice/table_column_matrix.rb
 - lib/wice/wice_grid_controller.rb
 - lib/wice/wice_grid_core_ext.rb

data/lib/wice/memory_adapter.rb

@@ -1,172 +0,0 @@
-# encoding: UTF-8
-module Wice
-  module MemoryAdapter
-    class MemoryAdapter
-      def initialize(rows, columns, kaminarafy = true)
-        @rows = rows
-        @klass = MemoryAdapterKlass.new(columns, self)
-        @columns = Set.new
-        columns.each do |col|
-          @columns << col.name.to_sym
-        end
-        @page_num = 1
-        @per_page = 20
-      end
-
-      def klass
-        @klass
-      end
-
-      def total_count
-        length
-      end
-
-      def length
-        @rows.length
-      end
-
-      # 1-based page number
-      def current_page
-        @page_num
-      end
-
-      def limit_value
-        @per_page
-      end
-
-      def total_pages
-        total_pages=(length.to_f / @per_page).ceil
-        total_pages
-      end
-
-      # 0-based index into array
-      def offset_value
-        @page_num = total_pages if current_page > total_pages
-
-        offset_value = (current_page-1) * @per_page
-        offset_value
-      end
-
-      def num_pages
-        total_pages
-      end
-
-      def last_page?
-        last_page = current_page==total_pages
-        last_page
-      end
-
-      def includes(*opts)
-        self
-      end
-
-      def joins(*opts)
-        self
-      end
-
-      def order(*opts)
-        self
-      end
-
-      def where(*opts)
-        self
-      end
-
-      def page(num)
-        @page_num=num.to_i
-        @page_num =1 if @page_num < 1
-        self
-      end
-
-      def per(num)
-        @per_page=num.to_i
-        @per_page = 1 if @per_page < 1
-        self
-      end
-
-      def each
-        start_index = offset_value
-        end_index = offset_value + @per_page
-        slice = @rows[start_index...end_index]
-        if slice
-          slice.each do |row|
-            yield Row.new(row, self)
-          end
-        end
-      end
-
-      def has_column?(col)
-        @columns.include?(col)
-      end
-    end
-
-    class MemoryAdapterKlass
-      def initialize(columns, memory_adapter)
-        @columns = columns
-        @memory_adapter = memory_adapter
-      end
-
-      def columns
-        @columns
-      end
-
-      def table_name
-        SecureRandom.hex
-      end
-
-      def merge_conditions(*conditions)
-        ""
-      end
-
-      def unscoped(&code)
-        #@memory_adapter.unscope
-        code.call
-        self
-      end
-
-      def connection
-      end
-    end
-
-    class Row
-      def initialize(row, memory_adapter)
-        @row=row
-        @memory_adapter = memory_adapter
-      end
-
-      def method_missing(m, *args, &block)
-        if @memory_adapter.has_column?(m)
-          @row[m]
-        else
-          super
-        end
-      end
-    end
-
-    class Column
-      def initialize(name)
-        @name = name.to_s
-        @model = Model.new
-      end
-
-      def name
-        @name
-      end
-
-      def model
-        @model
-      end
-
-      def model=(model)
-        @model=model
-      end
-
-      def type
-        :string
-      end
-    end
-
-    class Model
-    end
-  end
-end