query_helper 0.2.15 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a322338c9c9fd1675506690061efb3e40715f8efb438a6a552335cb7948a3e86
-  data.tar.gz: 6da1ce413feabd5f72b48fe599b6ce020e6288830af637e9c330a2083a49e91f
+  metadata.gz: 20ef59e4a5c449b359942acdf2577f6e756aa24df46175ab7c066a878d737a3e
+  data.tar.gz: 155d7aedaeb4b2da6ae1984217307dbb7144e19565cc28d1fdd920879adb4c6b
 SHA512:
-  metadata.gz: b0257379a11c98ed103f6cdd9751d341b815bb817789ee0b8054438c920813c94d2b25c4c5d26a75de53734e8ccf78b6a7077516011b3fd021a561a12681fda5
-  data.tar.gz: f75e4d2e80c083dc579829b46443b1dc6661a8fd57b648ed1d2ebedda14c016cf5d78a82ba388998e320d42d7ac065d2f7644b0c266076ea33a6afe595400800
+  metadata.gz: 1ee0d63818c17954054138587d5d6a49a175119bb37432e4c99952f638b8f39c4b81130e14eaf9e51e6715cb3fcd4527b23382c2caef7721f05dbe874cab07f6
+  data.tar.gz: 2295b50557aa7d74c9d713c4cfd4732f479fca0c026f101e9969562c7c8f68fe762324a4215c40cc722abfa0129e062ef995a504b3f060f6842ce27013cf9185

data/Gemfile.lock

@@ -1,56 +1,58 @@
 PATH
   remote: .
   specs:
-    query_helper (0.2.15)
+    query_helper (0.2.20)
       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.5)
+      actionview (= 6.0.3.5)
+      activesupport (= 6.0.3.5)
       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.5)
+      activesupport (= 6.0.3.5)
       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.5)
+      activesupport (= 6.0.3.5)
+    activerecord (6.0.3.5)
+      activemodel (= 6.0.3.5)
+      activesupport (= 6.0.3.5)
+    activesupport (6.0.3.5)
       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)
-      mini_portile2 (~> 2.4.0)
-    rack (2.2.2)
+    mini_portile2 (2.5.0)
+    minitest (5.14.1)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    racc (1.5.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
@@ -58,9 +60,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.5)
+      actionpack (= 6.0.3.5)
+      activesupport (= 6.0.3.5)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -69,15 +71,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 +87,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
@@ -99,7 +101,7 @@ PLATFORMS
 DEPENDENCIES
   actionpack
   activesupport
-  bundler (~> 1.17)
+  bundler (~> 2.2.6)
   byebug
   faker (~> 1.9.3)
   query_helper!
@@ -109,4 +111,4 @@ DEPENDENCIES
   sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.17.3
+   2.2.6

data/lib/query_helper.rb

@@ -66,6 +66,7 @@ class QueryHelper
     search_fields: nil,
     sql_filter: nil,
     sql_sort: nil,
+    sort_tiebreak: nil,
     page: nil,
     per_page: nil,
     search_string: nil,
@@ -80,13 +81,14 @@ 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
+    @sql_sort.sort_tiebreak = sort_tiebreak if sort_tiebreak
+    @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 +118,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,
@@ -152,7 +154,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 +183,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 +207,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 +228,7 @@ class QueryHelper
         @bind_variables[:limit] = limit
         @bind_variables[:offset] = offset
       end
-    end 
+    end
 
     def paginated_results
       { pagination: pagination_results(),
@@ -273,16 +275,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/query_helper_concern.rb

@@ -31,7 +31,7 @@ class QueryHelper
       end
 
       def create_query_helper_sort
-        QueryHelper::SqlSort.new(sort_string: params[:sort])
+        QueryHelper::SqlSort.new(sort_string: params[:sort], sort_tiebreak: params[:sort_tiebreak])
       end
 
       def create_query_helper_associations
@@ -48,7 +48,7 @@ class QueryHelper
       def query_helper_params_no_pagination
         helpers = {}
         helpers[:sql_filter] = create_query_helper_filter() if params[:filter]
-        helpers[:sql_sort] = create_query_helper_sort() if params[:sort]
+        helpers[:sql_sort] = create_query_helper_sort() if params[:sort] || params[:sort_tiebreak]
         helpers[:associations] = create_query_helper_associations() if params[:include]
         helpers[:search_string] = params[:search_for] if params[:search_for]
         helpers

data/lib/query_helper/sql_sort.rb

@@ -3,22 +3,33 @@ require "query_helper/invalid_query_error"
 class QueryHelper
   class SqlSort
 
-    attr_accessor :column_maps, :select_strings
+    attr_accessor :column_maps, :select_strings, :sort_tiebreak
 
-    def initialize(sort_string: "", column_maps: [])
+    def initialize(sort_string: "", sort_tiebreak: "", column_maps: [])
       @sort_string = sort_string
       @column_maps = column_maps
+      @sort_tiebreak = sort_tiebreak
       @select_strings = []
     end
 
     def parse_sort_string
+      return [] if @sort_string.blank? && @sort_tiebreak.blank?
+
+      return attributes_sql_expression(@sort_tiebreak) if @sort_string.blank?
+
+      sql_strings = attributes_sql_expression(@sort_string)
+      return sql_strings if @sort_tiebreak.blank?
+
+      sql_strings + attributes_sql_expression(@sort_tiebreak)
+    end
+
+    def attributes_sql_expression(sort_attribute)
       sql_strings = []
-      sorts = @sort_string.split(",")
+      sorts = sort_attribute.split(",")
       sorts.each_with_index do |sort, index|
         sort_alias = sort.split(":")[0]
         direction = sort.split(":")[1]
         modifier = sort.split(":")[2]
-
         begin
           sql_expression = @column_maps.find{ |m| m.alias_name == sort_alias }.sql_expression
         rescue NoMethodError => e
@@ -45,8 +56,7 @@ class QueryHelper
 
         sql_strings << "#{sql_expression} #{direction}"
       end
-
-      return sql_strings
+      sql_strings
     end
   end
 end

data/lib/query_helper/version.rb

@@ -1,3 +1,3 @@
 class QueryHelper
-  VERSION = "0.2.15"
+  VERSION = "0.2.20"
 end

data/query_helper.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler", "~> 2.2.6"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "sqlite3", "~> 1.3.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: query_helper
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.20
 platform: ruby
 authors:
 - Evan McDaniel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Ruby Gem to help with pagination and data formatting at Pattern, Inc.