appril-cli 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1dc24aad4f54cd214c7e2cf371da2dfaa73a585
-  data.tar.gz: 73a5ddff69205eac86f5c391030d3bb0e1219853
+  metadata.gz: 85a66e9654989e986c381b45f174a7da1fd42c1d
+  data.tar.gz: 67ec790ebc2913a72b081f1dc38f6dfea0401267
 SHA512:
-  metadata.gz: f5fedc40fc4c6dd2fe67f8d90a2c548ac796eea2f324597a70b2b59b8a2877e94127b9d2bef1880312203589e2520c7087340ec03a80f2b32a503c7735869454
-  data.tar.gz: d76ea8aab153e7d1ea3c03b0f2eb74f1e536bd1794590b72e8e994f953550e7f89e5a8e4350db7c00b0b75ff1056bf4cf2bdea01535c9cf16dff84dd61dd46bd
+  metadata.gz: db84371f8aa1045fe52f2d444f2d8e7ad45e18a7d1983af4e18fb851982367edc323231f5131a2b7072999af09ad5a9b3306c4258c7fa4d911d1cc6d07b26dc0
+  data.tar.gz: 3e02bda49fd24d922e6b66186ef48ffa09d98f18aaa0ba9a8cab541f5f6ef85e75742bba0ab4efe6086565ebde5d7575523f0791db59f14329face95f5c82661

data/app/Gemfile

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

data/app/base/app.js

@@ -1,22 +1,18 @@
-const DEVELOPMENT = APP_ENV === 'development'
-
 import Vue from 'vue'
-import components from './bootstrap/components'
-import store from './bootstrap/store'
-import router from './bootstrap/router'
-import vue_plugins from './bootstrap/vue_plugins'
+import store from './setup/store'
+import router from './setup/router'
+import './setup/vue_plugins'
+import './setup/vue_filters'
+import './setup/vue_directives'
 import './assets/app.css'
 
-Vue.config.devtools = DEVELOPMENT
-
-for (let plugin of vue_plugins)
-  Vue.use(plugin)
+Vue.config.devtools = APP_ENV === 'development'
 
 document.addEventListener('DOMContentLoaded', function() {
   new Vue({
     router,
     store,
     el: '#app',
-    template: require('templates/layouts/app.html')
+    template: require('templates/layout.html')
   })
 })

data/app/base/assets/app.css

@@ -1,2 +1,4 @@
 /** delete this line to enable Crudle styles
 @import url(~crudle/styles.css); /* */
+
+@import url(./spinner.css);

data/app/base/assets/spinner.css

@@ -0,0 +1,32 @@
+.spinner {
+  margin: auto;
+  position: relative;
+  text-indent: -9999em;
+  border-top: 0.15em solid rgba(0,0,0, 0.5);
+  border-right: 0.15em solid rgba(0,0,0, 0.5);
+  border-bottom: 0.15em solid rgba(0,0,0, 0.5);
+  border-left: 0.15em solid #ffffff;
+  border-left-color: transparent;
+  transform: translateZ(0);
+  animation: spinner-animation 1.1s infinite linear;
+}
+
+.spinner, .spinner:after {
+  border-radius: 50%;
+  width: 1.5em;
+  height: 1.5em;
+}
+
+.spinner-btn-lg, .spinner-btn-lg:after {
+  width: 1.2em;
+  height: 1.2em;
+}
+
+@keyframes spinner-animation {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}

data/app/base/components/base_controller.rb

@@ -23,11 +23,4 @@ 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/rtcp_controller.rb

@@ -11,7 +11,7 @@ class RTCPController < Appril::RTCPController
   end
 
   # environmental data to be sent to client at App initialization
-  def _env
+  def client_env
     {}
   end
 

data/app/base/helpers/application_helpers.rb

@@ -1,4 +1,4 @@
-# this file will be loaded before other files found in helpers/ folder
+# this file will be loaded before other any other helper files
 module Helpers
-  
+
 end

data/app/base/layouts/loading/index.js

@@ -0,0 +1,3 @@
+export default {
+  template: require('./template')
+}

data/app/base/layouts/loading/template.html

@@ -0,0 +1,3 @@
+<div style="position: fixed; top: 45%; left: 49%;">
+  <div class="spinner"></div>
+</div>

data/app/base/layouts/main/index.js

@@ -0,0 +1,3 @@
+export default {
+  template: require('./template')
+}

data/app/base/layouts/main/template.html

@@ -0,0 +1,3 @@
+<div>
+  <component :is="page_view"></component>
+</div>

data/app/base/setup/build_component.js

@@ -0,0 +1,65 @@
+import {cloneDeep, find} from 'lodash'
+import Loading from 'layouts/loading'
+import MainLayout from 'layouts/main'
+import components from './components'
+
+export default function(component, constructor) {
+  let layout = cloneDeep(constructor.layout || MainLayout)
+
+  if (layout.default)
+    layout = layout.default
+
+  delete constructor.layout
+
+  /** comment or delete this line to pipe component through Crudle builder
+  const Crudle = require('crudle').default
+  Crudle.Menu = {
+    template: require('templates/menu'),
+    data() {return {
+      ...components,
+      is_active(...a) {return find(a, ({name}) => name == component.name) ? true : false}
+    }}
+  }
+  constructor = Crudle(constructor)
+  /* */
+
+  let mixin
+
+  if (component.api.client_env) {
+    mixin = {
+
+      data() {return {
+        component,
+        env: null
+      }},
+
+      beforeCreate() {
+        component.api.client_env(
+          ...(
+            location.pathname.replace(/\/+/g, '/').
+            replace(component.url.toString().replace(/\/+$/, ''), '').split('/')
+          ),
+          this.$route.query
+        ).get({
+          success: (env) => this.env = env
+        })
+      },
+
+      computed: {
+        page_view() {return this.env ? constructor : Loading}
+      }
+    }
+  } else {
+    mixin = {
+      data() {return {
+        component,
+        page_view: constructor
+      }}
+    }
+  }
+
+  layout.mixins || (layout.mixins = [])
+  layout.mixins.push(mixin)
+
+  return layout
+}

data/app/base/{bootstrap → setup}/components.js

@@ -2,7 +2,7 @@ import {reduce} from 'lodash'
 import {urlify} from 'appril-utils'
 import xhr from 'appril-api/xhr'
 import rtcp from './rtcp'
-import * as callbacks_and_headers from 'base/api'
+import * as callbacks_and_headers from './api'
 import {components, default_api} from 'app/appril.json'
 
 export default reduce(components, function(map,component) {

data/app/base/setup/load_component.js

@@ -0,0 +1,35 @@
+import {compact} from 'lodash'
+import {dev_server_url, client_url} from 'app/appril.json'
+
+const BASEURL = compact([
+  APP_ENV === 'development' ? dev_server_url : null,
+  client_url,
+  APP_ENV
+]).join('')
+
+export default function(component, resolve) {
+  const xhr = new XMLHttpRequest()
+
+  xhr.onreadystatechange = function() {
+    if (xhr.readyState !== XMLHttpRequest.DONE)
+      return
+
+    if (parseInt(xhr.status / 100) !== 2)
+      return console.error(xhr.responseText)
+
+    resolve(_eval(xhr.responseText))
+  }
+
+  xhr.onerror = function(error = 'Network error occurred') {
+    console.error(error)
+  }
+
+  xhr.open('GET', `${BASEURL}/${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/setup/router.js

@@ -0,0 +1,25 @@
+import {map, filter} from 'lodash'
+import Vue from 'vue'
+import VueRouter from 'vue-router'
+
+import components from './components'
+import build_component from './build_component'
+import load_component from './load_component'
+
+Vue.use(VueRouter)
+
+export default new VueRouter({
+  mode: 'history',
+  base: __dirname,
+  routes: map(filter(components, 'entry_path'), function(component) {
+    return {
+      name: component.name,
+      path: component.url_pattern,
+      component: function(resolve) {
+        load_component(component, function(constructor) {
+          resolve(build_component(component, constructor))
+        })
+      }
+    }
+  })
+})

data/app/base/{bootstrap → setup}/rtcp.js

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

data/app/base/setup/vue_directives.js

@@ -0,0 +1 @@
+import Vue from 'vue'

data/app/base/setup/vue_filters.js

@@ -0,0 +1 @@
+import Vue from 'vue'

data/app/base/setup/vue_plugins.js

@@ -0,0 +1,21 @@
+import Vue from 'vue'
+import components from './components'
+import rtcp from './rtcp'
+
+Vue.use(function(vue) {
+
+  vue.prototype.components = components
+  vue.prototype.rtcp = rtcp
+
+  Object.defineProperty(vue.prototype, 'component', {
+    get() {return this.$parent.component}
+  })
+
+  Object.defineProperty(vue.prototype, 'api', {
+    get() {return this.component.api}
+  })
+
+  Object.defineProperty(vue.prototype, 'env', {
+    get() {return this.$parent.env}
+  })
+})

data/app/package.json

@@ -3,11 +3,9 @@
   "version": "0.0.0",
   "description": "...",
   "devDependencies": {
-    "appril-api": ">= 0.0.1",
+    "appril-api": ">= 0.0.2",
     "appril-alert": ">= 0.0.5",
-    "appril-polyfills": ">= 0.0.2",
-    "appril-url": ">= 0.0.5",
-    "appril-utils": ">= 0.1.5",
+    "appril-utils": ">= 0.2.1",
     "babel-core": "6",
     "babel-loader": "6",
     "babel-plugin-transform-object-rest-spread": "6",
@@ -16,17 +14,17 @@
     "babel-preset-stage-2": "6",
     "babel-preset-stage-3": "6",
     "css-loader": "*",
-    "deep-freeze-strict": "1",
     "extract-text-webpack-plugin": "^2.0.0-beta.2",
     "file-loader": "*",
     "json-loader": "*",
+    "lodash": "^4.15.0",
     "optimize-css-assets-webpack-plugin": "1",
     "style-loader": "*",
     "url-loader": "*",
-    "vue": "^2.0.0-rc.2",
-    "vue-router": "^2.0.0-rc.3",
+    "vue": "^2.0.0-rc.4",
+    "vue-router": "^2.0.0-rc.4",
     "vue-html-loader": "1",
-    "vuex": "^2.0.0-rc.3",
-    "webpack": "^2.1.0-beta.18"
+    "vuex": "^2.0.0-rc.5",
+    "webpack": "^2.1.0-beta.20"
   }
 }

data/app/webpack/alias.js

@@ -1,11 +1,13 @@
 const path = require('path')
 
 module.exports = {
+  vue: 'vue/dist/vue.js',
+
   app: path.resolve(__dirname, '..'),
   base: 'app/base',
   assets: 'base/assets',
   components: 'base/components',
   helpers: 'base/helpers',
+  layouts: 'base/layouts',
   templates: 'base/templates',
-  vue: 'vue/dist/vue.js'
 }

data/app/webpack/plugins.js

@@ -5,11 +5,6 @@ const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin')
 const plugins = [
   new webpack.optimize.CommonsChunkPlugin({names: ['app'], minChunks: 2}),
 
-  // new webpack.ProvidePlugin({
-  //   $: 'jquery',
-  //   jQuery: 'jquery'
-  // }),
-
   new webpack.DefinePlugin({
     APP_ENV: JSON.stringify(APP_ENV),
     'process.env': {

data/lib/appril-cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appril-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies: []
 description: Appril CLI
 email:
@@ -24,16 +24,10 @@ files:
 - app/.pryrc
 - app/Gemfile
 - app/Rakefile
-- app/base/api.js
 - app/base/app.js
 - app/base/assets/app.css
+- app/base/assets/spinner.css
 - app/base/boot.rb
-- app/base/bootstrap/component.js
-- app/base/bootstrap/components.js
-- app/base/bootstrap/router.js
-- app/base/bootstrap/rtcp.js
-- app/base/bootstrap/store.js
-- app/base/bootstrap/vue_plugins.js
 - app/base/components/base_controller.rb
 - app/base/components/index/index.js
 - app/base/components/index/server.rb
@@ -42,13 +36,27 @@ files:
 - app/base/helpers/application_helpers.rb
 - app/base/helpers/index.js
 - app/base/helpers/user.rb
+- app/base/layouts/loading/index.js
+- app/base/layouts/loading/template.html
+- app/base/layouts/main/index.js
+- app/base/layouts/main/template.html
 - app/base/load.rb
 - app/base/models/base_model.rb
+- app/base/setup/api.js
+- app/base/setup/build_component.js
+- app/base/setup/components.js
+- app/base/setup/load_component.js
+- app/base/setup/router.js
+- app/base/setup/rtcp.js
+- app/base/setup/store.js
+- app/base/setup/vue_directives.js
+- app/base/setup/vue_filters.js
+- app/base/setup/vue_plugins.js
 - app/base/store/components.js
 - app/base/store/mutations.js
 - app/base/store/state.js
+- app/base/templates/layout.html
 - app/base/templates/layout.liquid
-- app/base/templates/layouts/app.html
 - app/compiled/.ignore
 - app/config.ru
 - app/config/config.rb
@@ -121,5 +129,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: '["appril-cli-0.3.0", "Appril CLI"]'
+summary: '["appril-cli-0.4.0", "Appril CLI"]'
 test_files: []

data/app/base/bootstrap/component.js

@@ -1,19 +0,0 @@
-import {find} from 'lodash'
-
-// /** default deployer
-export default function(components, component, constructor) {
-  return constructor
-} /* */
-
-/** Crudle deployer
-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}
-    }}
-  }
-  return Crudle(constructor)
-} /* */

data/app/base/bootstrap/router.js

@@ -1,64 +0,0 @@
-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 {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,
-  routes: map(filter(components, 'entry_path'), function(component) {
-    return {
-      name: component.name,
-      path: component.url_pattern,
-      component: (resolve) => load_component(component, resolve)
-    }
-  })
-})
-
-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) {
-  const xhr = new XMLHttpRequest()
-
-  xhr.onreadystatechange = function() {
-    if (xhr.readyState !== XMLHttpRequest.DONE)
-      return
-
-    if (parseInt(xhr.status / 100) !== 2)
-      return console.error(xhr.responseText)
-
-    resolve_component(component, _eval(xhr.responseText), resolve)
-  }
-
-  xhr.onerror = function(error = 'Network error occurred') {
-    console.error(error)
-  }
-
-  xhr.open('GET', `${BASEURL}/${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/vue_plugins.js

@@ -1,27 +0,0 @@
-import components from './components'
-import rtcp from './rtcp'
-
-export default [
-
-  function(vue) {
-
-    vue.prototype.rtcp = rtcp
-
-    Object.defineProperty(vue.prototype, 'env', {
-      get() {return this.$store ? this.$store.state.__ENV__[this.$router.currentRoute.name] || {} : {}}
-    })
-
-    Object.defineProperty(vue.prototype, 'components', {
-      get() {return components}
-    })
-
-    Object.defineProperty(vue.prototype, 'component', {
-      get() {return components[this.$router.currentRoute.name]}
-    })
-
-    Object.defineProperty(vue.prototype, 'api', {
-      get() {return components[this.$router.currentRoute.name].api}
-    })
-  }
-
-]