appril-cli 0.2.3 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6fce6c027dc0c76302855dffb23a042f0bd5763
-  data.tar.gz: 4c8fbd6935a8d4255138b19f02ea85a10254d5d2
+  metadata.gz: f4f003f894639dd5000c890286eee557d61ac557
+  data.tar.gz: 5f0240d5e5325d50795c949348b0c6eb41bc0fc1
 SHA512:
-  metadata.gz: 3046ef4df845c82e265b35fdf0d6e83b2fed4860074848c7d2f9b4fbf9d237d176f59a6059cdb408bc218ad2486178ef581affd6523fe5a44b4ad50f2af90714
-  data.tar.gz: de4057dc75eee1af3c25c7415d3399068cb76824fb7ec8f82ee4620f00564d5a451ef833b2a76fa00275a3b43620f5620464420eebadde720cae620e1702efd0
+  metadata.gz: 94416ea1fde160d5c67958797beba36756619a36556797611d47b5e2dda4be0f9a7006a1b444792465d1e34595274d6be9bc0ef6a29829e76e4a8209df0bbcb8
+  data.tar.gz: cc66b95a1d2eba91759224eafd6926bc80e3a6871483235b908ed5ecd15e839f2cc95a2c0eddb2564588ea38eeaed3d339dbc5c0602cf4cc5d19e57838f01fd8

data/app/Gemfile

@@ -1,6 +1,11 @@
 source 'https://rubygems.org'
-# keep this line
-eval File.read(File.expand_path('../core/Gemfile', __FILE__))
+
+begin # keep these gems
+  gem 'appril', '~> 0.2', '>= 0.2.5'
+  gem 'rocketio', '~> 0.4', '>= 0.4.2'
+  gem 'rocketio-views', '~> 0.4'
+  gem 'tubesock', '~> 0.2'
+end
 
 # add your gems here
 gem 'liquid', '~> 3'

data/app/base/app.js

@@ -1,33 +1,22 @@
-import {merge, cloneDeep} from 'lodash'
-import deep_freeze from 'deep-freeze-strict'
-import Router from 'appril/router'
-import Vue from 'vue/dist/vue.js'
-import Vuex from 'vuex'
-import VuexLogger from 'vuex/logger'
 
-import {server_url, client_url, default_api} from 'app/config.js'
+const FRESH_STATE_FOR_EVERY_COMPONENT = true
+const DEVELOPMENT = APP_ENV === 'development'
 
-import {state, mutations} from 'appril/store'
+import {merge, reduce, cloneDeep} from 'lodash'
+import Vue from 'vue'
+import Vuex from 'vuex'
+import VuexLogger from 'vuex/logger'
+import Alert from 'appril-alert'
 import {vue_plugin, vuex_plugins} from 'appril/plugins'
-import components from 'appril/components'
-import async_components_loader from 'appril/components/async_loader'
-import ApiBuilder from 'appril/api'
-import Layout from 'templates/layouts/app.html'
+import {state, mutations} from 'appril/store'
+import {server_url, client_url, default_api} from 'app/config.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) /* */
 
-const FRESH_STATE_FOR_EVERY_COMPONENT = false
-const DEVELOPMENT = APP_ENV === 'development'
-
 Vue.use(Vuex)
-if (DEVELOPMENT) {
-  Vue.config.devtools = true
-  vuex_plugins.push(VuexLogger())
-}
-
 const store = new Vuex.Store({
   state: cloneDeep(state),
   mutations,
@@ -35,62 +24,102 @@ const store = new Vuex.Store({
   plugins: vuex_plugins
 })
 
-const api = ApiBuilder(default_api, 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
+    // }
+  },
 
-const initialize = function(data) {
-  deep_freeze(data)
+  // 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
+  },
 
-  if (data.user) {
-    store.commit('__USER__', data.user)
+  // to be used for requests that does not define a error handler
+  on_error(error) {
+    Alert.error(error)
   }
+}
 
-  // /* uncomment this line to disable RealTime Communication Protocol
-  api.rtcp.connect({
-    // make sure this url to match RTCPController url
-    path: server_url + '__rtcp__',
-    // disconnect if user is idle for N seconds
-    disconnect_after: 60
-  }) /* */
+// RealTime Communication Protocol
+import RTCP from 'appril/rtcp'
+const rtcp = new RTCP(api_callbacks)
 
-  Vue.use(vue_plugin({
-    ...data,
-    api,
-    components
-  }))
+rtcp.connect({
+  // make sure this URL is matching RTCPController URL
+  path: server_url + '__rtcp__',
+  // disconnect if user is idle for N seconds (it will reconnect on user activity)
+  disconnect_after: 60
+})
 
-  const router = new Router(components)
+import {urlify} from 'appril-utils'
+import api_builder from 'appril/api'
+const components = reduce(require('app/components.json'), 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]}})
+  map[component.name] = component
+  return map
+}, {})
 
-  new Vue({
-    store,
-    el: '#app',
-    template: Layout,
-    components: async_components_loader(components, client_url + APP_ENV, api[default_api])
-  })
+const handle_state = function(component, env) {
 
-  router.component_matched = function(component) {
-
-    if (store.state.__ROOT_COMPONENT__) {
-      if (store.state.__ROOT_COMPONENT__ !== component.name) {
-        // component switched
-        if (FRESH_STATE_FOR_EVERY_COMPONENT) {
-          // start with a fresh state
-          store.replaceState(merge(cloneDeep(state), {__ROOT_COMPONENT__: component.name}))
-        } else {
-          // just update __ROOT_COMPONENT__
-          store.commit('__ROOT_COMPONENT__', component.name)
-        }
-      }
-    } else {
-      store.replaceState(merge(cloneDeep(state), {__ROOT_COMPONENT__: component.name}))
-    }
+  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
 
-  router.start()
+  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() {
-  api.Index._env().get({
-    success: initialize
+
+  Vue.use(vue_plugin({components, rtcp}))
+
+  if (DEVELOPMENT) {
+    Vue.config.devtools = true
+    vuex_plugins.push(VuexLogger())
+  }
+
+  new Vue({
+    store,
+    el: '#app',
+    template: require('templates/layouts/app.html'),
+    components: component_loaders
   })
+
+  router.start()
 })

data/app/base/{components/deploy.js → component.js}

@@ -1,10 +1,9 @@
 import {find} from 'lodash'
-import Vue from 'vue/dist/vue.js'
+import Vue from 'vue'
 
 import 'assets/styles'
-// import 'appril-polyfills'
 
-/** default deployer */
+// /** default deployer
 export default function(components, component, constructor) {
   return constructor
 } /* */
@@ -14,12 +13,10 @@ import Crudle from 'crudle'
 export default function(components, component, constructor) {
   Crudle.Menu = {
     template: require('templates/menu'),
-    data() {
-      return {
-        ...components,
-        is_active(...a) {return find(a, (c) => c.url == component.url) ? true : false}
-      }
-    }
+    data() {return {
+      ...components,
+      is_active(...a) {return find(a, (c) => c.url == component.url) ? true : false}
+    }}
   }
   return Crudle(constructor)
 } /* */

data/app/base/components/index/server.rb

@@ -1,16 +1,3 @@
 class Index < BaseController
   map Cfg.server_url
-
-  # environmental data to be sent to client at App initialization
-  def _env
-    user = user? # see BaseController#user?
-    {
-      user: user
-    }
-  end
-
-  # data to be sent to client at Component initialization
-  def _options
-    {}
-  end
 end

data/app/base/store/modules.js

@@ -0,0 +1 @@
+// auto-generated file, do not edit

data/app/base/store/mutations.js

@@ -0,0 +1,7 @@
+export function __ROOT_COMPONENT__(state, component) {
+  state.__ROOT_COMPONENT__ = component
+}
+
+export function __ENV__(state, env) {
+  state.__ENV__ = env
+}

data/app/base/store/state.js

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

data/app/package.json

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

data/app/webpack/alias.js

@@ -6,5 +6,6 @@ module.exports = {
   assets: 'base/assets',
   components: 'base/components',
   helpers: 'base/helpers',
-  templates: 'base/templates'
+  templates: 'base/templates',
+  vue: 'vue/dist/vue.js'
 }

data/app/webpack/entry.js

@@ -1,3 +1,3 @@
-const config = require('../config.js')
+const config = require('../config.json')
 
 module.exports = config.webpack_entries

data/app/webpack/output.js

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

data/app/webpack/plugins.js

@@ -21,18 +21,15 @@ const plugins = [
 ]
 
 if (APP_ENV === 'production') {
-  plugins.push(
-    new webpack.optimize.UglifyJsPlugin({
-      compress: { warnings: false },
-      screwIE8: true,
-      sourceMap: false,
-      mangle: true
-    })
-  ),
-
-  plugins.push(
-    new OptimizeCssAssetsPlugin
-  )
+
+  plugins.push(new webpack.optimize.UglifyJsPlugin({
+    compress: { warnings: false },
+    screwIE8: true,
+    sourceMap: false,
+    mangle: true
+  }))
+
+  plugins.push(new OptimizeCssAssetsPlugin)
 }
 
 module.exports = plugins

data/lib/appril-cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appril-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.6
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies: []
 description: Appril CLI
 email:
@@ -27,8 +27,8 @@ files:
 - app/base/app.js
 - app/base/assets/styles.css
 - app/base/boot.rb
+- app/base/component.js
 - app/base/components/base_controller.rb
-- app/base/components/deploy.js
 - app/base/components/index/index.js
 - app/base/components/index/server.rb
 - app/base/components/index/template.html
@@ -37,6 +37,9 @@ files:
 - app/base/helpers/index.js
 - app/base/load.rb
 - app/base/models/base_model.rb
+- app/base/store/modules.js
+- app/base/store/mutations.js
+- app/base/store/state.js
 - app/base/templates/layout.liquid
 - app/base/templates/layouts/app.html
 - app/compiled/.ignore
@@ -47,7 +50,6 @@ files:
 - app/config/env/production.yml
 - app/config/env/stage.yml
 - app/config/env/test.yml
-- app/core/Gemfile
 - app/core/boot.rb
 - app/core/generate_configs.rb
 - app/core/load.rb
@@ -111,5 +113,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: '["appril-cli-0.2.3", "Appril CLI"]'
+summary: '["appril-cli-0.2.6", "Appril CLI"]'
 test_files: []

data/app/core/Gemfile

@@ -1,5 +0,0 @@
-# do NOT edit this file, edit ../Gemfile instead
-gem 'appril', '>= 0.2.2'
-gem 'rocketio', '>= 0.4.1'
-gem 'rocketio-views', '>= 0.4'
-gem 'tubesock', '>= 0.2.7'