datagrid 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4accb02f36dc5af245b6dd84008c22293e9bc0f6105b7fdfebe9458b6a7fa1e1
-  data.tar.gz: 4ca75ebff1804e8eaba5b0e41cae04e32f63c24211baffdc501a93870e1ba7e2
+  metadata.gz: a5f1043a8a905be92c309d00b6c0b107ebec35939c89b5766f5d7c43dbe2c584
+  data.tar.gz: 8b4bd8b0130ef2fa83cebe7012386ffcdb4d9ba32d3e803080e4345d6eb74dee
 SHA512:
-  metadata.gz: e8ab20bbbaec525f993c7e20a1ed5bd0105f6d2fc0c9ab098570401e610b7030a696c263959478b0cb4a39ecf921c81e5621bb76198cbc96060f433f23cbcaa5
-  data.tar.gz: 9158b9d0f26ee862292a5fdc0d9b596ee2ac70e52006cb559af1bfc043a5d43419c476e1b5a796a42a19e7bc5efcfb9e2b4e37e0fdfa9a8286c795a505aad573
+  metadata.gz: 4c42259fe4c806e235d10610ab4b3681319d8f5712c73addc1d54f61d6e6cbd0447a967464f878464da2b54f60dc376acef5238cce1467a097d7cbf799beb51d
+  data.tar.gz: 1ac692930c8a269190bc36ecce7c50cf1c1696fe5b9b6dc0644adfa59eb15a2bab77f4dac70a29633693e707e53ef29ed874eda6f6c82533ed441afe72a5d304

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.6.3
+
+* Fix usage of options spread operator for ruby 3.0 [#296](https://github.com/bogdan/datagrid/issues/296)
+
 ## 1.6.2
 
 * Add `input_options` and `label_options` to `filter` method [#294](https://github.com/bogdan/datagrid/issues/294)

data/Readme.markdown

@@ -23,10 +23,11 @@ Ruby library that helps you to build and represent table-like data with:
 [Create an issue](https://github.com/bogdan/datagrid/issues/new) if you want more.
 
 
-### Dependencies
+### Documentation
 
-* Ruby >= 2.0
-* Rails >= 3.2
+* [Readme](/Readme.markdown) - this read-me for basic information
+* [Wiki](https://github.com/bogdan/datagrid/wiki) - general reference on how to use the gem
+* [Rdoc](https://rdoc.info/github/bogdan/datagrid) - API reference
 
 ### Live Demo
 

data/lib/datagrid/column_names_attribute.rb

@@ -23,23 +23,22 @@ module Datagrid
       # Accepts same options as <tt>:enum</tt> filter
       #
       # Examples:
-      # 
-      #   column_names_filter(:header => "Choose columns")
-      #   
-      def column_names_filter(options = {})
-        filter(:column_names, :enum, {
-          :select => :optional_columns_select,
-          :multiple => true,
-          :dummy => true
-        }.merge(options || {}))
+      #
+      #   column_names_filter(header: "Choose columns")
+      #
+      def column_names_filter(**options)
+        filter(
+          :column_names, :enum,
+          select: :optional_columns_select,
+          multiple: true,
+          dummy: true,
+          **options,
+        )
       end
     end
 
-    def columns(*args) #:nodoc:
-      options = args.extract_options!
-      column_names = selected_column_names(*args)
-      column_names << options
-      super(*column_names)
+    def columns(*args, **options) #:nodoc:
+      super(*selected_column_names(*args), **options)
     end
 
     # Returns a list of enabled columns with <tt>:mandatory => true</tt> option
@@ -59,7 +58,7 @@ module Datagrid
       optional_columns.map {|c| [c.header, c.name] }
     end
 
-    def selected_column_names(*args)                  
+    def selected_column_names(*args)
       if args.any?
         args.compact!
         args.map!(&:to_sym)
@@ -75,7 +74,7 @@ module Datagrid
 
     def columns_visibility_enabled?
       columns_array.any? do |column|
-        column.options.key?(:mandatory)
+        column.mandatory_explicitly_set?
       end
     end
 

data/lib/datagrid/columns.rb

@@ -86,9 +86,10 @@ module Datagrid
       #
       # Supported options:
       #
-      # * :data - if true returns only non-html columns. Default: false.
-      def columns(*args)
-        filter_columns(columns_array, *args)
+      # * :data - if true returns only columns with data representation. Default: false.
+      # * :html - if true returns only columns with html columns. Default: false.
+      def columns(*args, data: false, html: false)
+        filter_columns(columns_array, *args, data: data, html: html)
       end
 
       # Defines new datagrid column
@@ -122,7 +123,7 @@ module Datagrid
       #
       # See: https://github.com/bogdan/datagrid/wiki/Columns for examples
       def column(name, query = nil, **options, &block)
-        define_column(columns_array, name, query, options, &block)
+        define_column(columns_array, name, query, **options, &block)
       end
 
       # Returns column definition with given name
@@ -184,14 +185,13 @@ module Datagrid
         child_class.columns_array = self.columns_array.clone
       end
 
-      def filter_columns(columns, *args) #:nodoc:
-        options = args.extract_options!
-        args.compact!
-        args.map!(&:to_sym)
-        columns.select do |column|
-          (!options[:data] || column.data?) &&
-            (!options[:html] || column.html?) &&
-            (column.mandatory? || args.empty? || args.include?(column.name))
+      def filter_columns(columns_array, *names, data: false, html: false) #:nodoc:
+        names.compact!
+        names.map!(&:to_sym)
+        columns_array.select do |column|
+          (!data || column.data?) &&
+            (!html || column.html?) &&
+            (column.mandatory? || names.empty? || names.include?(column.name))
         end
       end
 
@@ -308,11 +308,13 @@ module Datagrid
       #   grid.to_csv
       #   grid.to_csv(:id, :name)
       #   grid.to_csv(:col_sep => ';')
-      def to_csv(*column_names)
+      def to_csv(*column_names, **options)
         require "csv"
-        options = column_names.extract_options!
-        options = {:headers => self.header(*column_names), :write_headers => true}.merge!(options)
-        CSV.generate(**options) do |csv|
+        CSV.generate(
+          headers: self.header(*column_names),
+          write_headers: true,
+          **options
+        ) do |csv|
           each_with_batches do |asset|
             csv << row_for(asset, *column_names)
           end
@@ -328,24 +330,22 @@ module Datagrid
       #   grid = MyGrid.new(:column_names => [:id, :name])
       #   grid.columns # => id and name columns
       #   grid.columns(:id, :category) # => id and category column
-      def columns(*args)
-        self.class.filter_columns(columns_array, *args).select {|column| column.enabled?(self)}
+      def columns(*args, data: false, html: false)
+        self.class.filter_columns(
+          columns_array, *args, data: data, html: html
+        ).select do |column|
+          column.enabled?(self)
+        end
       end
 
       # Returns all columns that can be represented in plain data(non-html) way
-      def data_columns(*names)
-        options = names.extract_options!
-        options[:data] = true
-        names << options
-        self.columns(*names)
+      def data_columns(*names, **options)
+        self.columns(*names, **options, data: true)
       end
 
       # Returns all columns that can be represented in HTML table
-      def html_columns(*names)
-        options = names.extract_options!
-        options[:html] = true
-        names << options
-        self.columns(*names)
+      def html_columns(*names, **options)
+        self.columns(*names, **options, html: true)
       end
 
       # Finds a column definition by name
@@ -402,7 +402,7 @@ module Datagrid
       #
       # See Datagrid::Columns::ClassMethods#column for more info
       def column(name, query = nil, **options, &block)
-        self.class.define_column(columns_array, name, query, options, &block)
+        self.class.define_column(columns_array, name, query, **options, &block)
       end
 
       def initialize(*) #:nodoc:

data/lib/datagrid/columns/column.rb

@@ -106,6 +106,10 @@ class Datagrid::Columns::Column
     !! options[:mandatory]
   end
 
+  def mandatory_explicitly_set?
+    options.key?(:mandatory)
+  end
+
   def enabled?(grid)
     ::Datagrid::Utils.process_availability(grid, options[:if], options[:unless])
   end

data/lib/datagrid/filters/composite_filters.rb

@@ -16,10 +16,10 @@ module Datagrid
           from_options = normalize_composite_filter_options(from_options, field)
           to_options = normalize_composite_filter_options(to_options, field)
 
-          filter(from_options[:name] || :"from_#{field.to_s.tr('.', '_')}", :date, from_options) do |date, scope, grid|
+          filter(from_options[:name] || :"from_#{field.to_s.tr('.', '_')}", :date, **from_options) do |date, scope, grid|
             grid.driver.greater_equal(scope, field, date)
           end
-          filter(to_options[:name] || :"to_#{field.to_s.tr('.', '_')}", :date, to_options) do |date, scope, grid|
+          filter(to_options[:name] || :"to_#{field.to_s.tr('.', '_')}", :date, **to_options) do |date, scope, grid|
             grid.driver.less_equal(scope, field, date)
           end
         end
@@ -27,10 +27,10 @@ module Datagrid
         def integer_range_filters(field, from_options = {}, to_options = {})
           from_options = normalize_composite_filter_options(from_options, field)
           to_options = normalize_composite_filter_options(to_options, field)
-          filter(from_options[:name] || :"from_#{field.to_s.tr('.', '_')}", :integer, from_options) do |value, scope, grid|
+          filter(from_options[:name] || :"from_#{field.to_s.tr('.', '_')}", :integer, **from_options) do |value, scope, grid|
             grid.driver.greater_equal(scope, field, value)
           end
-          filter(to_options[:name] || :"to_#{field.to_s.tr('.', '_')}", :integer, to_options) do |value, scope, grid|
+          filter(to_options[:name] || :"to_#{field.to_s.tr('.', '_')}", :integer, **to_options) do |value, scope, grid|
             grid.driver.less_equal(scope, field, value)
           end
         end

data/lib/datagrid/form_builder.rb

@@ -4,11 +4,11 @@ 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 = {
         **filter.input_options,
-        **add_html_classes(options, filter.name, datagrid_filter_html_class(filter))
+        **add_html_classes(options, filter.name, datagrid_filter_html_class(filter)),
       }
       # Prevent partials option from appearing in HTML attributes
       options.delete(:partials) # Legacy option
@@ -70,9 +70,11 @@ module Datagrid
         select(
           filter.name,
           object.select_options(filter) || [],
-          {:include_blank => filter.include_blank,
-           :prompt => filter.prompt,
-           :include_hidden => false},
+          {
+            include_blank: filter.include_blank,
+            prompt: filter.prompt,
+            include_hidden: false
+          },
            multiple: filter.multiple?,
            **options,
            &block

data/lib/datagrid/helper.rb

@@ -38,8 +38,8 @@ module Datagrid
     #   and needs different columns. Default: all defined columns.
     # * <tt>:partials</tt> - Path for partials lookup.
     #   Default: 'datagrid'.
-    def datagrid_table(grid, *args)
-      datagrid_renderer.table(grid, *args)
+    def datagrid_table(grid, assets = grid.assets, **options)
+      datagrid_renderer.table(grid, assets, **options)
     end
 
     # Renders HTML table header for given grid instance using columns defined in it

data/lib/datagrid/renderer.rb

@@ -34,11 +34,9 @@ module Datagrid
       _render_partial('form', options[:partials], {:grid => grid, :options => options})
     end
 
-    def table(grid, *args)
-      options = args.extract_options!
+    def table(grid, assets, **options)
       options[:html] ||= {}
       options[:html][:class] ||= "datagrid #{@template.dom_class(grid)}"
-      assets = args.any? ? args.shift : grid.assets
 
       _render_partial('table', options[:partials],
                       {

data/lib/datagrid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Bogdan Gusiev
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Ruby gem to create datagrids