apiql 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03deaa31d43b9af72802ed8c1b3ccea05452acabac5ea8e9264a643cd89984d8
-  data.tar.gz: ffed0696e116b50271068581a582922f69f020de02809a36685e57677bd8c92d
+  metadata.gz: def514d5f185be467c6fe1d3cb0a45f1713ff47950d366f40c4830268064cf6b
+  data.tar.gz: 6e23322d7c596b40ebd2740bdd3e98ec961b88f1d2825bec8ecc829bb01e63b8
 SHA512:
-  metadata.gz: 0b4e55589c3945aab740d933b96a9a11a429c71c1e16ff98f781e9ddd84cae6cda193ef108235a89baf14e3d947687df6eaa52bed3ae184d3a9e130d2556421a
-  data.tar.gz: 1a8aba4a9920736810238cd133475960820d54580531bfc2850e59d6b564b7ee0e12a4318bc86fbc86638cef6a54850cbcf4fc0e6bef0ebf30e17f9bf1b573d9
+  metadata.gz: 5c4253fe05c60846ddb813e7c09ef431d6d21d6574ecb9f3660a1d6a9cdc4ef128debe34fa1d601bd42eec8eb64a218a06e55f14eb29ef72b682bd97c7d7e6c4
+  data.tar.gz: c93a2ffeafe521a9eccf3e27bd6b452fd1878ad2aff2d18652f71e0597e09981e3ef8059d3f8173d94312c535d3afb986eac184929d2835c939789b8e65e6d66

data/README.md

@@ -36,17 +36,17 @@ def user
 end
 
 ```
-variables `session`, `current_user` and `params` will be stored into context you can use in presenters and handlers
+variables `session`, `current_user` and `params` (you can list any you need) will be stored into context you can use in presenters and handlers
 
 Define presenters for your models:
 
 ```ruby
 class User < ApplicationRecord
   class Entity < ::APIQL::Entity
-    attributes :full_name, :email, :token, :role, :roles
+    attributes :full_name, :email, :token, :role, :roles # any attributes, methods or associations
 
-    def token
-      object.token if object == current_user
+    def token # if defined, method will be called instead of attribute
+      object.token if object == current_user # directly access to current_user from context
     end
   end
 
@@ -66,28 +66,34 @@ APIQL.endpoint = "/"
 ```
 
 ```javascript
+// function apiql(endpoint, schema, params = {}, form = null) -- schema is cached, so entire request is passed only for first time, later - short hashes only
+
 authenticate(email, password) {
-  let api = new APIQL("user")
-  api.call(`
+  apiql("user", `
     logout()
-    authenticate(email,password) {
+
+    authenticate(email, password) {
       token
     }
+
     me {
       email full_name role token
+
+      roles {
+        id title
+      }
    }
   `, {
-    email: email,
+    email: email, // these var will be passed into methods on the server side
     password: password
   })
-  .then(response => {
+  .then(response => { // response contains results of called methods
     let user = response.me
   })
 }
 
 logout() {
-  let api = new APIQL("user")
-  api.call(`
+  apiql("user", `
     logout
   `)
   .then(response => {

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

data/assets/javascripts/apiql.js

@@ -1,7 +1,6 @@
-class APIQL {
-  constructor(endpoint) {
-    this.endpoint = endpoint
-  }
+const APIQL = {
+  on_error: null,
+  endpoint: '',
 
   hash(s) {
     let hash = 0, i, chr
@@ -12,9 +11,9 @@ class APIQL {
       hash |= 0
     }
     return hash
-  }
+  },
 
-  call(schema, params = {}, form = null) {
+  call(endpoint, schema, params = {}, form = null) {
     return new Promise((resolve, reject) => {
       if(params instanceof FormData) {
         form = params
@@ -33,13 +32,14 @@ class APIQL {
         params.apiql = this.hash(schema)
       }
 
-      Vue.http.post(`${APIQL.endpoint}${this.endpoint}`, params)
+      Vue.http.post(`${APIQL.endpoint}${endpoint}`, params)
       .then(response => {
         resolve(response.body)
       })
       .catch(response => {
-        if(response.status == 401 && APIQL.unauthenticated) {
-          APIQL.unauthenticated()
+        if(response.status == 401 && APIQL.on_error) {
+          APIQL.on_error(response)
+          return
         }
 
         if(form) {
@@ -48,17 +48,22 @@ class APIQL {
           params.apiql_request = schema
         }
 
-        Vue.http.post(`${APIQL.endpoint}${this.endpoint}`, form || params)
+        Vue.http.post(`${APIQL.endpoint}${endpoint}`, form || params)
         .then(response => {
           resolve(response.body)
         })
         .catch(response => {
-          alert(response.body.errors)
+          if(APIQL.on_error) {
+            APIQL.on_error(response)
+          } else {
+            alert(response.body)
+          }
         })
       })
     })
   }
 }
 
-APIQL.unauthenticated = null
-APIQL.endpoint = ''
+function apiql(endpoint, schema, params = {}, form = null) {
+  return APIQL.call(endpoint, schema, params, form)
+}

metadata

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