appril-cli 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61b2c49ff11c5fedcc25016cc70eed0b218d2211
-  data.tar.gz: 46a6420c5cf7d573f0e4110719523823c7681238
+  metadata.gz: c35966729ddb1fdba992af4e06e467f86fcbe560
+  data.tar.gz: deaa22602500fba0fc0bd87af2efdd8f38a46747
 SHA512:
-  metadata.gz: d72448e5413aa4b19450adbf1caaec339a94539b2e90d0a55baaa08eaa9a4e82b8db4cf8266d762c0c5783b6410452d5726409ca9817a00c977927a15b7f7ccc
-  data.tar.gz: 1a4eb3f49d4fd871e254850ed1ba51a00baa322dfacca01c0e965b9e4f85e812572a65990c8619c2056777aba631c58c91f0364aa3354c254c1dee0b758f25df
+  metadata.gz: b49fe7811bfd656adb0b6f573668b70cc627d698553cda7d4afef89635696629612fa88e0b2453042626918fae4d07d832d4630586dc4a57c870db421d1d0168
+  data.tar.gz: e95dc5484b014c74976d184f62e0feef2faa3a9589ff04bc24d764ff73e0316e0ac6e1887d46bdbc770b65ec671a4a3e1c33b94d9e9f53032f3e3737651e66d5

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

@@ -0,0 +1,35 @@
+_ = {
+  has: require('lodash/has')
+}
+
+templates = {
+  none: require('templates/layouts/none')
+  main: require('templates/layouts/main')
+}
+
+previous_layout = null
+module.exports = (api, env) ->
+
+  layout = if _.has(api, 'layout')
+    if api.layout == false
+      'none'
+    else
+      api.layout
+  else
+    'main'
+  #end
+
+  if layout == previous_layout
+    # do not re-render body if current api uses same layout as previous one
+    return api(env)
+  #end
+  previous_layout = layout
+
+  env.render
+    el: 'body'
+    template: templates[layout] || templates.none
+    oncomplete: ->
+      api(env)
+    #end
+  #end
+#end

data/boilerplate/app/base/core.coffee

@@ -1,13 +1,14 @@
 _ =
   merge: require('lodash/merge')
-  has: require('lodash/has')
   isFunction: require('lodash/isFunction')
 #end
 
 Core = require('appril')
 Page = require('appril-page')
+Load = require('appril-load')
 Render = require('appril-ractive')
 Reporter = require('appril-reporter')
+DeployApi = require('./api/deploy.coffee')
 require 'appril-polyfills'
 require 'assets/styles.css'
 
@@ -36,10 +37,12 @@ Render.default_el = -> '#content'
 Render.global_data = -> {App: App, Cfg: Cfg, Util: Util}
 Render.global_handlers = -> {}
 
+
 for name, controller of Core.controllers
   App[name] = controller
 #end
 
+
 Core.on_initialize = (msg) ->
   if window.Cfg = msg.data.cfg
     delete msg.data.cfg
@@ -56,51 +59,6 @@ Core.on_initialize = (msg) ->
   #end
 #end
 
-templates =
-  none: require('templates/layouts/none')
-  main: require('templates/layouts/main')
-  access_denied: require('templates/access_denied')
-#end
-
-partials = {}
-
-deploy_api = (api) ->
-
-  env = _.merge({
-    render: Render,
-    render_component: Render.component,
-    render_string: Render.string
-  }, new Page)
-
-  layout = if _.has(api, 'layout')
-    if api.layout == false
-      'none'
-    else
-      api.layout
-  else
-    'main'
-  #end
-
-  if App.body
-    # do not re-render body if current api uses same layout as previous one
-    return new api(env) if App.body.layout == layout
-  #end
-
-  components = {}
-
-  App.body = env.render
-    el: 'body'
-    template: templates[layout] || templates.none
-    partials: partials
-    components: components
-    data: {}
-
-    oncomplete: ->
-      this.layout = layout
-      new api(env)
-    #end
-  #end
-#end
 
 previous_api = null
 Core.on_controller_matched = (controller, context) ->
@@ -110,33 +68,46 @@ Core.on_controller_matched = (controller, context) ->
 
     api.controller = controller
 
+    env = {
+      render: Render
+      render_component: Render.component
+      render_string: Render.string
+      page: new Page
+      context: context
+    }
+    _.merge(env, env.page)
+
     if previous_api?.teardown
-      previous_api.teardown()
+      previous_api.teardown(env)
     #end
     previous_api = api
 
-    if _.has(api, 'acl')
-      unless _.isFunction(api.acl)
-        throw new Error("#{controller.name}.acl should be a function")
+    if api.has_css && !controller.css_loaded
+      Load.stylesheet controller.client_url + '.css', ->
+        controller.css_loaded = true
+    #end
 
-      if api.acl()
-        deploy_api(api)
+    if _.isFunction(api.acl)
+
+      if api.acl(env)
+        DeployApi(api, env)
       else
         Render
           el: 'body'
-          template: templates.main
+          template: require('templates/layouts/main')
           partials: partials
           oncomplete: ->
-            Render(template: templates.access_denied)
+            Render(template: require('templates/access_denied'))
       #end
 
     else
-      deploy_api(api)
+      DeployApi(api, env)
     #end
 
   #end
 #end
 
+
 document.addEventListener 'DOMContentLoaded', ->
   # make sure this matches the RTCPController URL
   Core.connect('__rtcp__')

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

@@ -0,0 +1,41 @@
+_ = {
+  has: require('lodash/has')
+}
+
+Crudle = require('crudle')
+
+templates = {
+  none: require('templates/layouts/none')
+  main: require('templates/layouts/main')
+}
+
+previous_layout = null
+module.exports = (api, env) ->
+
+  crudle = Crudle(api.controller.ws, env.page)
+  crudle.partials.menu = require('templates/menu')
+  crudle.data.url = api.controller.url
+
+  layout = if _.has(api, 'layout')
+    if api.layout == false
+      'none'
+    else
+      api.layout
+  else
+    'main'
+  #end
+
+  if layout == previous_layout
+    # do not re-render body if current api uses same layout as previous one
+    return api(env, crudle)
+  #end
+  previous_layout = layout
+
+  env.render
+    el: 'body'
+    template: templates[layout] || templates.none
+    oncomplete: ->
+      api(env, crudle)
+    #end
+  #end
+#end

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

@@ -1,11 +1,23 @@
-# refer to underlying controller as self.controller
 
-self = (env, layout, list, editor) ->
-  editor.partials.editor = require('./editor')
-  layout.components =
-    list: env.render_component(list)
-    editor: env.render_component(editor)
+self = (env, layout) ->
+  layout.components.editor.partials.editor = require('./editor.html')
   env.render(layout)
 #end
 
 module.exports = self
+
+# list partials:
+# - filters_layout
+# - filters
+# - pager
+# - list_layout
+# - list_header
+# - list_footer
+# - items
+# - item
+
+# editor partials:
+# - editor
+
+# self properties:
+# - self.controller

data/lib/appril-cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appril-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies: []
 description: Appril CLI
 email:
@@ -27,6 +27,7 @@ files:
 - boilerplate/app/Gemfile
 - boilerplate/app/Rakefile
 - boilerplate/app/base/api/base_controller.rb
+- boilerplate/app/base/api/deploy.coffee
 - boilerplate/app/base/api/index/client.coffee
 - boilerplate/app/base/api/index/layout.html
 - boilerplate/app/base/api/index/server.rb
@@ -65,10 +66,10 @@ files:
 - boilerplate/app/var/.ignore
 - boilerplate/app/webpack.config.js
 - boilerplate/crudle/Gemfile
+- boilerplate/crudle/base/api/deploy.coffee
 - boilerplate/crudle/base/api/index/client.coffee
 - boilerplate/crudle/base/api/index/layout.html
 - boilerplate/crudle/base/api/index/server.rb
-- boilerplate/crudle/base/core.coffee
 - boilerplate/crudle/base/templates/menu.html
 - boilerplate/crudle/generators/api/client.coffee
 - boilerplate/crudle/generators/api/editor.html
@@ -158,5 +159,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: '["appril-cli-0.0.7", "Appril CLI"]'
+summary: '["appril-cli-0.0.8", "Appril CLI"]'
 test_files: []

data/boilerplate/crudle/base/core.coffee

@@ -1,128 +0,0 @@
-_ =
-  merge: require('lodash/merge')
-  has: require('lodash/has')
-  isFunction: require('lodash/isFunction')
-#end
-
-Core = require('appril')
-Page = require('appril-page')
-Render = require('appril-ractive')
-Reporter = require('appril-reporter')
-require 'appril-polyfills'
-require 'assets/styles.css'
-
-CONSIDER_IDLE_AFTER = 5 * 60
-
-window.Cfg = {}
-window.Util = {}
-window.App = {}
-# window.Alert = require('appril-alert')
-
-for k, v of require('appril-util')
-  Util[k] = v
-#end
-
-# for k, v of require('appril-datetime')
-#   Util[k] = v
-# #end
-
-for k, v of require('helpers/application_helpers.coffee')
-  Util[k] = v
-#end
-
-Object.freeze(Util)
-
-Render.default_el = -> '#content'
-Render.global_data = -> {App: App, Cfg: Cfg, Util: Util}
-Render.global_handlers = -> {}
-
-for name, controller of Core.controllers
-  App[name] = controller
-#end
-
-Core.on_initialize = (msg) ->
-  if window.Cfg = msg.data.cfg
-    delete msg.data.cfg
-    Object.freeze(Cfg)
-
-  for k, v of msg.data
-    App[k] = v
-  #end
-
-  Reporter CONSIDER_IDLE_AFTER, (status) ->
-    # close connection if user went away
-    Core.disconnect() if status == 'away'
-  #end
-#end
-
-templates =
-  none: require('templates/layouts/none.html')
-  main: require('templates/layouts/main.html')
-  access_denied: require('templates/access_denied.html')
-#end
-
-partials = {}
-
-Crudle = require('crudle')
-CrudleList = require('crudle-list')
-CrudleEditor = require('crudle-editor')
-
-deploy_api = (api) ->
-
-  page = new Page
-  env = _.merge({
-    render: Render
-    render_component: Render.component
-    render_string: Render.string
-  }, page)
-
-  crudle = Crudle(api.controller.ws, page)
-  crudle.partials.menu = require('templates/menu.html')
-  crudle.data.url = api.controller.url
-
-  api(
-    env,
-    crudle,
-    CrudleList(api.controller.ws, page),
-    CrudleEditor(api.controller.ws, page)
-  )
-#end
-
-previous_api = null
-Core.on_controller_matched = (controller, context) ->
-
-  controller.load (api) ->
-    context.save()
-
-    api.controller = controller
-
-    if previous_api?.teardown
-      previous_api.teardown()
-    #end
-    previous_api = api
-
-    if _.has(api, 'acl')
-      unless _.isFunction(api.acl)
-        throw new Error("#{controller.name}.acl should be a function")
-
-      if api.acl()
-        deploy_api(api)
-      else
-        Render
-          el: 'body'
-          template: templates.main
-          partials: partials
-          oncomplete: ->
-            Render(template: templates.access_denied)
-      #end
-
-    else
-      deploy_api(api)
-    #end
-  #end
-#end
-
-document.addEventListener 'DOMContentLoaded', ->
-  # make sure this matches the RTCPController URL.
-  Core.connect('__rtcp__')
-#end