datagrid 1.5.8 → 1.6.2

data/lib/datagrid/filters/dynamic_filter.rb

@@ -4,12 +4,22 @@ class Datagrid::Filters::DynamicFilter < Datagrid::Filters::BaseFilter
 
   include Datagrid::Filters::SelectOptions
 
+  EQUAL_OPERATION = '='
+  LIKE_OPERATION = '=~'
+  MORE_EQUAL_OPERATION = '>='
+  LESS_EQUAL_OPERATION = '<='
+  DEFAULT_OPERATIONS = [
+    EQUAL_OPERATION,
+    LIKE_OPERATION,
+    MORE_EQUAL_OPERATION,
+    LESS_EQUAL_OPERATION,
+  ]
   AVAILABLE_OPERATIONS = %w(= =~ >= <=)
 
   def initialize(*)
     super
     options[:select] ||= default_select
-    options[:operations] ||= AVAILABLE_OPERATIONS
+    options[:operations] ||= DEFAULT_OPERATIONS
     unless options.has_key?(:include_blank)
       options[:include_blank] = false
     end
@@ -35,12 +45,12 @@ class Datagrid::Filters::DynamicFilter < Datagrid::Filters::BaseFilter
       raise Datagrid::FilteringError, "Unknown operation: #{operation.inspect}. Available operations: #{operations.join(' ')}"
     end
     case operation
-    when '='
+    when EQUAL_OPERATION
       if date_conversion
         value = Datagrid::Utils.format_date_as_timestamp(value)
       end
       driver.where(scope, field, value)
-    when '=~'
+    when LIKE_OPERATION
       if column_type(field) == :string
         driver.contains(scope, field, value)
       else
@@ -49,12 +59,12 @@ class Datagrid::Filters::DynamicFilter < Datagrid::Filters::BaseFilter
         end
         driver.where(scope, field, value)
       end
-    when '>='
+    when MORE_EQUAL_OPERATION
       if date_conversion
         value = value.beginning_of_day
       end
       driver.greater_equal(scope, field, value)
-    when '<='
+    when LESS_EQUAL_OPERATION
       if date_conversion
         value = value.end_of_day
       end

data/lib/datagrid/filters/select_options.rb

@@ -1,9 +1,6 @@
 module Datagrid::Filters::SelectOptions
 
-  def select(object = nil)
-    unless object
-      Datagrid::Utils.warn_once("#{self.class.name}#select without argument is deprecated")
-    end
+  def select(object)
     select = self.options[:select]
     if select.is_a?(Symbol)
       object.send(select)

data/lib/datagrid/form_builder.rb

@@ -4,19 +4,21 @@ module Datagrid
   module FormBuilder
 
     # Returns a form input html for the corresponding filter name
-    def datagrid_filter(filter_or_attribute, options = {}, &block)
+    def datagrid_filter(filter_or_attribute, **options, &block)
       filter = datagrid_get_filter(filter_or_attribute)
-      options = add_html_classes(options, filter.name, datagrid_filter_html_class(filter))
+      options = {
+        **filter.input_options,
+        **add_html_classes(options, filter.name, datagrid_filter_html_class(filter))
+      }
       # Prevent partials option from appearing in HTML attributes
       options.delete(:partials) # Legacy option
       self.send(filter.form_builder_helper_name, filter, options, &block)
     end
 
     # Returns a form label html for the corresponding filter name
-    def datagrid_label(filter_or_attribute, options_or_text = {}, options = {}, &block)
+    def datagrid_label(filter_or_attribute, text = nil, **options, &block)
       filter = datagrid_get_filter(filter_or_attribute)
-      text, options = options_or_text.is_a?(Hash) ? [filter.header, options_or_text] : [options_or_text, options]
-      label(filter.name, text, options, &block)
+      label(filter.name, text || filter.header, **filter.label_options, **options, &block)
     end
 
     protected
@@ -42,7 +44,7 @@ module Datagrid
 
     def datagrid_default_filter(attribute_or_filter, options = {})
       filter = datagrid_get_filter(attribute_or_filter)
-      text_field filter.name, options.reverse_merge(:value => object.filter_value_as_string(filter))
+      text_field filter.name, value: object.filter_value_as_string(filter), **options
     end
 
     def datagrid_enum_filter(attribute_or_filter, options = {}, &block)
@@ -65,16 +67,15 @@ module Datagrid
           }
         )
       else
-        if !options.has_key?(:multiple) && filter.multiple?
-          options[:multiple] = true
-        end
         select(
           filter.name,
           object.select_options(filter) || [],
           {:include_blank => filter.include_blank,
            :prompt => filter.prompt,
            :include_hidden => false},
-           options, &block
+           multiple: filter.multiple?,
+           **options,
+           &block
         )
       end
     end
@@ -119,7 +120,7 @@ module Datagrid
         {:include_blank => false, :include_hidden => false, :prompt => false, :selected => operation },
         add_html_classes(options, "operation")
       )
-      value_input = text_field(filter.name, add_html_classes(options, "value").merge(:value => value))
+      value_input = text_field(filter.name, **add_html_classes(options, "value"), value: value)
       [field_input, operation_input, value_input].join("\n").html_safe
     end
 
@@ -129,7 +130,7 @@ module Datagrid
         # select options format may vary
         value = value.last if value.is_a?(Array)
         # don't render any visible input when there is nothing to choose from
-        hidden_field(name, html_options.merge(value: value))
+        hidden_field(name, **html_options, value: value)
       else
         select(name, variants, select_options, html_options)
       end
@@ -140,43 +141,16 @@ module Datagrid
       if filter.range?
         partial = partial_path('range_filter')
         options = options.merge(:multiple => true)
-
-
         from_options = datagrid_range_filter_options(object, filter, :from, options)
         to_options = datagrid_range_filter_options(object, filter, :to, options)
-        from_input = text_field(filter.name, from_options)
-        to_input = text_field(filter.name, to_options)
-
-        format_key = "datagrid.filters.#{type}.range_format"
-        separator_key = "datagrid.filters.#{type}.range_separator"
-        # 2 inputs: "from date" and "to date" to specify a range
-        if I18n.exists?(separator_key)
-          # Support deprecated translation option: range_separator
-          warn_deprecated_range_localization(separator_key)
-          separator = I18n.t(separator_key, default: '').presence
-          [from_input, separator, to_input].join.html_safe
-        elsif I18n.exists?(format_key)
-          # Support deprecated translation option: range_format
-          warn_deprecated_range_localization(format_key)
-          I18n.t(format_key, :from_input => from_input, :to_input => to_input).html_safe
-        else
-          # More flexible way to render via partial
-          @template.render :partial => partial, :locals => {
-            :from_options => from_options, :to_options => to_options, :filter => filter, :form => self
-          }
-        end
+        @template.render :partial => partial, :locals => {
+          :from_options => from_options, :to_options => to_options, :filter => filter, :form => self
+        }
       else
         datagrid_default_filter(filter, options)
       end
     end
 
-    def warn_deprecated_range_localization(key)
-      Datagrid::Utils.warn_once(
-        "#{key} localization key is deprectated. " +
-        "Customize formatting by rake datagrid:copy_partials and editing app/views/datagrid/range_filter partial."
-      )
-    end
-
     def datagrid_range_filter_options(object, filter, type, options)
       type_method_map = {:from => :first, :to => :last}
       options = add_html_classes(options, type)
@@ -204,7 +178,7 @@ module Datagrid
     end
 
     def datagrid_get_attribute(attribute_or_filter)
-      Utils.string_like?(attribute_or_filter) ?  attribute_or_filter : attribute_or_filter.name
+      Utils.string_like?(attribute_or_filter) ? attribute_or_filter : attribute_or_filter.name
     end
 
     def datagrid_get_filter(attribute_or_filter)

data/lib/datagrid/helper.rb

@@ -73,7 +73,7 @@ module Datagrid
     #       %td= row.project_name
     #       %td.project-status{class: row.status}= row.status
     def datagrid_rows(grid, assets = grid.assets, **options, &block)
-      datagrid_renderer.rows(grid, assets, options, &block)
+      datagrid_renderer.rows(grid, assets, **options, &block)
     end
 
     # Renders ordering controls for the given column name

data/lib/datagrid/locale/en.yml

@@ -1,11 +1,11 @@
 en:
   datagrid:
     no_results:
-      "——"
+      "――"
     table:
       order:
-        asc: "↑"
-        desc: "↓"
+        asc: "↑"
+        desc: "↓"
       no_columns: "No columns selected"
     form:
       search: "Search"
@@ -17,7 +17,7 @@ en:
 
       dynamic:
         operations:
-          ">=": "≥"
-          "<=": "&le;"
+          ">=": "≥"
+          "<=": "≤"
           "=": "="
-          "=~": "&asymp;"
+          "=~": "≈"

data/lib/datagrid/renderer.rb

@@ -81,10 +81,9 @@ module Datagrid
     def order_path(grid, column, descending, request)
       column = grid.column_by_name(column)
       query = request ? request.query_parameters : {}
-      order_parameter = {grid.param_name => grid.as_query.merge(:order => column.name, :descending => descending)}
       ActionDispatch::Http::URL.path_for(
         path: request ? request.path : '/',
-        params: query.merge(order_parameter)
+        params: query.merge(grid.query_params(order: column.name, descending: descending))
       )
     end
 

data/lib/datagrid/utils.rb

@@ -72,12 +72,8 @@ module Datagrid
       end
 
       def apply_args(*args, &block)
-        return block.call(*args) if block.arity < 0
-        args = args.clone
-        (args.size - block.arity).times do
-          args.pop
-        end
-        block.call(*args)
+        size = block.arity < 0 ? args.size : block.arity
+        block.call(*args.slice(0, size))
       end
 
       def parse_date(value)

data/lib/datagrid/version.rb

@@ -0,0 +1,3 @@
+module Datagrid
+  VERSION = "1.6.2"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.6.2
 platform: ruby
 authors:
 - Bogdan Gusiev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2020-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,146 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.2
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sequel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bson
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: This allows you to easily build datagrid aka data tables with sortable
   columns and filters
 email: agresso@gmail.com
@@ -171,15 +31,11 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
+- Readme.markdown
 files:
-- ".document"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
+- CHANGELOG.md
 - LICENSE.txt
-- Rakefile
 - Readme.markdown
-- VERSION
 - app/assets/stylesheets/datagrid.sass
 - app/views/datagrid/_enum_checkboxes.html.erb
 - app/views/datagrid/_form.html.erb
@@ -228,54 +84,8 @@ files:
 - lib/datagrid/rspec.rb
 - lib/datagrid/scaffold.rb
 - lib/datagrid/utils.rb
+- lib/datagrid/version.rb
 - lib/tasks/datagrid_tasks.rake
-- spec/datagrid/active_model_spec.rb
-- spec/datagrid/column_names_attribute_spec.rb
-- spec/datagrid/columns/column_spec.rb
-- spec/datagrid/columns_spec.rb
-- spec/datagrid/core_spec.rb
-- spec/datagrid/drivers/active_record_spec.rb
-- spec/datagrid/drivers/array_spec.rb
-- spec/datagrid/drivers/mongo_mapper_spec.rb
-- spec/datagrid/drivers/mongoid_spec.rb
-- spec/datagrid/drivers/sequel_spec.rb
-- spec/datagrid/filters/base_filter_spec.rb
-- spec/datagrid/filters/boolean_enum_filter_spec.rb
-- spec/datagrid/filters/composite_filters_spec.rb
-- spec/datagrid/filters/date_filter_spec.rb
-- spec/datagrid/filters/date_time_filter_spec.rb
-- spec/datagrid/filters/dynamic_filter_spec.rb
-- spec/datagrid/filters/enum_filter_spec.rb
-- spec/datagrid/filters/extended_boolean_filter_spec.rb
-- spec/datagrid/filters/float_filter_spec.rb
-- spec/datagrid/filters/integer_filter_spec.rb
-- spec/datagrid/filters/string_filter_spec.rb
-- spec/datagrid/filters_spec.rb
-- spec/datagrid/form_builder_spec.rb
-- spec/datagrid/helper_spec.rb
-- spec/datagrid/ordering_spec.rb
-- spec/datagrid/scaffold_spec.rb
-- spec/datagrid/stylesheet_spec.rb
-- spec/datagrid/utils_spec.rb
-- spec/datagrid_spec.rb
-- spec/spec_helper.rb
-- spec/support/active_record.rb
-- spec/support/configuration.rb
-- spec/support/i18n_helpers.rb
-- spec/support/matchers.rb
-- spec/support/mongo_mapper.rb
-- spec/support/mongoid.rb
-- spec/support/sequel.rb
-- spec/support/simple_report.rb
-- spec/support/test_partials/_actions.html.erb
-- spec/support/test_partials/client/datagrid/_form.html.erb
-- spec/support/test_partials/client/datagrid/_head.html.erb
-- spec/support/test_partials/client/datagrid/_order_for.html.erb
-- spec/support/test_partials/client/datagrid/_row.html.erb
-- spec/support/test_partials/client/datagrid/_table.html.erb
-- spec/support/test_partials/custom_checkboxes/_enum_checkboxes.html.erb
-- spec/support/test_partials/custom_form/_form.html.erb
-- spec/support/test_partials/custom_range/_range_filter.html.erb
 - templates/base.rb.erb
 - templates/controller.rb.erb
 - templates/grid.rb.erb
@@ -283,8 +93,13 @@ files:
 homepage: http://github.com/bogdan/datagrid
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/bogdan/datagrid
+  bug_tracker_uri: https://github.com/bogdan/datagrid/issues
+  documentation_uri: https://github.com/bogdan/datagrid/wiki
+  changelog_uri: https://github.com/bogdan/datagrid/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/bogdan/datagrid
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -299,9 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.2.0
+signing_key:
 specification_version: 4
 summary: Ruby gem to create datagrids
 test_files: []