effective_datatables 4.13.4 → 4.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb08f8a05559f50227ad9957db50f1fe46952a3509b8ec2a633b5991cc2984fb
-  data.tar.gz: 161bf01768bd46d37eac6e15e966b7dc5c2c9bc6a120c28510cc47b5d92414dd
+  metadata.gz: fc47f42fc35402807796c781d25c4a2c04209c298524ff5097eccd4132e0831d
+  data.tar.gz: 5237226dfc47dd03a9132f06a44bd664ce55c24016ea037c948ba781d05f4843
 SHA512:
-  metadata.gz: 7b7f399eccc357014bbcbce19dc9e75cc8196865a5a6943d0dbf8f850e9acd316a5ece105d03ccca61efc774faf3a627b4e9d48b0d93ec230af128b99e1eb07e
-  data.tar.gz: 778322bf428c4528520b7726466ac7bb57e63105967809c30846c12e2f351c613a18928efde8bf999ee89d6e2d492ad0eae3541543ff0f337733b99776789337
+  metadata.gz: fca83c18fac2f69f8934f2835ff1e26f7c90ee71cac121ce61652a6a17dfe064e57c3f22e8e2335a0b6ca866b0e531886d396babb72dccbb3ba24166859a13b3
+  data.tar.gz: 3bddcb7006524041110b313c5f5ce577c757c790abafac7e9324dbda6126c2a4a3472ee0ce28e63b81112562430adf7ecd93be994ac108f8e9730ec53fc3d496

data/app/models/effective/datatable_column_tool.rb

@@ -75,10 +75,10 @@ module Effective
     end
 
     def search_column(collection, value, column, sql_column)
-      Rails.logger.info "COLUMN TOOL: search_column #{column.to_s} #{value} #{sql_column}" if EffectiveDatatables.debug
+      Rails.logger.info "COLUMN TOOL: search_column #{column.to_s} value=#{value} operation=#{column[:search][:operation]} column=#{sql_column}" if EffectiveDatatables.debug
 
       Effective::Resource.new(collection)
-        .search(column[:name], value, as: column[:as], fuzzy: column[:search][:fuzzy], sql_column: sql_column)
+        .search(column[:name], value, as: column[:as], operation: column[:search][:operation], column: sql_column)
     end
 
     def paginate(collection)

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/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/app/models/effective/effective_datatable/resource.rb

@@ -158,7 +158,6 @@ module Effective
 
       def load_resource_search!
         columns.each do |name, opts|
-
           case opts[:search]
           when false
             opts[:search] = { as: :null }; next
@@ -176,13 +175,12 @@ module Effective
 
           # Parameterize collection
           if search[:collection].kind_of?(ActiveRecord::Relation)
-            search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.to_param] }
+            search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.id] }
           elsif search[:collection].kind_of?(Array) && search[:collection].first.kind_of?(ActiveRecord::Base)
-            search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.to_param] }
+            search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.id] }
           end
 
           search[:as] ||= :select if search.key?(:collection)
-          search[:fuzzy] ||= true unless search.key?(:fuzzy)
           search[:value] ||= search.delete(:selected) if search.key?(:selected)
 
           # Merge with defaults
@@ -195,6 +193,12 @@ module Effective
             search.reverse_merge!(search_resource.search_form_field(name, opts[:as]))
           end
 
+          # Assign default search operation
+          search[:operation] ||= search.delete(:op)
+          search[:operation] ||= :eq if search[:as] == :select
+          search[:operation] ||= :matches if search[:fuzzy]
+          search[:operation] ||= search_resource.sql_operation(name, as: opts[:as])
+
           # Assign default include_null
           if search[:as] == :select && !search.key?(:include_null)
             search[:include_null] = true

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.13.4'.freeze
+  VERSION = '4.14.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.13.4
+  version: 4.14.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails