apiql 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ac6431ebb996c5b4b6cdba16b98959d0940e2e49639f7ca4151ad661adaf68b
-  data.tar.gz: 496a09974536e4cab2b0c24991810976dbb1ba0c1970d1eebb6fe444a5eef44b
+  metadata.gz: bdbc7a6ae370719e2cf99317eecb62b1d55cb102f5e6c139efbaf3f834af3fe9
+  data.tar.gz: fe6cd1969365185700487d36ea7f4daaad0c3adbb344207ea14237a7299af709
 SHA512:
-  metadata.gz: 2d9b772486c1ff3acf01b3a38bdd546cd56d2225ea7355a7422fd9600754e1888acefe49546d0067dece0b783977bc40a55dbc8557018a5d6d9faa45d87d4085
-  data.tar.gz: f6b11444f78329b6dc5557b33d9ab2578c8379d072bec623d23dbdf69affa420568d4e2839090254f4ee74784a2c7be309ea26863afd91ec84c24c6f9b488a66
+  metadata.gz: 4e88a8c04a5f968a4a3ef2ce409ed68df1791103ff04732550b88cec6e6936145ae79054d99ad8102dbc8b448f015ddda9d399d28aa48e47e9762f78d2cc7fb1
+  data.tar.gz: 8adb7c155531070ea9a33292d0243fe0c4007f3f3c90da09103199ba25f0a4d323316cd7d215984559fe65087022e78a98f73fdb8d0e228f698698b7f9b61bf8

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.3.2'
+  spec.version       = '0.3.3'
   spec.authors       = ['Dmitry Silchenko']
   spec.email         = ['dmitry@desofto.com']
 

data/lib/apiql.rb

@@ -41,6 +41,28 @@ class APIQL
         value.is_a?(Hash)
     end
 
+    def eager_loads(schema)
+      result = []
+
+      schema&.each do |call|
+        if call.is_a? Hash
+          call.each do |function, sub_schema|
+            next if function.include? '('
+            function = function.split('.').first if function.include? '.'
+
+            sub = eager_loads(sub_schema)
+            if sub.present?
+              result.push(function => sub)
+            else
+              result.push function
+            end
+          end
+        end
+      end
+
+      result
+    end
+
     private
 
     def redis
@@ -122,7 +144,7 @@ class APIQL
           function = reg[:name]
           params = @context.parse_params(reg[:params].presence)
 
-          @eager_load = eager_loads(sub_schema)
+          @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)
@@ -160,28 +182,6 @@ class APIQL
 
   private
 
-  def eager_loads(schema)
-    result = []
-
-    schema.each do |call|
-      if call.is_a? Hash
-        call.each do |function, sub_schema|
-          next if function.include? '('
-          function = function.split('.').first if function.include? '.'
-
-          sub = eager_loads(sub_schema)
-          if sub.present?
-            result.push(function => sub)
-          else
-            result.push function
-          end
-        end
-      end
-    end
-
-    result
-  end
-
   class Entity
     class << self
       attr_reader :apiql_attributes
@@ -280,9 +280,26 @@ class APIQL
       end
     end
 
+    def eager_load
+      result = @eager_load
+
+      @eager_load = nil
+
+      result
+    end
+
     def render_attribute(field, params = nil, schema = nil)
+      @eager_load = APIQL::eager_loads(schema)
       data = get_field(field, params)
 
+      if @eager_load.present? && !data.is_a?(::Hash) && !data.is_a?(::Array)
+        if data.respond_to?(:each) && data.respond_to?(:map)
+          unless data.loaded?
+            data = data.eager_load(eager_load)
+          end
+        end
+      end
+
       if data.is_a?(Hash) && schema.present?
         respond = {}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apiql
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Dmitry Silchenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-19 00:00:00.000000000 Z
+date: 2018-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler