rad_core_rails 0.4.1 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20894cdcbbc09b23a7271f946adefd95783ba644190aed1d5a8589b3f2f3c8ad
-  data.tar.gz: 36cfbec37c2e80c9ce756122269349718dae958928e9eac1eb469900de312873
+  metadata.gz: 48f739f3efcd0dbc68c15a40a1342153a8a403b6e7fadc8e17c2ea77b87ebf34
+  data.tar.gz: 5827e62ec17c57d74b43f9027a2fa65989d7df2bee37c1b60c814cc1f2d00998
 SHA512:
-  metadata.gz: a09c99c1805728bb164a4676d3877ed571686d062bb46bdd787df242f1dc03861371a28d01796079549c36c29666598f587896aa14e0070bc805fe5f09e3faa1
-  data.tar.gz: 5d0a8c6cda29036a9ea0403bc16a3e7b8ecbe57b3bcc0ecc3da8e378d418900506f9cd394e98cd3bd8b58cd6f0b11c588fd563395ce370a3d368a2bd4ea57a7c
+  metadata.gz: af53c0879f5c3bd089fa94a6b1644e2b7548bc8a583de55a838a10824a69f7790b6120360ff922f0c5d57021232a3f0c44c12522e31cb116483b718cb38ea457
+  data.tar.gz: 4f7d2ac6a1ca1056effe24ef813999e0e9b07a70d07ba320f5915471691aca34bacaefa90fffdd0d7740abc8626d7f221a6eee33312005410fd84e90bb03dd12

data/.gitignore

@@ -1,15 +1,16 @@
-/.idea/
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-Gemfile.lock
-bin
-*.gem
-.rspec_status
-.ruby-gemset
-.ruby-version
+/.idea/
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+Gemfile.lock
+bin
+*.gem
+.rspec_status
+.ruby-gemset
+.ruby-version
+/.byebug_history

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/Gemfile

@@ -1,6 +1,13 @@
-source "https://rubygems.org"
-
-git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in new_gem.gemspec
-gemspec
+source "https://rubygems.org"
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
+# Specify your gem's dependencies in new_gem.gemspec
+gemspec
+
+group :test do
+  gem 'byebug'
+  gem 'pg'
+  gem 'database_cleaner-active_record'
+  gem "factory_bot_rails"
+end

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/README.md

@@ -1,44 +1,44 @@
-# RadCoreRails
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/rad_core_rails`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'rad_core_rails'
-```
-
-And then execute:
-
-    $ bundle install
-
-Or install it yourself as:
-
-    $ gem install rad_core_rails
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/rad_core_rails. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/rad_core_rails/blob/master/CODE_OF_CONDUCT.md).
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the RadCoreRails project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/rad_core_rails/blob/master/CODE_OF_CONDUCT.md).
+# RadCoreRails
+
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/rad_core_rails`. To experiment with that code, run `bin/console` for an interactive prompt.
+
+TODO: Delete this and the text above, and describe your gem
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'rad_core_rails'
+```
+
+And then execute:
+
+    $ bundle install
+
+Or install it yourself as:
+
+    $ gem install rad_core_rails
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/rad_core_rails. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/rad_core_rails/blob/master/CODE_OF_CONDUCT.md).
+
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Code of Conduct
+
+Everyone interacting in the RadCoreRails project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/rad_core_rails/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/rad_core_rails.rb

@@ -1,14 +1,15 @@
-require "rad_core_rails/version"
-require "active_support/concern"
-require "active_record"
-require 'rad_core_rails/query_generator'
-require 'rad_core_rails/search_terms'
-require 'rad_core_rails/sortable'
-
-module RadCoreRails
-  def self.included(receiver)
-    receiver.send :include, Sortable, SearchTerms, QueryGenerator
-  end
-
-  class Error < StandardError; end
-end
+require "rad_core_rails/version"
+require "active_support/concern"
+require "active_support/core_ext"
+require "active_record"
+require 'rad_core_rails/query_generator'
+require 'rad_core_rails/search_terms'
+require 'rad_core_rails/sortable'
+
+module RadCoreRails
+  def self.included(receiver)
+    receiver.send :include, Sortable, SearchTerms, QueryGenerator
+  end
+
+  class Error < StandardError; end
+end

data/lib/rad_core_rails/query_generator.rb

@@ -1,161 +1,241 @@
-module RadCoreRails
-  module QueryGenerator
-    extend ActiveSupport::Concern
-
-    class_methods do
-      attr_reader :searchable_columns
-
-      def searchable(columns=[])
-        @searchable_columns = handle_columns(columns)
-      end
-
-      def joins_clause
-        <<-SQL
-        SQL
-      end
-
-      def filter_manifest
-        {}.with_indifferent_access
-      end
-
-      def create_filters(search, filters)
-        query = []
-        args = []
-        clause, arguments = generate_search_clause(search)
-        query << clause
-        arguments.each do |arg|
-          args << arg
-        end
-        filters.map do |filter|
-          clause, arguments = filter_manifest[filter[:key]].call(filter)
-          query << clause
-          arguments.each do |arg|
-            args << arg
-          end
-        end
-        [query.reject(&:blank?).join(' AND '), args]
-      end
-
-      def generate_search_clause(search)
-        args = []
-        if search.present? && searchable_columns.is_a?(Array)
-          clause = []
-          search.split(' ').each do |term|
-            columns = []
-            searchable_columns.each do |col|
-              columns.push("(REPLACE(LOWER(#{col}), ' ', '') ILIKE ?)")
-              args.push '%' + term.downcase.strip + '%'
-            end
-            clause.push '(' + columns.join(' OR ') + ')'
-          end
-          ['(' + clause.join(' AND ') + ')', args]
-        else
-          ['', []]
-        end
-      end
-
-      # Generate Boolean clause
-      def generate_boolean_clause(column_name, filter)
-        str = "#{column_name} = ?"
-        args = []
-        args << filter[:values][0]
-
-        [str, args]
-      end
-
-      def generate_model_clause(column_name, filter)
-        str = "(#{column_name} = ANY(?))"
-        args = []
-        args << '{' + filter[:values].join(', ') + '}'
-
-        [str, args]
-      end
-
-      def generate_array_clause(column_name, filter)
-        str = "(#{column_name} && (?))"
-        args = []
-        args << '{' + filter[:values].join(', ') + '}'
-
-        [str, args]
-      end
-
-      def generate_reference_link_clause(link_out_type, filter)
-        str = "(reference_links.link_out_type = '#{link_out_type}' AND reference_links.link_out_id = ANY(?))"
-        args = []
-        args << '{' + filter[:values].join(', ') + '}'
-
-        [str, args]
-      end
-
-      def generate_number_clause(column_name, filter)
-        option = filter[:option]
-        values = filter[:values]
-        str = ''
-        args = []
-
-        case option
-        when '='
-          str = "#{column_name} = ?"
-          args << values[0]
-        when '>'
-          str = "#{column_name} > ?"
-          args << values[0]
-        when '<'
-          str = "#{column_name} < ?"
-          args << values[0]
-        when '..'
-          str = "(#{column_name} BETWEEN ? AND ?)"
-          args << values[0]
-          args << values[1]
-        end
-        [str, args]
-      end
-
-      def generate_date_clause(column_name, filter)
-        option = filter[:option]
-        values = filter[:values]
-        str = ''
-        args = []
-
-        case option
-        when '='
-          str = "#{column_name}::date = ?::date"
-          args << values[0]
-        when '>'
-          str = "#{column_name}::date > ?::date"
-          args << values[0]
-        when '<'
-          str = "#{column_name}::date < ?::date"
-          args << values[0]
-        when '..'
-          str = "(#{column_name}::date BETWEEN ?::date AND ?::date)"
-          args << values[0]
-          args << values[1]
-        end
-        [str, args]
-      end
-
-      def sort_direction(direction)
-        direction == 'asc' ? 'ASC' : 'DESC'
-      end
-
-      private
-
-      def handle_columns(columns)
-        if columns.empty?
-          return self.columns.select{|c| c.type == :string}.map{|c| "#{self.table_name}.#{c.name}"}
-        end
-
-        columns.map do |c|
-          splitted_c = c.split(".")
-
-          if splitted_c.size == 1 && splitted_c.first != self.table_name
-            "#{self.table_name}.#{c}"
-          else
-            c
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module RadCoreRails
+  module QueryGenerator
+    extend ActiveSupport::Concern
+
+    class_methods do
+      attr_reader :searchable_columns
+
+      def searchable(columns = [])
+        @searchable_columns = handle_columns(columns)
+      end
+
+      def joins_clause
+        <<-SQL
+        SQL
+      end
+
+      def filter_manifest
+        {}.with_indifferent_access
+      end
+
+      def create_filters(search, filters)
+        query = []
+        args = []
+        clause, arguments = generate_search_clause(search)
+        query << clause
+        arguments.each do |arg|
+          args << arg
+        end
+        filters.map do |filter|
+          clause, arguments = filter_manifest[filter[:key]].call(filter)
+          query << clause
+          arguments.each do |arg|
+            args << arg
+          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)
+        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
+          sanitized_and_terms = search.split(' ')
+                                      .reject { |term| term.include?('+') }
+                                      .map { |term| '%' + term.downcase.strip + '%' }
+          # extract or terms, remove casing, and add ILIKE '%' comparisions
+          sanitized_or_terms = search.split(' ')
+                                     .select { |term| term.include?('+') }
+                                     .map { |term| '%' + term[1, term.length].downcase.strip + '%' }
+          # loop through sanitized_and_terms to find all possible columns.
+          sanitized_and_terms.each do |sanitized_term|
+            columns = []
+            # all possible columns where this should be searched
+            searchable_columns.each do |col|
+              columns.push("(LOWER(#{col}) ILIKE ?)")
+              and_args.push sanitized_term
+            end
+            and_clause.push '(' + columns.join(' OR ') + ')'
+          end
+          # loop through sanitized_or_terms to find all possible columns.
+          sanitized_or_terms.each do |sanitized_term|
+            columns = []
+            # all possible columns where this should be searched
+            searchable_columns.each do |col|
+              columns.push("(LOWER(#{col}) ILIKE ?)")
+              or_args.push sanitized_term
+            end
+            or_clause.push '(' + columns.join(' OR ') + ')'
+          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]
+          end
+        else
+          ['', []]
+        end
+      end
+
+      # Generate Boolean clause
+      def generate_boolean_clause(column_name, filter)
+        str = "#{column_name} = ?"
+        args = []
+        args << filter[:values][0]
+
+        [str, args]
+      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]]
+
+        [str, args]
+      end
+
+      def generate_array_clause(column_name, filter)
+        str = "(#{column_name} && ARRAY[?])"
+        args = [filter[:values]]
+
+        [str, args]
+      end
+
+      def generate_reference_link_clause(link_out_type, filter)
+        str = "(reference_links.link_out_type = '#{link_out_type}' AND reference_links.link_out_id = ANY(?))"
+        args = [filter[:values]]
+
+        [str, args]
+      end
+
+      def generate_jsonb_array_clause(unique_filter_key, column_name, filter)
+        str = "(#{column_name}  ?| ARRAY[:#{unique_filter_key}])"
+        args = [{ "#{unique_filter_key}": filter[:values] }]
+
+        [str, args]
+      end
+
+      def generate_number_clause(column_name, filter)
+        option = filter[:option]
+        values = filter[:values]
+        str = ''
+        args = []
+
+        case option
+        when '='
+          str = "#{column_name} = ?"
+          args << values[0]
+        when '>'
+          str = "#{column_name} > ?"
+          args << values[0]
+        when '<'
+          str = "#{column_name} < ?"
+          args << values[0]
+        when '..'
+          str = "(#{column_name} BETWEEN ? AND ?)"
+          args << values[0]
+          args << values[1]
+        end
+        [str, args]
+      end
+
+      def generate_date_clause(column_name, filter)
+        option = filter[:option]
+        values = filter[:values]
+        str = ''
+        args = []
+
+        case option
+        when '='
+          str = "#{column_name}::date = ?::date"
+          args << values[0]
+        when '>'
+          str = "#{column_name}::date > ?::date"
+          args << values[0]
+        when '<'
+          str = "#{column_name}::date < ?::date"
+          args << values[0]
+        when '..'
+          str = "(#{column_name}::date BETWEEN ?::date AND ?::date)"
+          args << values[0]
+          args << values[1]
+        end
+        [str, args]
+      end
+
+      def sort_direction(direction)
+        direction == 'asc' ? 'ASC' : 'DESC'
+      end
+
+      private
+
+      def handle_columns(columns)
+        return self.columns.select { |c| c.type == :string }.map { |c| "#{table_name}.#{c.name}" } if columns.empty?
+
+        columns.map do |c|
+          splitted_c = c.split('.')
+
+          if splitted_c.size == 1 && splitted_c.first != table_name
+            "#{table_name}.#{c}"
+          else
+            c
+          end
+        end
+      end
+    end
+  end
+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,3 +1,5 @@
-module RadCoreRails
-  VERSION = "0.4.1"
-end
+# frozen_string_literal: true
+
+module RadCoreRails
+  VERSION = '0.5.4'
+end

data/rad_core_rails.gemspec

@@ -1,39 +1,39 @@
-require_relative 'lib/rad_core_rails/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "rad_core_rails"
-  spec.version       = RadCoreRails::VERSION
-  spec.authors       = ["Oleksandr Poltavets, James Marrs"]
-  spec.email         = ["sancho.ck@gmail.com"]
-
-  spec.summary       = %q{RadCoreRails}
-  spec.description   = %q{RadCoreRails lib}
-  spec.homepage      = "https://github.com/jamesmarrs/rad-core-rails"
-  spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
-
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://rubygems.org/gems/rad_core_rails"
-  spec.metadata["changelog_uri"] = "https://rubygems.org/gems/rad_core_rails"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "activesupport", '>= 4.2'
-  spec.add_dependency "activemodel", '>= 4.2'
-  spec.add_dependency "activerecord", '>= 4.2'
-  # spec.add_dependency 'pg', '>= 0.17.1'
-  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", '>= 3.0'
-  # spec.add_development_dependency "simplecov", '~> 0.17', '>= 0.18.5'
-end
+require_relative 'lib/rad_core_rails/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "rad_core_rails"
+  spec.version       = RadCoreRails::VERSION
+  spec.authors       = ["Oleksandr Poltavets, James Marrs"]
+  spec.email         = ["sancho.ck@gmail.com"]
+
+  spec.summary       = %q{RadCoreRails}
+  spec.description   = %q{RadCoreRails lib}
+  spec.homepage      = "https://github.com/jamesmarrs/rad-core-rails"
+  spec.license       = "MIT"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://rubygems.org/gems/rad_core_rails"
+  spec.metadata["changelog_uri"] = "https://rubygems.org/gems/rad_core_rails"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "activesupport", '>= 4.2'
+  spec.add_dependency "activemodel", '>= 4.2'
+  spec.add_dependency "activerecord", '>= 4.2'
+  # spec.add_dependency 'pg', '>= 0.17.1'
+  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", '>= 3.0'
+  # spec.add_development_dependency "simplecov", '~> 0.17', '>= 0.18.5'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rad_core_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.4
 platform: ruby
 authors:
 - Oleksandr Poltavets, James Marrs
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -137,7 +137,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
@@ -153,7 +153,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: []