rad_core_rails 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82f95dfd6c84c8aa3594f89b742563c9d2d07c0637ae18432acabd352c6ff088
-  data.tar.gz: bf435325dc6b733c186167a643c07330d10da47fa165328b14465109986af93e
+  metadata.gz: dae4ae340b06a1da96202cc5dce7e727a3907edc48841586a125db38e427e8c8
+  data.tar.gz: 622d9c87e97ff694d590b3dd9002afbe2e83ac0931e86e71a3165be2b7a8348b
 SHA512:
-  metadata.gz: 5e47b6b0a09ff8f6b77c8b97b59664e8b03180e1f1ed461b6a37eef2a0bd59431195055c33e565c2244c0ffa56708dfd186b35dcc2c9f3ccfbb5acfa66a39f1c
-  data.tar.gz: 2205ff6ff6494d0f770b69f896b26e5075c23da826ca964f2edafd2dba7f3cee7f0add929538ec755fc65f44e10142847ba269223c1acae2f9f4c7637fcaec83
+  metadata.gz: 1975e49d1eb90781389bff974d63b0ae0ca948a88ea427258e34dd401b34bf922999f10fb3f0ac5ba5bb96ec5b1bbe03cad4601dc0252b3ea129f16cc39c451b
+  data.tar.gz: 8a69180847d8c03ecd95fe3c941d4d04d29bc5416638cf9752cdd7154c84e9e9325f1aa1e0fe46f4d3863028b13133ccdbd470cdc8fdb94fe493b8705e5978f7

data/Gemfile

@@ -5,9 +5,18 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in new_gem.gemspec
 gemspec
 
+gem "activesupport", '>= 4.2'
+gem "activemodel", '>= 4.2'
+gem "activerecord", '>= 4.2'
+gem "actionpack", '>= 4.2'
+gem "bundler", '>= 1.17.3'
+gem "rake"
+
 group :test do
   gem 'byebug'
   gem 'pg'
   gem 'database_cleaner-active_record'
-  gem "factory_bot_rails"
+  gem 'factory_bot_rails'
+  gem 'rspec-rails'
+  gem 'shoulda-matchers', '>= 4.0'
 end

data/lib/rad_core_rails/query_generator.rb

@@ -178,12 +178,13 @@ module RadCoreRails
         [str, args]
       end
 
-      def generate_model_clause(column_name, filter, optional_exclusion_clause = nil)
+      def generate_model_clause(column_name, filter, optional_exclusion_clause = nil, optional_blank_clause = nil)
         if optional_exclusion_clause.present? && filter[:option] == '!='
           str = optional_exclusion_clause
           args = [filter[:values]]
         elsif filter[:option] == '!!'
-          str = "(#{column_name} IS NULL)"
+          optional_blank_clause ||= "(#{column_name} IS NULL)"
+          str = optional_blank_clause
           args = []
         else
           # probably should fix this.
@@ -195,7 +196,24 @@ module RadCoreRails
         [str, args]
       end
 
-      def sanitize_vector_string(search)
+      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 = "(LOWER(TRIM(#{column_name})) #{filter[:option] || '='} ANY(ARRAY[?]))"
+          args = [filter[:values].map(&:strip).map(&:downcase)]
+        end
+
+        [str, args]
+      end
+
+      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?
@@ -210,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(' & ')
@@ -257,18 +275,24 @@ 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]]
       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)
+        if filter[:option] != '!!'
+          str = "(#{column_name} = ANY(#{zip_code_class.distance_query}))"
+          args = zip_code_class.distance_args(filter)
+        elsif filter[:option] == '!!'
+          str = "(#{column_name} IS NULL OR #{column_name} = '')"
+          args = []
+        end
 
         [str, args]
       end
@@ -277,6 +301,9 @@ module RadCoreRails
         if filter[:option] == '!='
           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[?]::text[]))"
           args = [filter[:values]]

data/lib/rad_core_rails/version.rb

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

data/rad_core_rails.gemspec

@@ -27,18 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # spec.add_dependency "rails", '>= 4.2'
-  spec.add_dependency "activesupport", '>= 4.2'
-  spec.add_dependency "activemodel", '>= 4.2'
-  spec.add_dependency "activerecord", '>= 4.2'
-
-  spec.add_development_dependency "actionpack", '>= 4.2'
-  spec.add_development_dependency "bundler", '>= 1.17.3'
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-rails"
-  spec.add_development_dependency "factory_bot_rails"
-  spec.add_development_dependency "shoulda-matchers", '>= 4.0'
-  spec.add_development_dependency 'pg', '>= 0.19'
-  spec.add_development_dependency 'railties', '>= 5'
-  # spec.add_development_dependency "simplecov", '~> 0.17', '>= 0.18.5'
+  spec.add_dependency "activesupport"
+  spec.add_dependency "activemodel"
+  spec.add_dependency "activerecord"
 end

metadata

@@ -1,93 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: rad_core_rails
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Oleksandr Poltavets, James Marrs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.17.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.17.3
-- !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -95,13 +25,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -109,61 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_bot_rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda-matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.19'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.19'
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
 description: RadCoreRails lib
 email:
 - sancho.ck@gmail.com