pattern_query_helper 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65460f1546e868997cf4f1b0d049ee2d16f68ff4
-  data.tar.gz: 347f43fb24fad0aed12bfd4c5e3c901edc5b5b87
+  metadata.gz: f0cd0ab9dafb896354a15f72a94a08f7ed138aa4
+  data.tar.gz: 7d8a6af8fcaea92089dde58d8a0a44952ecd7c7e
 SHA512:
-  metadata.gz: 8db937be84711841bd756d37f43021ad0e73541bcc9f16401641d03f1fbb0429c505c5e6668d0a4e7eb80128246c69734aab59b3b6f977e5811f2404eda7a78b
-  data.tar.gz: f198e72b5325b64221fc4105da3259f8e6ed2127b5fd625549f0b13fed206bccb850cbfa049d9aceb6eb9b32723bb4a5125a2d8b7a88b416c5188f4001e20f67
+  metadata.gz: f1351d92b0aaaa74ef26d8db9f155f9875920326d830ae5cefbcd5c14caec38436993d6663a9088332b4fdfb1dfdac0bbac7f5947f60c3fff09c22170f118271
+  data.tar.gz: dbf25ee9fbf6b7ae8e59573cbf3c29bda4e29e0a68c4da221cc1ca084b5d3b7af22d61270fd284c01f52af4efdd7c6ad2b0b135864b1afefaaa7a732c738aa9d

data/.travis.yml

@@ -1,4 +1,3 @@
----
 sudo: false
 language: ruby
 cache: bundler

data/Gemfile.lock

@@ -1,59 +1,59 @@
 PATH
   remote: .
   specs:
-    pattern_query_helper (0.2.0)
+    pattern_query_helper (0.2.1)
       activerecord (~> 5.0)
-      kaminari
+      kaminari (~> 1.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (5.0.7)
-      activesupport (= 5.0.7)
+    actionview (5.2.2)
+      activesupport (= 5.2.2)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.0.7)
-      activesupport (= 5.0.7)
-    activerecord (5.0.7)
-      activemodel (= 5.0.7)
-      activesupport (= 5.0.7)
-      arel (~> 7.0)
-    activesupport (5.0.7)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
+      arel (>= 9.0)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (7.1.4)
+    arel (9.0.0)
     builder (3.2.3)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     crass (1.0.4)
     diff-lcs (1.3)
-    erubis (2.7.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
-    i18n (0.9.3)
+    erubi (1.8.0)
+    faker (1.9.3)
+      i18n (>= 0.7)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    kaminari (1.1.0)
+    kaminari (1.1.1)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.1.0)
-      kaminari-activerecord (= 1.1.0)
-      kaminari-core (= 1.1.0)
-    kaminari-actionview (1.1.0)
+      kaminari-actionview (= 1.1.1)
+      kaminari-activerecord (= 1.1.1)
+      kaminari-core (= 1.1.1)
+    kaminari-actionview (1.1.1)
       actionview
-      kaminari-core (= 1.1.0)
-    kaminari-activerecord (1.1.0)
+      kaminari-core (= 1.1.1)
+    kaminari-activerecord (1.1.1)
       activerecord
-      kaminari-core (= 1.1.0)
-    kaminari-core (1.1.0)
+      kaminari-core (= 1.1.1)
+    kaminari-core (1.1.1)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
@@ -83,11 +83,11 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.16)
-  faker
+  faker (~> 1.9.3)
   pattern_query_helper!
   rake (~> 10.0)
   rspec (~> 3.0)
-  sqlite3
+  sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
    1.16.6

data/README.md

@@ -1,4 +1,6 @@
 # PatternQueryHelper
+[![TravisCI](https://travis-ci.org/iserve-products/pattern_query_helper.svg?branch=master)](https://travis-ci.org/iserve-products/pattern_query_helper)
+[![Gem Version](https://badge.fury.io/rb/pattern_query_helper.svg)](https://badge.fury.io/rb/pattern_query_helper)
 
 Ruby Gem developed and used at Pattern to paginate, sort, filter, and include associations on sql and active record queries.
 

data/lib/pattern_query_helper/sorting.rb

@@ -1,6 +1,6 @@
 module PatternQueryHelper
   class Sorting
-    def self.parse_sorting_params(sort)
+    def self.parse_sorting_params(sort, valid_columns)
       sort_sql = []
       if sort
         sorts = sort.split(",")
@@ -9,6 +9,8 @@ module PatternQueryHelper
           direction = sort.split(":")[1]
           modifier = sort.split(":")[2]
 
+          raise ArgumentError.new("Sorting not allowed on column '#{column}'") unless valid_columns.include? column
+
           if direction == "desc"
             case PatternQueryHelper.active_record_adapter
             when "sqlite3"

data/lib/pattern_query_helper/version.rb

@@ -1,3 +1,3 @@
 module PatternQueryHelper
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/pattern_query_helper.rb

@@ -7,24 +7,24 @@ require "pattern_query_helper/sql"
 
 module PatternQueryHelper
 
-  def self.run_sql_query(model, query, query_params, query_helpers, single_record=false)
+  def self.run_sql_query(model, query, query_params, query_helpers, valid_columns=[], single_record=false)
     if single_record
-      single_record_sql_query(model, query, query_params, query_helpers)
+      single_record_sql_query(model, query, query_params, query_helpers, valid_columns)
     elsif query_helpers[:per_page] || query_helpers[:page]
-      paginated_sql_query(model, query, query_params, query_helpers)
+      paginated_sql_query(model, query, query_params, query_helpers, valid_columns)
     else
-      sql_query(model, query, query_params, query_helpers)
+      sql_query(model, query, query_params, query_helpers, valid_columns)
     end
   end
 
-  def self.run_active_record_query(active_record_call, query_helpers, single_record=false)
+  def self.run_active_record_query(active_record_call, query_helpers, valid_columns=[], single_record=false)
     run_sql_query(active_record_call.model, active_record_call.to_sql, {}, query_helpers, single_record)
   end
 
   private
 
-  def self.paginated_sql_query(model, query, query_params, query_helpers)
-    query_helpers = parse_helpers(query_helpers)
+  def self.paginated_sql_query(model, query, query_params, query_helpers, valid_columns)
+    query_helpers = parse_helpers(query_helpers, valid_columns)
 
     query_config = {
       model: model,
@@ -48,8 +48,8 @@ module PatternQueryHelper
     }
   end
 
-  def self.sql_query(model, query, query_params, query_helpers)
-    query_helpers = parse_helpers(query_helpers)
+  def self.sql_query(model, query, query_params, query_helpers, valid_columns)
+    query_helpers = parse_helpers(query_helpers, valid_columns)
 
     query_config = {
       model: model,
@@ -68,8 +68,8 @@ module PatternQueryHelper
     }
   end
 
-  def self.single_record_sql_query(model, query, query_params, query_helpers)
-    query_helpers = parse_helpers(query_helpers)
+  def self.single_record_sql_query(model, query, query_params, query_helpers, valid_columns)
+    query_helpers = parse_helpers(query_helpers, valid_columns)
 
     query_config = {
       model: model,
@@ -88,11 +88,15 @@ module PatternQueryHelper
     }
   end
 
-  def self.parse_helpers(params)
-    filtering = PatternQueryHelper::Filtering.create_filters(params[:filter])
-    sorting = PatternQueryHelper::Sorting.parse_sorting_params(params[:sort])
-    associations = PatternQueryHelper::Associations.process_association_params(params[:include])
-    pagination = PatternQueryHelper::Pagination.parse_pagination_params(params[:page], params[:per_page])
+  def self.parse_helpers(query_helpers, valid_columns)
+    valid_columns_map = {}
+    valid_columns.each do |c|
+      valid_columns_map["#{c}"] = c
+    end
+    filtering = PatternQueryHelper::Filtering.create_filters(query_helpers[:filter], valid_columns_map)
+    sorting = PatternQueryHelper::Sorting.parse_sorting_params(query_helpers[:sort], valid_columns)
+    associations = PatternQueryHelper::Associations.process_association_params(query_helpers[:include])
+    pagination = PatternQueryHelper::Pagination.parse_pagination_params(query_helpers[:page], query_helpers[:per_page])
 
     {
       filters: filtering,

data/pattern_query_helper.gemspec

@@ -39,9 +39,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "faker"
+  spec.add_development_dependency "sqlite3", "~> 1.3.6"
+  spec.add_development_dependency "faker", "~> 1.9.3"
 
   spec.add_dependency "activerecord", "~> 5.0"
-  spec.add_dependency "kaminari"
+  spec.add_dependency "kaminari", "~> 1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pattern_query_helper
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Evan McDaniel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,30 +56,30 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.3
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
 description: Ruby gem developed to help with pagination, filtering, sorting, and including
   associations on both active record queries and custom sql queries
 email: