apiql 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f34e609be9a7132527a772ee95d0e7dd4e43aff4bb7d8f9fd43010f73e9632e
-  data.tar.gz: 1194eed934b4c0f26084dc0cdec5beac7d51967236e1b6438efa176d176cfdb2
+  metadata.gz: 1c646102791e4397cfd322014616a3f214c38dde8b7edd37fef3c37c6b84176b
+  data.tar.gz: 90d131a408fb22501e197027f4b05d55b080fbe07fe5c1f7d4f9bf405d3fd988
 SHA512:
-  metadata.gz: adca6b4acf505f3a281a352640dbabb23a05b9ded7a9ddd99c10d64f0cbba1b67b054a66e048cbdd0f59c164f9fa2b850c3f8693cf0ec92ad967326e87639ee1
-  data.tar.gz: 0c1c05a98a7cb45868e3d0f3118b4d4ccf87c475e9e88aa84cb49808005ee5f45cdc1df9595eef0be5f5c3f7087213f8ecaeca97e5fad45733dbdf8280a28677
+  metadata.gz: 170163dba5b575197a34d1baf4ec38bdd8fdfb67c7742ff924d8bc09d0df5626cb2a203b80bbb9b6fe57cb9ff6eb87848856f17a432391dbca523b0f3a4672c5
+  data.tar.gz: 5bc6a8546e72f75fdd46f06120ea739d247cc2716f1c3fa71e3739f117826d81e859f5ff89202f6fd65d0d17e145754191b4977bae8edf365a3f9684bf02dae2

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

data/lib/apiql.rb

@@ -69,7 +69,7 @@ class APIQL
           schema = reg[:rest]
 
           ptr = pool.pop
-        elsif pool.any? && (reg = schema.match(/\A\s*(?<name>[\w\.]+)(\((?<params>.*)\))?(?<rest>.*)\z/m))
+        elsif pool.any? && (reg = schema.match(/\A\s*(?<name>[\w\.]+)(\((?<params>.*?)\))?(?<rest>.*)\z/m))
           schema = reg[:rest]
 
           if reg[:params].nil?
@@ -116,11 +116,11 @@ 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(?<name>[\w\.]+)(\((?<params>.*?)\))?\z/)
           raise Error, function unless reg.present?
 
           function = reg[:name]
-          params = @context.parse_params(reg[:params])
+          params = @context.parse_params(reg[:params].presence)
 
           @eager_load = eager_loads(sub_schema)
           data = public_send(function, *params)
@@ -135,11 +135,11 @@ class APIQL
           result[function] = @context.render_value(data, sub_schema)
         end
       else
-        reg = call.match(/\A(?<name>[\w\.]+)(\((?<params>.*)\))?\z/)
+        reg = call.match(/\A(?<name>[\w\.]+)(\((?<params>.*?)\))?\z/)
         raise Error, call unless reg.present?
 
         function = reg[:name]
-        params = @context.parse_params(reg[:params])
+        params = @context.parse_params(reg[:params].presence)
 
         @eager_load = ''
         data = public_send(function, *params)
@@ -220,12 +220,16 @@ class APIQL
       schema.each do |field|
         if field.is_a? Hash
           field.each do |field, sub_schema|
-            name = field.is_a?(Array) ? field.first : field
-            respond[name] = render_attribute(field, sub_schema)
+            reg = field.match(/\A(?<name>[\w\.]+)(\((?<params>.*?)\))?\z/)
+            raise Error, field unless reg.present?
+
+            respond[reg[:name]] = render_attribute(reg[:name], reg[:params].presence, sub_schema)
           end
         else
-          name = field.is_a?(Array) ? field.first : field
-          respond[name] = render_attribute(field)
+          reg = field.match(/\A(?<name>[\w\.]+)(\((?<params>.*?)\))?\z/)
+          raise Error, field unless reg.present?
+
+          respond[reg[:name]] = render_attribute(reg[:name], reg[:params].presence)
         end
       end
 
@@ -234,9 +238,8 @@ class APIQL
 
     private
 
-    def get_field(field)
-      if field.is_a? Array
-        field, params = field
+    def get_field(field, params = nil)
+      if params.present?
         params = @context.parse_params(params)
       end
 
@@ -277,8 +280,8 @@ class APIQL
       end
     end
 
-    def render_attribute(field, schema = nil)
-      data = get_field(field)
+    def render_attribute(field, params = nil, schema = nil)
+      data = get_field(field, params)
 
       if data.is_a?(Hash) && schema.present?
         respond = {}
@@ -309,7 +312,7 @@ class APIQL
   end
 
   class HashEntity < Entity
-    def get_field(field)
+    def get_field(field, params = nil)
       object[field.to_sym]
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apiql
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Dmitry Silchenko