rad_core_rails 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 542155bff8ff325428b30760ef13fda51209abd8d3f828fe6f4e8d6ebaa27c79
-  data.tar.gz: 31a9ee127dd3dd4639df4f8504083521f6587f1d67d9ed64498ef9b38e163627
+  metadata.gz: 48f739f3efcd0dbc68c15a40a1342153a8a403b6e7fadc8e17c2ea77b87ebf34
+  data.tar.gz: 5827e62ec17c57d74b43f9027a2fa65989d7df2bee37c1b60c814cc1f2d00998
 SHA512:
-  metadata.gz: 5d0404693b4bad560238af7f4c459fd3cda9075ac720163b818d38e8d12e49bcc1cf14a503dc4f09a361eec550f652b8936ad476b3da36e980073a8a67c2eae0
-  data.tar.gz: e9a5a0ba37595e5a3ab1326b9af740bab64305801867660275e63b3e98cebf0a7d5d2d3191b3fe8abebb336382262342dcc95c82ae2ecb4af64018a8917d9f05
+  metadata.gz: af53c0879f5c3bd089fa94a6b1644e2b7548bc8a583de55a838a10824a69f7790b6120360ff922f0c5d57021232a3f0c44c12522e31cb116483b718cb38ea457
+  data.tar.gz: 4f7d2ac6a1ca1056effe24ef813999e0e9b07a70d07ba320f5915471691aca34bacaefa90fffdd0d7740abc8626d7f221a6eee33312005410fd84e90bb03dd12

data/lib/rad_core_rails/query_generator.rb

@@ -38,24 +38,89 @@ module RadCoreRails
         [query.reject(&:blank?).join(' AND '), args]
       end
 
+      # def generate_search_clause(search)
+      #   and_args = []
+      #   or_args = []
+      #   if search.present? && searchable_columns.is_a?(Array)
+      #     # search_term_size = search.split(' ').length
+      #     and_terms = search.split(' ').select { |term| !term.include?('+') }
+      #     or_terms = search.split(' ').select { |term| term.include?('+') }
+      #     and_columns = []
+      #     or_columns = []
+      #     # just_ors = search_term_size == or_term_size
+      #     # operand = just_ors ? 'OR' : 'AND'
+      #     # search_terms = just_ors == true ? search.split(' ') : search.split(' ').select { |term| !term.include?('+') }
+      #     and_terms.each do |term|
+      #       columns = []
+      #       and_terms.each do |col|
+      #         and_columns.push("(LOWER(#{col}) ILIKE ?)")
+      #         and_args.push '%' + term.downcase.strip + '%'
+      #       end
+      #       or_terms.each do |col|
+      #         columns.push("(LOWER(#{col}) ILIKE ?)")
+      #         or_args.push '%' + term[1, term.length].downcase.strip + '%'
+      #       end
+      #       clause = if or_columns.empty?
+      #                  '(' + and_columns.join(' OR ') + ')'
+      #                else
+      #                  '(' + '(' + and_columns.join(' OR ') + ')' + 'AND' + '(' + or_columns.join(' OR ') + ')' + ')'
+      #                         end
+      #     end
+      #     [clause, and_args + or_args]
+      #   else
+      #     ['', []]
+      #   end
+      # end
+
+      # @searchable_columns, is an array of column names that you can compare to your terms.
+      #
       def generate_search_clause(search)
-        args = []
         if search.present? && searchable_columns.is_a?(Array)
-          search_term_size = search.split(' ').length
-          or_term_size = search.split(' ').select { |term| term.include?('+') }.length
-          just_ors = search_term_size == or_term_size
-          operand = just_ors ? 'OR' : 'AND'
-          search_terms = just_ors == true ? search.split(' ') : search.split(' ').select { |term| !term.include?('+') }
-          clause = []
-          search_terms.each do |term|
+          # holds all of the sql from sanitized_and_terms
+          and_args = []
+          # holds all the table columns sql for all the AND terms
+          and_clause = []
+          # holds all of the sql from sanitized_or_terms
+          or_args = []
+          # holds all the table columns sql for all the OR terms
+          or_clause = []
+          # extract and terms, remove casing, and add ILIKE '%' comparisions
+          sanitized_and_terms = search.split(' ')
+                                      .reject { |term| term.include?('+') }
+                                      .map { |term| '%' + term.downcase.strip + '%' }
+          # extract or terms, remove casing, and add ILIKE '%' comparisions
+          sanitized_or_terms = search.split(' ')
+                                     .select { |term| term.include?('+') }
+                                     .map { |term| '%' + term[1, term.length].downcase.strip + '%' }
+          # loop through sanitized_and_terms to find all possible columns.
+          sanitized_and_terms.each do |sanitized_term|
+            columns = []
+            # all possible columns where this should be searched
+            searchable_columns.each do |col|
+              columns.push("(LOWER(#{col}) ILIKE ?)")
+              and_args.push sanitized_term
+            end
+            and_clause.push '(' + columns.join(' OR ') + ')'
+          end
+          # loop through sanitized_or_terms to find all possible columns.
+          sanitized_or_terms.each do |sanitized_term|
             columns = []
+            # all possible columns where this should be searched
             searchable_columns.each do |col|
               columns.push("(LOWER(#{col}) ILIKE ?)")
-              args.push '%' + (operand == 'OR' ? term[1, term.length].downcase.strip : term.downcase.strip) + '%'
+              or_args.push sanitized_term
             end
-            clause.push '(' + columns.join(' OR ') + ')'
+            or_clause.push '(' + columns.join(' OR ') + ')'
+          end
+          if or_clause.empty? && and_clause.empty?
+            ['', []]
+          elsif or_clause.empty?
+            ['(' + and_clause.join(' AND ') + ')', and_args]
+          elsif and_clause.empty?
+            ['(' + or_clause.join(' OR ') + ')', or_args]
+          else
+            ['((' + and_clause.join(' AND ') + ') AND (' + or_clause.join(' OR ') + '))', and_args + or_args]
           end
-          ['(' + clause.join(" #{operand} ") + ')', args]
         else
           ['', []]
         end
@@ -74,7 +139,9 @@ module RadCoreRails
         str = if optional_exclusion_clause.present? && filter[:option] == '!='
                 optional_exclusion_clause
               else
-                "(#{column_name} #{filter[:option]} ANY(ARRAY[?]))"
+                # probably should fix this.
+                # somtimes we arent sending a filter option, so just default it to =
+                "(#{column_name} #{filter[:option] || '='} ANY(ARRAY[?]))"
               end
         args = [filter[:values]]
 

data/lib/rad_core_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RadCoreRails
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rad_core_rails
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Oleksandr Poltavets, James Marrs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport