apiql 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b31f3704ac2a7144b1d492f13cddc83b3c722cd5db52ecee24efa8889cdc4fc7
-  data.tar.gz: f2c5ebc7381cd7b2fd2f9cb886e674f8c68fc193071ba98a1edeb4c19b570a20
+  metadata.gz: 63b4f97269f59d36c635c7b748139aaa028ee54d39693d6f0f44e047448fbf50
+  data.tar.gz: 2b349ebef9fc19be13bff57f40a3b35dbb9b87fd749087da5b57f2d853442c83
 SHA512:
-  metadata.gz: 92e64b9e2d197e22cb01eb14a97448551d49e89c03af894646d993abed04b8fd08c558216f82a2f7a00cd2e19bced08bac1cf3642e3b9fc7fb792ab6ed8186dc
-  data.tar.gz: 16460fa4e99dbd0ab42ca676f7f95a758b9d5ef83f63e07a8fe4483a5dc818145b8e873a6f2a9ecbdc10abf182ba9e7b9d64e0a0250290ed5cd98cdb828909a1
+  metadata.gz: ca5733013a1f7346c3ec80f9baab183694d8a2681a1f91d926c7827ae2d52014389a050d6ff5b3aefbec9da46e0bb28a5b89fc0d68cf318d62fa6f7e8baf03ea
+  data.tar.gz: e6b7644edb288b4cf7f4b729706b292e4ca0aad43e251bf4862cb7024ccf15e12b60306616a0b9075ed3648209b6ff18ac41084dd7bb9968b1de680becb9b1e6

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

data/lib/apiql.rb

@@ -101,15 +101,15 @@ class APIQL
           end
 
           ptr.push(key)
-        elsif reg = schema.match(/\A\s*(?<name>[\w\.]+)(\((?<params>((\w+)(\s*\,\s*\w+)*))?\))?\s*\{(?<rest>.*)\z/m)
+        elsif reg = schema.match(/\A\s*((?<alias>[\w\.]+):\s*)?(?<name>[\w\.]+)(\((?<params>((\w+)(\s*\,\s*\w+)*))?\))?\s*\{(?<rest>.*)\z/m)
           schema = reg[:rest]
 
           pool.push(ptr)
-          ptr.push("#{reg[:name]}(#{reg[:params]})" => (ptr = []))
-        elsif reg = schema.match(/\A\s*(?<name>[\w\.]+)(\((?<params>((\w+)(\s*\,\s*\w+)*))?\))?\s*\n?(?<rest>.*)\z/m)
+          ptr.push("#{reg[:alias] || reg[:name]}: #{reg[:name]}(#{reg[:params]})" => (ptr = []))
+        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[:name]}(#{reg[:params]})")
+          ptr.push("#{reg[:alias] || reg[:name]}: #{reg[:name]}(#{reg[:params]})")
         else
           raise Error, schema
         end
@@ -138,9 +138,10 @@ class APIQL
     schema.map do |call|
       if call.is_a? ::Hash
         call.each do |function, sub_schema|
-          reg = function.match(/\A(?<name>[\w\.]+)(\((?<params>.*?)\))?\z/)
+          reg = function.match(/\A((?<alias>[\w\.]+):\s*)?(?<name>[\w\.]+)(\((?<params>.*?)\))?\z/)
           raise Error, function unless reg.present?
 
+          name = reg[:alias] || reg[:name]
           function = reg[:name]
           params = @context.parse_params(reg[:params].presence)
 
@@ -154,12 +155,13 @@ class APIQL
             end
           end
 
-          result[function] = @context.render_value(data, sub_schema)
+          result[name] = @context.render_value(data, sub_schema)
         end
       else
-        reg = call.match(/\A(?<name>[\w\.]+)(\((?<params>.*?)\))?\z/)
+        reg = call.match(/\A((?<alias>[\w\.]+):\s*)?(?<name>[\w\.]+)(\((?<params>.*?)\))?\z/)
         raise Error, call unless reg.present?
 
+        name = reg[:alias] || reg[:name]
         function = reg[:name]
         params = @context.parse_params(reg[:params].presence)
 
@@ -173,7 +175,7 @@ class APIQL
           data = nil
         end
 
-        result[function] = data
+        result[name] = data
       end
     end
 

metadata

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