effective_datatables 4.31.0 → 4.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44820c2466c8503adb80773c5bc282203a8c1a7be41d931bea08413b2c980644
-  data.tar.gz: e450c9c54b19fe4c5aa1619f8ee19a893796c1ffb6b88e66be3016feecb2a01f
+  metadata.gz: 890644cd1a399947c8b3deb2d12880367b1b225dd6ff41400bf50fa6aaa01b75
+  data.tar.gz: dcb2353768e455e880798aac5929413166fe1a756872c0e984bab73706bf064b
 SHA512:
-  metadata.gz: 79964cf5b2036ca752a16a2529bdc79f37189990c3296a285ae05792a5218a58af426d9f0165503303caacdbcda98c8b309b50c152debf7ac0ec203c5b20375c
-  data.tar.gz: 7783cf0f17017eeba8c143138a1d535ed06bfa85c7cb41c73dbf76523d74243f18842b8bb6042c45afbdd1d9aa6d9334bded97d7e2e2e06b4aa1ff4161c0bc12
+  metadata.gz: 625aad5dfc3f4e5615e7d6294c17548bb9ae40698311a180635566c290bed3d8ef7a86f13fe2bc526fb77f71a515f1376daaed39cb4ad7804ba3e0f0ea7d38e8
+  data.tar.gz: 751a5b50f64124797862d8b194fac5662f939dcd3b2aacf4e707d781ae10477754aa08774494eb8a426ec3944ccd789cdbc30b248a911b7c4eedbfaff4ca2c54

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

@@ -77,20 +77,23 @@ module Effective
             )
 
             if csv && (opts[:format] || opts[:partial]) && !formatted.frozen?
+              html_content = formatted.include?('<') && formatted.include?('>')
+
+              formatted.gsub!("&nbsp;", ' ')
               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.gsub!("\n", ' ')
 
+              if html_content
+                formatted.gsub!(/<span[^>]*\bclass=["']?badge\b[^>]*>.*?<\/span>/, '') # strip badges
+                formatted.gsub!('</div>', "</div>\n") if formatted.include?('col-resource_item')
                 formatted = view.strip_tags(formatted).strip
               end
+
+              formatted.gsub!('  ', ' ')
             end
 
             row[index] = formatted
@@ -130,7 +133,7 @@ module Effective
         when :duration
           view.number_to_duration(value)
         when :effective_addresses
-          csv ? value.to_html.gsub('<br>', "\n") : value.to_html
+          csv ? value.to_html.gsub('<br>', '').gsub("&nbsp;", ' ') : value.to_html
         when :effective_obfuscation
           value.to_s
         when :effective_roles
@@ -139,7 +142,7 @@ module Effective
           csv ? value : view.mail_to(value)
         when :integer
           value.to_s
-        when :percent
+        when :percent, :percentage
           case value
           when Integer    ; view.number_to_percentage(value / 1000.0, precision: 3).gsub('.000%', '%')
           when Numeric    ; view.number_to_percentage(value, precision: 3).gsub('.000%', '%')

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.31.0'.freeze
+  VERSION = '4.31.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.31.0
+  version: 4.31.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-17 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails