rad_core_rails 0.7.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95f6475b2b10bb6d51c5b4ad3feb7ebe08404663230abcae5278e81babe5e189
-  data.tar.gz: 90bfdddfeda70290d119eaad3bb4cdd35afc593e04a1d7d7a0c71736567b6710
+  metadata.gz: a00752d7d95c527463926fbb1e14ab869308906d7b40dead1cb538f8e8c590c9
+  data.tar.gz: 6530bcf049d2fa65ff5e69830e2ed678aae9c25689ff526839b13d549734a399
 SHA512:
-  metadata.gz: 5406cb277bf3591e979e14adb5aef5f92370483cd8dce83fb1cd78c333f0c57ebd9a9de3a586272c649738ee44fe5a32a2d7f08b3ab54b545c914366033e1bb9
-  data.tar.gz: 20950b080d702d04bde47999be305945643acdf50d078f9d0fe05a50108656ad648f453f652d248e4e0980b9df980f9e84cb0ae8b84b5b366597bffb4616f05b
+  metadata.gz: 72c7c3a5700725dfadf879f3f02f0ff9273e2a7fab1fdd1d35a3aec3f28571ac66ddcd94b49a06c523a795b588f5134db2419669b60fdb22e4ae1b0a89d4f9b8
+  data.tar.gz: 6fbd8139f169048dd2512c69477d8dc0f89cb2ac844e6d46221ce8d55c3491c53901125803c152cdf8d4af43742bcc0f765149fd6c10ef8b90c3f6269d943caa

data/lib/rad_core_rails/query_generator.rb

@@ -24,15 +24,16 @@ module RadCoreRails
         @filter_manifest || {}.with_indifferent_access
       end
 
-      def create_filters(search, filters)
+      def create_filters(filters)
         query = []
         args = []
-        clause, arguments = generate_search_clause(search)
-        query << clause
-        arguments.each do |arg|
-          args << arg
-        end
-        filters.map do |filter|
+        # clause, arguments = generate_search_clause(search)
+        # query << clause
+        # arguments.each do |arg|
+        #   args << arg
+        # end
+        filters.map do |raw_filter|
+          filter = raw_filter.with_indifferent_access
           begin
             clause, arguments = filter_manifest[filter[:key]].call(filter)
             query << clause
@@ -46,7 +47,8 @@ module RadCoreRails
         [query.reject(&:blank?).join(' AND '), args]
       end
 
-      def generate_search_clause(search)
+      def generate_search_clause(filter)
+        search = filter[:values][0]
         search_clause = ['', []]
 
         if search.present? && searchable_columns.is_a?(Array)
@@ -57,23 +59,28 @@ module RadCoreRails
           or_args = []          # SQL from sanitized_or_terms
           or_clause = []        # table columns SQL for all the OR terms
 
-          phrases_to_exclude = search.scan(/-"([^"]*)"/)  # e.g. -"Phrase to exclude"
-          phrases_or = search.scan(/\+"([^"]*)"/)         # e.g. +"Phrase for OR"
+          phrases_or = search.scan(/\+"([^"]*)"/) # e.g. +"Phrase for OR"
+          # remove 'or' phrases from search if any
+          phrases_or.each { |phrase| search.gsub!('+"' + phrase.first.to_s + '"', '') } if phrases_or.any?
 
+          phrases_to_exclude = search.scan(/-"([^"]*)"/) # e.g. -"Phrase to exclude"
           # remove excluded phrases from search if any
           if phrases_to_exclude.any?
-            phrases_to_exclude.each {|phrase| search.gsub!('-"' + "#{phrase.first}" + '"', '')}
+            phrases_to_exclude.each { |phrase| search.gsub!('-"' + phrase.first.to_s + '"', '') }
           end
 
-          # remove 'or' phrases from search if any
-          if phrases_or.any?
-            phrases_or.each {|phrase| search.gsub!('+"' + "#{phrase.first}" + '"', '')}
-          end
+          phrases_and = search.scan(/"([^"]*)"/) # e.g. "Phrase for AND"
+          # remove 'and' phrases from search if any
+          phrases_and.each { |phrase| search.gsub!('"' + phrase.first.to_s + '"', '') } if phrases_and.any?
 
           # extract 'and' terms, remove casing, and add ILIKE '%' comparisons
           sanitized_and_terms = search.split(' ')
                                       .reject { |term| term.include?('+') || term.include?('-') }
                                       .map { |term| '%' + term.downcase.strip + '%' }
+          # add 'and' phrase terms, remove casing, and add ILIKE '%' comparisons
+          if phrases_and.any?
+            sanitized_and_terms += phrases_and.flatten.map { |phrase| '%' + phrase.downcase.strip + '%' }
+          end
 
           # extract 'or' terms, remove casing, and add ILIKE '%' comparisons
           sanitized_or_terms = search.split(' ')
@@ -81,9 +88,7 @@ module RadCoreRails
                                      .map { |term| '%' + term[1, term.length].downcase.strip + '%' }
 
           # add 'or' phrase terms, remove casing, and add ILIKE '%' comparisons
-          if phrases_or.any?
-           sanitized_or_terms += phrases_or.flatten.map{|phrase| '%' + phrase.downcase.strip + '%'}
-          end
+          sanitized_or_terms += phrases_or.flatten.map { |phrase| '%' + phrase.downcase.strip + '%' } if phrases_or.any?
 
           # extract excluded terms, remove casing, and add NOT ILIKE '%' comparisons
           sanitized_excluded_terms = search.split(' ')
@@ -92,7 +97,8 @@ module RadCoreRails
 
           # add excluded phrase terms, remove casing, and add NOT ILIKE '%' comparisons
           if phrases_to_exclude.any?
-           sanitized_excluded_terms += phrases_to_exclude.flatten.map{|phrase| '%' + phrase.downcase.strip + '%'}
+            sanitized_excluded_terms += phrases_to_exclude.flatten
+                                                          .map { |phrase| '%' + phrase.downcase.strip + '%' }
           end
 
           # loop through sanitized_and_terms to find all possible columns.
@@ -100,7 +106,7 @@ module RadCoreRails
             columns = []
             # all possible columns where this should be searched
             searchable_columns.each do |col|
-              columns.push("(LOWER(#{col}) ILIKE ?)")
+              columns.push("(COALESCE(LOWER(#{col}), '') ILIKE ?)")
               and_args.push sanitized_term
             end
             and_clause.push '(' + columns.join(' OR ') + ')'
@@ -110,7 +116,7 @@ module RadCoreRails
             columns = []
             # all possible columns where this should be searched
             searchable_columns.each do |col|
-              columns.push("(LOWER(#{col}) NOT ILIKE ?)")
+              columns.push("(COALESCE(LOWER(#{col}), '') NOT ILIKE ?)")
               excluded_args.push sanitized_term
             end
             excluded_clause.push '(' + columns.join(' AND ') + ')'
@@ -120,34 +126,28 @@ module RadCoreRails
             columns = []
             # all possible columns where this should be searched
             searchable_columns.each do |col|
-              columns.push("(LOWER(#{col}) ILIKE ?)")
+              columns.push("(COALESCE(LOWER(#{col}), '') ILIKE ?)")
               or_args.push sanitized_term
             end
             or_clause.push '(' + columns.join(' OR ') + ')'
           end
 
-          if or_clause.empty? && and_clause.empty? && excluded_clause.empty?
-            return ['', []]
-          end
+          return ['', []] if or_clause.empty? && and_clause.empty? && excluded_clause.empty?
 
-          if or_clause.empty? && excluded_clause.empty?
-            return ['(' + and_clause.join(' AND ') + ')', and_args]
-          end
+          return ['(' + and_clause.join(' AND ') + ')', and_args] if or_clause.empty? && excluded_clause.empty?
 
-          if and_clause.empty? && excluded_clause.empty?
-            return ['(' + or_clause.join(' OR ') + ')', or_args]
-          end
+          return ['(' + or_clause.join(' OR ') + ')', or_args] if and_clause.empty? && excluded_clause.empty?
 
-          if or_clause.empty? && and_clause.empty?
-            return ['(' + excluded_clause.join(' AND ') + ')', excluded_args]
-          end
+          return ['(' + excluded_clause.join(' AND ') + ')', excluded_args] if or_clause.empty? && and_clause.empty?
 
           if or_clause.empty?
-            return ['((' + and_clause.join(' AND ') + ') AND (' + excluded_clause.join(' AND ') + '))', and_args + excluded_args]
+            return ['((' + and_clause.join(' AND ') + ') AND (' + excluded_clause.join(' AND ') + '))',
+                    and_args + excluded_args]
           end
 
           if and_clause.empty?
-            return ['((' + or_clause.join(' OR ') + ') AND (' + excluded_clause.join(' AND ') + '))', or_args + excluded_args]
+            return ['((' + or_clause.join(' OR ') + ') AND (' + excluded_clause.join(' AND ') + '))',
+                    or_args + excluded_args]
           end
 
           if excluded_clause.empty?
@@ -155,14 +155,14 @@ module RadCoreRails
           end
 
           search_clause = [
-           '((' +
-             and_clause.join(' AND ') +
-             ') AND (' +
-             or_clause.join(' OR ') +
-             ') AND (' +
-             excluded_clause.join(' AND ') +
-           '))',
-           and_args + or_args + excluded_args
+            '((' +
+              and_clause.join(' AND ') +
+              ') AND (' +
+              or_clause.join(' OR ') +
+              ') AND (' +
+              excluded_clause.join(' AND ') +
+              '))',
+            and_args + or_args + excluded_args
           ]
         end
 
@@ -191,6 +191,76 @@ module RadCoreRails
         [str, args]
       end
 
+      def sanitize_vector_string(search)
+        phrases_or = search.scan(/\+"([^"]*)"/) # e.g. +"Phrase for OR"
+        # remove 'or' phrases from search if any
+        phrases_or.each { |phrase| search.gsub!('+"' + phrase.first.to_s + '"', '') } if phrases_or.any?
+
+        phrases_to_exclude = search.scan(/-"([^"]*)"/) # e.g. -"Phrase to exclude"
+        # remove excluded phrases from search if any
+        phrases_to_exclude.each { |phrase| search.gsub!('-"' + phrase.first.to_s + '"', '') } if phrases_to_exclude.any?
+
+        phrases_and = search.scan(/"([^"]*)"/) # e.g. "Phrase for AND"
+        # remove 'and' phrases from search if any
+        phrases_and.each { |phrase| search.gsub!('"' + phrase.first.to_s + '"', '') } if phrases_and.any?
+
+        sanitized_and_terms = search.split(' ')
+                                    .reject { |term| term.include?('+') || term.include?('-') }
+                                    .map { |term| term.downcase.strip.gsub('*', ':*') }
+                                    .reject { |t| t.blank? }
+
+        sanitized_or_terms = search.split(' ')
+                                   .select { |term| term.include?('+') }
+                                   .map { |term| term[1, term.length].downcase.strip.gsub('*', ':*') }
+                                   .reject { |t| t.blank? }
+
+        sanitized_excluded_terms = search.split(' ')
+                                         .select { |term| term.include?('-') }
+                                         .map { |term| term[1, term.length].downcase.strip.gsub('*', ':*') }
+                                         .reject { |t| t.blank? }
+
+        and_clause = sanitized_and_terms.join(' & ')
+
+        or_clause = sanitized_or_terms.join(' | ')
+
+        excluded_clause = sanitized_excluded_terms.map { |t| "!#{t}" }.join(' & ')
+
+        # puts '------'
+        # puts '------'
+        # puts '------'
+        # puts and_clause.inspect
+        # puts or_clause.inspect
+        # puts excluded_clause.inspect
+        # puts '------'
+        # puts '------'
+
+        if and_clause.present? && or_clause.empty? && excluded_clause.empty?
+          and_clause
+        elsif and_clause.empty? && or_clause.present? && excluded_clause.empty?
+          or_clause
+        elsif and_clause.empty? && or_clause.empty? && excluded_clause.present?
+          excluded_clause
+        elsif and_clause.present? && or_clause.present? && excluded_clause.empty?
+          "(#{and_clause}) & (#{or_clause})"
+        elsif and_clause.present? && or_clause.empty? && excluded_clause.present?
+          "(#{and_clause}) & (#{excluded_clause})"
+        elsif and_clause.empty? && or_clause.present? && excluded_clause.present?
+          "(#{or_clause}) & (#{excluded_clause})"
+        elsif and_clause.present? && or_clause.present? && excluded_clause.present?
+          "(#{and_clause}) & (#{or_clause}) & (#{excluded_clause})"
+        else
+          raise StandardError, 'Combination not available.'
+        end
+      end
+
+      def generate_vector_clause(column_name, filter)
+        return ['', []] if filter[:values][0].blank?
+        vector_string = sanitize_vector_string(filter[:values][0])
+
+        query = "(#{column_name} @@ to_tsquery('english', ?))"
+        [query, [vector_string]]
+      end
+
       def generate_zip_codes_clause(column_name, filter)
         str = "(#{column_name} = ANY(#{zip_code_class.distance_query}))"
         args = zip_code_class.distance_args(filter)

data/lib/rad_core_rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rad_core_rails
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.0
 platform: ruby
 authors:
 - Oleksandr Poltavets, James Marrs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport