effective_resources 2.0.4 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5179c0bb8855a9265428e895d5ba520ca3c30fc4a0e4a5f08d2cbe026bf7801a
-  data.tar.gz: 9c5e6364e79d82e6f4419f114f24fffc77431ce2e793c241b387c0c97b38b542
+  metadata.gz: 1fdc93f33038497592b4ddb1c493191567d6c85e995fbf81eee114ed24c0c690
+  data.tar.gz: a93e21e2cdb21e570bd60ba383bfcb5eb3ce561c7ec87a5420141912c8e24c06
 SHA512:
-  metadata.gz: 84c8b8610fe599ac1c1c7ee706bed4fe5b5575f7a66aef64f37b51a27ed589a49bb788fba3984870a078528af397ada56208629d1c51b558fd0e3e66385a701e
-  data.tar.gz: 8717b561cdf65de63cb5e3b7dc6a84c41ba9347bc08dfef01000ed91f2c2a6ad79708b6ca7554382d07a1da52ed99afb70e17b69463c2e9ea54ec8f8bbecfe79
+  metadata.gz: d8d8b01b110fc396d02a8a813e2bfe5aa3d072f23141c3cf4c91033c5a4fe12ee46ba745b7175bee21cd811b1d90bf25c5631e2fe2f33c5aafe0cb94e251eedb
+  data.tar.gz: f857d31677d5519415cbe90804e4a707f21eb8b89b5ef9d36ae207686f9c4236c27b251d0fdd76a4721b7e49b42f3082edd53c2199997566e8faface7986480d

data/app/helpers/effective_resources_private_helper.rb

@@ -36,20 +36,20 @@ module EffectiveResourcesPrivateHelper
       end
 
       # Replace resource name in any token strings
-      if opts['data-confirm'].present? && opts['data-confirm'].include?('@resource'.freeze)
-        opts['data-confirm'] = opts['data-confirm'].gsub('@resource'.freeze, resource_to_s)
+      if opts.key?('data-confirm') && opts['data-confirm'].to_s.include?('@resource')
+        opts['data-confirm'] = opts['data-confirm'].gsub('@resource', resource_to_s)
       end
 
       # Assign class
       opts[:class] ||= (
-        if opts['data-method'.freeze] == 'delete'.freeze
-          'btn btn-danger'.freeze
+        if opts['data-method'].to_s == 'delete'
+          'btn btn-danger'
         elsif h.length == 0
-          'btn btn-primary'.freeze
+          'btn btn-primary'
         elsif defined?(EffectiveBootstrap)
-          'btn btn-secondary'.freeze
+          'btn btn-secondary'
         else
-          'btn btn-default'.freeze
+          'btn btn-default'
         end
       )
 

data/app/models/effective/resources/relation.rb

@@ -49,19 +49,19 @@ module Effective
             .order(order_by_associated_conditions(associated(:addresses), sort: sort, direction: direction, limit: limit))
             .order(Arel.sql("#{sql_column(klass.primary_key)} #{sql_direction}"))
         when :active_storage
-          relation.send("with_attached_#{name}").references("#{name}_attachment")
+          relation
+            .send("with_attached_#{name}")
+            .references("#{name}_attachment")
             .order(Arel.sql("active_storage_blobs.filename #{sql_direction}"))
         when :effective_roles
-          relation.order(Arel.sql("#{sql_column(:roles_mask)} #{sql_direction}"))
-        when :string, :text
           relation
-            .order(Arel.sql(("ISNULL(#{sql_column}), " if mysql?).to_s + "#{sql_column}='' ASC, #{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?).to_s))
-          when :time
-            relation
-              .order(Arel.sql(("ISNULL(#{sql_column}), " if mysql?).to_s + "EXTRACT(hour from #{sql_column}) #{sql_direction}, EXTRACT(minute from #{sql_column}) #{sql_direction}" + (" NULLS LAST" if postgres?).to_s))
+            .order(Arel.sql("#{sql_column(:roles_mask)} #{sql_direction}"))
+        when :time
+          relation
+            .order(Arel.sql("EXTRACT(hour from #{sql_column}) #{sql_direction}, EXTRACT(minute from #{sql_column}) #{sql_direction}"))
         else
           relation
-            .order(Arel.sql(("ISNULL(#{sql_column}), " if mysql?).to_s + "#{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?).to_s))
+            .order(Arel.sql("#{sql_column} #{sql_direction}"))
         end
       end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.0.4'.freeze
+  VERSION = '2.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2022-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails