apiql 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be1cd2e607d5b0b9f400d217c227a53826f20e5904db4caef949978580be45cf
-  data.tar.gz: cbd052428a30d779a3ab3670ca60eebf15fe095df867a7f3d3f1d19c35b7663d
+  metadata.gz: 456ef97a233db53a9e51b2fe04e55c8e360e2f12077e745ac1527278a294dd50
+  data.tar.gz: 79d50b2cf5b3bc79b3eeca1bed1b3d401a1a2fb76ef1cf5b4ac7ac1d9e3dbc05
 SHA512:
-  metadata.gz: b583b6f640c5113d3735d90358375d20cd702382b9ca6815d85a70a15473ccac3ce683cd029fe3abcb7c0e812521ff800c4c7ca3291864939592225095449723
-  data.tar.gz: 7c6090d8ab1e9ea06a181ed7c397cea36c4f6bbd0849f55f45f03fbe1506de24c06ea9a1ad3aebd8959189bd3c3ed9547434eeb56d44a0552e907fcbb1dca124
+  metadata.gz: 96f51297e1bc429c789f3614deb3a959a2746fed188b2197cf6a92e31233dbb9f5d4e57815775f9c12478c17bee34673573ae32a508854ab1cd576ed16b9ab4d
+  data.tar.gz: a2c0f57660d4be5f0ac9e76fa8814d038fa748dde5bd38f147a0fd3f7355aff15e161d853c0a21bfb0a02687adddad6359e2b448973f47f8bd2b34fe7a5e4c0f

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

data/lib/apiql.rb

@@ -133,6 +133,7 @@ class APIQL
         if call.is_a? Hash
           call.each do |function, sub_schema|
             next if function.include? '('
+            function = function.split(':').last.strip if function.include? ':'
             function = function.split('.').first if function.include? '.'
 
             sub = eager_loads(sub_schema)
@@ -165,36 +166,67 @@ class APIQL
       ptr = result
       pool = []
 
+      push_key = lambda do |key, subtree = false|
+        ptr.each_with_index do |e, index|
+          if e.is_a?(::Hash)
+            return e[key] if e[key]
+          elsif e == key
+            if subtree
+              ptr[index] = { key => (p = []) }
+              return p
+            end
+            return
+          end
+        end
+
+        if subtree
+          ptr.push(key => (p = []))
+          return p
+        else
+          ptr.push(key)
+        end
+      end
+
+      last_key = nil
+
       while schema.present? do
         if reg = schema.match(/\A\s*\{(?<rest>.*)\z/m) # {
           schema = reg[:rest]
 
           pool.push(ptr)
-          key = ptr.pop
-          ptr.push(key => (ptr = []))
+
+          ptr = push_key.call(last_key, true)
         elsif reg = schema.match(/\A\s*\}(?<rest>.*)\z/m) # }
           schema = reg[:rest]
 
           ptr = pool.pop
-        elsif pool.any? && (reg = schema.match(/\A\s*(?<name>[\w\.]+)(\((?<params>.*?)\))?(?<rest>.*)\z/m))
-          schema = reg[:rest]
+        elsif pool.any?
+          if reg = schema.match(/\A\s*((?<alias>[\w\.]+):\s*)?(?<name>[\w\.]+)(\((?<params>.*?)\))?(?<rest>.*)\z/m)
+            schema = reg[:rest]
+
+            key = reg[:alias].present? ? "#{reg[:alias]}: #{reg[:name]}" : reg[:name]
+            key += "(#{reg[:params]})" unless reg[:params].nil?
 
-          if reg[:params].nil?
-            key = reg[:name]
+            push_key.call(key)
+
+            last_key = key
           else
-            key = "#{reg[:name]}(#{reg[:params]})"
+            raise Error, schema
           end
-
-          ptr.push(key)
         elsif reg = schema.match(/\A\s*((?<alias>[\w\.]+):\s*)?(?<name>[\w\.]+)(\((?<params>((\w+)(\s*\,\s*\w+)*))?\))?\s*\{(?<rest>.*)\z/m)
           schema = reg[:rest]
 
+          key = "#{reg[:alias] || reg[:name]}: #{reg[:name]}(#{reg[:params]})"
+
           pool.push(ptr)
-          ptr.push("#{reg[:alias] || reg[:name]}: #{reg[:name]}(#{reg[:params]})" => (ptr = []))
+
+          ptr = push_key.call(key, true)
         elsif reg = schema.match(/\A\s*((?<alias>[\w\.]+):\s*)?(?<name>[\w\.]+)(\((?<params>((\w+)(\s*\,\s*\w+)*))?\))?\s*\n?(?<rest>.*)\z/m)
           schema = reg[:rest]
 
-          ptr.push("#{reg[:alias] || reg[:name]}: #{reg[:name]}(#{reg[:params]})")
+          key = "#{reg[:alias] || reg[:name]}: #{reg[:name]}(#{reg[:params]})"
+
+          push_key.call(key)
         else
           raise Error, schema
         end
@@ -240,9 +272,13 @@ class APIQL
             end
           end
 
-          result = result.deep_merge({
-            name => @context.render_value(data, sub_schema)
-          })
+          if result[name].is_a? ::Hash
+            result = result.deep_merge({
+              name => @context.render_value(data, sub_schema)
+            })
+          else
+            result[name] = @context.render_value(data, sub_schema)
+          end
         end
       else
         reg = call.match(/\A((?<alias>[\w\.]+):\s*)?(?<name>[\w\.]+)(\((?<params>.*?)\))?\z/)
@@ -262,9 +298,13 @@ class APIQL
           data = nil
         end
 
-        result = result.deep_merge({
-          name => data
-        })
+        if result[name].is_a? ::Hash
+          result = result.deep_merge({
+            name => data
+          })
+        else
+          result[name] = data
+        end
       end
     end
 
@@ -314,20 +354,32 @@ class APIQL
       schema.each do |field|
         if field.is_a? Hash
           field.each do |field, sub_schema|
-            reg = field.match(/\A(?<name>[\w\.]+)(\((?<params>.*?)\))?\z/)
+            reg = field.match(/\A((?<alias>[\w\.]+):\s*)?(?<name>[\w\.]+)(\((?<params>.*?)\))?\z/)
             raise Error, field unless reg.present?
 
-            respond = respond.deep_merge({
-              reg[:name] => render_attribute(reg[:name], reg[:params].presence, sub_schema)
-            })
+            name = reg[:alias] || reg[:name]
+
+            if respond[name].is_a? ::Hash
+              respond = respond.deep_merge({
+                name => render_attribute(reg[:name], reg[:params].presence, sub_schema)
+              })
+            else
+              respond[name] = render_attribute(reg[:name], reg[:params].presence, sub_schema)
+            end
           end
         else
-          reg = field.match(/\A(?<name>[\w\.]+)(\((?<params>.*?)\))?\z/)
+          reg = field.match(/\A((?<alias>[\w\.]+):\s*)?(?<name>[\w\.]+)(\((?<params>.*?)\))?\z/)
           raise Error, field unless reg.present?
 
-          respond = respond.deep_merge({
-            reg[:name] => render_attribute(reg[:name], reg[:params].presence)
-          })
+          name = reg[:alias] || reg[:name]
+
+          if respond[name].is_a? ::Hash
+            respond = respond.deep_merge({
+              name => render_attribute(reg[:name], reg[:params].presence)
+            })
+          else
+            respond[name] = render_attribute(reg[:name], reg[:params].presence)
+          end
         end
       end
 

metadata

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