effective_datatables 4.10.0 → 4.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 173cdec1d403c8203a7f3d3701104a76d7fd8fb04843c4989180b351b5096264
-  data.tar.gz: 70da4dcc029e6f7ac2a2f0d7f896734c4036eea227dfd5ecb6354f1efa59f531
+  metadata.gz: 23fc1a12eb490a341d424c18f5f773081ff37c4b7de69143b0d76d016830f454
+  data.tar.gz: 6d3fff829f467d8dac9abbac7a9023b939d34a0a6eb978270fdcb5ce5edf3d2e
 SHA512:
-  metadata.gz: 474ead17fcde2196a4bdf06cdfa02c9d23e1dc4345126d79bcdf4fa3aa9785a358cce6d54a062862f17ec33c618a908db703a1eaa94e847a87df42dfe738b816
-  data.tar.gz: 55570bbe0d91f0bcdb24d818368a3a4dce9be6ffc0d7a99327121d8204df62a56b6eecc61a1bbbb6bb89b1feff5e4ea6d293497bb571ffff640331f14076d8b2
+  metadata.gz: 2177238d3bfac03c9020a25b4998bc31d325ad589be8fc8c2c28467a42715cf0d61af9698540db04fad665bb13bc6dc7e8c04c912666f3c4aa85debe98bdfaea
+  data.tar.gz: f48c993d05144a299f366dace3287d4a83d047219bcf30974a23bd3254a81f96a2e6854bafc8dbc2428d34025dff60661057781a89486169f9b25098850bae62

data/app/controllers/effective/datatables_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'csv'
 
 module Effective

data/app/helpers/effective_datatables_controller_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # These are expected to be called by a developer.  They are part of the datatables DSL.
 module EffectiveDatatablesControllerHelper
 

data/app/helpers/effective_datatables_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # These are expected to be called by a developer.  They are part of the datatables DSL.
 module EffectiveDatatablesHelper
   def render_datatable(datatable, input_js: {}, buttons: true, charts: true, download: nil, entries: true, filters: true, inline: false, namespace: nil, pagination: true, search: true, simple: false, sort: true)

data/app/helpers/effective_datatables_private_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # These aren't expected to be called by a developer. They are internal methods.
 module EffectiveDatatablesPrivateHelper
 
@@ -33,7 +35,7 @@ module EffectiveDatatablesPrivateHelper
     action = { action: :new, class: ['btn', column[:btn_class].presence].compact.join(' '), 'data-remote': true }
 
     if column[:actions][:new].kind_of?(Hash) # This might be active_record_array_collection?
-      action.merge!(column[:actions][:new])
+      actions = action.merge(column[:actions][:new])
 
       effective_resource = (datatable.effective_resource || datatable.fallback_effective_resource)
       klass = (column[:actions][:new][:klass] || effective_resource&.klass || datatable.collection_class)
@@ -67,13 +69,13 @@ module EffectiveDatatablesPrivateHelper
     return if opts[:search] == false
 
     # Build the search
-    @_effective_datatables_form_builder || effective_form_with(scope: :datatable_search, url: '#') { |f| @_effective_datatables_form_builder = f }
+    @_effective_datatables_form_builder || effective_form_with(scope: 'datatable_search', url: '#') { |f| @_effective_datatables_form_builder = f }
     form = @_effective_datatables_form_builder
 
     collection = opts[:search].delete(:collection)
     value = datatable.state[:search][name]
 
-    options = opts[:search].merge!(
+    options = opts[:search].merge(
       name: nil,
       feedback: false,
       label: false,
@@ -87,20 +89,20 @@ module EffectiveDatatablesPrivateHelper
     when :string, :text, :number
       form.text_field name, options
     when :date, :datetime
-      form.date_field name, options.reverse_merge!(
+      form.date_field name, options.reverse_merge(
         date_linked: false, prepend: false, input_js: { useStrict: true, keepInvalid: true }
       )
     when :time
-      form.time_field name, options.reverse_merge!(
+      form.time_field name, options.reverse_merge(
         date_linked: false, prepend: false, input_js: { useStrict: false, keepInvalid: true }
       )
     when :select, :boolean
-      options[:input_js] = (options[:input_js] || {}).reverse_merge!(placeholder: '')
+      options[:input_js] = (options[:input_js] || {}).reverse_merge(placeholder: '')
 
       form.select name, collection, options
     when :bulk_actions
       options[:data]['role'] = 'bulk-actions'
-      form.check_box name, options.merge!(label: ' ')
+      form.check_box name, options.merge(label: ' ')
     end
   end
 
@@ -130,7 +132,7 @@ module EffectiveDatatablesPrivateHelper
       placeholder: (opts[:label] || name.to_s.titleize),
       value: value,
       wrapper: { class: 'form-group col-auto'}
-    }.merge!(opts.except(:as, :collection, :parse, :value))
+    }.merge(opts.except(:as, :collection, :parse, :value))
 
     options[:name] = '' unless datatable._filters_form_required?
 
@@ -162,7 +164,7 @@ module EffectiveDatatablesPrivateHelper
       label: false,
       required: false,
       wrapper: { class: 'form-group col-auto'}
-    }.merge!(opts.except(:checked, :value))
+    }.merge(opts.except(:checked, :value))
 
     form.radios :scope, collection, options
   end

data/app/models/effective/datatable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   class Datatable
     attr_reader :attributes # Anything that we initialize our table with. That's it. Can't be changed by state.

data/app/models/effective/datatable_column.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # In practice this is just a regular hash with the aggregate, format, search, sort do syntax that saves a block
 module Effective
   class DatatableColumn

data/app/models/effective/datatable_column_tool.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   class DatatableColumnTool
     attr_reader :datatable

data/app/models/effective/datatable_dsl_tool.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
 
   class DatatableDslTool

data/app/models/effective/datatable_value_tool.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   # The collection is an Array of Arrays
   class DatatableValueTool

data/app/models/effective/effective_datatable/attributes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Attributes

data/app/models/effective/effective_datatable/collection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Collection
@@ -34,7 +36,7 @@ module Effective
         raise 'No collection defined. Please add a collection with collection do ... end' if collection.nil?
 
         @collection_class = (collection.respond_to?(:klass) ? collection.klass : self.class)
-        
+
         @active_record_collection = (collection.ancestors.include?(ActiveRecord::Base) rescue false)
         @active_record_array_collection = collection.kind_of?(Array) && collection.present? && collection.first.kind_of?(ActiveRecord::Base)
         @array_collection = collection.kind_of?(Array) && (collection.blank? || collection.first.kind_of?(Array))

data/app/models/effective/effective_datatable/compute.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Compute

data/app/models/effective/effective_datatable/cookie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Cookie

data/app/models/effective/effective_datatable/csv.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'csv'
 
 module Effective

data/app/models/effective/effective_datatable/dsl/bulk_actions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Dsl

data/app/models/effective/effective_datatable/dsl/charts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Dsl

data/app/models/effective/effective_datatable/dsl/datatable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Dsl

data/app/models/effective/effective_datatable/dsl/filters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Dsl

data/app/models/effective/effective_datatable/dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Dsl
@@ -11,11 +13,11 @@ module Effective
       end
 
       def collection(apply_belongs_to: true, apply_scope: true, &block)
-        define_method('initialize_collection') { 
+        define_method('initialize_collection') {
           self._collection_apply_belongs_to = apply_belongs_to
           self._collection_apply_scope = apply_scope
-          
-          self._collection = dsl_tool.instance_exec(&block) 
+
+          self._collection = dsl_tool.instance_exec(&block)
         }
       end
 

data/app/models/effective/effective_datatable/format.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Format

data/app/models/effective/effective_datatable/hooks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Hooks

data/app/models/effective/effective_datatable/params.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Params

data/app/models/effective/effective_datatable/resource.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Resource

data/app/models/effective/effective_datatable/state.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module State
@@ -98,7 +100,7 @@ module Effective
           load_cookie_state! if cookie.present? && cookie[:params] == cookie_state_params
           load_filter_params!
         end
-        
+
         fill_empty_filters!
       end
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.10.0'.freeze
+  VERSION = '4.10.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 4.10.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails