appril-cli 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6688ffe7a76f2dcee1e23d9425a33e6e4d53ec4a
-  data.tar.gz: 820e1300cebf1e9fe46ba1d5bbca2b8dcb9e0449
+  metadata.gz: c6fce6c027dc0c76302855dffb23a042f0bd5763
+  data.tar.gz: 4c8fbd6935a8d4255138b19f02ea85a10254d5d2
 SHA512:
-  metadata.gz: 9a75c1bc52aabaa0dac78e8f07b09114048ccbcf9144b45e91bb3b703eaa0e9f73f0376c1ceff3c15ef553912f602dfb0d825963cb2213015fbf4dd86b5edd39
-  data.tar.gz: 6d1f0c33713a66d513cf7af96773713e4f6422be9cdf740a11060bb08769017aee1fff1220aadf75fe5f2633f64a4e5f9715af782232fb53bafac3eb75b6f7e0
+  metadata.gz: 3046ef4df845c82e265b35fdf0d6e83b2fed4860074848c7d2f9b4fbf9d237d176f59a6059cdb408bc218ad2486178ef581affd6523fe5a44b4ad50f2af90714
+  data.tar.gz: de4057dc75eee1af3c25c7415d3399068cb76824fb7ec8f82ee4620f00564d5a451ef833b2a76fa00275a3b43620f5620464420eebadde720cae620e1702efd0

data/app/base/{core.js → app.js}

@@ -12,12 +12,14 @@ 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'
 
 /** 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)
@@ -26,11 +28,22 @@ if (DEVELOPMENT) {
   vuex_plugins.push(VuexLogger())
 }
 
-const api = ApiBuilder(default_api)
+const store = new Vuex.Store({
+  state: cloneDeep(state),
+  mutations,
+  strict: DEVELOPMENT,
+  plugins: vuex_plugins
+})
+
+const api = ApiBuilder(default_api, store)
 
 const initialize = function(data) {
   deep_freeze(data)
 
+  if (data.user) {
+    store.commit('__USER__', data.user)
+  }
+
   // /* uncomment this line to disable RealTime Communication Protocol
   api.rtcp.connect({
     // make sure this url to match RTCPController url
@@ -47,24 +60,30 @@ const initialize = function(data) {
 
   const router = new Router(components)
 
-  const store = new Vuex.Store({
-    state: cloneDeep(state),
-    mutations,
-    strict: DEVELOPMENT,
-    plugins: vuex_plugins
-  })
-
   new Vue({
     store,
     el: '#app',
-    template: `<component :is="$store.state.__ROOT_COMPONENT__"></component>`,
+    template: Layout,
     components: async_components_loader(components, client_url + APP_ENV, api[default_api])
   })
 
   router.component_matched = function(component) {
-    if (store.state.__ROOT_COMPONENT__ === component.name)
-      return
-    store.replaceState(merge(cloneDeep(state), {__ROOT_COMPONENT__: component.name}))
+
+    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}))
+    }
+
   }
 
   router.start()

data/app/base/components/base_controller.rb

@@ -20,4 +20,11 @@ class BaseController < Appril::BaseController
     e.backtrace && e.backtrace.each {|l| puts "  \e[0;36m%s\e[0m" % l}
     e.message
   end
+
+  private
+  # fetch user using authorization_token
+  def user?
+    # return unless authorization_token = params[:__authorization_token__] || cookies[:__authorization_token__]
+    # User.find_by(authorization_token: authorization_token)
+  end
 end

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

@@ -3,7 +3,10 @@ class Index < BaseController
 
   # 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

data/app/base/templates/layout.liquid

@@ -4,8 +4,8 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
     <script type="text/javascript">window.module = {}</script>
-    <link rel="stylesheet" media="all" href="{{client_url}}/core.css">
-    <script src="{{client_url}}/core.js"></script>
+    <link rel="stylesheet" media="all" href="{{client_url}}/app.css">
+    <script src="{{client_url}}/app.js"></script>
   </head>
   <body>
     <div id="app"></div>

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

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

data/app/core/Gemfile

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

data/app/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "description": "...",
   "devDependencies": {
-    "appril": ">= 0.2.8",
+    "appril": ">= 0.4.1",
     "appril-polyfills": ">= 0.0.2",
     "appril-url": ">= 0.0.5",
     "appril-utils": ">= 0.1.5",
@@ -22,7 +22,7 @@
     "optimize-css-assets-webpack-plugin": "1",
     "style-loader": "*",
     "url-loader": "*",
-    "vue": "^2.0.0-beta.3",
+    "vue": "^2.0.0-beta.5",
     "vue-html-loader": "1",
     "vuex": "^2.0.0-rc.3",
     "webpack": "^2.1.0-beta.18"

data/app/webpack/plugins.js

@@ -3,7 +3,7 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin')
 
 const plugins = [
-  new webpack.optimize.CommonsChunkPlugin({names: ['core'], minChunks: 2}),
+  new webpack.optimize.CommonsChunkPlugin({names: ['app'], minChunks: 2}),
 
   // new webpack.ProvidePlugin({
   //   $: 'jquery',

data/app/webpack.config.js

@@ -5,7 +5,7 @@ APP_ENV = process.env.APP_ENV || 'development'
 if (APP_ENV === 'development') {
   process.stdout.write('Generating configs... ')
   try {
-    child_process.execSync('./core/generate_configs.rb')
+    child_process.execSync('bundle exec ./core/generate_configs.rb')
     console.log('done')
   } catch(e) {
     console.log(e.stdout.toString() + e.stderr.toString())

data/lib/appril-cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appril-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies: []
 description: Appril CLI
 email:
@@ -24,6 +24,7 @@ files:
 - app/.pryrc
 - app/Gemfile
 - app/Rakefile
+- app/base/app.js
 - app/base/assets/styles.css
 - app/base/boot.rb
 - app/base/components/base_controller.rb
@@ -32,12 +33,12 @@ files:
 - app/base/components/index/server.rb
 - app/base/components/index/template.html
 - app/base/components/rtcp_controller.rb
-- app/base/core.js
 - app/base/helpers/application_helpers.rb
 - app/base/helpers/index.js
 - app/base/load.rb
 - app/base/models/base_model.rb
 - app/base/templates/layout.liquid
+- app/base/templates/layouts/app.html
 - app/compiled/.ignore
 - app/config.ru
 - app/config/config.rb
@@ -110,5 +111,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: '["appril-cli-0.2.2", "Appril CLI"]'
+summary: '["appril-cli-0.2.3", "Appril CLI"]'
 test_files: []