effective_resources 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fdcf01c69458d8e030d019b71b8f56dba8ed6eae878c626125baca1c798fc87
-  data.tar.gz: 23c9425e10027572f282e93bde82e077e55aaf291600a64ee307beae3e7acd9a
+  metadata.gz: 22b266fe036432aaf679e5a695edcea2d17639a1bc5e1fa082d93b1317cdd1e7
+  data.tar.gz: dc3b135919307b5735aa5f34bb79633fa1532f2dbe9702ad995fad89e8886d7f
 SHA512:
-  metadata.gz: f9f2ff6adccdbbb14d23b4d3bd19ddb6ecd08726468d55f9a414477e920c16549a153d97d06cc015809e337f5d25be9b0ee39cd60ade94229d61382391fec22f
-  data.tar.gz: b66e45de9d79cc0332b4e33a91ca26666cf087617c7204796a90a1b5bdeee2e27baecf4e8188441de7db35b6b8a53ca8ceca8e72bcdd8b8ceab68674a026404a
+  metadata.gz: 757ba49ce72d18d953634a6baf91b4f71292cf04a55475808ef417970697470531d2f06c7db77356f2768f95c7fd85c05d3fde186b0c1a125f927e8af2882687
+  data.tar.gz: dea57f166262cbeeb8e43d7c2e730ab0b59c1eb43bc31e67f29801055128425c9414397d3050a508fb8872021280a5818da8fc7b087493d525040d03464609f9

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
 
@@ -200,6 +200,12 @@ module Effective
           return relation.where(klass.primary_key => maybe_id) if (maybe_id.to_i.to_s == maybe_id)
         end
 
+        # If the user specifies columns. Filter out invalid ones for this klass
+        if columns.present?
+          columns = Array(columns).map(&:to_s) - [nil, '']
+          columns = (columns & search_columns)
+        end
+
         # Otherwise, we fall back to a string/text search of all columns
         columns = Array(columns || search_columns).reject do |column|
           DO_NOT_SEARCH_EQUALS.any? { |value| column == value } ||
@@ -207,6 +213,8 @@ module Effective
           DO_NOT_SEARCH_END_WITH.any? { |value| column.end_with?(value) }
         end
 
+        return relation.none() if columns.blank?
+
         fuzzy = true unless fuzzy == false
 
         # Retval

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.0.3'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

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