rad_core_rails 0.8.6 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b17f485067f34bebbd35a7fcab545dcf81273201bdeff52fdfc9bf4f730c064d
-  data.tar.gz: 9fa40daaa31729315ae09af260478b9ee50f109a1867ff9fea46d016e5162c6e
+  metadata.gz: 25afa2ab283d0e2464b20d53c7277c1fbbe517a817304c7ae478bb4e84335970
+  data.tar.gz: 9edaa7586be8b6ac0383324ee4be4df07b5bc4e311601d61fbf8ed3fedbd6070
 SHA512:
-  metadata.gz: b0f1f03e5b71cf858a9517a9b9e2b7d51187cba5dcd04119683103ca3218f8a90a60c92a82350b261e968d817d61a1539500a3a792166140585c602378fb9005
-  data.tar.gz: dd746c29acad9bb3ea5c4443cc9d7567773a3999f7173b9bd5eaed0b49323f1aab85ff3ab4d58db4122300180abeadd7101c89384a9f64bd9a756c86b144e4f1
+  metadata.gz: d12332fbf8ececde8084ff0db21d9587c95fad46f851993dcfa2ad2e8211fb4b21cf74850a52fd6c40d8ae9e718bb7dfc48d03295552a091ca356c2d06905d4e
+  data.tar.gz: 2d7a5335aa20f9abff6f976ae44084ca3f215da2ab78674ce2199c97f959f4be836268b9f50f9baa3cef7262cf00fc3ab58582986b5bb814b850d29d69a65bb7

data/.rspec

@@ -1,3 +1,3 @@
---format documentation
---color
---require spec_helper
+--format documentation
+--color
+--require spec_helper

data/.travis.yml

@@ -1,6 +1,6 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.4.5
+---
+language: ruby
+cache: bundler
+rvm:
+  - 2.4.5
   - 2.7.0

data/CODE_OF_CONDUCT.md

@@ -1,74 +1,74 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at sancho.ck@gmail.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [https://contributor-covenant.org/version/1/4][version]
-
-[homepage]: https://contributor-covenant.org
-[version]: https://contributor-covenant.org/version/1/4/
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at sancho.ck@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [https://contributor-covenant.org/version/1/4][version]
+
+[homepage]: https://contributor-covenant.org
+[version]: https://contributor-covenant.org/version/1/4/

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2020 Oleksandr Poltavets
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2020 Oleksandr Poltavets
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

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.
@@ -205,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?
@@ -227,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(' & ')
@@ -274,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]]
+        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)
-        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

data/lib/rad_core_rails/search_terms.rb

@@ -1,31 +1,31 @@
-module RadCoreRails
-  module SearchTerms
-    extend ActiveSupport::Concern
-
-    class_methods do
-      def _terms(column, search = '')
-        if search.present?
-          if column.is_a?(Array)
-            terms = []
-            search.split(' ').each do |term|
-              columns = []
-              column.each do |col|
-                columns.push("(replace(lower(#{Arel.sql(col)}), ' ', '') ILIKE '%#{Arel.sql(term.downcase)}%')")
-              end
-              terms.push '(' + columns.join(' OR ') + ')'
-            end
-            '(' + terms.join(' AND ') + ')'
-          else
-            terms = []
-            search.split(' ').each do |term|
-              terms.push("(replace(lower(#{Arel.sql(column)}), ' ', '') ILIKE '%#{Arel.sql(term.downcase)}%')")
-            end
-            '(' + terms.join(' AND ') + ')'
-          end
-        else
-          '1 = 1'
-        end
-      end
-    end
-  end
+module RadCoreRails
+  module SearchTerms
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def _terms(column, search = '')
+        if search.present?
+          if column.is_a?(Array)
+            terms = []
+            search.split(' ').each do |term|
+              columns = []
+              column.each do |col|
+                columns.push("(replace(lower(#{Arel.sql(col)}), ' ', '') ILIKE '%#{Arel.sql(term.downcase)}%')")
+              end
+              terms.push '(' + columns.join(' OR ') + ')'
+            end
+            '(' + terms.join(' AND ') + ')'
+          else
+            terms = []
+            search.split(' ').each do |term|
+              terms.push("(replace(lower(#{Arel.sql(column)}), ' ', '') ILIKE '%#{Arel.sql(term.downcase)}%')")
+            end
+            '(' + terms.join(' AND ') + ')'
+          end
+        else
+          '1 = 1'
+        end
+      end
+    end
+  end
 end

data/lib/rad_core_rails/sortable.rb

@@ -1,14 +1,14 @@
-# frozen_string_literal: true
-module RadCoreRails
-  module Sortable
-    extend ActiveSupport::Concern
-
-    included do
-      scope :sort_order, ->(column, direction) { order(self.sort_column(column, direction)) }
-
-      def self.sort_column(column, direction)
-        "#{Arel.sql(column)} #{sort_direction(direction)}"
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+module RadCoreRails
+  module Sortable
+    extend ActiveSupport::Concern
+
+    included do
+      scope :sort_order, ->(column, direction) { order(self.sort_column(column, direction)) }
+
+      def self.sort_column(column, direction)
+        "#{Arel.sql(column)} #{sort_direction(direction)}"
+      end
+    end
+  end
+end

data/lib/rad_core_rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rad_core_rails
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.1
 platform: ruby
 authors:
 - Oleksandr Poltavets, James Marrs
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-07 00:00:00.000000000 Z
+date: 2021-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -89,7 +89,7 @@ metadata:
   homepage_uri: https://github.com/jamesmarrs/rad-core-rails
   source_code_uri: https://rubygems.org/gems/rad_core_rails
   changelog_uri: https://rubygems.org/gems/rad_core_rails
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: RadCoreRails
 test_files: []