pattern_query_helper 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46a21200973a9a7ef991273e4f33bc5ae303b629
-  data.tar.gz: 0ad956c2e24bb70558ca9d1ab8d4e11ff82e3c7f
+  metadata.gz: a793c720df496cc279d3d86683056cc0193cd9ce
+  data.tar.gz: 89b26c1e5e760a05d22f8cd99cc4027bf63c6bd1
 SHA512:
-  metadata.gz: a8fc381457c1b6108db43f9353bcac5c4f31ac8a88ae0e37ede34ab8f452655e22854500dc8236be1fe311dd15563849cc8f1d152c2111391e5a2fc75a93a48a
-  data.tar.gz: 8ab06c771c9e42b2934305a2b2972a680e423eabc7ba405282b90cd9aec3832ea74661955d29f8f39b653bd86bdbdb509b35a76fd29007a81f64ea0bf16eb55c
+  metadata.gz: '021168529aaef384c4c32c5d632aebf035a015f15f5f3d7f28fd25225c3829f4b97c41b9ec9b280d203c6dee71e95c3ffd505aad470bb7e84f1b77857df2d131'
+  data.tar.gz: 4193cdd182b61699046e1fd1108eb12815246022aae9eef75a89e0a347625633c06e2cf369bcc5a6dd78142ab7d17017625b2100b975600d6945f9f0f68c4932

data/Gemfile.lock

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

data/lib/pattern_query_helper.rb

@@ -7,23 +7,23 @@ require "pattern_query_helper/sql"
 
 module PatternQueryHelper
   def self.paginated_sql_query(model, query, query_params, url_params)
-    parse_params(url_params)
+    query_helpers = parse_params(url_params)
 
     query_config = {
       model: model,
       query: query,
       query_params: query_params,
-      page: @pagination[:page],
-      per_page: @pagination[:per_page],
-      filter_string: @filtering[:filter_string],
-      filter_params: @filtering[:filter_params],
-      sort_string: @sorting,
+      page: query_helpers[:pagination][:page],
+      per_page: query_helpers[:pagination][:per_page],
+      filter_string: query_helpers[:filters][:filter_string],
+      filter_params: query_helpers[:filters][:filter_params],
+      sort_string: query_helpers[:sorting],
     }
 
     data = PatternQueryHelper::Sql.sql_query(query_config)
-    data = PatternQueryHelper::Associations.load_associations(data, @associations)
+    data = PatternQueryHelper::Associations.load_associations(data, query_helpers[:associations])
     count = PatternQueryHelper::Sql.sql_query_count(query_config)
-    pagination = PatternQueryHelper::Pagination.create_pagination_payload(count, @pagination)
+    pagination = PatternQueryHelper::Pagination.create_pagination_payload(count, query_helpers[:pagination])
 
     {
       pagination: pagination,
@@ -32,19 +32,19 @@ module PatternQueryHelper
   end
 
   def self.sql_query(model, query, query_params, url_params)
-    parse_params(url_params)
+    query_helpers = parse_params(url_params)
 
     query_config = {
       model: model,
       query: query,
       query_params: query_params,
-      filter_string: @filtering[:filter_string],
-      filter_params: @filtering[:filter_params],
-      sort_string: @sorting,
+      filter_string: query_helpers[:filters][:filter_string],
+      filter_params: query_helpers[:filters][:filter_params],
+      sort_string: query_helpers[:sorting],
     }
 
     data = PatternQueryHelper::Sql.sql_query(query_config)
-    data = PatternQueryHelper::Associations.load_associations(data, @associations)
+    data = PatternQueryHelper::Associations.load_associations(data, query_helpers[:associations])
 
     {
       data: data
@@ -52,19 +52,19 @@ module PatternQueryHelper
   end
 
   def self.single_record_sql_query(model, query, query_params, url_params)
-    parse_params(url_params)
+    query_helpers = parse_params(url_params)
 
     query_config = {
       model: model,
       query: query,
       query_params: query_params,
-      filter_string: @filtering[:filter_string],
-      filter_params: @filtering[:filter_params],
-      sort_string: @sorting,
+      filter_string: query_helpers[:filters][:filter_string],
+      filter_params: query_helpers[:filters][:filter_params],
+      sort_string: query_helpers[:sorting],
     }
 
     data = PatternQueryHelper::Sql.single_record_query(query_config)
-    data = PatternQueryHelper::Associations.load_associations(data, @associations)
+    data = PatternQueryHelper::Associations.load_associations(data, query_helpers[:associations])
 
     {
       data: data
@@ -72,22 +72,22 @@ module PatternQueryHelper
   end
 
   def self.active_record_query(active_record_call, url_params)
-    parse_params(url_params)
-    filtered_query = PatternQueryHelper::Filtering.filter_active_record_query(active_record_call, @filtering)
-    sorted_query = PatternQueryHelper::Sorting.sort_active_record_query(active_record_call, @sorting)
-    with_associations = PatternQueryHelper::Associations.load_associations(sorted_query, @associations)
+    query_helpers = parse_params(url_params)
+    filtered_query = PatternQueryHelper::Filtering.filter_active_record_query(active_record_call, query_helpers[:filters])
+    sorted_query = PatternQueryHelper::Sorting.sort_active_record_query(active_record_call, query_helpers[:sorting])
+    with_associations = PatternQueryHelper::Associations.load_associations(sorted_query, query_helpers[:associations])
     {
       data: with_associations
     }
   end
 
   def self.paginated_active_record_query(active_record_call, url_params)
-    parse_params(url_params)
-    filtered_query = PatternQueryHelper::Filtering.filter_active_record_query(active_record_call, @filtering)
-    sorted_query = PatternQueryHelper::Sorting.sort_active_record_query(active_record_call, @sorting)
-    paginated_query = PatternQueryHelper::Pagination.paginate_active_record_query(sorted_query, @pagination)
-    with_associations = PatternQueryHelper::Associations.load_associations(paginated_query, @associations)
-    pagination = PatternQueryHelper::Pagination.create_pagination_payload(sorted_query.count, @pagination)
+    query_helpers = parse_params(url_params)
+    filtered_query = PatternQueryHelper::Filtering.filter_active_record_query(active_record_call, query_helpers[:filters])
+    sorted_query = PatternQueryHelper::Sorting.sort_active_record_query(active_record_call, query_helpers[:sorting])
+    paginated_query = PatternQueryHelper::Pagination.paginate_active_record_query(sorted_query, query_helpers[:pagination])
+    with_associations = PatternQueryHelper::Associations.load_associations(paginated_query, query_helpers[:associations])
+    pagination = PatternQueryHelper::Pagination.create_pagination_payload(sorted_query.count, query_helpers[:pagination])
     {
       pagination: pagination,
       data: with_associations
@@ -99,16 +99,16 @@ module PatternQueryHelper
   end
 
   def self.parse_params(params)
-    @filtering = PatternQueryHelper::Filtering.create_filters(params[:filter])
-    @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)
+    sorting = PatternQueryHelper::Sorting.parse_sorting_params(params)
+    associations = PatternQueryHelper::Associations.process_association_params(params)
+    pagination = PatternQueryHelper::Pagination.parse_pagination_params(params)
 
     {
-      filters: @filtering,
-      sorting: @sorting,
-      associations: @associations,
-      pagination: @pagination
+      filters: filtering,
+      sorting: sorting,
+      associations: associations,
+      pagination: pagination
     }
   end
 

data/lib/pattern_query_helper/filtering.rb

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

data/lib/pattern_query_helper/version.rb

@@ -1,3 +1,3 @@
 module PatternQueryHelper
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pattern_query_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Evan McDaniel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler