pattern_query_helper 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c3503df41d4640984dac6772f15d439c23b8fd3904514d58fb98b2af7efbc45
-  data.tar.gz: d40370dd2f2e9c2da4b0993a7ac21d08dbc512b76bd2da031ff1e3ce56605507
+  metadata.gz: 05e0f634c8e36cce3943e085bf9a0bd461f9e8cded7fa8b28ba84e606bba50fe
+  data.tar.gz: 2bc96a37d492f6733a370d3c5f86696dae953056a261bcd2de9787589bd02e34
 SHA512:
-  metadata.gz: 30a723aca45d1ceb20f914826367ca92bfc6381ebe621d823163c0cc3eb6615b4398dc1e4147f4dad4b40b41c8c71bb52191ab8909d384b6ff345caf1982f224
-  data.tar.gz: 8c8c2855b31e831ed3b22c6c1f2709e15f2ee332515becf48e8a31637a82cf1ded7712155444d89e740bde76a0f62f53a765e61b4686930870507c755e63e8a7
+  metadata.gz: f6e697f89bc109f2c120998d662106340fb78db4c319ca898ee9e86fe7aebdaaa2dd9e6881b8686128b34d377b58893ab3ce31e9e09b00d89bef05efea1b629f
+  data.tar.gz: c14a371a3224a4d80d00c5da3f78e821d37d2a0ed1625dff40e3727adea536f7bf8f585a837887a9be90ec8009b8bc831bb5796d8bf24f68d331c73060e2a9cd

data/lib/pattern_query_helper/filtering.rb

@@ -1,13 +1,16 @@
 module PatternQueryHelper
   class Filtering
-    def self.create_filters(filters, valid_columns=nil, symbol_prefix="")
+    def self.create_filters(filters, valid_columns_map=nil, symbol_prefix="")
       filters ||= {}
       filter_string = "true = true"
       filter_params = {}
       filter_array = []
       filters.each do |filter_attribute, criteria|
-        if valid_columns
-          raise ArgumentError.new("Invalid filter '#{filter_attribute}'") unless valid_columns.include? filter_attribute
+        if valid_columns_map
+          raise ArgumentError.new("Invalid filter '#{filter_attribute}'") unless valid_columns_map[filter_attribute]
+          filter_column = valid_columns_map[filter_attribute]
+        else
+          filter_column = filter_attribute
         end
         criteria.each do |operator_code, criterion|
           filter_symbol = "#{symbol_prefix}#{filter_attribute}_#{operator_code}"
@@ -25,22 +28,22 @@ module PatternQueryHelper
             when "noteql"
               operator = "!="
             when "like"
-              modified_filter_attribute = "lower(#{filter_attribute})"
+              modified_filter_column = "lower(#{filter_column})"
               operator = "like"
               criterion.downcase!
             when "in"
               operator = "in (:#{filter_symbol})"
-              # if criterion are anything but numbers, downcase the filter_attribute
+              # if criterion are anything but numbers, downcase the filter_column
               if criterion.scan(/[^\d|,|\s]/).any?
-                modified_filter_attribute = "lower(#{filter_attribute})"
+                modified_filter_column = "lower(#{filter_column})"
               end
               criterion = criterion.downcase.split(",")
               filter_symbol_already_embedded = true
             when "notin"
               operator = "not in (:#{filter_symbol})"
-              # if criterion are anything but numbers, downcase the filter_attribute
+              # if criterion are anything but numbers, downcase the filter_column
               if criterion.scan(/[^\d|,|\s]/).any?
-                modified_filter_attribute = "lower(#{filter_attribute})"
+                modified_filter_column = "lower(#{filter_column})"
               end
               criterion = criterion.downcase.split(",")
               filter_symbol_already_embedded = true
@@ -50,7 +53,7 @@ module PatternQueryHelper
             else
               raise ArgumentError.new("Invalid operator code '#{operator_code}' on '#{filter_attribute}' filter")
           end
-          filter_column = modified_filter_attribute || filter_attribute
+          filter_column = modified_filter_column || filter_column
           filter_string = "#{filter_string} and #{filter_column} #{operator}"
           filter_string << " :#{filter_symbol}" unless filter_symbol_already_embedded or filter_symbol.blank?
           filter_params["#{filter_symbol}"] = criterion unless filter_symbol.blank?

data/lib/pattern_query_helper/version.rb

@@ -1,3 +1,3 @@
 module PatternQueryHelper
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/lib/pattern_query_helper.rb

@@ -89,7 +89,11 @@ module PatternQueryHelper
   end
 
   def self.parse_helpers(query_helpers, valid_columns)
-    filtering = PatternQueryHelper::Filtering.create_filters(query_helpers[:filter], valid_columns)
+    valid_columns_map = {}
+    valid_columns.each do |c|
+      valid_columns_map["#{c}"] = c
+    end
+    filtering = PatternQueryHelper::Filtering.create_filters(query_helpers[:filter], valid_columns_map)
     sorting = PatternQueryHelper::Sorting.parse_sorting_params(query_helpers[:sort], valid_columns)
     associations = PatternQueryHelper::Associations.process_association_params(query_helpers[:include])
     pagination = PatternQueryHelper::Pagination.parse_pagination_params(query_helpers[:page], query_helpers[:per_page])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pattern_query_helper
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Evan McDaniel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-17 00:00:00.000000000 Z
+date: 2019-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler