rad_core_rails 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19eb34cf021bf71626e4dffbf85549af5d4f1a66c6e04690e7652a6b716d185b
-  data.tar.gz: 2c5a597b5884b9a8d6cd8ac11eba03e31eeab05f67e04d300542a3fca6f51872
+  metadata.gz: 6ceead2841d732a837cd792358174211cd357da39c2f72b1435fdd47a68cc354
+  data.tar.gz: f3fc5c87d4e9a9769b13354b3b1f6594936f54d97221c56910e1d9a4c677eb07
 SHA512:
-  metadata.gz: 39a39f01993527ae34221b035cd864a4dd35bb6240b54c6e71dded4793f7a098aee0c47a744e72d7a361214a05fc64ee79d2664e8303cf4262c8f36f7dae701c
-  data.tar.gz: ef0ec46b1c1bf8563cdef0747cac98cc95e0c12bc114f0e3d2d76271927f18d6621f53f77a55ecded26351fb59ecf05547cc82261ef16b0d44921948dcd09f48
+  metadata.gz: 343d979caca6c5ef32a443720983111ef7c4b1f9d1f5bfe58517929ddba0d0c3dcafaa9f8d87b62f1a307259f3af2be829e78e9e9bbf942975bc8544cdfbe7e8
+  data.tar.gz: 9b0205167f8736b088c68ab4eefba1aae2997480bd1fd4eb427924287985bbc0bbb7b4eb84e4633b1a596634d758674e779574b9a1e7a63b8484a4d667fb9665

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/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/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,167 +1,167 @@
-# 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)
-        args = []
-        if search.present? && searchable_columns.is_a?(Array)
-          clause = []
-          search.split(' ').each do |term|
-            columns = []
-            searchable_columns.each do |col|
-              columns.push("(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(ARRAY[?]))"
-        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)
-        if columns.empty?
-          return self.columns.select { |c| c.type == :string }.map { |c| "#{table_name}.#{c.name}" }
-        end
-
-        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
+# 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)
+        args = []
+        if search.present? && searchable_columns.is_a?(Array)
+          clause = []
+          search.split(' ').each do |term|
+            columns = []
+            searchable_columns.each do |col|
+              columns.push("(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(ARRAY[?]))"
+        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)
+        if columns.empty?
+          return self.columns.select { |c| c.type == :string }.map { |c| "#{table_name}.#{c.name}" }
+        end
+
+        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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rad_core_rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Oleksandr Poltavets, James Marrs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport