effective_resources 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fdcf01c69458d8e030d019b71b8f56dba8ed6eae878c626125baca1c798fc87
-  data.tar.gz: 23c9425e10027572f282e93bde82e077e55aaf291600a64ee307beae3e7acd9a
+  metadata.gz: 5179c0bb8855a9265428e895d5ba520ca3c30fc4a0e4a5f08d2cbe026bf7801a
+  data.tar.gz: 9c5e6364e79d82e6f4419f114f24fffc77431ce2e793c241b387c0c97b38b542
 SHA512:
-  metadata.gz: f9f2ff6adccdbbb14d23b4d3bd19ddb6ecd08726468d55f9a414477e920c16549a153d97d06cc015809e337f5d25be9b0ee39cd60ade94229d61382391fec22f
-  data.tar.gz: b66e45de9d79cc0332b4e33a91ca26666cf087617c7204796a90a1b5bdeee2e27baecf4e8188441de7db35b6b8a53ca8ceca8e72bcdd8b8ceab68674a026404a
+  metadata.gz: 84c8b8610fe599ac1c1c7ee706bed4fe5b5575f7a66aef64f37b51a27ed589a49bb788fba3984870a078528af397ada56208629d1c51b558fd0e3e66385a701e
+  data.tar.gz: 8717b561cdf65de63cb5e3b7dc6a84c41ba9347bc08dfef01000ed91f2c2a6ad79708b6ca7554382d07a1da52ed99afb70e17b69463c2e9ea54ec8f8bbecfe79

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

@@ -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.0.4'.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.0.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-19 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails