query_helper 0.2.29 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6393029fea1bbf5dcc2e0c724689a7a9eada99b0bcba65896ddfcb4704442130
-  data.tar.gz: a988a611a54efa8ea34080294b92c278bb5dbc3cf59e3598b1e7a3668f87343c
+  metadata.gz: b9626c22503b7f257a4276b969a498a017753e879e30b04b6643c618ae8f03d4
+  data.tar.gz: 825fdbf988d8a41abd89d250aa6d56f0add379fced68e630099ea688cde9b586
 SHA512:
-  metadata.gz: 8c9a16cf6b3706de8eede885b7301d433b2317ea8bb1136d4386d7248c11dd06851d51d9ba6bd3536382b37103ed22554ce757ddb63ea85f6af43e62dcbc6650
-  data.tar.gz: b6f5bf13fee17da7f195a6ff4e38afe68020379782ada889514654c769014ec41dc31ca7eafc743299dac5cf729cc27c842c7b72cb5ce55984dc3bb9548666f2
+  metadata.gz: 1ce4589b5783e435ec47b22b2e04b094d8f5da5703b439510b7a9570d8dc0d87d505d2e2fca6125b1c180707bcae9001af9d3f40003c2747966f09a420978237
+  data.tar.gz: 9c8188da6470cd4469a4825e21725cbc1d19b5fcd1f246eb0d86d2dddd589ddcb7be30c8a500a3650b1a61fb2d2a622f6ff41388a8193bacda3544ca3974d81c

data/.github/workflows/brakeman.yml

@@ -0,0 +1,26 @@
+name: Brakeman
+
+on: [push]
+
+jobs:
+  brakeman:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby 2.7.2
+        uses: ruby/setup-ruby@v1
+        with:
+          # Not needed with a .ruby-version file
+          ruby-version: 2.7.2
+          # runs 'bundle install' and caches installed gems automatically
+          bundler-cache: true
+
+      - name: Brakeman install
+        run: gem install brakeman
+
+      - name: brakeman
+        id: brakeman
+        run: |
+          brakeman --color --force -q
+          if [ $? -ne 0 ]; then return 1; fi

data/.github/workflows/publish_rubygems.yml

@@ -0,0 +1,20 @@
+name: Publish Gem
+
+on:
+  push:
+    tags:
+      - v*
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Release Gem
+        if: contains(github.ref, 'refs/tags/v')
+        uses: cadwallion/publish-rubygems-action@master
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
+          RELEASE_COMMAND: rake release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    query_helper (0.2.29)
+    query_helper (0.3.4)
       activerecord (> 5)
       activesupport (> 5)
       sqlite3
@@ -43,13 +43,13 @@ GEM
       i18n (>= 0.7)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    loofah (2.12.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
     mini_portile2 (2.8.0)
     minitest (5.14.4)
-    nokogiri (1.13.3)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     racc (1.6.0)
@@ -59,7 +59,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
     railties (6.1.4.1)
       actionpack (= 6.1.4.1)
@@ -89,7 +89,8 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.2)
-    sqlite3 (1.4.2)
+    sqlite3 (1.6.2)
+      mini_portile2 (~> 2.8.0)
     thor (1.1.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)

data/lib/query_helper/associations.rb

@@ -8,12 +8,24 @@ class QueryHelper
     def self.load_associations(payload:, associations: [], as_json_options: {})
       as_json_options ||= {}
       as_json_options[:include] = as_json_options[:include] || json_associations(associations)
-      ActiveRecord::Associations::Preloader.new.preload(payload, associations)
+      begin
+        # Preloader have been changed in Rails 7, which is giving error on upgrade.
+        # This should be updated to latest API once all repos have been upgraded to Rails 7
+        ActiveRecord::Associations::Preloader.new.preload(payload, associations)
+      rescue
+        ActiveRecord::Associations::Preloader.new(records: payload, associations: associations).call
+      end
       payload.as_json(as_json_options)
     end
 
     def self.preload_associations(payload:, preload: [])
-      ActiveRecord::Associations::Preloader.new.preload(payload, preload)
+      begin
+        # Preloader have been changed in Rails 7, which is giving error on upgrade.
+        # This should be updated to latest API once all repos have been upgraded to Rails 7
+        ActiveRecord::Associations::Preloader.new.preload(payload, preload)
+      rescue
+        ActiveRecord::Associations::Preloader.new(records: payload, associations: preload).call
+      end
     end
 
     def self.json_associations(associations)

data/lib/query_helper/query_helper_concern.rb

@@ -26,7 +26,8 @@ class QueryHelper
       end 
 
       def create_query_helper_filter
-        filter_values = params[:filter].permit!.to_h
+        # Here we get dynamic filter variable and hence we can't define permit.
+        filter_values = params[:filter].to_unsafe_h
         QueryHelper::SqlFilter.new(filter_values: filter_values)
       end
 

data/lib/query_helper/sql_manipulator.rb

@@ -26,8 +26,8 @@ class QueryHelper
     end
 
     def build
-      insert_having_clauses()
       insert_qualify_clauses()
+      insert_having_clauses()
       insert_where_clauses()
       insert_select_clauses()
       insert_order_by_and_limit_clause()
@@ -49,7 +49,7 @@ class QueryHelper
 
     def qualify_clauses(index)
       if index == 0
-        "qualified_results AS ( "
+        "WITH qualified_results AS ( "
       else
         ", qualified_results AS ( "
       end

data/lib/query_helper/sql_parser.rb

@@ -114,7 +114,7 @@ class QueryHelper
     end
 
     def insert_where_index
-      group_by_index() || order_by_index() || limit_index() || @sql.length
+      qualify_index() || group_by_index() || order_by_index() || limit_index() || @sql.length
     end
 
     def insert_qualify_index

data/lib/query_helper/version.rb

@@ -1,3 +1,3 @@
 class QueryHelper
-  VERSION = "0.2.29"
+  VERSION = "0.3.4"
 end

data/query_helper.gemspec

@@ -6,12 +6,12 @@ require "query_helper/version"
 Gem::Specification.new do |spec|
   spec.name          = "query_helper"
   spec.version       = QueryHelper::VERSION
-  spec.authors       = ["Evan McDaniel"]
-  spec.email         = ["eamigo13@gmail.com"]
+  spec.authors       = ["Patterninc"]
+  spec.email         = ["jason@pattern.com"]
 
   spec.summary       = %q{Ruby Gem to help with pagination and data formatting at Pattern, Inc.}
   spec.description   = %q{Ruby gem developed to help with pagination, filtering, sorting, and including associations on both active record queries and custom sql queries}
-  spec.homepage      = "https://github.com/iserve-products/query_helper"
+  spec.homepage      = "https://github.com/patterninc/query_helper"
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: query_helper
 version: !ruby/object:Gem::Version
-  version: 0.2.29
+  version: 0.3.4
 platform: ruby
 authors:
-- Evan McDaniel
+- Patterninc
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 2023-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,12 +167,14 @@ dependencies:
 description: Ruby gem developed to help with pagination, filtering, sorting, and including
   associations on both active record queries and custom sql queries
 email:
-- eamigo13@gmail.com
+- jason@pattern.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/brakeman.yml"
 - ".github/workflows/ci.yml"
+- ".github/workflows/publish_rubygems.yml"
 - ".gitignore"
 - ".rspec"
 - CODE_OF_CONDUCT.md
@@ -195,7 +197,7 @@ files:
 - lib/query_helper/sql_sort.rb
 - lib/query_helper/version.rb
 - query_helper.gemspec
-homepage: https://github.com/iserve-products/query_helper
+homepage: https://github.com/patterninc/query_helper
 licenses:
 - MIT
 metadata: {}