rad_core_rails 0.7.0 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c80461bc2b08411eb1989bbda0e49d9cb47e73fbcd3b959c569742dd75f3342
-  data.tar.gz: 7df243406dd934723cf34c117475b3384a0bd237486d390236ea0e9215671234
+  metadata.gz: 95f6475b2b10bb6d51c5b4ad3feb7ebe08404663230abcae5278e81babe5e189
+  data.tar.gz: 90bfdddfeda70290d119eaad3bb4cdd35afc593e04a1d7d7a0c71736567b6710
 SHA512:
-  metadata.gz: 5e2f659480bbf9fe6b5eedbeb4a8c007c7877ee572709334a63441bbaeefd6f28488712010532eb7edb086028ad62714568b222a95f293ad387416917b05b098
-  data.tar.gz: 9e3071cd56281bb7f2dcbd22a1c5ff0d106803233f6e537ea5c5f600ae0432bf18edfd99ea136a80aea6290114b6eefb76afbd7e7ba031c03ed104b041575ad0
+  metadata.gz: 5406cb277bf3591e979e14adb5aef5f92370483cd8dce83fb1cd78c333f0c57ebd9a9de3a586272c649738ee44fe5a32a2d7f08b3ab54b545c914366033e1bb9
+  data.tar.gz: 20950b080d702d04bde47999be305945643acdf50d078f9d0fe05a50108656ad648f453f652d248e4e0980b9df980f9e84cb0ae8b84b5b366597bffb4616f05b

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/generators/rad_core_rails/templates/migration.rb.tt

@@ -11,7 +11,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version
     end
 
     add_index :zip_codes, :zip, unique: true
-    add_index :zip_codes, :latitude, unique: true
-    add_index :zip_codes, :longitude, unique: true
+    add_index :zip_codes, :latitude
+    add_index :zip_codes, :longitude
   end
 end

data/lib/rad_core_rails/query_generator.rb

@@ -40,66 +40,61 @@ module RadCoreRails
               args << arg
             end
           rescue NoMethodError
-            raise NoMethodError.new("Filter with the name `#{filter[:key]}` doesn't exist.")
+            raise NoMethodError, "Filter with the name `#{filter[:key]}` doesn't exist."
           end
         end
         [query.reject(&:blank?).join(' AND '), args]
       end
 
-      # def generate_search_clause(search)
-      #   and_args = []
-      #   or_args = []
-      #   if search.present? && searchable_columns.is_a?(Array)
-      #     # search_term_size = search.split(' ').length
-      #     and_terms = search.split(' ').select { |term| !term.include?('+') }
-      #     or_terms = search.split(' ').select { |term| term.include?('+') }
-      #     and_columns = []
-      #     or_columns = []
-      #     # just_ors = search_term_size == or_term_size
-      #     # operand = just_ors ? 'OR' : 'AND'
-      #     # search_terms = just_ors == true ? search.split(' ') : search.split(' ').select { |term| !term.include?('+') }
-      #     and_terms.each do |term|
-      #       columns = []
-      #       and_terms.each do |col|
-      #         and_columns.push("(LOWER(#{col}) ILIKE ?)")
-      #         and_args.push '%' + term.downcase.strip + '%'
-      #       end
-      #       or_terms.each do |col|
-      #         columns.push("(LOWER(#{col}) ILIKE ?)")
-      #         or_args.push '%' + term[1, term.length].downcase.strip + '%'
-      #       end
-      #       clause = if or_columns.empty?
-      #                  '(' + and_columns.join(' OR ') + ')'
-      #                else
-      #                  '(' + '(' + and_columns.join(' OR ') + ')' + 'AND' + '(' + or_columns.join(' OR ') + ')' + ')'
-      #                         end
-      #     end
-      #     [clause, and_args + or_args]
-      #   else
-      #     ['', []]
-      #   end
-      # end
-
-      # @searchable_columns, is an array of column names that you can compare to your terms.
-      #
       def generate_search_clause(search)
+        search_clause = ['', []]
+
         if search.present? && searchable_columns.is_a?(Array)
-          # holds all of the sql from sanitized_and_terms
-          and_args = []
-          # holds all the table columns sql for all the AND terms
-          and_clause = []
-          # holds all of the sql from sanitized_or_terms
-          or_args = []
-          # holds all the table columns sql for all the OR terms
-          or_clause = []
-          # extract and terms, remove casing, and add ILIKE '%' comparisions
+          and_args = []         # SQL from sanitized_and_terms
+          excluded_args = []    # SQL from sanitized_excluded_terms
+          and_clause = []       # table columns SQL for all the AND terms
+          excluded_clause = []  # table columns SQL for all the AND NOT terms
+          or_args = []          # SQL from sanitized_or_terms
+          or_clause = []        # table columns SQL for all the OR terms
+
+          phrases_to_exclude = search.scan(/-"([^"]*)"/)  # e.g. -"Phrase to exclude"
+          phrases_or = search.scan(/\+"([^"]*)"/)         # e.g. +"Phrase for OR"
+
+          # remove excluded phrases from search if any
+          if phrases_to_exclude.any?
+            phrases_to_exclude.each {|phrase| search.gsub!('-"' + "#{phrase.first}" + '"', '')}
+          end
+
+          # remove 'or' phrases from search if any
+          if phrases_or.any?
+            phrases_or.each {|phrase| search.gsub!('+"' + "#{phrase.first}" + '"', '')}
+          end
+
+          # extract 'and' terms, remove casing, and add ILIKE '%' comparisons
           sanitized_and_terms = search.split(' ')
-                                      .reject { |term| term.include?('+') }
+                                      .reject { |term| term.include?('+') || term.include?('-') }
                                       .map { |term| '%' + term.downcase.strip + '%' }
-          # extract or terms, remove casing, and add ILIKE '%' comparisions
+
+          # extract 'or' terms, remove casing, and add ILIKE '%' comparisons
           sanitized_or_terms = search.split(' ')
                                      .select { |term| term.include?('+') }
                                      .map { |term| '%' + term[1, term.length].downcase.strip + '%' }
+
+          # add 'or' phrase terms, remove casing, and add ILIKE '%' comparisons
+          if phrases_or.any?
+           sanitized_or_terms += phrases_or.flatten.map{|phrase| '%' + phrase.downcase.strip + '%'}
+          end
+
+          # extract excluded terms, remove casing, and add NOT ILIKE '%' comparisons
+          sanitized_excluded_terms = search.split(' ')
+                                           .select { |term| term.include?('-') }
+                                           .map { |term| '%' + term[1, term.length].downcase.strip + '%' }
+
+          # add excluded phrase terms, remove casing, and add NOT ILIKE '%' comparisons
+          if phrases_to_exclude.any?
+           sanitized_excluded_terms += phrases_to_exclude.flatten.map{|phrase| '%' + phrase.downcase.strip + '%'}
+          end
+
           # loop through sanitized_and_terms to find all possible columns.
           sanitized_and_terms.each do |sanitized_term|
             columns = []
@@ -110,6 +105,16 @@ module RadCoreRails
             end
             and_clause.push '(' + columns.join(' OR ') + ')'
           end
+          # loop through sanitized_excluded_terms to find all possible columns.
+          sanitized_excluded_terms.each do |sanitized_term|
+            columns = []
+            # all possible columns where this should be searched
+            searchable_columns.each do |col|
+              columns.push("(LOWER(#{col}) NOT ILIKE ?)")
+              excluded_args.push sanitized_term
+            end
+            excluded_clause.push '(' + columns.join(' AND ') + ')'
+          end
           # loop through sanitized_or_terms to find all possible columns.
           sanitized_or_terms.each do |sanitized_term|
             columns = []
@@ -120,18 +125,48 @@ module RadCoreRails
             end
             or_clause.push '(' + columns.join(' OR ') + ')'
           end
+
+          if or_clause.empty? && and_clause.empty? && excluded_clause.empty?
+            return ['', []]
+          end
+
+          if or_clause.empty? && excluded_clause.empty?
+            return ['(' + and_clause.join(' AND ') + ')', and_args]
+          end
+
+          if and_clause.empty? && excluded_clause.empty?
+            return ['(' + or_clause.join(' OR ') + ')', or_args]
+          end
+
           if or_clause.empty? && and_clause.empty?
-            ['', []]
-          elsif or_clause.empty?
-            ['(' + and_clause.join(' AND ') + ')', and_args]
-          elsif and_clause.empty?
-            ['(' + or_clause.join(' OR ') + ')', or_args]
-          else
-            ['((' + and_clause.join(' AND ') + ') AND (' + or_clause.join(' OR ') + '))', and_args + or_args]
+            return ['(' + excluded_clause.join(' AND ') + ')', excluded_args]
           end
-        else
-          ['', []]
+
+          if or_clause.empty?
+            return ['((' + and_clause.join(' AND ') + ') AND (' + excluded_clause.join(' AND ') + '))', and_args + excluded_args]
+          end
+
+          if and_clause.empty?
+            return ['((' + or_clause.join(' OR ') + ') AND (' + excluded_clause.join(' AND ') + '))', or_args + excluded_args]
+          end
+
+          if excluded_clause.empty?
+            return ['((' + and_clause.join(' AND ') + ') AND (' + or_clause.join(' OR ') + '))', and_args + or_args]
+          end
+
+          search_clause = [
+           '((' +
+             and_clause.join(' AND ') +
+             ') AND (' +
+             or_clause.join(' OR ') +
+             ') AND (' +
+             excluded_clause.join(' AND ') +
+           '))',
+           and_args + or_args + excluded_args
+          ]
         end
+
+        search_clause
       end
 
       # Generate Boolean clause
@@ -164,8 +199,13 @@ module RadCoreRails
       end
 
       def generate_array_clause(column_name, filter)
-        str = "(#{column_name} && ARRAY[?])"
-        args = [filter[:values]]
+        if filter[:option] == '!='
+          str = "(SELECT NOT(#{column_name}::text[] && ARRAY[?]))"
+          args = [filter[:values]]
+        else
+          str = "(SELECT (#{column_name}::text[] && ARRAY[?]))"
+          args = [filter[:values]]
+        end
 
         [str, args]
       end
@@ -254,6 +294,7 @@ module RadCoreRails
 
       def handle_filterable(filters_data)
         return nil if filters_data.empty?
+
         @zip_code_class = filters_data.delete(:zip_code_class)
 
         result = {}
@@ -270,6 +311,7 @@ module RadCoreRails
 
       def zip_code_class
         return RadCoreRails::ZipCode unless @zip_code_class
+
         @zip_code_class.to_s.constantize
       end
     end