appril-cli 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39c148a207991873f601d0278b707baa497b5db3
-  data.tar.gz: 5ac6342115df0ecf940e2f0b130cc8294fd7e6cd
+  metadata.gz: 5d28e060372bfb237fc2f55ce5f175d22638b826
+  data.tar.gz: 3c8ff729036829a42d8325e03beb31c133327db9
 SHA512:
-  metadata.gz: a03831c158147e7a45362d762c94842aeb6b8d076422fb2a8a73a35e4f78db9a2bf93746152ffb378588f8b5948d67ad02a3e474257bc4261bd86cc609697f61
-  data.tar.gz: 6eb8180050fe5c1ea1de2014822d06734ec5c5ef969b20ebdb5882291ebbaab2acd42a497b1c8d67be7c5ad39e6de7b6f7635a429b9e4539339b89da668d63eb
+  metadata.gz: 670bdd5a1c68d0455a57bb1780fececf8a3051664767481a06a0a2899c20d4753f7191fe5943cce7395b1f0f92422f84923dae4fe19c4b0aa35ef718c4fff7ab
+  data.tar.gz: 70cad4caf1e501927fcb530e2a956891c9c4a39f37344d5189a08c74f5687a0c193298158a9fc17129eab97fef595a3c1c165c04e5003f461c204ed557076623

data/app/base/bootstrap/api/request-methods.js

@@ -0,0 +1,7 @@
+export default  [
+  'GET',
+  'POST',
+  'PUT',
+  'DELETE',
+  'HEAD'
+]

data/app/base/bootstrap/api/rtcp.js

@@ -0,0 +1,28 @@
+import {reduce} from 'lodash'
+import validate_arguments from './validate-arguments'
+import REQUEST_METHODS from './request-methods'
+
+export default function(component, rtcp) {
+
+  return reduce(component.api || [], function(component_api, method) {
+    component_api[method] = function(...args) {
+
+      validate_arguments(args)
+
+      return reduce(REQUEST_METHODS, function(method_api, request_method) {
+        method_api[request_method.toLowerCase()] = function(callbacks) {
+
+          rtcp.call_server_method(
+            component.controller_name,
+            method,
+            args,
+            request_method,
+            callbacks
+          )
+        }
+        return method_api
+      }, {})
+    }
+    return component_api
+  }, {})
+}

data/app/base/bootstrap/api/validate-arguments.js

@@ -0,0 +1,29 @@
+import {forEach} from 'lodash'
+
+const STRING = '[object String]'
+const NUMBER = '[object Number]'
+const OBJECT = '[object Object]'
+
+function get_type(arg) {
+  const type = Object.prototype.toString.call(arg)
+  return {
+    is_string: type === STRING,
+    is_number: type === NUMBER,
+    is_object: type === OBJECT,
+  }
+}
+
+export default function(args) {
+  forEach(args, function(arg,i) {
+
+    const {is_string, is_number, is_object} = get_type(arg)
+
+    if (!is_string && !is_number && !is_object) {
+      throw `Api methods accepts only Strings, Numbers and Objects as arguments. Argument #${i} is a ${type} instead.`
+    }
+
+    if (is_object && i + 1 !== args.length) {
+      throw `Only last argument can be a Object`
+    }
+  })
+}

data/app/base/bootstrap/api/xhr.js

@@ -0,0 +1,88 @@
+import {reduce, isObject, isArray, isFunction, last} from 'lodash'
+import {url_builder} from 'appril-utils'
+import validate_arguments from './validate-arguments'
+import REQUEST_METHODS from './request-methods'
+
+export default function(component, {on_request, on_response, on_error} = {}) {
+
+  return reduce(component.api || [], function(component_api, method) {
+
+    component_api[method] = function(...args) {
+
+      validate_arguments(args)
+
+      return reduce(REQUEST_METHODS, function(method_api, request_method) {
+
+        const is_post = request_method === 'POST'
+
+        method_api[request_method.toLowerCase()] = function(callbacks = {}) {
+
+          const error_reporter = function(error_message) {
+            if (callbacks.error)
+              return callbacks.error(error_message)
+            if (on_error)
+              return on_error(error_message)
+            throw error_message
+          }
+
+          const xhr = new XMLHttpRequest()
+
+          let params = last(args)
+
+          if (isObject(params)) {
+            if (is_post) {
+              args.pop()
+            }
+          } else {
+            params = {}
+          }
+
+          on_request && on_request(params)
+
+          xhr.onreadystatechange = function() {
+            if (xhr.readyState !== XMLHttpRequest.DONE)
+              return
+
+            callbacks.done && callbacks.done()
+
+            if (parseInt(xhr.status / 100) !== 2)
+              return error_reporter(xhr.responseText)
+
+            if (!callbacks.success)
+              return
+
+            let response = JSON.parse(xhr.responseText)
+
+            on_response && on_response(response)
+
+            callbacks.success(response)
+          }
+
+          xhr.onerror = function(error_message = 'Network error occurred') {
+            callbacks.done && callbacks.done()
+            error_reporter(error_message)
+          }
+
+          xhr.open(request_method, url_builder(component.url, method, ...args))
+
+          xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest')
+          xhr.setRequestHeader('Accept', 'application/json')
+
+          if (is_post) {
+            xhr.setRequestHeader('Content-Type', 'application/json;charset=UTF-8')
+            xhr.send(JSON.stringify(params))
+          } else {
+            xhr.send()
+          }
+        }
+
+        return method_api
+      }, {})
+
+    }
+
+    return component_api
+
+  }, {})
+
+}

data/app/base/bootstrap/components.js

@@ -1,14 +1,15 @@
 import {reduce} from 'lodash'
 import {urlify} from 'appril-utils'
-import api_builder from 'appril/api'
-import * as callbacks from './api_callbacks'
+import xhr_api_builder from './api/xhr'
+import rtcp_api_builder from './api/rtcp'
+import * as callbacks from './api/callbacks'
 import rtcp from './rtcp'
 import {components, default_api} from 'app/appril.json'
 
 export default reduce(components, function(map,component) {
   component.url = urlify(component.url)
-  component.xhr = api_builder.xhr(component, callbacks)
-  component.rtcp = api_builder.rtcp(component, rtcp)
+  component.xhr = xhr_api_builder(component, callbacks)
+  component.rtcp = rtcp_api_builder(component, rtcp)
   Object.defineProperty(component, 'api', {get() {return component[default_api]}})
   map[component.name] = component
   return map

data/app/base/bootstrap/router.js

@@ -5,6 +5,7 @@ import VueRouter from 'vue-router'
 import components from './components'
 import store from './store'
 import componentify from './component'
+import {client_url} from 'app/appril.json'
 
 Vue.use(VueRouter)
 
@@ -15,18 +16,47 @@ export default new VueRouter({
     return {
       name: component.name,
       path: component.url_pattern,
-      component: (resolve) => System.import(`components/${component.entry_path}/index.js`).then(function(constructor) {
-        if (component.api._env) {
-          component.api._env().get({
-            success(env) {
-              store.commit('__SET_ENV__', {component: component.name, env})
-              resolve(componentify(components, component, constructor.default))
-            }
-          })
-        } else {
-          resolve(componentify(components, component, constructor.default))
-        }
-      })
+      component: (resolve, reject) => load_component(component, resolve, reject)
     }
   })
 })
+
+function resolve_component(component, constructor, resolve) {
+  if (component.api._env) {
+    component.api._env().get({
+      success(env) {
+        store.commit('__SET_ENV__', {component: component.name, env})
+        resolve(componentify(components, component, constructor))
+      }
+    })
+  } else {
+    resolve(componentify(components, component, constructor))
+  }
+}
+
+function load_component(component, resolve, reject) {
+  const xhr = new XMLHttpRequest()
+
+  xhr.onreadystatechange = function() {
+    if (xhr.readyState !== XMLHttpRequest.DONE)
+      return
+
+    if (parseInt(xhr.status / 100) !== 2)
+      return reject(xhr.responseText)
+
+    resolve_component(component, _eval(xhr.responseText), resolve)
+  }
+
+  xhr.onerror = function() {
+    reject('Network error occurred')
+  }
+
+  xhr.open('GET', `${client_url}/${APP_ENV}/${component.entry_path}.js`)
+  xhr.send()
+}
+
+function _eval(text) {
+  window.module = {exports: null}
+  eval.call(window, text)
+  return window.module.exports.default
+}

data/app/base/bootstrap/rtcp.js

@@ -1,5 +1,5 @@
-import RTCP from 'appril/rtcp'
-import * as callbacks from './api_callbacks'
+import RTCP from 'appril-rtcp'
+import * as callbacks from './api/callbacks'
 import {server_url} from 'app/appril.json'
 
 const rtcp = new RTCP(callbacks)

data/app/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "description": "...",
   "devDependencies": {
-    "appril": ">= 0.5.6",
+    "appril-rtcp": "0",
     "appril-alert": ">= 0.0.5",
     "appril-polyfills": ">= 0.0.2",
     "appril-url": ">= 0.0.5",
@@ -23,7 +23,8 @@
     "optimize-css-assets-webpack-plugin": "1",
     "style-loader": "*",
     "url-loader": "*",
-    "vue": "^2.0.0-beta.5",
+    "vue": "^2.0.0-rc.2",
+    "vue-router": "^2.0.0-rc.3",
     "vue-html-loader": "1",
     "vuex": "^2.0.0-rc.3",
     "webpack": "^2.1.0-beta.18"

data/app/webpack/entry.js

@@ -3,6 +3,6 @@ const filter = require('lodash/filter')
 const config = require('../appril.json')
 
 module.exports = reduce(filter(config.components, 'entry_path'), function(entries,component) {
-  entries[component.name] = 'base/components/' + component.entry_path + '/index.js'
+  entries[component.entry_path] = 'components/' + component.entry_path + '/index.js'
   return entries
 }, {app: 'base/app.js'})

data/lib/appril-cli/version.rb

@@ -1,5 +1,5 @@
 module Appril
   class CLI
-    VERSION = '0.2.8'.freeze
+    VERSION = '0.2.9'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appril-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies: []
 description: Appril CLI
 email:
@@ -27,7 +27,11 @@ files:
 - app/base/app.js
 - app/base/assets/app.css
 - app/base/boot.rb
-- app/base/bootstrap/api_callbacks.js
+- app/base/bootstrap/api/callbacks.js
+- app/base/bootstrap/api/request-methods.js
+- app/base/bootstrap/api/rtcp.js
+- app/base/bootstrap/api/validate-arguments.js
+- app/base/bootstrap/api/xhr.js
 - app/base/bootstrap/component.js
 - app/base/bootstrap/components.js
 - app/base/bootstrap/router.js
@@ -121,5 +125,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: '["appril-cli-0.2.8", "Appril CLI"]'
+summary: '["appril-cli-0.2.9", "Appril CLI"]'
 test_files: []