apiql 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 456ef97a233db53a9e51b2fe04e55c8e360e2f12077e745ac1527278a294dd50
-  data.tar.gz: 79d50b2cf5b3bc79b3eeca1bed1b3d401a1a2fb76ef1cf5b4ac7ac1d9e3dbc05
+  metadata.gz: af9fa1cb96cd3d2e6d145267c14c58dcf8d8c7a1447cfe824744ec5eba0cad03
+  data.tar.gz: 7c24953bb0c44591e51e381c3e514726239187148c5ec0266beb189f3db1ec0b
 SHA512:
-  metadata.gz: 96f51297e1bc429c789f3614deb3a959a2746fed188b2197cf6a92e31233dbb9f5d4e57815775f9c12478c17bee34673573ae32a508854ab1cd576ed16b9ab4d
-  data.tar.gz: a2c0f57660d4be5f0ac9e76fa8814d038fa748dde5bd38f147a0fd3f7355aff15e161d853c0a21bfb0a02687adddad6359e2b448973f47f8bd2b34fe7a5e4c0f
+  metadata.gz: 70f020f58b6490b0d94b4b3f71f5c74bc4c432a3b19712e626058cf07c8235ae5f4f7001cd334b91f9ec41289af471bb6977987b8d72d283af62866978a83707
+  data.tar.gz: 27577d19ebb03273470d84ec35ca9a9b5248fe4e67647723a1f5d63ebc18a70a07a6e8ab22be1fa4e7944b0cac75e015bb32ceb8228c13f011b8d6a0d6f7ff63

data/apiql.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'apiql'
-  spec.version       = '0.4.5'
+  spec.version       = '0.4.6'
   spec.authors       = ['Dmitry Silchenko']
   spec.email         = ['dmitry@desofto.com']
 

data/lib/apiql.rb

@@ -22,15 +22,15 @@ class APIQL
         if page.present?
           {
             total: klass.count,
-            items: klass.offset(page * page_size).limit(page_size)
+            items: klass.eager_load(eager_load).offset(page * page_size).limit(page_size)
           }
         else
-          klass.all
+          klass.eager_load(eager_load).all
         end
       end
 
       define_method "#{klass.name.underscore}" do |id|
-        item = klass.find(id)
+        item = klass.eager_load(eager_load).find(id)
 
         authorize! :read, item
 
@@ -244,7 +244,7 @@ class APIQL
   def eager_load
     result = @eager_load
 
-    @eager_load = nil
+    @eager_load = []
 
     result
   end
@@ -265,7 +265,7 @@ class APIQL
           @eager_load = APIQL::eager_loads(sub_schema)
           data = public_send(function, *params)
           if @eager_load.present? && !data.is_a?(::Hash) && !data.is_a?(::Array)
-            if data.respond_to?(:each) && data.respond_to?(:map)
+            if data.respond_to?(:eager_load)
               data = data.eager_load(eager_load)
             elsif data.respond_to?(:id)
               data = data.class.eager_load(eager_load).find(data.id)
@@ -288,7 +288,7 @@ class APIQL
         function = reg[:name]
         params = @context.parse_params(reg[:params].presence)
 
-        @eager_load = ''
+        @eager_load = []
         data = public_send(function, *params)
         if data.is_a? Array
           if data.any? { |item| !APIQL::simple_class?(item) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apiql
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Dmitry Silchenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-28 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler