pattern_query_helper 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38dc301a4cb672d6462a7e7b94284493b46718ed016f68c0c3282a9233abf2fc
-  data.tar.gz: f41c477445fcdda1d57e8e76b40cac7c9acc9f88da328d82040c7ecdad062e08
+  metadata.gz: 9f0fe768952212e8b6a240fc7cee61e3dc768ae1aa41791c7e91761dbc2836c8
+  data.tar.gz: f2546fc691f1bdccca39f10fdabcbc2d419df7e9241a957986af9a2b0fe3bd4a
 SHA512:
-  metadata.gz: 2dd92c57a1dcab50677649498fde26983f685899e10f096bbce573544420ae0c3c7736b22836d1e8c8ccd6450a7f33c6ebce5f1b03f69eb2b41fca9357a13eb0
-  data.tar.gz: 5a062958f9d86f8264fa86b5914a7f958940a39c743d9d8f62dd4f2c4ee4db14d26543436075400d04e2c33e1cf858cc6723f59083d736ab1a892d2b41a6d931
+  metadata.gz: 1d9b94902b4ffc1ed5201c25edc7f34717ad01f575202692f48e111a692f208ed1efe88e289510577659090729d380f69537766f7193df6854f369950270be46
+  data.tar.gz: 483a160eaaac70209bfbde5642b55516a1bb50ba36566fa0b1bfa85f792ad7795962f5c667c5bf3325b284f8c624296f4ce648950d8cef76cd3145c6f1e1f80e

data/Gemfile.lock

@@ -1,26 +1,26 @@
 PATH
   remote: .
   specs:
-    pattern_query_helper (0.2.3)
+    pattern_query_helper (0.2.4)
       activerecord (~> 5.0)
       kaminari (~> 1.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
       arel (>= 9.0)
-    activesupport (5.2.2)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -53,7 +53,7 @@ GEM
       nokogiri (>= 1.5.9)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
-    nokogiri (1.10.1)
+    nokogiri (1.10.2)
       mini_portile2 (~> 2.4.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)

data/lib/pattern_query_helper.rb

@@ -38,7 +38,7 @@ module PatternQueryHelper
     }
 
     data = PatternQueryHelper::Sql.sql_query(query_config)
-    data = PatternQueryHelper::Associations.load_associations(data, query_helpers[:associations])
+    data = PatternQueryHelper::Associations.load_associations(data, query_helpers[:associations], query_helpers[:as_json])
     count = PatternQueryHelper::Sql.sql_query_count(query_config)
     pagination = PatternQueryHelper::Pagination.create_pagination_payload(count, query_helpers[:pagination])
 
@@ -61,7 +61,7 @@ module PatternQueryHelper
     }
 
     data = PatternQueryHelper::Sql.sql_query(query_config)
-    data = PatternQueryHelper::Associations.load_associations(data, query_helpers[:associations])
+    data = PatternQueryHelper::Associations.load_associations(data, query_helpers[:associations], query_helpers[:as_json])
 
     {
       data: data
@@ -81,7 +81,7 @@ module PatternQueryHelper
     }
 
     data = PatternQueryHelper::Sql.single_record_query(query_config)
-    data = PatternQueryHelper::Associations.load_associations(data, query_helpers[:associations])
+    data = PatternQueryHelper::Associations.load_associations(data, query_helpers[:associations], query_helpers[:as_json])
 
     {
       data: data
@@ -97,12 +97,14 @@ module PatternQueryHelper
     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])
+    as_json = query_helpers[:as_json]
 
     {
       filters: filtering,
       sorting: sorting,
       associations: associations,
-      pagination: pagination
+      pagination: pagination,
+      as_json: as_json
     }
   end
 

data/lib/pattern_query_helper/associations.rb

@@ -9,9 +9,10 @@ module PatternQueryHelper
       end
     end
 
-    def self.load_associations(payload, associations)
+    def self.load_associations(payload, associations, as_json_options)
       ActiveRecord::Associations::Preloader.new.preload(payload, associations)
-      payload.as_json(include: json_associations(associations))
+      as_json_options ||= { include: json_associations(associations) }
+      payload.as_json(as_json_options)
     end
 
     def self.json_associations(associations)

data/lib/pattern_query_helper/version.rb

@@ -1,3 +1,3 @@
 module PatternQueryHelper
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

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