appril-cli 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d28e060372bfb237fc2f55ce5f175d22638b826
-  data.tar.gz: 3c8ff729036829a42d8325e03beb31c133327db9
+  metadata.gz: f1dc24aad4f54cd214c7e2cf371da2dfaa73a585
+  data.tar.gz: 73a5ddff69205eac86f5c391030d3bb0e1219853
 SHA512:
-  metadata.gz: 670bdd5a1c68d0455a57bb1780fececf8a3051664767481a06a0a2899c20d4753f7191fe5943cce7395b1f0f92422f84923dae4fe19c4b0aa35ef718c4fff7ab
-  data.tar.gz: 70cad4caf1e501927fcb530e2a956891c9c4a39f37344d5189a08c74f5687a0c193298158a9fc17129eab97fef595a3c1c165c04e5003f461c204ed557076623
+  metadata.gz: f5fedc40fc4c6dd2fe67f8d90a2c548ac796eea2f324597a70b2b59b8a2877e94127b9d2bef1880312203589e2520c7087340ec03a80f2b32a503c7735869454
+  data.tar.gz: d76ea8aab153e7d1ea3c03b0f2eb74f1e536bd1794590b72e8e994f953550e7f89e5a8e4350db7c00b0b75ff1056bf4cf2bdea01535c9cf16dff84dd61dd46bd

data/app/base/{bootstrap/api/callbacks.js → api.js}

@@ -12,3 +12,6 @@ export function on_response(response) {
 export function on_error(error) {
   Alert.error(error)
 }
+
+// extra headers to be appended to every request
+export const headers = {}

data/app/base/bootstrap/components.js

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

data/app/base/bootstrap/router.js

@@ -1,14 +1,16 @@
-import {map, filter} from 'lodash'
+import {map, filter, compact} from 'lodash'
 import Vue from 'vue'
 import VueRouter from 'vue-router'
 
 import components from './components'
 import store from './store'
 import componentify from './component'
-import {client_url} from 'app/appril.json'
+import {dev_server_url, client_url} from 'app/appril.json'
 
 Vue.use(VueRouter)
 
+const BASEURL = compact([dev_server_url, client_url, APP_ENV]).join('')
+
 export default new VueRouter({
   mode: 'history',
   base: __dirname,
@@ -16,7 +18,7 @@ export default new VueRouter({
     return {
       name: component.name,
       path: component.url_pattern,
-      component: (resolve, reject) => load_component(component, resolve, reject)
+      component: (resolve) => load_component(component, resolve)
     }
   })
 })
@@ -34,7 +36,7 @@ function resolve_component(component, constructor, resolve) {
   }
 }
 
-function load_component(component, resolve, reject) {
+function load_component(component, resolve) {
   const xhr = new XMLHttpRequest()
 
   xhr.onreadystatechange = function() {
@@ -42,16 +44,16 @@ function load_component(component, resolve, reject) {
       return
 
     if (parseInt(xhr.status / 100) !== 2)
-      return reject(xhr.responseText)
+      return console.error(xhr.responseText)
 
     resolve_component(component, _eval(xhr.responseText), resolve)
   }
 
-  xhr.onerror = function() {
-    reject('Network error occurred')
+  xhr.onerror = function(error = 'Network error occurred') {
+    console.error(error)
   }
 
-  xhr.open('GET', `${client_url}/${APP_ENV}/${component.entry_path}.js`)
+  xhr.open('GET', `${BASEURL}/${component.entry_path}.js`)
   xhr.send()
 }
 

data/app/base/bootstrap/rtcp.js

@@ -1,8 +1,8 @@
-import RTCP from 'appril-rtcp'
-import * as callbacks from './api/callbacks'
+import RTCP from 'appril-api/rtcp'
+import * as callbacks_and_headers from 'base/api'
 import {server_url} from 'app/appril.json'
 
-const rtcp = new RTCP(callbacks)
+const rtcp = new RTCP(callbacks_and_headers)
 
 rtcp.connect({
   // make sure this URL is matching RTCPController URL

data/app/base/components/base_controller.rb

@@ -2,15 +2,17 @@ class BaseController < Appril::BaseController
   include Helpers
   include UserHelpers
 
-  map Cfg.server_url
+  map(Cfg.server_url)
+
+  engine(:Liquid)
+
+  define_layout(:layout, {file: '../templates/layout'})
+  layout(:layout)
 
-  define_layout :layout, file: '../templates/layout'
-  layout :layout
-  engine :Liquid
   define_template(:index) {''}
 
   # highly important setup, do NOT remove
-  define_template_var(:client_url, File.join(Cfg.client_url, environment).freeze)
+  define_template_var(:client_url, File.join(Cfg.dev_server_url.to_s, Cfg.client_url, environment).freeze)
 
   def index
     render

data/app/config/env/development.yml

@@ -0,0 +1 @@
+# dev_server_url: http://localhost:8080

data/app/core/generate_configs.rb

@@ -21,6 +21,7 @@ module Appril
           build_path: config[:build_path],
           client_url: config[:client_url],
           server_url: config[:server_url],
+          dev_server_url: config[:dev_server_url],
           default_api: config[:default_api],
           components: components
         })

data/app/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "description": "...",
   "devDependencies": {
-    "appril-rtcp": "0",
+    "appril-api": ">= 0.0.1",
     "appril-alert": ">= 0.0.5",
     "appril-polyfills": ">= 0.0.2",
     "appril-url": ">= 0.0.5",

data/lib/appril-cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appril-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-08-20 00:00:00.000000000 Z
 dependencies: []
 description: Appril CLI
 email:
@@ -24,14 +24,10 @@ files:
 - app/.pryrc
 - app/Gemfile
 - app/Rakefile
+- app/base/api.js
 - app/base/app.js
 - app/base/assets/app.css
 - app/base/boot.rb
-- 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
@@ -125,5 +121,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: '["appril-cli-0.2.9", "Appril CLI"]'
+summary: '["appril-cli-0.3.0", "Appril CLI"]'
 test_files: []

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

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

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

@@ -1,28 +0,0 @@
-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

@@ -1,29 +0,0 @@
-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

@@ -1,88 +0,0 @@
-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
-
-  }, {})
-
-}