pattern_query_helper 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d80b1ac39e887931fa741b1b0d5e8e3eac8e86b3
-  data.tar.gz: 6b42d27cd476ee84ad1438a220d7230c35484182
+  metadata.gz: caceb088a2059270acfce9119d5794089c9805b1
+  data.tar.gz: 8e6916e46207d6cbc92d4c3eb15fecd9267e80d8
 SHA512:
-  metadata.gz: b788897d5d99e1f236d07906a2ecf2217c25e2dd2ce20d2a3e8299576103a2708f7a89542b6e14d68a165aa2bb52804a634ee51cb134eaf0f03ee535c1a2dff0
-  data.tar.gz: 851a0726152bdfed51bcd0cb15c99a3142a1779f3a7c068e4e00cdcad2bed4857a99a1b61731d0b7807a3aa4bdcc02dfa978419acd3730f787dd7d27c8a23d62
+  metadata.gz: ea414de0fdecea3f2a786d75a5abfd5c7f16eb3664a24262832da73260d7a4b03819faad2dccdb01b2362b9f49bc1dad756021f29ae7eb9915c2446a9a8d4391
+  data.tar.gz: df415343bc674682fc0684af8023bf91bab7737f637cae1704d57b7af468e8d740586921b24e8f452fcdee9db4eff64ec3642fd49547e3fe7dd2236021047002

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pattern_query_helper (0.1.8)
+    pattern_query_helper (0.1.9)
       activerecord (~> 5.0)
       kaminari
 

data/lib/pattern_query_helper/associations.rb

@@ -1,7 +1,7 @@
 module PatternQueryHelper
   class Associations
-    def self.process_association_params(params)
-      associations = params[:include] || []
+    def self.process_association_params(associations)
+      associations ||= []
       if associations.class == String
         return [associations.to_sym]
       else

data/lib/pattern_query_helper/filtering.rb

@@ -1,7 +1,7 @@
 module PatternQueryHelper
   class Filtering
-    def self.create_filters(params, column_map=nil, symbol_prefix="")
-      filters = params[:filter] || {}
+    def self.create_filters(filters, column_map=nil, symbol_prefix="")
+      filters ||= {}
       filter_string = "true = true"
       filter_params = {}
       filter_array = []

data/lib/pattern_query_helper/pagination.rb

@@ -3,32 +3,24 @@ require 'kaminari'
 
 module PatternQueryHelper
   class Pagination
-    def self.parse_pagination_params(params)
-      if params[:per_page] == 'all'
-        pagination_params = {
-          include_all: true
-        }
+    def self.parse_pagination_params(page, per_page)
+      if page
+        page = page.to_i
       else
-        if params[:page]
-          page = params[:page].to_i
-        else
-          page = 1
-        end
-        if params[:per_page]
-          per_page = params[:per_page].to_i
-        else
-          per_page = 20
-        end
-        raise RangeError.new("page must be greater than 0") unless page > 0
-        raise RangeError.new("per_page must be greater than 0") unless per_page > 0
-        pagination_params = {
-          page: page.to_i,
-          per_page: per_page.to_i
-        }
+        page = 1
       end
+      if per_page
+        per_page = per_page.to_i
+      else
+        per_page = 20
+      end
+      raise RangeError.new("page must be greater than 0") unless page > 0
+      raise RangeError.new("per_page must be greater than 0") unless per_page > 0
 
-      pagination_params
-
+      {
+        page: page,
+        per_page: per_page
+      }
     end
 
     def self.create_pagination_payload(count, pagination_params)

data/lib/pattern_query_helper/sorting.rb

@@ -1,9 +1,9 @@
 module PatternQueryHelper
   class Sorting
-    def self.parse_sorting_params(params)
-      sort_sql= []
-      if params[:sort]
-        sorts = params[:sort].split(",")
+    def self.parse_sorting_params(sort)
+      sort_sql = []
+      if sort
+        sorts = sort.split(",")
         sorts.each_with_index do |sort, index|
           column = sort.split(":")[0]
           direction = sort.split(":")[1]

data/lib/pattern_query_helper/version.rb

@@ -1,3 +1,3 @@
 module PatternQueryHelper
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/pattern_query_helper.rb

@@ -123,10 +123,10 @@ module PatternQueryHelper
   end
 
   def self.parse_helpers(params)
-    filtering = PatternQueryHelper::Filtering.create_filters(params)
-    sorting = PatternQueryHelper::Sorting.parse_sorting_params(params)
-    associations = PatternQueryHelper::Associations.process_association_params(params)
-    pagination = PatternQueryHelper::Pagination.parse_pagination_params(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])
 
     {
       filters: filtering,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pattern_query_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Evan McDaniel