effective_datatables 4.19.0 → 4.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9a3cae1554f2bcf9b6d73f51972eb1f8bc00c38a30d160c7f8910bf6e339a99
-  data.tar.gz: 72193d4f4895fa60a933c6be50d2d5d6a9d32d5d09a7f60558b130c2042eee1a
+  metadata.gz: c5bf5141b655e975b0e158b2f33572d8b8acc1f13ffa50d25f761795c6cdeb25
+  data.tar.gz: 67c30d8895b19d093e43e6ae1b521a528a18ea8ca156ca90209e8c1c922248c2
 SHA512:
-  metadata.gz: 321d799d2a21d4e3d19523ef8ae24d8ae62649bd1656afcc90223b26a77409d00dd8bd80a8f15bd40eb07476ea2b1f4a3eb7500f0f44a4a6b0b98553c873ba1d
-  data.tar.gz: f35dc8eeabe695ded08c56d80d1f09cfb18ac1e9925cf55d43870ac121d357543e085e9fdeb14020f92a52f6419de45712a0a663cb4429029ee3edcd9f29e9b4
+  metadata.gz: 0d08c8f32b066240576a4e4ee4cdea3916999d6c26f44e9c4533b125625de29922ae49ceebfdbd9ce68ba6be5d7da81255f9b60e54af5a250b380ae9bab94952
+  data.tar.gz: e20da9812bae53fbcaf98fc18022d624c41fe918f544607ea6a7ad0c8d8d062b9f4c8dc89fe5ca067e3b9daf2e47e2537404ce40a50d0c514b475a06b9aa05b7

data/app/controllers/effective/datatables_controller.rb

@@ -15,7 +15,7 @@ module Effective
         EffectiveDatatables.authorize!(self, :index, @datatable.collection_class)
 
         render json: @datatable.to_json
-      rescue => e
+      rescue Exception => e
         EffectiveDatatables.authorized?(self, :index, @datatable.try(:collection_class))
         render json: error_json(e)
 
@@ -84,7 +84,7 @@ module Effective
         render status: :ok, body: :ok
       rescue Effective::AccessDenied => e
         render(status: :unauthorized, body: 'Access Denied')
-      rescue => e
+      rescue Exception => e
         render(status: :error, body: 'Unexpected Error')
       end
 

data/app/models/effective/datatable_dsl_tool.rb

@@ -24,20 +24,16 @@ module Effective
         raise "#{method} block must be declared outside the datatable do ... end block"
       end
 
-      if datatable.respond_to?(method)
-        if block_given?
-          datatable.send(method, *args, **kwargs) { yield }
-        else
-          datatable.send(method, *args, **kwargs)
-        end
-      elsif view.respond_to?(method)
-        if block_given?
-          view.send(method, *args, **kwargs) { yield }
-        else
-          view.send(method, *args, **kwargs)
-        end
+      subject = datatable if datatable.respond_to?(method)
+      subject ||= view if view.respond_to?(method)
+      subject ||= Tenant.helpers if defined?(Tenant) && Tenant.helpers.respond_to?(method)
+
+      return super unless subject
+
+      if block_given?
+        subject.send(method, *args, **kwargs) { yield }
       else
-        super
+        subject.send(method, *args, **kwargs)
       end
     end
 

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

@@ -92,10 +92,6 @@ module Effective
       def format_column(value, column, csv: false)
         return if value.nil? || (column[:resource] && value.blank?)
 
-        unless column[:as] == :email
-          return value if value.kind_of?(String)
-        end
-
         if value.kind_of?(Array) && column[:as] == :string
           if csv
             return value.map { |v| format_column(v, column, csv: csv) }.join("\n")
@@ -145,6 +141,16 @@ module Effective
           end
         when :time
           value.respond_to?(:strftime) ? value.strftime(EffectiveDatatables.format_time) : BLANK
+        when :text
+          if csv
+            value
+          elsif value.to_s.starts_with?('<') && value.ends_with?('>')
+            view.sanitize(value.to_s)
+          else
+            view.simple_format(value.to_s)
+          end
+        when :string
+          csv ? value : view.escape_once(value.to_s)
         else
           value.to_s
         end

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.19.0'.freeze
+  VERSION = '4.20.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.19.0
+  version: 4.20.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-01 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails