appril-cli 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4f003f894639dd5000c890286eee557d61ac557
-  data.tar.gz: 5f0240d5e5325d50795c949348b0c6eb41bc0fc1
+  metadata.gz: aaf51693e976f3705b533a067f6c78f7fd9e6c20
+  data.tar.gz: 7c0f82b8545055cc268cba2ec510cac3a9611441
 SHA512:
-  metadata.gz: 94416ea1fde160d5c67958797beba36756619a36556797611d47b5e2dda4be0f9a7006a1b444792465d1e34595274d6be9bc0ef6a29829e76e4a8209df0bbcb8
-  data.tar.gz: cc66b95a1d2eba91759224eafd6926bc80e3a6871483235b908ed5ecd15e839f2cc95a2c0eddb2564588ea38eeaed3d339dbc5c0602cf4cc5d19e57838f01fd8
+  metadata.gz: 5ef58942e1a8397f0ffbffa97f0a32598beec89c67558ebdbc7fde090e60e794a5e371d2d4ca09665533c14161251351244f203c1c8229ded95e649bcfc3f142
+  data.tar.gz: d8598cb33bd2bb245e744225b1edca5e2adb46e32e03f6d14e077a9a57e7f09ccda4a08af4260b042e97b5c896612c0a5a153110474d93c2729419fb8929a923

data/app/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 begin # keep these gems
   gem 'appril', '~> 0.2', '>= 0.2.5'
-  gem 'rocketio', '~> 0.4', '>= 0.4.2'
+  gem 'rocketio', '~> 0.4', '>= 0.4.3'
   gem 'rocketio-views', '~> 0.4'
   gem 'tubesock', '~> 0.2'
 end

data/app/base/app.js

@@ -1,22 +1,29 @@
 
-const FRESH_STATE_FOR_EVERY_COMPONENT = true
 const DEVELOPMENT = APP_ENV === 'development'
 
-import {merge, reduce, cloneDeep} from 'lodash'
+import {merge, map, reduce, filter, cloneDeep} from 'lodash'
 import Vue from 'vue'
+import VueRouter from 'vue-router'
 import Vuex from 'vuex'
 import VuexLogger from 'vuex/logger'
 import Alert from 'appril-alert'
 import {vue_plugin, vuex_plugins} from 'appril/plugins'
 import {state, mutations} from 'appril/store'
-import {server_url, client_url, default_api} from 'app/config.json'
+import config from 'app/appril.json'
 
 /** delete or comment this line if your components piped through Crudle
 import {state as crudle_state, mutations as crudle_mutations} from 'crudle/store'
 merge(state, crudle_state)
 merge(mutations, crudle_mutations) /* */
 
+Vue.use(VueRouter)
 Vue.use(Vuex)
+
+if (DEVELOPMENT) {
+  Vue.config.devtools = true
+  vuex_plugins.push(VuexLogger())
+}
+
 const store = new Vuex.Store({
   state: cloneDeep(state),
   mutations,
@@ -25,18 +32,11 @@ const store = new Vuex.Store({
 })
 
 const api_callbacks = {
-
   // do whatever with params Object just before sending to server
-  on_request(params) {
-    // if (store.state.__ENV__.user && store.state.__ENV__.user.authorization_token) {
-    //   params.__authorization_token__ = store.state.__ENV__.user.authorization_token
-    // }
-  },
+  on_request(params) {},
 
   // do whatever with data received from server just before entering success callback
-  on_response(response) {
-    // it is possible only to update the response content, not the type
-  },
+  on_response(response) {},
 
   // to be used for requests that does not define a error handler
   on_error(error) {
@@ -50,76 +50,55 @@ const rtcp = new RTCP(api_callbacks)
 
 rtcp.connect({
   // make sure this URL is matching RTCPController URL
-  path: server_url + '__rtcp__',
+  path: config.server_url + '__rtcp__',
   // disconnect if user is idle for N seconds (it will reconnect on user activity)
   disconnect_after: 60
 })
 
 import {urlify} from 'appril-utils'
 import api_builder from 'appril/api'
-const components = reduce(require('app/components.json'), function(map,component) {
+
+const components = reduce(config.components, function(map,component) {
   component.url = urlify(component.url)
   component.xhr = api_builder.xhr(component, api_callbacks)
   component.rtcp = api_builder.rtcp(component, rtcp)
-  Object.defineProperty(component, 'api', {get() {return component[default_api]}})
+  Object.defineProperty(component, 'api', {get() {return component[config.default_api]}})
   map[component.name] = component
   return map
 }, {})
 
-const handle_state = function(component, env) {
-
-  if (!store.state.__ROOT_COMPONENT__)
-    return store.replaceState(merge(cloneDeep(state), {__ROOT_COMPONENT__: component.name, __ENV__: env}))
-
-  if (store.state.__ROOT_COMPONENT__ === component.name)
-    return // do nothing if component did not change
-
-  if (FRESH_STATE_FOR_EVERY_COMPONENT)
-    return store.replaceState(merge(cloneDeep(state), {__ROOT_COMPONENT__: component.name, __ENV__: env}))
-
-  store.commit('__ROOT_COMPONENT__', component.name)
-  store.commit('__ENV__', env)
-}
-
-import Router from 'appril/router'
-const router = new Router(components)
-
-router.component_matched = function(component) {
-  if (component.api._env) {
-    component.api._env().get({
-      success(env) { handle_state(component, env) }
-    })
-  } else {
-    handle_state(component)
-  }
-}
-
-import load_component from 'appril/load-component'
 import deploy_component from './component'
-const component_loaders = reduce(components, function(map, component) {
-  map[component.name] = function(resolve, reject) {
-    load_component(component, client_url + APP_ENV, function(constructor) {
-      resolve(deploy_component(components, component, constructor))
-    }, reject)
-  }
-  return map
-}, {})
 
-document.addEventListener('DOMContentLoaded', function() {
+const router = new VueRouter({
+  mode: 'history',
+  base: __dirname,
+  routes: map(filter(components, 'entry_path'), function(component) {
+    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(deploy_component(components, component, constructor.default))
+            }
+          })
+        } else {
+          resolve(deploy_component(components, component, constructor.default))
+        }
+      })
+    }
+  })
+})
 
+document.addEventListener('DOMContentLoaded', function() {
   Vue.use(vue_plugin({components, rtcp}))
 
-  if (DEVELOPMENT) {
-    Vue.config.devtools = true
-    vuex_plugins.push(VuexLogger())
-  }
-
   new Vue({
+    router,
     store,
     el: '#app',
-    template: require('templates/layouts/app.html'),
-    components: component_loaders
+    template: require('templates/layouts/app.html')
   })
-
-  router.start()
 })

data/app/base/component.js

@@ -1,7 +1,5 @@
 import {find} from 'lodash'
-import Vue from 'vue'
-
-import 'assets/styles'
+import 'assets/app'
 
 // /** default deployer
 export default function(components, component, constructor) {

data/app/base/components/base_controller.rb

@@ -1,5 +1,6 @@
 class BaseController < Appril::BaseController
   include Helpers
+  include UserHelpers
 
   map Cfg.server_url
 

data/app/base/components/rtcp_controller.rb

@@ -1,4 +1,7 @@
 class RTCPController < Appril::RTCPController
+  include Helpers
+  include UserHelpers
+
   map BaseController.url('__rtcp__')
   import :error_handlers, from: BaseController
 

data/app/base/helpers/user.rb

@@ -0,0 +1,7 @@
+module UserHelpers
+
+  def user?
+    return unless authorization_token = params[:__authorization_token__] || cookies[:__authorization_token__]
+    # fetch user using authorization_token
+  end
+end

data/app/base/store/mutations.js

@@ -1,7 +1,4 @@
-export function __ROOT_COMPONENT__(state, component) {
-  state.__ROOT_COMPONENT__ = component
-}
 
-export function __ENV__(state, env) {
-  state.__ENV__ = env
+export function __SET_ENV__({__ENV__}, {component, env}) {
+  __ENV__[component] = env
 }

data/app/base/store/state.js

@@ -1,4 +1,3 @@
 export default {
-  __ROOT_COMPONENT__: null,
   __ENV__: {}
 }

data/app/base/templates/layouts/app.html

@@ -1,3 +1,3 @@
 <div>
-  <component :is="$store.state.__ROOT_COMPONENT__"></component>
+  <router-view></router-view>
 </div>

data/app/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "description": "...",
   "devDependencies": {
-    "appril": ">= 0.5.1",
+    "appril": ">= 0.5.4",
     "appril-alert": ">= 0.0.5",
     "appril-polyfills": ">= 0.0.2",
     "appril-url": ">= 0.0.5",

data/app/webpack/entry.js

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

data/app/webpack/output.js

@@ -1,5 +1,5 @@
 const path = require('path')
-const config = require('../config.json')
+const config = require('../appril.json')
 
 module.exports = {
   path: path.join(config.build_path, config.client_url, APP_ENV),

data/lib/appril-cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appril-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies: []
 description: Appril CLI
 email:
@@ -25,7 +25,7 @@ files:
 - app/Gemfile
 - app/Rakefile
 - app/base/app.js
-- app/base/assets/styles.css
+- app/base/assets/app.css
 - app/base/boot.rb
 - app/base/component.js
 - app/base/components/base_controller.rb
@@ -35,6 +35,7 @@ files:
 - app/base/components/rtcp_controller.rb
 - app/base/helpers/application_helpers.rb
 - app/base/helpers/index.js
+- app/base/helpers/user.rb
 - app/base/load.rb
 - app/base/models/base_model.rb
 - app/base/store/modules.js
@@ -113,5 +114,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: '["appril-cli-0.2.6", "Appril CLI"]'
+summary: '["appril-cli-0.2.7", "Appril CLI"]'
 test_files: []