query_helper 0.2.14 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1aceb412b2d8c65cbe7a8ca001c0d3609b926546a3928e996b9a8f68f3c59491
-  data.tar.gz: 28027fdaec7281917bf52578c2dcf36d390e4dbdecc71286f35453f30831fd2f
+  metadata.gz: c3bc15fea354655ec8dc8ab74e84849104d7f13e8f0dfc064d7210d75642ae60
+  data.tar.gz: cdb0d638c3afc722e19816d136a1a27f5716e1d06bc838eeea481d6995438f7c
 SHA512:
-  metadata.gz: 8a402b1afb054e8470ee020d354e581564940b27091f5d24cb7a0cd277e7fd20c26cc2e6e15211967bf993ea96346223e60fba4a07f39eda34720d23351eb58a
-  data.tar.gz: cae4fbd2f45abbd36df6393883897cf77d7451c8a86211085f48185ba0ad3d6dab68f3d196a757b49261afa4976137f4291acd825d63bebc2a81d9eff2893030
+  metadata.gz: 4ce4101f690100aabd91841e8866daa1bffc728d5b741739707dc28bdb220dc2851974fb468d11ad5c681d5aa3315c49e93e3de7b197046e4badfd8bdb339866
+  data.tar.gz: 65aaa2d1e2d37ae994968728df34027cd846ff4e38c6c25771c64c90bffde48d799fb70ddffdadbee7b6a7584055e2ba8a43a32155a2aff1e2e0c6311c98261d

data/Gemfile.lock

@@ -1,56 +1,56 @@
 PATH
   remote: .
   specs:
-    query_helper (0.2.14)
+    query_helper (0.2.19)
       activerecord (> 5)
       activesupport (> 5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.2.2)
-      actionview (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionpack (6.0.3.2)
+      actionview (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionview (6.0.3.2)
+      activesupport (= 6.0.3.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activerecord (6.0.2.2)
-      activemodel (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activesupport (6.0.2.2)
+    activemodel (6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activerecord (6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     builder (3.2.4)
-    byebug (11.1.1)
+    byebug (11.1.3)
     concurrent-ruby (1.1.6)
     crass (1.0.6)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     erubi (1.9.0)
     faker (1.9.6)
       i18n (>= 0.7)
-    i18n (1.8.2)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    loofah (2.4.0)
+    loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
-    nokogiri (1.10.9)
+    minitest (5.14.1)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    rack (2.2.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
@@ -58,9 +58,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    railties (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -69,15 +69,15 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-rails (4.0.0)
+    rspec-rails (4.0.1)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
       railties (>= 4.2)
@@ -85,13 +85,13 @@ GEM
       rspec-expectations (~> 3.9)
       rspec-mocks (~> 3.9)
       rspec-support (~> 3.9)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     sqlite3 (1.3.13)
     thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby

data/lib/query_helper.rb

@@ -80,13 +80,13 @@ class QueryHelper
     @as_json_options = as_json_options if as_json_options
     @custom_mappings = custom_mappings if custom_mappings
     @preload = preload if preload
-    @search_fields = search_fields if search_fields 
-    @sql_filter = sql_filter if sql_filter 
-    @sql_sort = sql_sort if sql_sort 
-    @search_string = search_string if search_string 
+    @search_fields = search_fields if search_fields
+    @sql_filter = sql_filter if sql_filter
+    @sql_sort = sql_sort if sql_sort
+    @search_string = search_string if search_string
     @page = determine_page(page: page, per_page: per_page) if page
     @per_page = determine_per_page(page: page, per_page: per_page) if per_page
-    @metadata = metadata if metadata 
+    @metadata = metadata if metadata
     set_limit_and_offset()
     return self
   end
@@ -116,21 +116,21 @@ class QueryHelper
     @sql_filter.create_filters()
 
     having_clauses = @sql_filter.having_clauses
-    where_clauses = @sql_filter.where_clauses 
-    
+    where_clauses = @sql_filter.where_clauses
+
     if @search_string
       search_filter = search_filter(column_maps)
       if search_filter[:placement] == :where
         where_clauses << search_filter[:filter]
-      else 
+      else
         having_clauses << search_filter[:filter]
       end
-    end 
+    end
 
 
     # merge the filter bind variables into the query bind variables
     @bind_variables.merge!(@sql_filter.bind_variables)
-    
+
     # Execute Sql Query
     manipulator = SqlManipulator.new(
       sql: @query,
@@ -144,7 +144,7 @@ class QueryHelper
   end
 
   def to_json(args)
-    JSON.generate(results)
+    results.to_json
   end
 
   def to_sql
@@ -152,7 +152,7 @@ class QueryHelper
     return query if @bind_variables.length == 0
     begin
       return @model.sanitize_sql_array([query, @bind_variables])
-    rescue NoMethodError 
+    rescue NoMethodError
       # sanitize_sql_array is a protected method before Rails v5.2.3
       return @model.send(:sanitize_sql_array, [query, @bind_variables])
     end
@@ -181,14 +181,14 @@ class QueryHelper
 
   def pagination_results(count=@count)
     # Set pagination params if they aren't provided
-    results_per_page = @per_page || count 
-    results_page = @page || 1 
+    results_per_page = @per_page || count
+    results_page = @page || 1
 
-    total_pages = (count/(results_per_page.nonzero? || 1).to_f).ceil
+    total_pages = (count.to_i/(results_per_page.nonzero? || 1).to_f).ceil
     next_page = results_page + 1 if results_page.between?(1, total_pages - 1)
     previous_page = results_page - 1 if results_page.between?(2, total_pages)
     first_page = results_page == 1
-    last_page = results_page == total_pages
+    last_page = results_page >= total_pages
     out_of_range = !results_page.between?(1,total_pages)
 
     { count: count,
@@ -205,16 +205,16 @@ class QueryHelper
   private
 
     def determine_page(page:, per_page:)
-      return page.to_i if page 
-      return 1 if !page && per_page 
+      return page.to_i if page
+      return 1 if !page && per_page
       return nil
-    end 
+    end
 
     def determine_per_page(page:, per_page:)
-      return per_page.to_i if per_page 
-      return 100 if !per_page && page 
+      return per_page.to_i if per_page
+      return 100 if !per_page && page
       return nil
-    end 
+    end
 
     def set_limit_and_offset
       if @page && @per_page
@@ -226,7 +226,7 @@ class QueryHelper
         @bind_variables[:limit] = limit
         @bind_variables[:offset] = offset
       end
-    end 
+    end
 
     def paginated_results
       { pagination: pagination_results(),
@@ -273,16 +273,16 @@ class QueryHelper
     def search_filter(column_maps)
       raise ArgumentError.new("search_fields not defined") unless @search_fields.length > 0
       placement = :where
-      maps = column_maps.select do |cm| 
+      maps = column_maps.select do |cm|
         placement = :having if cm.aggregate
         @search_fields.include? cm.alias_name
-      end 
+      end
       bind_variable = ('a'..'z').to_a.shuffle[0,20].join.to_sym
       @bind_variables[bind_variable] = "%#{@search_string}%"
-      filter = "#{maps.map{|m| "#{m.sql_expression}::varchar"}.join(" || ")} ilike :#{bind_variable}"
+      filter = "#{maps.map{|m| "coalesce(#{m.sql_expression}::varchar, '')"}.join(" || ")} ilike :#{bind_variable}"
       return {
         filter: filter,
         placement: placement
       }
-    end 
+    end
 end

data/lib/query_helper/column_map.rb

@@ -13,7 +13,7 @@ class QueryHelper
 
       model.attribute_names.each do |attribute|
         if maps.select{|x| x.alias_name == attribute}.empty?
-          maps << ColumnMap.new(alias_name: attribute, sql_expression: "#{model.to_s.underscore.pluralize}.#{attribute}")
+          maps << ColumnMap.new(alias_name: attribute, sql_expression: "#{model.table_name.pluralize}.#{attribute}")
         end
       end
 

data/lib/query_helper/version.rb

@@ -1,3 +1,3 @@
 class QueryHelper
-  VERSION = "0.2.14"
+  VERSION = "0.2.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: query_helper
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.19
 platform: ruby
 authors:
 - Evan McDaniel
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -199,7 +199,7 @@ homepage: https://github.com/iserve-products/query_helper
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby Gem to help with pagination and data formatting at Pattern, Inc.
 test_files: []