effective_datatables 4.20.5 → 4.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efe60765e3b15e6c05007e9bba964cb70d52e411ff5fe8eb7899c7289317c24d
-  data.tar.gz: ec684a2e94cb1955f657fe86f412302ac5ff44795e3f6f06217f22240cd27e33
+  metadata.gz: 59425c0820bca218251c276ec9c7ea515e37ffefaa43b438b6d082e3fb9e0219
+  data.tar.gz: 32c49b0c8806c7905f2474999d6debf93be35de1bc43aa11fa9cd415ddebe474
 SHA512:
-  metadata.gz: bf3517b19749fa82ff16a57cee12b778b88693e2519830e438af3f18752e771ed519fadd586c72d6cd155084fc9fd358a5e3fa4939a7c9c4a023db8348957619
-  data.tar.gz: db6d03253ce56d049b95992f382c41c4ea7f9d44f5e1919243430ec40eb3b927f1365960641eb1ac30343ad557c1842cd9267d6ca738af12610a9c2bad90bbf6
+  metadata.gz: ca83f8036759b78eeaab77dacbfea62723438e4c7678bcf7a3e2706f0512e587b83a3c923d97572d7b8eb61577aaa594af32e2890989ad0bebccd489637576d4
+  data.tar.gz: 1deef20248ebefa1ee6351d39754f3cb94e4d9f5417ca9466b10fafa0557b810db10b05e11c285fe0dc699f8040425ad670e7c98ffef5f4e17e9bca77efa7826

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

@@ -28,8 +28,8 @@ module Effective
         retval = attributes.except(*resources.keys)
 
         resources.each do |k, resource|
-          retval["#{k}_id".to_sym] = resource.id
           retval["#{k}_type".to_sym] = resource.class.name
+          retval["#{k}_id".to_sym] = resource.id
         end
 
         retval

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

@@ -15,6 +15,12 @@ module Effective
         # Assign total records
         @total_records = (active_record_collection? ? column_tool.size(col) : value_tool.size(col))
 
+        # Apply jit_preloader if present
+        if active_record_collection? && defined?(JitPreloader) && EffectiveDatatables.use_jit_preloader
+          col.includes_values.reject! { true } # Removes any previously defined .includes()
+          col = col.jit_preload
+        end
+
         # Apply scope
         col = column_tool.scope(col) if @_collection_apply_scope
 

data/config/effective_datatables.rb

@@ -46,4 +46,8 @@ EffectiveDatatables.setup do |config|
 
   # Enable the Download button which serves a CSV of your collection
   config.download = false
+
+  # Call jit_preloader on ActiveRecord collections automatically. Must have jit_preloader gem installed.
+  # https://github.com/clio/jit_preloader
+  config.use_jit_preloader = false
 end

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.20.5'.freeze
+  VERSION = '4.21.0'.freeze
 end

data/lib/effective_datatables.rb

@@ -23,6 +23,8 @@ module EffectiveDatatables
   mattr_accessor :debug
   mattr_accessor :download
 
+  mattr_accessor :use_jit_preloader
+
   alias_method :max_cookie_size, :cookie_max_size
   alias_method :max_cookie_size=, :cookie_max_size=
 
@@ -80,12 +82,13 @@ module EffectiveDatatables
 
     raise 'invalid decoded inline payload' unless attributes.kind_of?(Hash)
 
-    attributes
+    attributes.symbolize_keys
   end
 
   def self.message_encrypter
-    key = (Rails.application.secrets.secret_key_base.presence rescue nil)
-    key ||= (Rails.application.secret_key_base.presence rescue nil)
+    key = (Rails.application.secret_key_base.presence rescue nil)
+    key ||= (Rails.application.try(:credentials).try(:secret_key_base).presence rescue nil)
+    key ||= (Rails.application.try(:secrets).try(:secret_key_base).presence rescue nil)
     key ||= 10.times.map { "".hash.to_s }.join
 
     ActiveSupport::MessageEncryptor.new(key.to_s.first(32))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.20.5
+  version: 4.21.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-15 00:00:00.000000000 Z
+date: 2023-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord