rad_core_rails 0.8.0 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a00752d7d95c527463926fbb1e14ab869308906d7b40dead1cb538f8e8c590c9
-  data.tar.gz: 6530bcf049d2fa65ff5e69830e2ed678aae9c25689ff526839b13d549734a399
+  metadata.gz: 94385bc06e9963131ae34f6bb60e292d1d17843e33ec172d6b77208d62a8fd42
+  data.tar.gz: e7633994fc346ba6a735201173be955121b5d53b9147eefb433ae99864e5fc6f
 SHA512:
-  metadata.gz: 72c7c3a5700725dfadf879f3f02f0ff9273e2a7fab1fdd1d35a3aec3f28571ac66ddcd94b49a06c523a795b588f5134db2419669b60fdb22e4ae1b0a89d4f9b8
-  data.tar.gz: 6fbd8139f169048dd2512c69477d8dc0f89cb2ac844e6d46221ce8d55c3491c53901125803c152cdf8d4af43742bcc0f765149fd6c10ef8b90c3f6269d943caa
+  metadata.gz: 8dde266785258fbd7c1f94c9c40769498693f06ba0a4bff7a6787d5e9b6c8cf7ac4986277ea6bd22ecff9079708584473fbf47078a3215c3eb6e469a3ed88cfa
+  data.tar.gz: adb7160fc0842d87a3653583134678e407c4364f72d400045a19621a8eb2bd584be5079f2e43fd176846b5dd3e248ccf9ba90ff36be1dec9adc28ac9f2440cfb

data/lib/rad_core_rails/query_generator.rb

@@ -179,14 +179,35 @@ module RadCoreRails
       end
 
       def generate_model_clause(column_name, filter, optional_exclusion_clause = nil)
-        str = if optional_exclusion_clause.present? && filter[:option] == '!='
-                optional_exclusion_clause
-              else
-                # 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]]
+        if optional_exclusion_clause.present? && filter[:option] == '!='
+          str = optional_exclusion_clause
+          args = [filter[:values]]
+        elsif filter[:option] == '!!'
+          str = "(#{column_name} IS NULL)"
+          args = []
+        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]]
+        end
+
+        [str, args]
+      end
+
+      def generate_string_clause(column_name, filter, optional_exclusion_clause = nil)
+        if optional_exclusion_clause.present? && filter[:option] == '!='
+          str = optional_exclusion_clause
+          args = [filter[:values]]
+        elsif filter[:option] == '!!'
+          str = "(#{column_name} IS NULL OR #{column_name} = '')"
+          args = []
+        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]]
+        end
 
         [str, args]
       end
@@ -206,17 +227,17 @@ module RadCoreRails
 
         sanitized_and_terms = search.split(' ')
                                     .reject { |term| term.include?('+') || term.include?('-') }
-                                    .map { |term| term.downcase.strip.gsub('*', ':*') }
+                                    .map { |term| term.downcase.strip + ':*' }
                                     .reject { |t| t.blank? }
 
         sanitized_or_terms = search.split(' ')
                                    .select { |term| term.include?('+') }
-                                   .map { |term| term[1, term.length].downcase.strip.gsub('*', ':*') }
+                                   .map { |term| term[1, term.length].downcase + ':*' }
                                    .reject { |t| t.blank? }
 
         sanitized_excluded_terms = search.split(' ')
                                          .select { |term| term.include?('-') }
-                                         .map { |term| term[1, term.length].downcase.strip.gsub('*', ':*') }
+                                         .map { |term| term[1, term.length].downcase.strip + ':*' }
                                          .reject { |t| t.blank? }
 
         and_clause = sanitized_and_terms.join(' & ')
@@ -255,9 +276,10 @@ module RadCoreRails
 
       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 = "(#{column_name} @@ to_tsquery('simple', ?))"
         [query, [vector_string]]
       end
 
@@ -270,10 +292,13 @@ module RadCoreRails
 
       def generate_array_clause(column_name, filter)
         if filter[:option] == '!='
-          str = "(SELECT NOT(#{column_name}::text[] && ARRAY[?]))"
+          str = "(SELECT NOT(#{column_name}::text[] && ARRAY[?]::text[]))"
           args = [filter[:values]]
+        elsif filter[:option] == '!!'
+          str = "(#{column_name}::text[] = '{}')"
+          args = []
         else
-          str = "(SELECT (#{column_name}::text[] && ARRAY[?]))"
+          str = "(SELECT (#{column_name}::text[] && ARRAY[?]::text[]))"
           args = [filter[:values]]
         end
 

data/lib/rad_core_rails/version.rb

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

metadata

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