apiql 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: def514d5f185be467c6fe1d3cb0a45f1713ff47950d366f40c4830268064cf6b
-  data.tar.gz: 6e23322d7c596b40ebd2740bdd3e98ec961b88f1d2825bec8ecc829bb01e63b8
+  metadata.gz: d352e5c0593440e6f860500f9aff2e02238ff4ccd4cee8d4845eb80aa2301e95
+  data.tar.gz: 8600a0d3df1e54eac36e10d0898c151adbb53d771d2a09f50a6002899506ae28
 SHA512:
-  metadata.gz: 5c4253fe05c60846ddb813e7c09ef431d6d21d6574ecb9f3660a1d6a9cdc4ef128debe34fa1d601bd42eec8eb64a218a06e55f14eb29ef72b682bd97c7d7e6c4
-  data.tar.gz: c93a2ffeafe521a9eccf3e27bd6b452fd1878ad2aff2d18652f71e0597e09981e3ef8059d3f8173d94312c535d3afb986eac184929d2835c939789b8e65e6d66
+  metadata.gz: '0979ad9a4921e756a9e4251fe753002db11b2a3f769bb8274e45e1c44da9df64eda69d928ec72ae0666faa5c3347d779935f55134a6279b7dcd34e8f424b4e64'
+  data.tar.gz: 7d11f62c6ca0fee4236307a001c9038ef1e2191b72970644e90b8f6847f75f1e4b87430ded40faadddcf1bdcb6c7ec4c5d8157f9ed1265de261edf778b9fbc41

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

data/assets/javascripts/apiql.js

@@ -42,6 +42,8 @@ const APIQL = {
           return
         }
 
+        if(response.status < 400) return
+
         if(form) {
           form.append('apiql_request', schema)
         } else {

data/lib/apiql.rb

@@ -87,7 +87,7 @@ class APIQL
           keys.delete(last_key)
           keys << { last_key => last_keys }
         end
-      elsif function.present? && (reg = schema.match(/\A\s*(?<name>\w+)(\((?<params>.*)\))?(?<rest>.*)\z/m))
+      elsif function.present? && (reg = schema.match(/\A\s*(?<name>[\w\.]+)(\((?<params>.*)\))?(?<rest>.*)\z/m))
         schema = reg[:rest]
 
         if reg[:params].present?
@@ -97,7 +97,7 @@ class APIQL
         end
 
         last_key = reg[:name]
-      elsif reg = schema.match(/\A\s*(?<name>\w+)(\((?<params>((\w+)(\s*\,\s*\w+)*))?\))?\s*\{(?<rest>.*)\z/m)
+      elsif reg = schema.match(/\A\s*(?<name>[\w\.]+)(\((?<params>((\w+)(\s*\,\s*\w+)*))?\))?\s*\{(?<rest>.*)\z/m)
         schema = reg[:rest]
 
         function = reg[:name]
@@ -112,7 +112,7 @@ class APIQL
 
         pool.push [keys, last_key]
         keys = []
-      elsif reg = schema.match(/\A\s*(?<name>\w+)(\((?<params>((\w+)(\s*\,\s*\w+)*))?\))?\s*\n(?<rest>.*)\z/m)
+      elsif reg = schema.match(/\A\s*(?<name>[\w\.]+)(\((?<params>((\w+)(\s*\,\s*\w+)*))?\))?\s*\n?(?<rest>.*)\z/m)
         schema = reg[:rest]
 
         function = reg[:name]
@@ -195,12 +195,41 @@ class APIQL
         field, params = field
         params = @context.parse_params(params)
       end
-      return unless field.to_sym.in? self.class.apiql_attributes
 
-      if respond_to? field
-        public_send(field, *params)
+      names = field.split('.')
+      if names.count > 1
+        o = nil
+
+        names.each do |field|
+          if o.present?
+            if o.respond_to? field
+              o = o.public_send(field, *params)
+            else
+              o = nil
+              break
+            end
+          else
+            return unless field.to_sym.in? self.class.apiql_attributes
+
+            if respond_to? field
+              o = public_send(field, *params)
+            else
+              o = object.public_send(field, *params)
+            end
+
+            break unless o.present?
+          end
+        end
+
+        o
       else
-        object.public_send(field, *params)
+        return unless field.to_sym.in? self.class.apiql_attributes
+
+        if respond_to? field
+          public_send(field, *params)
+        else
+          object.public_send(field, *params)
+        end
       end
     end
 
@@ -262,7 +291,7 @@ class APIQL
 
     def parse_params(list)
       list&.split(',')&.map(&:strip)&.map do |name|
-        if reg = name.match(/\A[a-zA-Z]\w*\z/)
+        if reg = name.match(/\A[a-zA-Z_]\w*\z/)
           params[name]
         else
           begin

metadata

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