effective_datatables 4.25.1 → 4.25.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee2ffed192a97207be7e49f3dc13ea49695e6efa6a9f302b28cc6871fb501533
-  data.tar.gz: 747968e4eacfe8cbac5888a8535525c546465d70395b8fbad8880cd6d7f7b6cf
+  metadata.gz: 6795fc15046e40e435529576eb9f7f4c3473e51c12f0a62778854d567b8abee6
+  data.tar.gz: a1db0bc8b76f4f47561458dc7df631ed065cb5f5734840db664b493cb2012cbe
 SHA512:
-  metadata.gz: 0d37a268fd08e0590a44dc8adf2fd041afe72ad3a49965ccfa4aac8237906d7ca4e1886a924254d2d3429e320b5c4a1f91ba9fa95aa3709b0e3bc0584796a5d1
-  data.tar.gz: 943b66cd71ec58c8bc4db1c3257d56d882e0abb047674b8303c301e1783614a8ec0cebc2fb48fd046bf060fbe7299b4c9c8a831fe78db2a7f5380fb2ac785fd9
+  metadata.gz: 16816ddfd74f48e8d6deb1ac9a2d05d665fc8c063e8865b7c7237df8cc5a1b70921472927a26d09f00e94fb65764ab3280373c857ffa7c9ebe8e6d33d9b18d54
+  data.tar.gz: 4b65d03eddc9bc7bf6040b069995b211747cabcfdf0ca5bff05c9337172cfd59926a7f7bcbbb3b92fb3bb27bab85775e0838a78799ff265020eb84397fe0449c

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

@@ -76,11 +76,21 @@ module Effective
               end
             )
 
-            if csv && (opts[:format] || opts[:partial])
-              formatted = view.strip_tags(formatted)
-
-              formatted.gsub!("\n\n", ' ') unless formatted.frozen?
-              formatted.gsub!("\n", '')  unless formatted.frozen?
+            if csv && (opts[:format] || opts[:partial]) && !formatted.frozen?
+              formatted.gsub!("<br>\n", ' ')
+              formatted.gsub!("<br> ", ' ')
+              formatted.gsub!("<br>", ' ')
+              formatted.gsub!("<br/>", ' ')
+              formatted.gsub!("<br />", ' ')
+              formatted.gsub!("\n\n", ' ')
+              formatted.gsub!("\n", ' ') unless formatted.include?('<')
+
+              if formatted.include?('<')
+                formatted.gsub!("\n", '') 
+                formatted.gsub!("<div class='col-resource_item'>", ' ')
+
+                formatted = view.strip_tags(formatted).strip
+              end
             end
 
             row[index] = formatted
@@ -89,18 +99,18 @@ module Effective
       end
 
       # Must return a string
-      def format_column(value, column, csv: false)
+      def format_column(value, column, as: nil, csv: false)
         return if value.nil? || (column[:resource] && value.blank?)
 
-        if value.kind_of?(Array) && column[:as] == :string
+        if value.kind_of?(Array) && [:string, :text].include?(column[:as])
           if csv
             return value.map { |v| format_column(v, column, csv: csv) }.join("\n")
           else
-            return value.map { |v| view.content_tag(:div, format_column(v, column, csv: csv).html_safe, class: 'col-resource_item') }.join.html_safe
+            return value.map { |v| view.content_tag(:div, format_column(v, column, as: :string, csv: csv).html_safe, class: 'col-resource_item') }.join.html_safe
           end
         end
 
-        case column[:as]
+        case (as || column[:as])
         when :actions
           raise("please use actions_col instead of col(#{name}, as: :actions)")
         when :boolean

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.25.1'.freeze
+  VERSION = '4.25.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.25.1
+  version: 4.25.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-06 00:00:00.000000000 Z
+date: 2024-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails