rad_core_rails 0.8.8 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aee20fb677577f2bdbae21a0a002968a70e0f11c052580713f2538e0321252d4
-  data.tar.gz: fb22e9d2d70617d2b5acc150cda26f662a67b8b58d00dbf264507de870553d3d
+  metadata.gz: dae4ae340b06a1da96202cc5dce7e727a3907edc48841586a125db38e427e8c8
+  data.tar.gz: 622d9c87e97ff694d590b3dd9002afbe2e83ac0931e86e71a3165be2b7a8348b
 SHA512:
-  metadata.gz: 36809f265234f02255bd581587a4e362f985e7eee3f1bf1e2d0dfcde1c1a90b6d4d9e32f20adb1cbbbd35e8e593b376c02b40fe1aacb7435affad55a54f59392
-  data.tar.gz: '08fea0c02b655b2e8f8ee15453d6bb42afe4e35eaed7461e9d16f06275646a8972e783e92c3290f5652ecd9dac29b7da6d695280280d3bd7237e31100f67554b'
+  metadata.gz: 1975e49d1eb90781389bff974d63b0ae0ca948a88ea427258e34dd401b34bf922999f10fb3f0ac5ba5bb96ec5b1bbe03cad4601dc0252b3ea129f16cc39c451b
+  data.tar.gz: 8a69180847d8c03ecd95fe3c941d4d04d29bc5416638cf9752cdd7154c84e9e9325f1aa1e0fe46f4d3863028b13133ccdbd470cdc8fdb94fe493b8705e5978f7

data/lib/rad_core_rails/query_generator.rb

@@ -213,7 +213,7 @@ module RadCoreRails
         [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,10 +275,11 @@ 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]]

data/lib/rad_core_rails/version.rb

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

metadata

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