wice_grid 3.6.0 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3643b83501590a87afd3879142d6354d32e7a19b
-  data.tar.gz: d9c0551a69cd1e7eb6b73484ec36670ddb566b8f
+  metadata.gz: 777b992fc1ebf294ec398237e48bc9ce00af6901
+  data.tar.gz: dcef37136f0ef4ed89b46ec9d6fc70c13929453e
 SHA512:
-  metadata.gz: a50ee89b67227a47d257b4b0571984d2aeb3b0172cbe73a9c04de5c828046afbaad465436912182172e450d907af620cdb69469198d6cb9bd0c5b4a7328910e3
-  data.tar.gz: f6837a1b328b5e117d2dc1de534275475dd9a3b7f066ab898b2f29698150ced61683c70cbb53393f631d729b67b25a3b649f65922588441f6296142284dea457
+  metadata.gz: 6eadc9a77111c3c9782f039d3dc5163383893d9ffd9efa17162e95d7f4d8afc07855ac282d64bce240b50d7547999db15dc247c8b67cdbe13bc5eb8edb65a4b7
+  data.tar.gz: 3849db33020c6675b2834e33db7abe1fb1387bb8403da00245eb2e8ed5798643b16949660aa11e7f2998c57ef50863c5352d17d90acd298f8785ec20ad82d916

data/.rubocop.yml

@@ -19,11 +19,16 @@ Style/SpaceAroundBlockParameters:
 
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
-Style/TrailingComma:
-  Enabled: true
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: no_comma
+
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: no_comma
 
 # Cop supports --auto-correct.
-Style/SingleSpaceBeforeFirstArg:
+Style/SpaceBeforeFirstArg:
   Enabled: true
 
 # Cop supports --auto-correct.

data/Gemfile

@@ -1,4 +1,3 @@
-# encoding: utf-8
 source 'https://rubygems.org'
 
 gemspec

data/Rakefile

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'rubygems'
 require 'bundler'
 require 'bundler/gem_tasks'
@@ -17,15 +16,6 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-require 'rubocop/rake_task'
-
-desc 'Run RuboCop on the lib directory'
-RuboCop::RakeTask.new(:rubocop) do |task|
-  task.patterns = ['lib/**/*.rb']
-  # don't abort rake on failure
-  task.fail_on_error = false
-end
-
 desc 'Run RSpec with code coverage'
 task :coverage do
   ENV['COVERAGE'] = 'true'
@@ -56,4 +46,4 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-task default: [:rubocop, :spec, :yardoc]
+task default: [:spec, :yardoc]

data/config/locales/uk.yml

@@ -5,41 +5,41 @@ uk:
       - :month
       - :day
   wice_grid:
-    show_filter_tooltip: Показати фільтр
-    hide_filter_tooltip: Сховати фільтр
-    csv_export_tooltip: Експорт в CSV
-    filter_tooltip: Фільтрувати
-    reset_filter_tooltip: Скинути фільтр
-    boolean_filter_true_label: так
-    boolean_filter_false_label: ні
-    previous_label: «
-    next_label: »
+    show_filter_tooltip: "Показати фільтр"
+    hide_filter_tooltip: "Сховати фільтр"
+    csv_export_tooltip: "Експорт в CSV"
+    filter_tooltip: "Фільтрувати"
+    reset_filter_tooltip: "Скинути фільтр"
+    boolean_filter_true_label: "так"
+    boolean_filter_false_label: "ні"
+    previous_label: "«"
+    next_label: "»"
     # Title of the icon clicking on which will show the calendar to set the FROM date.
-    date_selector_tooltip_from: Від
+    date_selector_tooltip_from: "Від"
     # Title of the icon clicking on which will show the calendar to set the TO date.
-    date_selector_tooltip_to: До
+    date_selector_tooltip_to: "До"
     # The title of the checkox to turn on negation
-    negation_checkbox_title: За винятком
+    negation_checkbox_title: "За винятком"
     # link to switch to show all records
-    show_all_records_label: показати всі
+    show_all_records_label: "показати всі"
     # tooltip for the link to switch to show all records
-    show_all_records_tooltip: Показати всі записи
+    show_all_records_tooltip: "Показати всі записи"
     # Warning message shown when the user wants to switch to all-records mode
-    all_queries_warning: Ви впевнені в тому, що хочете відобразити всі записи?
+    all_queries_warning: "Ви впевнені в тому, що хочете відобразити всі записи?"
     # link to paginated view
-    switch_back_to_paginated_mode_label: Назад до посторінкового виводу
+    switch_back_to_paginated_mode_label: "Назад до посторінкового виводу"
     # tooltip for the link to paginated view
-    switch_back_to_paginated_mode_tooltip: Назад до посторінкового виводу
+    switch_back_to_paginated_mode_tooltip: "Назад до посторінкового виводу"
     # Title of the date string.
-    date_string_tooltip: Натисніть, щоб видалити дату
-    saved_query_panel_title: Збережені фільтри
-    save_query_button_label: Зберегти фільтр
-    saved_query_deletion_confirmation: Ви впевнені?
-    saved_query_deletion_link_title: Видалити збережуваний фільтр
-    saved_query_link_title: Завантажити збережуваний фільтр
-    validates_uniqueness_error: Збережуваний фільтр з такою назвою вже існує
-    validates_presence_error: Будь ласка, введіть назву Збережуваного фільтра
-    query_deleted_message: Збережуваний фільтр видалено.
-    query_saved_message: Збережуваний фільтр збережено.
-    select_all: Виділити все
-    deselect_all: Забрати виділення
+    date_string_tooltip: "Натисніть, щоб видалити дату"
+    saved_query_panel_title: "Збережені фільтри"
+    save_query_button_label: "Зберегти фільтр"
+    saved_query_deletion_confirmation: "Ви впевнені?"
+    saved_query_deletion_link_title: "Видалити збережуваний фільтр"
+    saved_query_link_title: "Завантажити збережуваний фільтр"
+    validates_uniqueness_error: "Збережуваний фільтр з такою назвою вже існує"
+    validates_presence_error: "Будь ласка, введіть назву Збережуваного фільтра"
+    query_deleted_message: "Збережуваний фільтр видалено."
+    query_saved_message: "Збережуваний фільтр збережено."
+    select_all: "Виділити все"
+    deselect_all: "Забрати виділення"

data/lib/generators/wice_grid/add_migration_for_serialized_queries_generator.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module WiceGrid #:nodoc:
   module Generators #:nodoc:
     class AddMigrationForSerializedQueriesGenerator < Rails::Generators::Base  #:nodoc:

data/lib/generators/wice_grid/install_generator.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module WiceGrid #:nodoc:
   module Generators #:nodoc:
     class InstallGenerator < Rails::Generators::Base #:nodoc:

data/lib/generators/wice_grid/templates/create_wice_grid_serialized_queries.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 class CreateWiceGridSerializedQueries < ::ActiveRecord::Migration #:nodoc:
   def change #:nodoc:
     create_table :wice_grid_serialized_queries do |t|

data/lib/generators/wice_grid/templates/wice_grid_config.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 if defined?(Wice::Defaults)
 
   # Default number of rows to show per page.
@@ -134,15 +133,15 @@ if defined?(Wice::Defaults)
 
   # Format of the date displayed.
   # If you change the format, make sure to check if +DATE_PARSER+ can still parse this string.
-  Wice::Defaults::DATE_FORMAT     =  '%Y-%m-%d'
+  Wice::Defaults::DATE_FORMAT = '%Y-%m-%d'
 
   # Format of the date displayed in jQuery's Datepicker
   # If you change the format, make sure to check if +DATE_PARSER+ can still parse this string.
-  Wice::Defaults::DATE_FORMAT_JQUERY     =  'yy-mm-dd'
+  Wice::Defaults::DATE_FORMAT_JQUERY =  'yy-mm-dd'
 
   # Format of the date displayed in Bootstrap's Datepicker
   # If you change the format, make sure to check if +DATE_PARSER+ can still parse this string.
-  Wice::Defaults::DATE_FORMAT_BOOTSTRAP     =  'yyyy-mm-dd'
+  Wice::Defaults::DATE_FORMAT_BOOTSTRAP =  'yyyy-mm-dd'
 
   # With Calendar helpers enabled the parameter sent is the string displayed. This lambda will be given a date string in the
   # format defined by +DATETIME_FORMAT+ and must generate a DateTime object.

data/lib/wice/active_record_column_wrapper.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
   # to be mixed in into ActiveRecord::ConnectionAdapters::Column
   module WiceGridExtentionToActiveRecordColumn #:nodoc:
@@ -31,7 +30,7 @@ module Wice
       return if @all_filter_params.nil?
 
       # if the parameter does not specify the table name we only allow columns in the default table to use these parameters
-      if @main_table && @request_params  = @all_filter_params[@column.name]
+      if @main_table && @request_params = @all_filter_params[@column.name]
         current_parameter_name = @column.name
       elsif @request_params = @all_filter_params[alias_or_table_name(@table_alias) + '.' + @column.name]
         current_parameter_name = alias_or_table_name(@table_alias) + '.' + @column.name

data/lib/wice/columns.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice #:nodoc:
   module Columns #:nodoc:
     mattr_reader :handled_type_view, :handled_type_conditions_generator
@@ -16,20 +15,20 @@ module Wice #:nodoc:
 
           Wice::Defaults::ADDITIONAL_COLUMN_PROCESSORS.each do |key, value|
             unless key.is_a?(Symbol)
-              fail common_error_prefix + 'A key of Wice::Defaults::ADDITIONAL_COLUMN_PROCESSORS should be a Symbol!'
+              raise common_error_prefix + 'A key of Wice::Defaults::ADDITIONAL_COLUMN_PROCESSORS should be a Symbol!'
             end
 
             if @@handled_type_view.key?(key)
-              fail common_error_prefix +
+              raise common_error_prefix +
                 "Column with key \"#{key}\" already exists in WiceGrid, overwriting existing columns is forbidden, please choose another key!"
             end
 
             if !value.is_a?(Array) || value.size != 2
-              fail common_error_prefix +
+              ail common_error_prefix +
                 'A value of Wice::Defaults::ADDITIONAL_COLUMN_PROCESSORS should be a a 2-element array!'
             end
 
-            view_processor, conditions_generator  = value.map(&:to_s).map do |klass|
+            view_processor, conditions_generator = value.map(&:to_s).map do |klass|
               begin
                 eval(klass)
               rescue NameError
@@ -38,12 +37,12 @@ module Wice #:nodoc:
             end
 
             unless view_processor.ancestors.include?(::Wice::Columns::ViewColumn)
-              fail common_error_prefix +
+              raise common_error_prefix +
                 "#{view_processor} should be inherited from Wice::Columns::ViewColumn!"
             end
 
             unless conditions_generator.ancestors.include?(::Wice::Columns::ConditionsGeneratorColumn)
-              fail common_error_prefix +
+              raise common_error_prefix +
                 "#{conditions_generator} should be inherited from Wice::Columns::ConditionsGeneratorColumn!"
             end
 
@@ -59,7 +58,7 @@ module Wice #:nodoc:
 
       def get_conditions_generator_column_processor(column_type) #:nodoc:
         column_type = column_type.intern if column_type.is_a? String
-        @@handled_type_conditions_generator[column_type] || fail("Could not find conditions generator processor for column_type #{column_type}")
+        @@handled_type_conditions_generator[column_type] || raise("Could not find conditions generator processor for column_type #{column_type}")
       end
 
       private
@@ -73,7 +72,7 @@ module Wice #:nodoc:
               processor_class_name = "#{prefix}_#{column_source_file}".classify
 
               unless Wice::Columns.const_defined?(processor_class_name.intern)
-                fail "#{column_source_file}.rb is expected to define #{processor_class_name}!"
+                raise "#{column_source_file}.rb is expected to define #{processor_class_name}!"
               end
               processor_class = eval("Wice::Columns::#{processor_class_name}")
 
@@ -268,7 +267,7 @@ module Wice #:nodoc:
       end
 
       def generate_conditions(_table_alias, _opts) #:nodoc:
-        fail('implement me')
+        raise('implement me')
       end
 
     end

data/lib/wice/columns/column_action.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
   module Columns #:nodoc:
     class ViewColumnAction < ViewColumn #:nodoc:

data/lib/wice/columns/column_boolean.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
   module Columns #:nodoc:
     class ViewColumnBoolean < ViewColumnCustomDropdown #:nodoc:

data/lib/wice/columns/column_bootstrap_datepicker.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
   module Columns #:nodoc:
     class ViewColumnBootstrapDatepicker < ViewColumn #:nodoc:

data/lib/wice/columns/column_custom_dropdown.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
   module Columns #:nodoc:
     class ViewColumnCustomDropdown < ViewColumn #:nodoc:

data/lib/wice/columns/column_float.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice #:nodoc:
   module Columns #:nodoc:
     class ViewColumnFloat < ViewColumnInteger #:nodoc:

data/lib/wice/columns/column_html5_datepicker.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
   module Columns #:nodoc:
     class ViewColumnHtml5Datepicker < ViewColumn #:nodoc:

data/lib/wice/columns/column_integer.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
   module Columns #:nodoc:
     class ViewColumnInteger < ViewColumn #:nodoc:

data/lib/wice/columns/column_jquery_datepicker.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
   module Columns #:nodoc:
     class ViewColumnJqueryDatepicker < ViewColumn #:nodoc:

data/lib/wice/columns/column_processor_index.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice #:nodoc:
   module Columns #:nodoc:
     require 'active_support'

data/lib/wice/columns/column_rails_date_helper.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
   module Columns #:nodoc:
     class ViewColumnRailsDateHelper < ViewColumn #:nodoc:

data/lib/wice/columns/column_rails_datetime_helper.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
   module Columns #:nodoc:
     class ViewColumnRailsDatetimeHelper < ViewColumn #:nodoc:

data/lib/wice/columns/column_range.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
   module Columns #:nodoc:
     class ViewColumnRange < ViewColumn #:nodoc:

data/lib/wice/columns/column_string.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
   module Columns #:nodoc:
     class ViewColumnString < ViewColumn #:nodoc:

data/lib/wice/columns/common_date_datetime_mixin.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
   module Columns #:nodoc:
     module CommonDateDatetimeMixin #:nodoc:

data/lib/wice/columns/common_js_date_datetime_conditions_generator_mixin.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
   module Columns #:nodoc:
     module CommonJsDateDatetimeConditionsGeneratorMixin #:nodoc:

data/lib/wice/columns/common_js_date_datetime_mixin.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
   module Columns #:nodoc:
     module CommonJsDateDatetimeMixin #:nodoc:

data/lib/wice/columns/common_rails_date_datetime_conditions_generator_mixin.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
   module Columns #:nodoc:
     module CommonRailsDateDatetimeConditionsGeneratorMixin #:nodoc:

data/lib/wice/columns/common_standard_helper_date_datetime_mixin.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
   module Columns #:nodoc:
     module CommonStandardDateDatetimeMixin #:nodoc:

data/lib/wice/grid_output_buffer.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
   class GridOutputBuffer < String #:nodoc:
 
@@ -20,7 +19,7 @@ module Wice
 
     # stores HTML code for a detached filter
     def add_filter(detach_with_id, filter_code)
-      fail WiceGridException.new("Detached ID #{detach_with_id} is already used!") if @filters.key? detach_with_id
+      raise WiceGridException.new("Detached ID #{detach_with_id} is already used!") if @filters.key? detach_with_id
       @filters[detach_with_id] = filter_code
     end
 
@@ -30,12 +29,12 @@ module Wice
         if @return_empty_strings_for_nonexistent_filters
           return ''
         else
-          fail WiceGridException.new("No filter with Detached ID '#{detach_with_id}'!")
+          raise WiceGridException.new("No filter with Detached ID '#{detach_with_id}'!")
         end
       end
 
       unless @filters[detach_with_id]
-        fail WiceGridException.new("Filter with Detached ID '#{detach_with_id}' has already been requested once! There cannot be two instances of the same filter on one page")
+        raise WiceGridException.new("Filter with Detached ID '#{detach_with_id}' has already been requested once! There cannot be two instances of the same filter on one page")
       end
 
       res = @filters[detach_with_id]

data/lib/wice/grid_renderer.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Wice
 
   # Instance of `GridRenderer` is injected into the top level block of the `grid` helper.
@@ -158,7 +157,7 @@ module Wice
 
     def action_column(opts = {}, &block)
       if @action_column_present
-        fail Wice::WiceGridException.new('There can be only one action column in a WiceGrid')
+        raise Wice::WiceGridException.new('There can be only one action column in a WiceGrid')
       end
 
       options = {
@@ -323,7 +322,7 @@ module Wice
       assocs = nil
 
       if options[:model]
-        fail WiceGridArgumentError.new('Instead of specifying a model of a joined table please use assoc: :name_of_association')
+        raise WiceGridArgumentError.new('Instead of specifying a model of a joined table please use assoc: :name_of_association')
       end
 
       unless options[:assoc].nil?
@@ -331,7 +330,7 @@ module Wice
         unless options[:assoc].is_a?(Symbol) ||
               (options[:assoc].is_a?(Array) && ! options[:assoc].empty? && options[:assoc].all?{ |assoc| assoc.is_a?(Symbol)})
 
-          fail WiceGridArgumentError.new('Option :assoc can only be a symbol or an array of symbols')
+          raise WiceGridArgumentError.new('Option :assoc can only be a symbol or an array of symbols')
         end
 
         assocs = options[:assoc].is_a?(Symbol) ? [options[:assoc]] : options[:assoc]
@@ -340,11 +339,11 @@ module Wice
       end
 
       if options[:attribute].nil? && options[:model]
-        fail WiceGridArgumentError.new('Option :assoc is only used together with :attribute')
+        raise WiceGridArgumentError.new('Option :assoc is only used together with :attribute')
       end
 
       if options[:attribute] && options[:attribute].index('.')
-        fail WiceGridArgumentError.new("Invalid attribute name #{options[:attribute]}. An attribute name must not contain a table name!")
+        raise WiceGridArgumentError.new("Invalid attribute name #{options[:attribute]}. An attribute name must not contain a table name!")
       end
 
 
@@ -363,7 +362,7 @@ module Wice
             block = ->(obj) { obj.deep_send(*messages) }
           end
         else
-          fail WiceGridArgumentError.new(
+          raise WiceGridArgumentError.new(
             'Missing column block without attribute defined. You can only omit the block if attribute is present.')
         end
       end
@@ -408,7 +407,7 @@ module Wice
             elsif Wice::WgEnumerable.all_items_are_of_class(options[:custom_filter], Array)
               options[:custom_filter]
             else
-              fail WiceGridArgumentError.new(
+              raise WiceGridArgumentError.new(
                 ':custom_filter can equal :auto, an array of string and/or numbers (direct values for the dropdown), ' \
                 'a homogeneous array of symbols (a sequence of methods to send to AR objects in the result set to ' \
                 'retrieve unique values for the dropdown), a Symbol (a shortcut for a one member array of symbols), ' \
@@ -462,7 +461,7 @@ module Wice
           next_model = reflection.klass
           get_model_from_associations(next_model, tail)
         else
-          fail WiceGridArgumentError.new("Association #{head} not found in #{model}")
+          raise WiceGridArgumentError.new("Association #{head} not found in #{model}")
         end
       end
     end
@@ -511,7 +510,7 @@ module Wice
       elsif opts.nil? && block
         @blank_slate_handler = block
       else
-        fail 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
 
@@ -520,7 +519,7 @@ module Wice
         row_attributes = @row_attributes_handler.call(ar_object)
         row_attributes = {} if row_attributes.blank?
         unless row_attributes.is_a?(Hash)
-          fail WiceGridArgumentError.new("row_attributes block must return a hash containing HTML attributes. The returned value is #{row_attributes.inspect}")
+          raise WiceGridArgumentError.new("row_attributes block must return a hash containing HTML attributes. The returned value is #{row_attributes.inspect}")
         end
         row_attributes
       else
@@ -579,7 +578,7 @@ module Wice
         ORDER_DIRECTION_PARAMETER_NAME => direction
       } }
 
-      cleaned_params =  Wice::WgHash.deep_clone params
+      cleaned_params = Wice::WgHash.deep_clone params
       cleaned_params.merge!(extra_parameters)
 
       cleaned_params.delete(:controller)