appril-cli 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaf51693e976f3705b533a067f6c78f7fd9e6c20
-  data.tar.gz: 7c0f82b8545055cc268cba2ec510cac3a9611441
+  metadata.gz: 39c148a207991873f601d0278b707baa497b5db3
+  data.tar.gz: 5ac6342115df0ecf940e2f0b130cc8294fd7e6cd
 SHA512:
-  metadata.gz: 5ef58942e1a8397f0ffbffa97f0a32598beec89c67558ebdbc7fde090e60e794a5e371d2d4ca09665533c14161251351244f203c1c8229ded95e649bcfc3f142
-  data.tar.gz: d8598cb33bd2bb245e744225b1edca5e2adb46e32e03f6d14e077a9a57e7f09ccda4a08af4260b042e97b5c896612c0a5a153110474d93c2729419fb8929a923
+  metadata.gz: a03831c158147e7a45362d762c94842aeb6b8d076422fb2a8a73a35e4f78db9a2bf93746152ffb378588f8b5948d67ad02a3e474257bc4261bd86cc609697f61
+  data.tar.gz: 6eb8180050fe5c1ea1de2014822d06734ec5c5ef969b20ebdb5882291ebbaab2acd42a497b1c8d67be7c5ad39e6de7b6f7635a429b9e4539339b89da668d63eb

data/app/Gemfile

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

data/app/base/app.js

@@ -1,100 +1,18 @@
-
 const DEVELOPMENT = APP_ENV === 'development'
 
-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 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)
+import components from './bootstrap/components'
+import store from './bootstrap/store'
+import router from './bootstrap/router'
+import vue_plugins from './bootstrap/vue_plugins'
+import './assets/app.css'
 
-if (DEVELOPMENT) {
-  Vue.config.devtools = true
-  vuex_plugins.push(VuexLogger())
-}
-
-const store = new Vuex.Store({
-  state: cloneDeep(state),
-  mutations,
-  strict: DEVELOPMENT,
-  plugins: vuex_plugins
-})
+Vue.config.devtools = DEVELOPMENT
 
-const api_callbacks = {
-  // do whatever with params Object just before sending to server
-  on_request(params) {},
-
-  // do whatever with data received from server just before entering success callback
-  on_response(response) {},
-
-  // to be used for requests that does not define a error handler
-  on_error(error) {
-    Alert.error(error)
-  }
-}
-
-// RealTime Communication Protocol
-import RTCP from 'appril/rtcp'
-const rtcp = new RTCP(api_callbacks)
-
-rtcp.connect({
-  // make sure this URL is matching RTCPController URL
-  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(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[config.default_api]}})
-  map[component.name] = component
-  return map
-}, {})
-
-import deploy_component from './component'
-
-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))
-        }
-      })
-    }
-  })
-})
+for (let plugin of vue_plugins)
+  Vue.use(plugin)
 
 document.addEventListener('DOMContentLoaded', function() {
-  Vue.use(vue_plugin({components, rtcp}))
-
   new Vue({
     router,
     store,

data/app/base/bootstrap/api_callbacks.js

@@ -0,0 +1,14 @@
+import Alert from 'appril-alert'
+
+// do whatever with params Object just before sending to server
+export function on_request(params) {
+}
+
+// do whatever with data received from server just before entering success callback
+export function on_response(response) {
+}
+
+// used on requests that does not define own error handler
+export function on_error(error) {
+  Alert.error(error)
+}

data/app/base/{component.js → bootstrap/component.js}

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

data/app/base/bootstrap/components.js

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

data/app/base/bootstrap/router.js

@@ -0,0 +1,32 @@
+import {map, filter} from 'lodash'
+import Vue from 'vue'
+import VueRouter from 'vue-router'
+
+import components from './components'
+import store from './store'
+import componentify from './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: (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(componentify(components, component, constructor.default))
+            }
+          })
+        } else {
+          resolve(componentify(components, component, constructor.default))
+        }
+      })
+    }
+  })
+})

data/app/base/bootstrap/rtcp.js

@@ -0,0 +1,14 @@
+import RTCP from 'appril/rtcp'
+import * as callbacks from './api_callbacks'
+import {server_url} from 'app/appril.json'
+
+const rtcp = new RTCP(callbacks)
+
+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
+})
+
+export default rtcp

data/app/base/bootstrap/store.js

@@ -0,0 +1,27 @@
+const DEVELOPMENT = APP_ENV === 'development'
+
+import {forEach, merge} from 'lodash'
+import Vue from 'vue'
+import Vuex from 'vuex'
+import VuexLogger from 'vuex/logger'
+
+import state from 'base/store/state'
+import * as mutations from 'base/store/mutations'
+
+forEach(require('base/store/components'), function(s,n) {
+  state[n] = s.state
+  merge(mutations, s.mutations)
+})
+
+/** 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(Vuex)
+export default new Vuex.Store({
+  state,
+  mutations,
+  strict: DEVELOPMENT,
+  plugins: DEVELOPMENT ? [VuexLogger()] : []
+})

data/app/base/bootstrap/vue_plugins.js

@@ -0,0 +1,27 @@
+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}
+    })
+  }
+
+]

data/app/config/config.rb

@@ -1,10 +1,10 @@
 # loading .yml configs from current directory (config.yml will be loaded first)
-Cfg = Appril.load_configs(File.expand_path('..', __FILE__))
+Cfg = Appril::Configs.load(File.expand_path('..', __FILE__))
 
 # it is highly recommended to freeze configs so they stay unaltered on runtime
 Cfg.freeze
 
-# loading all .rb files in current dir (this one will be skipped automatically)
+# loading all .rb files in current dir (this one will be skipped)
 %w[
   ../*.rb
   ../**/*.rb

data/app/core/boot.rb

@@ -1,14 +1,10 @@
 # do NOT edit this file, edit base/boot.rb instead
 
-require 'appril'
-require 'appril/load_configs'
-
 Dir.chdir File.expand_path('../..', __FILE__) do
+  require './core/load_configs'
   require './base/boot'
-
   require 'bundler/setup'
   Bundler.require(:default)
   Bundler.require(RocketIO.environment)
-
   require './config/config'
 end

data/app/core/generate_configs.rb

@@ -2,6 +2,83 @@
 
 # do NOT edit this file
 
-require 'appril/generate_configs'
+require 'fileutils'
+
+module Appril
+  module Configs
+    extend self
+
+    def generate dir
+      components = self.components(dir)
+      generate_config_file(dir, components)
+      generate_store_modules_file(dir, components)
+    end
+
+    def generate_config_file dir, components
+      config = Configs.load("#{dir}/config", env: :development)
+      File.open File.expand_path('appril.json', dir), 'w' do |f|
+        f << JSON.pretty_generate({
+          build_path: config[:build_path],
+          client_url: config[:client_url],
+          server_url: config[:server_url],
+          default_api: config[:default_api],
+          components: components
+        })
+      end
+    end
+
+    def generate_store_modules_file dir, components
+
+      lines = components.each_with_object([
+        '// auto-generated file, do not edit',
+      ]) do |c,o|
+        next unless c[:name] # skip anonymous controllers
+        pattern = "base/components/#{c[:entry_path]}/store.*"
+        next unless file = Dir[File.expand_path(pattern, dir)].find {|e| File.file?(e)}
+        path = file.sub(dir, 'app')
+        o << "
+          import #{c[:name]} from '#{path}'
+          export {#{c[:name]}}
+        "
+      end
+
+      file = File.expand_path('base/store/components.js', dir)
+      FileUtils.mkdir_p(File.dirname(file))
+      File.open(file, 'w') {|f| f << lines.join("\n")}
+    end
+
+    def components dir
+      components_root = File.expand_path('base/components', dir) + '/'
+      RocketIO.controllers.each_with_object([]) do |controller,o|
+        next if controller.to_s =~ /BaseController|RTCPController/
+        entry = Dir["#{controller.dirname}/index.*"].find {|e| File.file?(e)}
+        o << {
+          entry_path: entry && File.dirname(entry.sub(components_root, '')),
+          url: controller.url,
+          url_pattern: url_pattern(controller),
+          name: controller.name.gsub('::', '__'),
+          controller_name: controller.name,
+          api: controller.api.keys
+        }
+      end.sort do |a,b|
+        b[:url].split('/').size <=> a[:url].split('/').size
+      end
+    end
+
+    def url_pattern controller
+      controller.url *controller.instance_method(:index).parameters.each_with_object([]) {|param,o|
+        pattern = if param[0] == :rest
+          "*"
+        elsif param[0] == :req
+          ":#{param[1]}"
+        elsif param[0] == :opt
+          ":#{param[1]}?"
+        end
+        o << pattern if pattern
+      }
+    end
+  end
+end
+
 require File.expand_path('../load', __FILE__)
-Appril.generate_configs(File.expand_path('../..', __FILE__))
+Appril::Configs.generate(File.expand_path('../..', __FILE__))

data/app/core/load_configs.rb

@@ -0,0 +1,63 @@
+# do NOT edit this file, edit base/boot.rb instead
+
+require 'yaml'
+
+module Appril
+  module Configs
+    extend self
+
+    def load *dirs, env: RocketIO.environment
+
+      config = RocketIO.indifferent_params({environment: env.to_s.freeze})
+
+      dirs.each do |dir|
+        config.update(load_file("#{dir}/config.yml"))
+        config.update(load_file("#{dir}/env/#{env}.yml"))
+
+        loaded = [
+          File.expand_path("config.yml", dir),
+          File.expand_path("env/#{env}.yml", dir)
+        ]
+
+        %w[
+          *.yml
+          **/*.yml
+        ].each do |pattern|
+          Dir[File.join(dir, pattern)].each do |file|
+
+            path = File.expand_path(file, dir)
+            next if loaded.include?(path)
+            loaded << path
+
+            key = File.basename(file, '.yml')
+            key_config = load_file(file)
+            key_config_keys = key_config.keys.map(&:to_s)
+
+            config[key] = if key_config_keys.include?(config[:environment])
+              # current environment found, use it
+              key_config[config[:environment]]
+            else
+              if RocketIO::ENVIRONMENTS.keys.find {|k| key_config_keys.include?(k)}
+                # there are some environment(s), but current one is missing, so set current environment to nil
+                nil
+              else
+                # there are no environments, so this config is available on any environment
+                key_config
+              end
+            end
+          end
+        end
+      end
+
+      def config.method_missing key
+        self[key]
+      end
+
+      config
+    end
+
+    def load_file file
+      RocketIO.indifferent_params(YAML.load(File.read(file)) || {})
+    end
+  end
+end

data/app/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "description": "...",
   "devDependencies": {
-    "appril": ">= 0.5.4",
+    "appril": ">= 0.5.6",
     "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.7'.freeze
+    VERSION = '0.2.8'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appril-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies: []
 description: Appril CLI
 email:
@@ -27,7 +27,13 @@ files:
 - app/base/app.js
 - app/base/assets/app.css
 - app/base/boot.rb
-- app/base/component.js
+- app/base/bootstrap/api_callbacks.js
+- 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
@@ -38,7 +44,7 @@ files:
 - app/base/helpers/user.rb
 - app/base/load.rb
 - app/base/models/base_model.rb
-- app/base/store/modules.js
+- app/base/store/components.js
 - app/base/store/mutations.js
 - app/base/store/state.js
 - app/base/templates/layout.liquid
@@ -55,6 +61,7 @@ files:
 - app/core/generate_configs.rb
 - app/core/load.rb
 - app/core/load_components.rb
+- app/core/load_configs.rb
 - app/core/load_helpers.rb
 - app/core/load_models.rb
 - app/generators/_component/index.js
@@ -114,5 +121,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: '["appril-cli-0.2.7", "Appril CLI"]'
+summary: '["appril-cli-0.2.8", "Appril CLI"]'
 test_files: []