appril-cli 0.0.9 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a59ff3fe21255ea48b9809f16896c7a26abcfdf7
-  data.tar.gz: 1301cc1479ea82ca40e13948b29e69db18974526
+  metadata.gz: 7c4ee73b112f5a00aab967429c4d6f5625f23764
+  data.tar.gz: 8290fa13dd21b4de97b87603bfc83d1dbcc9a640
 SHA512:
-  metadata.gz: 52d14e4f4f43a047155b907d190db15ea0a85d86dd687c60556193b0bdd8acfa970186b21d160f6dc0bb872ded9e74f56c3a31819d8a30d5bf613349ecb3499c
-  data.tar.gz: db17c6171a86eb7f9db8a1558c8bb9bfcf08a52917120bcec7329f964b90227e3a152f224ba1cb04d4945bcf4e85fa30e93c388ee4502266138b3a06f52f5c1e
+  metadata.gz: 103fcc739853591314068ea3c2571542bd02449c97197968bb67d05b4f6284b93252ea8bb7786ea18323a522d4578e6c94591e78df74fac2301ba519f293a47d
+  data.tar.gz: 5ed2ec0f096f78bdbabff15bedb0ada7635b7cfb92bc2e568ce4754c2c7685cdbb4756fe4ba50813c25a58f6adf0b19ed05cec8821bc1151608a02ede9309f3e

data/boilerplate/app/base/api/base_controller.rb

@@ -6,10 +6,10 @@ class BaseController < Appril::BaseController
   define_layout :layout, file: '../templates/layout'
   layout :layout
   engine :Liquid
-  define_template(:get) {''}
+  define_template(:index) {''}
   define_template_var(:client_url, Cfg.client_url)
 
-  def get
+  def index
     render
   end
 

data/boilerplate/app/base/api/deploy.coffee

@@ -1,5 +1,6 @@
 _ = {
   has: require('lodash/has')
+  isFunction: require('lodash/isFunction')
 }
 
 templates = {
@@ -11,10 +12,19 @@ previous_layout = null
 module.exports = (api, env) ->
 
   layout = if _.has(api, 'layout')
-    if api.layout == false
-      'none'
+
+    api_layout = if _.isFunction(api.layout)
+      api.layout(env)
     else
       api.layout
+    #end
+
+    if api_layout == false
+      'none'
+    else
+      api_layout || 'main'
+    #end
+
   else
     'main'
   #end

data/boilerplate/app/base/api/rtcp_controller.rb

@@ -1,5 +1,6 @@
 class RTCPController < Appril::RTCPController
   map BaseController.url('__rtcp__')
+  import :error_handlers, from: BaseController
 
   private
   # called after socket connection established
@@ -8,7 +9,9 @@ class RTCPController < Appril::RTCPController
 
   # data sent to client after connection established
   def initialization_data
-    {}
+    {
+      client_url: Cfg.client_url, # this is highly important setup, do NOT remove
+    }
   end
 
   # merged into original env when calling a controller

data/boilerplate/app/base/core.coffee

@@ -66,14 +66,13 @@ Core.on_controller_matched = (controller, context) ->
   controller.load (api) ->
     context.save()
 
-    api.controller = controller
-
     env = {
       render: Render
       render_component: Render.component
       render_string: Render.string
       page: new Page
-      context: context
+      controller: controller
+      api: controller.ws
     }
     _.merge(env, env.page)
 

data/boilerplate/app/config/config.yml

@@ -12,7 +12,7 @@
 server_url: /
 
 # base URL for compiled client app
-client_url: /app
+client_url: /public_app
 
 # where webpack should install compiled app. relative to webpack.config.js
-client_path: ./public
+client_path: ./

data/boilerplate/app/core/Gemfile

@@ -1,4 +1,4 @@
 # do NOT edit this file, edit ../Gemfile instead
-gem 'appril',   '>= 0.0.5'
-gem 'rocketio', '>= 0.1'
+gem 'appril',   '>= 0.0.7'
+gem 'rocketio', '>= 0.2'
 gem 'tubesock', '>= 0.2.7'

data/boilerplate/app/core/generate_configs.rb

@@ -10,17 +10,16 @@ module Appril
   def generate_configs dir
     config = load_config("#{dir}/config", env: :development)
 
-    controllers = controllers_map(dir)
-    webpack_entries = webpack_entries(dir, controllers)
+    api = controllers_map(dir)
+    webpack_entries = webpack_entries(dir, api)
 
-    File.open File.expand_path('config.json', dir), 'w' do |f|
+    File.open(File.expand_path('api.json', dir), 'w') {|f| f << JSON.pretty_generate(api)}
+
+    File.open File.expand_path('webpack/config.json', dir), 'w' do |f|
       f << JSON.pretty_generate({
-        controllers: controllers,
-        webpack: {
-          path: config[:client_path],
-          url: config[:client_url],
-          entries: webpack_entries
-        }
+        path: config[:client_path],
+        url: config[:client_url],
+        entries: webpack_entries
       })
     end
   end
@@ -35,7 +34,7 @@ module Appril
         url: controller.url,
         url_pattern: url_pattern(controller),
         name: controller.name.gsub('::', '__'),
-        api: controller.api
+        api: controller.api.keys
       }
     end.sort do |a,b|
       b[:url].split('/').size <=> a[:url].split('/').size
@@ -64,7 +63,7 @@ module Appril
   end
 
   def url_pattern controller
-    controller.url *controller.instance_method(:get).parameters.each_with_object([]) {|param,o|
+    controller.url *controller.instance_method(:index).parameters.each_with_object([]) {|param,o|
       pattern = if param[0] == :rest
         "*"
       elsif param[0] == :req

data/boilerplate/app/webpack/alias.js

@@ -0,0 +1,10 @@
+var path = require('path')
+
+module.exports = {
+  app: path.resolve(__dirname, '..'),
+  base: 'app/base',
+  api: 'base/api',
+  helpers: 'base/helpers',
+  assets: 'base/assets',
+  templates: 'base/templates'
+}

data/boilerplate/app/webpack/config.js

@@ -0,0 +1,6 @@
+var fs = require('fs'),
+    path = require('path'),
+    config_file = path.resolve(__dirname, 'config.json')
+;
+
+module.exports = JSON.parse(fs.readFileSync(config_file))

data/boilerplate/app/webpack/entry.js

@@ -0,0 +1,3 @@
+var config = require('./config.js');
+
+module.exports = config.entries

data/boilerplate/app/webpack/extensions.js

@@ -0,0 +1,8 @@
+module.exports = [
+  '',
+  '.js',
+  '.css',
+  '.json',
+  '.coffee',
+  '.html'
+]

data/boilerplate/app/webpack/loaders.js

@@ -0,0 +1,15 @@
+var ExtractTextPlugin = require("extract-text-webpack-plugin");
+
+module.exports = [
+  { test: /\.coffee$/,   loader: 'coffee-loader' },
+  { test: /\.css$/,      loader: ExtractTextPlugin.extract("style-loader", "css-loader") },
+  { test: /\.json$/,     loader: 'json-loader' },
+  { test: /\.otf($|\?)/, loader: require.resolve('file-loader') },
+  { test: /\.ttf($|\?)/, loader: require.resolve('file-loader') },
+  { test: /\.eot($|\?)/, loader: require.resolve('file-loader') },
+  { test: /\.svg($|\?)/, loader: require.resolve('file-loader') },
+  { test: /\.png($|\?)/, loader: require.resolve('url-loader') + '?limit=10000&mimetype=image/png' },
+  { test: /\.jpg($|\?)/, loader: require.resolve('file-loader') },
+  { test: /\.gif($|\?)/, loader: require.resolve('file-loader') },
+  { test: /\.woff[2]?($|\?)/, loader: require.resolve('url-loader') + '?limit=10000&mimetype=application/font-woff' },
+]

data/boilerplate/app/webpack/output.js

@@ -0,0 +1,11 @@
+var path = require('path'),
+    config = require('./config.js'),
+    app_env = process.env.APP_ENV || 'development'
+;
+
+module.exports = {
+  path: path.join(config.path, config.url, app_env),
+  filename: '[name].js',
+  publicPath: path.join(config.url, app_env, '/'), // trailing slash required
+  libraryTarget: 'commonjs2'
+}

data/boilerplate/app/webpack/plugins.js

@@ -0,0 +1,19 @@
+var webpack = require('webpack'),
+    ExtractTextPlugin = require("extract-text-webpack-plugin")
+;
+
+var plugins = [
+  new webpack.optimize.CommonsChunkPlugin('core', 'core.js'),
+  new ExtractTextPlugin("[name].css")
+]
+
+if (process.env.APP_ENV == 'production') {
+  plugins.push(new webpack.optimize.UglifyJsPlugin({
+    compress: { warnings: false },
+    screwIE8: true,
+    sourceMap: false,
+    mangle: true
+  }))
+}
+
+module.exports = plugins

data/boilerplate/app/webpack.config.js

@@ -1,53 +1,19 @@
-var webpack = require('webpack'),
-    fs = require('fs'),
-    ExtractTextPlugin = require("extract-text-webpack-plugin"),
-    child_process = require('child_process')
-;
+var child_process = require('child_process');
 
-if (process.env.APP_ENV == 'development') {
+if ((process.env.APP_ENV || 'development') == 'development') {
   console.log('Generating configs...');
   child_process.execSync('./core/generate_configs.rb');
 }
 
-var setup = JSON.parse(fs.readFileSync('./config.json')).webpack;
-console.log(JSON.stringify(setup, null, 2))
-
 module.exports = {
-  entry: setup.entries,
-  output: {
-    path: [setup.path, setup.url].join('/'),
-    filename: '[name].js',
-    publicPath: setup.url + '/',  // trailing slash required
-    libraryTarget: 'commonjs2'
-  },
+  entry: require('./webpack/entry.js'),
+  output: require('./webpack/output.js'),
   module: {
-    loaders: [
-      { test: /\.coffee$/,   loader: 'coffee-loader' },
-      { test: /\.css$/,      loader: ExtractTextPlugin.extract("style-loader", "css-loader") },
-      { test: /\.json$/,     loader: 'json-loader' },
-      { test: /\.otf($|\?)/, loader: require.resolve('file-loader') },
-      { test: /\.ttf($|\?)/, loader: require.resolve('file-loader') },
-      { test: /\.eot($|\?)/, loader: require.resolve('file-loader') },
-      { test: /\.svg($|\?)/, loader: require.resolve('file-loader') },
-      { test: /\.png($|\?)/, loader: require.resolve('url-loader') + '?limit=10000&mimetype=image/png' },
-      { test: /\.jpg($|\?)/, loader: require.resolve('file-loader') },
-      { test: /\.gif($|\?)/, loader: require.resolve('file-loader') },
-      { test: /\.woff[2]?($|\?)/, loader: require.resolve('url-loader') + '?limit=10000&mimetype=application/font-woff' },
-    ]
+    loaders: require('./webpack/loaders.js')
   },
   resolve: {
-    extensions: ['', '.js', '.css', '.json', '.coffee', '.html'],
-    alias: {
-      app: __dirname,
-      base: 'app/base',
-      api: 'base/api',
-      helpers: 'base/helpers',
-      assets: 'base/assets',
-      templates: 'base/templates'
-    }
+    extensions: require('./webpack/extensions.js'),
+    alias: require('./webpack/alias.js')
   },
-  plugins: [
-    new webpack.optimize.CommonsChunkPlugin('core', 'core.js'),
-    new ExtractTextPlugin("[name].css")
-  ]
+  plugins: require('./webpack/plugins.js')
 }

data/boilerplate/crudle/base/api/deploy.coffee

@@ -1,5 +1,6 @@
 _ = {
   has: require('lodash/has')
+  isFunction: require('lodash/isFunction')
 }
 
 Crudle = require('crudle')
@@ -12,15 +13,24 @@ templates = {
 previous_layout = null
 module.exports = (api, env) ->
 
-  crudle = Crudle(api.controller.ws, env.page)
+  crudle = Crudle(env)
   crudle.partials.menu = require('templates/menu')
-  crudle.data.url = api.controller.url
+  crudle.data.url = env.controller.url
 
   layout = if _.has(api, 'layout')
-    if api.layout == false
-      'none'
+
+    api_layout = if _.isFunction(api.layout)
+      api.layout(env)
     else
       api.layout
+    #end
+
+    if api_layout == false
+      'none'
+    else
+      api_layout || 'main'
+    #end
+
   else
     'main'
   #end

data/boilerplate/crudle/base/api/index/client.coffee

@@ -2,3 +2,4 @@
 module.exports = (env, layout) ->
   layout.partials.content = require('./layout')
   env.render(layout)
+#end

data/boilerplate/crudle/base/api/index/server.rb

@@ -1,3 +1,7 @@
 class Index < BaseController
   map Cfg.server_url
+
+  def init params
+    {}
+  end
 end

data/boilerplate/crudle/generators/api/client.coffee

@@ -1,23 +1,17 @@
 
-self = (env, layout) ->
-  layout.components.editor.partials.editor = require('./editor.html')
+self = (env, {layout, list, editor}) ->
+  list.partials.item = require('./list/item')
+  editor.template = require('./editor/layout')
   env.render(layout)
 #end
 
 module.exports = self
 
 # list partials:
-# - filters_layout
-# - filters
-# - pager
-# - list_layout
-# - list_header
-# - list_footer
+# - header
+# - footer
 # - items
 # - item
 
-# editor partials:
-# - editor
-
-# self properties:
-# - self.controller
+# filters partials:
+# - filters

data/boilerplate/crudle/generators/api/editor/layout.html

@@ -0,0 +1,3 @@
+<form id="crudle-editor-form">
+  
+</form>

data/boilerplate/crudle/generators/api/list/item.html

@@ -0,0 +1,3 @@
+<a href="#" on-click="open">
+  {{self.name}}
+</a>

data/boilerplate/crudle/generators/api/server.rb

@@ -6,7 +6,7 @@ class CONTROLLER_NAME < BaseController
 
   # def order; end
 
-  # def filter_by_name params, dataset
+  # def name_filter params, dataset
   #   return if params[:name].nil? || params[:name].empty?
   #   dataset.where('name LIKE ?', params[:name] + '%')
   # end

data/boilerplate/crudle/webpack/loaders.js

@@ -0,0 +1,16 @@
+var ExtractTextPlugin = require("extract-text-webpack-plugin");
+
+module.exports = [
+  { test: /\.html$/,     loader: 'ractive-loader' },
+  { test: /\.coffee$/,   loader: 'coffee-loader' },
+  { test: /\.css$/,      loader: ExtractTextPlugin.extract("style-loader", "css-loader") },
+  { test: /\.json$/,     loader: 'json-loader' },
+  { test: /\.otf($|\?)/, loader: require.resolve('file-loader') },
+  { test: /\.ttf($|\?)/, loader: require.resolve('file-loader') },
+  { test: /\.eot($|\?)/, loader: require.resolve('file-loader') },
+  { test: /\.svg($|\?)/, loader: require.resolve('file-loader') },
+  { test: /\.png($|\?)/, loader: require.resolve('url-loader') + '?limit=10000&mimetype=image/png' },
+  { test: /\.jpg($|\?)/, loader: require.resolve('file-loader') },
+  { test: /\.gif($|\?)/, loader: require.resolve('file-loader') },
+  { test: /\.woff[2]?($|\?)/, loader: require.resolve('url-loader') + '?limit=10000&mimetype=application/font-woff' },
+]

data/lib/appril-cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appril-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.1
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies: []
 description: Appril CLI
 email:
@@ -65,6 +65,13 @@ files:
 - boilerplate/app/tmp/.ignore
 - boilerplate/app/var/.ignore
 - boilerplate/app/webpack.config.js
+- boilerplate/app/webpack/alias.js
+- boilerplate/app/webpack/config.js
+- boilerplate/app/webpack/entry.js
+- boilerplate/app/webpack/extensions.js
+- boilerplate/app/webpack/loaders.js
+- boilerplate/app/webpack/output.js
+- boilerplate/app/webpack/plugins.js
 - boilerplate/crudle/Gemfile
 - boilerplate/crudle/base/api/deploy.coffee
 - boilerplate/crudle/base/api/index/client.coffee
@@ -72,10 +79,11 @@ files:
 - boilerplate/crudle/base/api/index/server.rb
 - boilerplate/crudle/base/templates/menu.html
 - boilerplate/crudle/generators/api/client.coffee
-- boilerplate/crudle/generators/api/editor.html
+- boilerplate/crudle/generators/api/editor/layout.html
+- boilerplate/crudle/generators/api/list/item.html
 - boilerplate/crudle/generators/api/server.rb
 - boilerplate/crudle/package.json
-- boilerplate/crudle/webpack.config.js
+- boilerplate/crudle/webpack/loaders.js
 - docker/Dockerfile
 - docker/run
 - docker/skel/build.sh
@@ -159,5 +167,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: '["appril-cli-0.0.9", "Appril CLI"]'
+summary: '["appril-cli-0.1.1", "Appril CLI"]'
 test_files: []

data/boilerplate/crudle/webpack.config.js

@@ -1,54 +0,0 @@
-var webpack = require('webpack'),
-    fs = require('fs'),
-    ExtractTextPlugin = require("extract-text-webpack-plugin"),
-    child_process = require('child_process')
-;
-
-if (process.env.APP_ENV == 'development') {
-  console.log('Generating configs...');
-  child_process.execSync('./core/generate_configs.rb');
-}
-
-var setup = JSON.parse(fs.readFileSync('./config.json')).webpack;
-console.log(JSON.stringify(setup, null, 2))
-
-module.exports = {
-  entry: setup.entries,
-  output: {
-    path: [setup.path, setup.url].join('/'),
-    filename: '[name].js',
-    publicPath: setup.url + '/',  // trailing slash required
-    libraryTarget: 'commonjs2'
-  },
-  module: {
-    loaders: [
-      { test: /\.coffee$/,   loader: 'coffee-loader' },
-      { test: /\.html$/,     loader: 'ractive-loader' },
-      { test: /\.css$/,      loader: ExtractTextPlugin.extract("style-loader", "css-loader") },
-      { test: /\.json$/,     loader: 'json-loader' },
-      { test: /\.otf($|\?)/, loader: require.resolve('file-loader') },
-      { test: /\.ttf($|\?)/, loader: require.resolve('file-loader') },
-      { test: /\.eot($|\?)/, loader: require.resolve('file-loader') },
-      { test: /\.svg($|\?)/, loader: require.resolve('file-loader') },
-      { test: /\.png($|\?)/, loader: require.resolve('url-loader') + '?limit=10000&mimetype=image/png' },
-      { test: /\.jpg($|\?)/, loader: require.resolve('file-loader') },
-      { test: /\.gif($|\?)/, loader: require.resolve('file-loader') },
-      { test: /\.woff[2]?($|\?)/, loader: require.resolve('url-loader') + '?limit=10000&mimetype=application/font-woff' },
-    ]
-  },
-  resolve: {
-    extensions: ['', '.js', '.css', '.json', '.coffee', '.html'],
-    alias: {
-      app: __dirname,
-      base: 'app/base',
-      api: 'base/api',
-      helpers: 'base/helpers',
-      assets: 'base/assets',
-      templates: 'base/templates'
-    }
-  },
-  plugins: [
-    new webpack.optimize.CommonsChunkPlugin('core', 'core.js'),
-    new ExtractTextPlugin("[name].css")
-  ]
-}