effective_datatables 4.13.3 → 4.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 195e2fea792167d2a115b603eca328921936b989a2ee8250f927f2dc0e7c9135
-  data.tar.gz: 945313e0c3188ece78cd3a89ec0cad517f1e72b65424b51718887d1670d477ca
+  metadata.gz: 1a652ec20b06f01718d88cbc9c6d78e6905c44239c577009b6df777d02432975
+  data.tar.gz: 6f148f5dd453d595ae3bca1592b179974802c2b3c6b83d0051bd6043ce39533e
 SHA512:
-  metadata.gz: 8a833adb0cdd8b0f98775b2245b1a6fd5d08c5237ba0f01e42e3e34fe3e170073e40c70d1d43af4670f9fbad2e838a8540be6d9d33cbbb987fb2ec97e6fbcc11
-  data.tar.gz: 6f3e823b061a30a69499dab532a2b385233409ef9c72b24a91aac25c7527244e88dfd304bff9ca2cf824ebc3b864b6b38e3ab503f79f361d1d89dccaca2031e2
+  metadata.gz: e9c0d5927da2c915118f5b0347591b38a8e355f1d2860548523da04a3cfd6b3dac10d66181f353552bc4bcfa63ba218d2254c55a38e3ad8c89c7869dcdfaadd2
+  data.tar.gz: 32b2a35689ca9591d7729b2ec72164c6b699d81dfbca19fd54948f866a952f364c9d5713db0617ad19deb285f1151be78b8bb8a961158d2833f3eaa8a2de76a8

data/app/models/effective/datatable.rb

@@ -182,6 +182,10 @@ module Effective
       attributes[:downloadable] != false
     end
 
+    def skip_save_state?
+      attributes[:skip_save_state] == true
+    end
+
     # Whether the filters must be rendered as a <form> or we can keep the normal <div> behaviour
     def _filters_form_required?
       _form[:verb].present?

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

@@ -12,6 +12,7 @@ module Effective
 
       def load_cookie!
         return unless EffectiveDatatables.save_state
+        return if skip_save_state?
         return unless (view.cookies rescue false) # Rails 6.1 view doesn't respond_to?(:cookies)
 
         @dt_cookie = view.cookies.signed['_effective_dt']
@@ -36,6 +37,7 @@ module Effective
 
       def save_cookie!
         return unless EffectiveDatatables.save_state
+        return if skip_save_state?
         return unless (view.cookies rescue false)
 
         @dt_cookie ||= []

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

@@ -22,7 +22,7 @@ module Effective
         CSV.generate do |csv|
           csv << csv_header()
 
-          collection.send(csv_collection_method) do |resources|
+          collection.find_in_batches do |resources|
             resources = arrayize(resources, csv: true)
             format(resources, csv: true)
             finalize(resources)

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

@@ -30,6 +30,10 @@ module Effective
           datatable.attributes[:downloadable] = bool
         end
 
+        def skip_save_state!
+          datatable.attributes[:skip_save_state] = true
+        end
+
         # A col has its internal values sorted/searched before the block is run
         # Anything done in the block, is purely a format on the after sorted/ordered value
         # the original object == the computed value, which is yielded to the format block

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

@@ -68,7 +68,7 @@ module Effective
               elsif opts[:format] && rendered.key?(name)
                 dsl_tool.instance_exec(value, row, rendered[name][row_index], &opts[:format])
               elsif opts[:format]
-                dsl_tool.instance_exec(value, row, &opts[:format])
+                dsl_tool.instance_exec(value, row, &opts[:format]).to_s
               elsif opts[:partial]
                 rendered[name][row_index]
               else
@@ -88,6 +88,7 @@ module Effective
         end
       end
 
+      # Must return a string
       def format_column(value, column, csv: false)
         return if value.nil? || (column[:resource] && value.blank?)
 
@@ -114,24 +115,24 @@ module Effective
           value.respond_to?(:strftime) ? value.strftime(EffectiveDatatables.format_date) : BLANK
         when :datetime
           if csv
-            value
+            value.to_s
           else
             value.respond_to?(:strftime) ? value.strftime(EffectiveDatatables.format_datetime) : BLANK
           end
         when :decimal
-          value
+          value.to_s
         when :duration
           view.number_to_duration(value)
         when :effective_addresses
           csv ? value.to_html.gsub('<br>', "\n") : value.to_html
         when :effective_obfuscation
-          value
+          value.to_s
         when :effective_roles
           value.join(', ')
         when :email
           csv ? value : view.mail_to(value)
         when :integer
-          value
+          value.to_s
         when :percent
           case value
           when Integer    ; view.number_to_percentage(value / 1000.0, precision: 3).gsub('.000%', '%')

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.13.3'.freeze
+  VERSION = '4.13.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.13.3
+  version: 4.13.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-07 00:00:00.000000000 Z
+date: 2022-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails