rad_core_rails 0.8.7 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7ca060d1ce95b64a271d3f79ea39addadbdbdef68b5bf26cf072dfb0fb7629d
-  data.tar.gz: 372188898723e4937380ada34fed23b6b77c082ec15850adb95ee3d58ec5cc01
+  metadata.gz: e868d3c6a889cb756093bfb614670f8e11db9d993f0fa58f404e21c214d82c40
+  data.tar.gz: 8a0841bde276161304032020371df1d93aaa877c89b5b07b239810ad98905775
 SHA512:
-  metadata.gz: 8544212d17b05eb6519cd04855bf90b2355a7368fd5a43c65b2a9d690a307bcbe3bf5cb8f066f48536a61dda107283cc4d0d0a2f0d157d1d0a8003f0f5d60ad3
-  data.tar.gz: 48cf45ef1b71c6cc0e0509715568d997f5442661f32c152f2830ad6ba375976d965714668c1d1d9d10ddc4632968eadcb35b3e00fb954280860200e9b04ab7cb
+  metadata.gz: 241e68dd2e610b2f61c2fd8e1f88ecc035f6f7fe9e1b35e1e32439de00ca71dacf5490131d977b9c8529121904558bb2e4310e5ec50c03c0f27512e1207237cc
+  data.tar.gz: b99dca53fa9a2aa1b7a14db7fad805c6f5cf04e3f90d8fb80c6197fafcd80262bcd9ea571b11a064a48cbe1a65c362d5e0f42455861e728f3a883b6c3889c872

data/lib/rad_core_rails/query_generator.rb

@@ -206,14 +206,14 @@ module RadCoreRails
         else
           # probably should fix this.
           # somtimes we arent sending a filter option, so just default it to =
-          str = "(#{column_name} #{filter[:option] || '='} ANY(ARRAY[?]))"
-          args = [filter[:values]]
+          str = "(LOWER(TRIM(#{column_name})) #{filter[:option] || '='} ANY(ARRAY[?]))"
+          args = [filter[:values].map(&:strip).map(&:downcase)]
         end
 
         [str, args]
       end
 
-      def sanitize_vector_string(search)
+      def sanitize_vector_string(search, weight = ':*')
         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?
@@ -228,17 +228,17 @@ module RadCoreRails
 
         sanitized_and_terms = search.split(' ')
                                     .reject { |term| term.include?('+') || term.include?('-') }
-                                    .map { |term| term.downcase.strip + ':*' }
+                                    .map { |term| term.downcase.strip + weight }
                                     .reject { |t| t.blank? }
 
         sanitized_or_terms = search.split(' ')
                                    .select { |term| term.include?('+') }
-                                   .map { |term| term[1, term.length].downcase + ':*' }
+                                   .map { |term| term[1, term.length].downcase + weight }
                                    .reject { |t| t.blank? }
 
         sanitized_excluded_terms = search.split(' ')
                                          .select { |term| term.include?('-') }
-                                         .map { |term| term[1, term.length].downcase.strip + ':*' }
+                                         .map { |term| term[1, term.length].downcase.strip + weight }
                                          .reject { |t| t.blank? }
 
         and_clause = sanitized_and_terms.join(' & ')
@@ -275,13 +275,14 @@ module RadCoreRails
         end
       end
 
-      def generate_vector_clause(column_name, filter)
+      def generate_vector_clause(column_name, actual_column, filter, weight = ':*')
+        return ["(#{actual_column} IS NULL OR #{actual_column} = '')", []] if filter[:option] == '!!'
         return ['', []] if filter[:values][0].blank?
 
-        vector_string = sanitize_vector_string(filter[:values][0])
+        vector_string = sanitize_vector_string(filter[:values][0], weight)
 
-        query = "(#{column_name} @@ to_tsquery('simple', ?))"
-        [query, [vector_string]]
+        query = "(#{column_name} @@ to_tsquery('simple', ?) OR #{column_name} @@ to_tsquery('english', ?))"
+        [query, [vector_string, vector_string]]
       end
 
       def generate_zip_codes_clause(column_name, filter)
@@ -356,19 +357,13 @@ module RadCoreRails
         args = []
 
         case option
-        when '='
-          str = "#{column_name}::date = ?::date"
-          args << values[0]
-        when '>'
-          str = "#{column_name}::date > ?::date"
-          args << values[0]
-        when '<'
-          str = "#{column_name}::date < ?::date"
-          args << values[0]
         when '..'
           str = "(#{column_name}::date BETWEEN ?::date AND ?::date)"
           args << values[0]
           args << values[1]
+        else
+          str = "#{column_name}::date #{option} ?::date"
+          args << values[0]
         end
         [str, args]
       end

data/lib/rad_core_rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rad_core_rails
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.9.2
 platform: ruby
 authors:
 - Oleksandr Poltavets, James Marrs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport