effective_datatables 4.20.4 → 4.20.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de9e67c1d5ddd3f19c322ea61f2bb1b50f9792e1ca6666607af4a14f11dc615d
-  data.tar.gz: ae1f07be260e375e21d4cf4520a1d55fb4c51787ea09f4f56acfc49168137f45
+  metadata.gz: 6f7c205135a1636a8e73e9b18f9a1ae773a742dedaf1f8c9ded5841437b76de1
+  data.tar.gz: 4833cbbf89c6c11c58e3493df4c6ce9cd6832eab94fe57c82a9cd4b7bb1e063e
 SHA512:
-  metadata.gz: 711ca1ee0f32fd3b91bcac59f294ac8d3822d364a7318ee89d68ed6a8d0de7147dab2934365abcc3e49ba1ea85142ba50f515207601e651677fc74f1cfdf5281
-  data.tar.gz: fd4a8536658314a46199c03aec85898365b992472b78e7e8592b468a25f6cc16ed914b2385f131b0e5f927963b5990a469b0a93e8e62697ec80c151e611ca7ba
+  metadata.gz: 3369c5d02656e568ad03d80f063c862deb76fbdbe7ee59f3825b7648be9c65903c63f7185e0318aa81265fc723e4b14d704b838c1e7ec37b0692ff0daa4c258a
+  data.tar.gz: f4bedb87ab51be6fcaf49392e65ccabfabf3c1b15df3d88338015ea2aa40704167c03caa45cee6c6bf162098351734373b946c21f5f72e37e9105b0f34a14981

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/resource.rb

@@ -177,7 +177,9 @@ module Effective
           search = opts[:search]
 
           # Parameterize collection
-          if search[:collection].kind_of?(ActiveRecord::Relation)
+          if attributes[:searchable] == false
+            # Nothing to do
+          elsif search[:collection].kind_of?(ActiveRecord::Relation)
             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.id] }
@@ -193,7 +195,9 @@ module Effective
           search_resource = search_resource.find { |res| res.klass.present? } || search_resource.first
 
           # Assign search collections from effective_resources
-          if search[:as] == :string
+          if attributes[:searchable] == false
+            # Nothing to do
+          elsif search[:as] == :string
             # Nothing to do. We're just a string search.
           elsif search[:as] == :select && search[:collection].kind_of?(Array)
             # Nothing to do. We already loaded the custom parameterized collection above.

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.20.4'.freeze
+  VERSION = '4.20.6'.freeze
 end

data/lib/effective_datatables.rb

@@ -80,12 +80,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.4
+  version: 4.20.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-15 00:00:00.000000000 Z
+date: 2023-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails