query_helper 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd74b25ab6dec2f0e3134685cefed049a7159a18e3275e35472492a34549579a
-  data.tar.gz: 1944a711b68598a1cca8ff26d997173db0b89f649ff2d8c5086b84752016da58
+  metadata.gz: 34196dda5d9ed84de34c317c6f9096a87e9b403ca37868f5f087ef565886fe8d
+  data.tar.gz: e036203e497d95e1d37ceddd53ec72a3cb794ac3c6675842dfae642e0d9db9ac
 SHA512:
-  metadata.gz: 2ba12818f15699010276c02db6c932d61023b97d3ca742c8edd0bef96c1f085a792bae1ec3935a0db1ac3e06d84345bcebf65dcc369a96ea8b4884c41b0746bd
-  data.tar.gz: f97690b832ab759b8cb2005cd221611bf70bbc619aad66154f8936a875a587559d7c1b72485dd2506f2d2a8372b9fc89fa3e0442eea911e0997fb1797101bd93
+  metadata.gz: 71590ca9d1f926b868d44f6170390d6a795dcab47f17dae1fbc7aed8e010d85d095e7322c5e1fbfe491ef614a2d9abf2863ce67baf57ab013f8d4faac7db823f
+  data.tar.gz: 3efc246697287100945bd1c247df76ca0db2c5d04df4c44fb711560de9245c5daabe5d73f8a3c9dc4d6c0edf748f8e29b065ad3d30816ddccde0205dcee9c6c2

data/Gemfile.lock

@@ -1,38 +1,37 @@
 PATH
   remote: .
   specs:
-    query_helper (0.2.6)
-      activerecord (~> 5.0)
-      activesupport (~> 5.0)
+    query_helper (0.2.7)
+      activerecord (> 5)
+      activesupport (> 5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.4.2)
-      actionview (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    actionpack (6.0.2.2)
+      actionview (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.2)
-      activesupport (= 5.2.4.2)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.2.2)
+      activesupport (= 6.0.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.2.4.2)
-      activesupport (= 5.2.4.2)
-    activerecord (5.2.4.2)
-      activemodel (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
-      arel (>= 9.0)
-    activesupport (5.2.4.2)
+      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)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
+      zeitwerk (~> 2.2)
     builder (3.2.4)
     byebug (11.1.1)
     concurrent-ruby (1.1.6)
@@ -59,12 +58,12 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (5.2.4.2)
-      actionpack (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    railties (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)
     rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -92,6 +91,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby

data/lib/query_helper.rb

@@ -36,8 +36,8 @@ class QueryHelper
     @bind_variables = bind_variables
     @sql_filter = sql_filter
     @sql_sort = sql_sort
-    @page = (page.to_i if page) || 1
-    @per_page = (per_page.to_i if per_page) || 100
+    @page = determine_page(page: page, per_page: per_page)
+    @per_page = determine_per_page(page: page, per_page: per_page)
     @single_record = single_record
     @associations = associations
     @as_json_options = as_json_options
@@ -155,6 +155,18 @@ class QueryHelper
 
   private
 
+    def determine_page(page:, per_page:)
+      return page.to_i if page 
+      return 1 if !page && per_page 
+      return nil
+    end 
+
+    def determine_per_page(page:, per_page:)
+      return per_page.to_i if per_page 
+      return 100 if !per_page && page 
+      return nil
+    end 
+
     def paginated_results
       { pagination: pagination_results(),
         data: @results }

data/lib/query_helper/version.rb

@@ -1,3 +1,3 @@
 class QueryHelper
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/query_helper.gemspec

@@ -46,6 +46,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'actionpack'
   spec.add_development_dependency 'activesupport'
 
-  spec.add_dependency "activerecord", "~> 5.0"
-  spec.add_dependency "activesupport", "~> 5.0"
+  spec.add_dependency "activerecord", "> 5"
+  spec.add_dependency "activesupport", "> 5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: query_helper
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Evan McDaniel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,30 +140,30 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
 description: Ruby gem developed to help with pagination, filtering, sorting, and including
   associations on both active record queries and custom sql queries
 email: