query_helper 0.3.5 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 216dd6ebcc3d4be6014068002ae576a58bb0ec6a040fea677c1b34cd179d2d0e
-  data.tar.gz: 445170ef612bcfa6342bcd3c0be20d29067d672e038e85b50832cea83322c008
+  metadata.gz: 8de4575667fa298b34568c0635c91d7bc056e8f69b17e7c2053a29a974dff831
+  data.tar.gz: 12b8586b7bd0b14323ea85511dede752fd03d8b0ad12d3704e905fe2f0f8fe56
 SHA512:
-  metadata.gz: 8d412f5a205b9120b3a67a337cf67e829f89f9b9729ede92728c13e5de9fc98afbde03db42d1c23a7ada03027d208f24bfa3725a4e6ec1a21900900717370c6c
-  data.tar.gz: 8df8fbe91ceb8585b0dcd5b50a32e9a26bfdbb1784451c8e4e1f3f2e3f909112b8ecfd2ea97b0a7619ee19fc225144ab086f6ca09983c612336f035810488474
+  metadata.gz: bf2ec789f7bc275fffde36f677711423279cf4746e6cdcd8c14f18d47b5c53053ec7772652b9ea23885dde9b0f63397fcab115624ceac486e004ba12edbcf16e
+  data.tar.gz: 853857f9e9937833b3199064964a54a20e2a089d786d50e5bc3775543d394e040e45b6c1fdc6ebc589f3febef515ccb1da850ac10115fe97a70bd268447ee4d0

data/.github/workflows/brakeman.yml

@@ -17,7 +17,7 @@ jobs:
           bundler-cache: true
 
       - name: Brakeman install
-        run: gem install brakeman
+        run: gem install brakeman -v 5.4.1
 
       - name: brakeman
         id: brakeman

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    query_helper (0.3.5)
+    query_helper (0.3.8)
       activerecord (> 5)
       activesupport (> 5)
       sqlite3
@@ -89,7 +89,7 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.2)
-    sqlite3 (1.6.2)
+    sqlite3 (2.1.0)
       mini_portile2 (~> 2.8.0)
     thor (1.1.0)
     tzinfo (2.0.4)

data/lib/query_helper/invalid_sort_param_error.rb

@@ -0,0 +1,18 @@
+class QueryHelper
+  class InvalidSortParamError < StandardError
+
+    attr_reader :sort_string
+
+    def initialize(msg='Invalid sort param', sort_string='')
+      @sort_string = sort_string
+      super(msg)
+    end
+    
+    def as_json
+      {
+        'error' => message,
+        'sort_param' => sort_string
+      }
+    end
+  end
+end

data/lib/query_helper/sql_filter.rb

@@ -17,7 +17,7 @@ class QueryHelper
 
       @filter_values.each do |comparate_alias, criteria|
         # Find the sql mapping if it exists
-        map = @column_maps.find { |m| m.alias_name == comparate_alias }
+        map = @column_maps.find { |m| m.alias_name.downcase == comparate_alias.downcase }
         raise InvalidQueryError.new("cannot filter by #{comparate_alias}") unless map
 
         # create the filter

data/lib/query_helper/sql_sort.rb

@@ -5,12 +5,13 @@ class QueryHelper
 
     attr_accessor :column_maps, :select_strings, :sort_tiebreak, :column_sort_order
 
-    def initialize(sort_string: "", sort_tiebreak: "", column_maps: [], column_sort_order: {})
+    def initialize(sort_string: "", sort_tiebreak: "", column_maps: [], column_sort_order: {}, keep_nulls_last: false)
       @sort_string = sort_string
       @column_maps = column_maps
       @sort_tiebreak = sort_tiebreak
       @column_sort_order = column_sort_order
       @select_strings = []
+      @keep_nulls_last = keep_nulls_last
     end
 
     def parse_sort_string
@@ -33,7 +34,9 @@ class QueryHelper
           direction = sort.split(":")[1]
           modifier = sort.split(":")[2]
           begin
-            sql_expression = @column_maps.find{ |m| m.alias_name.casecmp?(sort_alias) }.sql_expression
+            sort_col = @column_maps.find{ |m| m.alias_name.casecmp?(sort_alias) }
+            raise InvalidSortParamError.new("Invalid sort param", sort_alias) if sort_col.nil?
+            sql_expression = sort_col.sql_expression
           rescue NoMethodError => e
             raise InvalidQueryError.new("Sorting not allowed on column '#{sort_alias}'")
           end
@@ -41,12 +44,12 @@ class QueryHelper
           if direction == "desc"
             case ActiveRecord::Base.connection.adapter_name
             when "SQLite" # SQLite is used in the test suite
-              direction = "desc"
+              direction = @keep_nulls_last ? "desc nulls last" : "desc"
             else
               direction = "desc nulls last"
             end
           else
-            direction = "asc"
+            direction = @keep_nulls_last ? "asc nulls last" : "asc"
           end
 
           case modifier

data/lib/query_helper/version.rb

@@ -1,3 +1,3 @@
 class QueryHelper
-  VERSION = "0.3.5"
+  VERSION = "0.3.8"
 end

data/lib/query_helper.rb

@@ -10,6 +10,7 @@ require "query_helper/sql_manipulator"
 require "query_helper/sql_filter"
 require "query_helper/sql_sort"
 require "query_helper/invalid_query_error"
+require "query_helper/invalid_sort_param_error"
 
 class QueryHelper
 
@@ -281,7 +282,7 @@ class QueryHelper
       placement = :where
       maps = column_maps.select do |cm|
         placement = :having if cm.aggregate
-        @search_fields.include? cm.alias_name
+        @search_fields.map(&:downcase).include? cm.alias_name.downcase
       end
       bind_variable = ('a'..'z').to_a.shuffle[0,20].join.to_sym
       @bind_variables[bind_variable] = "%#{@search_string}%"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: query_helper
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.8
 platform: ruby
 authors:
 - Patterninc
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2024-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -190,6 +190,7 @@ files:
 - lib/query_helper/column_map.rb
 - lib/query_helper/filter.rb
 - lib/query_helper/invalid_query_error.rb
+- lib/query_helper/invalid_sort_param_error.rb
 - lib/query_helper/query_helper_concern.rb
 - lib/query_helper/sql_filter.rb
 - lib/query_helper/sql_manipulator.rb
@@ -201,7 +202,7 @@ homepage: https://github.com/patterninc/query_helper
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,8 +217,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: Ruby Gem to help with pagination and data formatting at Pattern, Inc.
 test_files: []