apiql 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2239e120580841a94f58c1a7e15a8be3b2563d352092817905975c69cb69dc26
-  data.tar.gz: 3b22d1a1aab96520d240e6728d79754771098cec23b8275e0d63c1e06f4c2f7f
+  metadata.gz: f23382bfe0c9946640a70754b0111d109267e24a00b23e675d16f2d5f5685938
+  data.tar.gz: d0fa0b8295cc1184b408e9817f7ba052b881abbefdab93533000af4d3fa1ea3c
 SHA512:
-  metadata.gz: '06876552a00283a6586b03c24730c6ef4a98065897d173170f721d67110e6439e17c7b94ed4ce491cde5be6cb8b559a61a7e07f5c216b13df87d05ad1ce4e7ba'
-  data.tar.gz: 442ca29ae8e1f95132c964830ac36dafce8a433d9e5540efaf1fd044991c52d7514206bc4a79f69b5545abbe12a1786df4caec06bb90dc9288433b6e4bbe086c
+  metadata.gz: e795fba519ff01d1b7e21ed99f1e8f58619600249a5cd03b57b3b8acba407799c43fd2170dfb0d45d7b1ce6e18754caf23bd6c44ef28579dc571b2d644b52c17
+  data.tar.gz: a39ea52e53d9a8299fbaa0ae359ed25fa77112c0405279b1fa0cdbd089483d81894bf132466d197c32cee6c08415207a90c3d7763bec228258cfce9ff681db19

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

data/assets/javascripts/apiql.js

@@ -2,7 +2,7 @@ const APIQL = {
   on_error: null,
   endpoint: '',
 
-  hash(s) {
+  hash: function(s) {
     let hash = 0, i, chr
     if(s.length === 0) return hash
     for(i = 0; i < s.length; i++) {
@@ -13,33 +13,33 @@ const APIQL = {
     return hash
   },
 
-  call(schema, params) {
+  call: function(schema, params, form) {
     if(!params) params = {}
     if(!form) form = null
 
-    return new Promise((resolve, reject) => {
+    return new Promise(function(resolve, reject) {
       if(params instanceof FormData) {
         form = params
         params = {}
       }
 
       if(form) {
-        Object.keys(params).forEach(key => {
+        Object.keys(params).forEach(function(key) {
           form.append(key, params[key])
         })
       }
 
       if(form) {
-        form.append('apiql', this.hash(schema))
+        form.append('apiql', APIQL.hash(schema))
       } else {
-        params.apiql = this.hash(schema)
+        params.apiql = APIQL.hash(schema)
       }
 
       Vue.http.post(APIQL.endpoint, form || params)
-      .then(response => {
+      .then(function(response) {
         resolve(response.body)
       })
-      .catch(response => {
+      .catch(function(response) {
         if(response.status == 401 && APIQL.on_error) {
           APIQL.on_error(response)
           return
@@ -54,10 +54,10 @@ const APIQL = {
         }
 
         Vue.http.post(APIQL.endpoint, form || params)
-        .then(response => {
+        .then(function(response) {
           resolve(response.body)
         })
-        .catch(response => {
+        .catch(function(response) {
           if(APIQL.on_error) {
             APIQL.on_error(response)
           } else {

data/lib/apiql.rb

@@ -107,8 +107,8 @@ class APIQL
       if request.present?
         request = compile(request)
         redis&.set("api-ql-cache-#{request_id}", request.to_json)
-        @@cache = {} if @@cache.count > 1000
         @@cache[request_id] = request
+        @@cache = {} if(@@cache.count > 1000)
       else
         request = @@cache[request_id]
         request ||= JSON.parse(redis.get("api-ql-cache-#{request_id}")) rescue nil
@@ -252,10 +252,10 @@ class APIQL
   def render(schema)
     result = {}
 
-    schema.map do |call|
+    schema.each do |call|
       if call.is_a? ::Hash
         call.each do |function, sub_schema|
-          reg = function.match(/\A((?<alias>[\w\.]+):\s*)?(?<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]
@@ -266,9 +266,9 @@ class APIQL
           data = public_send(function, *params)
           if @eager_load.present? && !data.is_a?(::Hash) && !data.is_a?(::Array)
             if data.respond_to?(:eager_load)
-              data = data.eager_load(eager_load)
+              data = data.includes(eager_load)
             elsif data.respond_to?(:id)
-              data = data.class.eager_load(eager_load).find(data.id)
+              data = data.class.includes(eager_load).find(data.id)
             end
           end
 
@@ -281,7 +281,7 @@ class APIQL
           end
         end
       else
-        reg = call.match(/\A((?<alias>[\w\.]+):\s*)?(?<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]
@@ -354,7 +354,7 @@ class APIQL
       schema.each do |field|
         if field.is_a? Hash
           field.each do |field, sub_schema|
-            reg = field.match(/\A((?<alias>[\w\.]+):\s*)?(?<name>[\w\.]+)(\((?<params>.*?)\))?\z/)
+            reg = field.match(/\A((?<alias>[\w\.\!]+):\s*)?(?<name>[\w\.\!]+)(\((?<params>.*?)\))?\z/)
             raise Error, field unless reg.present?
 
             name = reg[:alias] || reg[:name]
@@ -368,7 +368,7 @@ class APIQL
             end
           end
         else
-          reg = field.match(/\A((?<alias>[\w\.]+):\s*)?(?<name>[\w\.]+)(\((?<params>.*?)\))?\z/)
+          reg = field.match(/\A((?<alias>[\w\.\!]+):\s*)?(?<name>[\w\.\!]+)(\((?<params>.*?)\))?\z/)
           raise Error, field unless reg.present?
 
           name = reg[:alias] || reg[:name]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apiql
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Dmitry Silchenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Implementation of the API language similar to GraphQL for Ruby on Rails