luca 0.9.6 → 0.9.7

data/src/define.coffee

@@ -13,6 +13,7 @@
 # _.def("MyView").extends("Luca.View").with the_custom:"shit"
 _.mixin
   def: Luca.component = Luca.define = Luca.register = (componentName)-> new DefineProxy(componentName)
+  register: Luca.register
 
 # The define proxy chain sets up a call to Luca.extend, which is a wrapper around Luca and Backbone component class' extend function.
 class DefineProxy
@@ -20,6 +21,7 @@ class DefineProxy
     @namespace = Luca.util.namespace()
     @componentId = @componentName = componentName
     @superClassName = 'Luca.View' 
+    @properties ||= {}
 
     if componentName.match(/\./)
       @namespaced = true
@@ -30,6 +32,14 @@ class DefineProxy
       # automatically add the namespace to the namespace registry
       Luca.registry.addNamespace( parts.join('.') )
 
+  meta: (key, value)->
+    metaKey = @namespace + '.' + @componentId
+    metaKey = metaKey.replace(/^\./,'')
+    data = Luca.registry.addMetaData(metaKey, key, value)
+
+    @properties.componentMetaData = ()->
+      Luca.registry.getMetaDataFor(metaKey)
+
   # allow for specifying the namespace
   in: (@namespace)-> @
 
@@ -43,6 +53,7 @@ class DefineProxy
     for hook in hooks
       @properties.hooks.push(hook) 
     @properties.hooks = _.uniq(@properties.hooks)
+    @meta("hooks", @properties.hooks)
     @
 
   includes: (includes...)->
@@ -50,16 +61,35 @@ class DefineProxy
     for include in includes
       @properties.include.push(include) 
     @properties.include = _.uniq(@properties.include)
+    @meta("includes", @properties.include)
     @
 
-  mixesIn: (mixins...)->
-    _.defaults(@properties ||= {}, mixins: []) 
-    for mixin in mixins
-      @properties.mixins.push(mixin) 
-    @properties.mixins = _.uniq(@properties.mixins)
+  mixesIn: (concerns...)->
+    _.defaults(@properties ||= {}, concerns: []) 
+    for concern in concerns
+      @properties.concerns.push(concern) 
+    @properties.concerns = _.uniq(@properties.concerns)
+
+    @meta("concerns", @properties.concerns)
     @
 
-  defaultProperties: (properties={})->
+  publicConfiguration: (properties={})->
+    @meta("public configuration", _.keys(properties) )
+    _.defaults((@properties||={}), properties)
+
+  privateConfiguration: (properties={})->
+    @meta("private configuration", _.keys(properties) )
+    _.defaults((@properties||={}), properties)
+
+  publicInterface: (properties={})->
+    @meta("public interface", _.keys(properties) )
+    _.defaults((@properties||={}), properties)
+
+  privateInterface: (properties={})->
+    @meta("private interface", _.keys(properties) )
+    _.defaults((@properties||={}), properties)
+
+  definePrototype: (properties={})->
     _.defaults((@properties||={}), properties)
 
     at = if @namespaced
@@ -72,29 +102,37 @@ class DefineProxy
       eval("(window||global).#{ @namespace } = {}")
       at = Luca.util.resolve(@namespace,(window || global))
 
-    at[@componentId] = Luca.extend(@superClassName,@componentName, @properties)
+    @meta("super class name", @superClassName )
+    @meta("display name", @componentName)
+
+    @properties.displayName = @componentName
+    
+    @properties.componentMetaData = ()->
+      Luca.registry.getMetaDataFor(@displayName)
+
+    definition = at[@componentId] = Luca.extend(@superClassName,@componentName, @properties)
 
-    if Luca.autoRegister is true 
-      componentType = "view" if Luca.isViewPrototype( at[@componentId] )
+    if Luca.config.autoRegister is true 
+      componentType = "view" if Luca.isViewPrototype( definition )
 
-      if Luca.isCollectionPrototype( at[@componentId] )
+      if Luca.isCollectionPrototype( definition )
         Luca.Collection.namespaces ||= []
         Luca.Collection.namespaces.push( @namespace )
         componentType = "collection" 
 
-      componentType = "model" if Luca.isModelPrototype( at[@componentId] )
+      componentType = "model" if Luca.isModelPrototype( definition )
 
       # automatically register this with the component registry
       Luca.registerComponent( _.string.underscored(@componentId), @componentName, componentType)
 
-    at[@componentId]
+    definition
 
 # Aliases for the mixin definition
-DefineProxy::behavesAs = DefineProxy::uses = DefineProxy::mixesIn 
+DefineProxy::concerns = DefineProxy::behavesAs = DefineProxy::uses = DefineProxy::mixesIn 
 
 # Aliases for the final call on the define proxy
-DefineProxy::defines = DefineProxy::defaults = DefineProxy::exports = DefineProxy::defaultProperties 
-DefineProxy::defaultsTo = DefineProxy::enhance = DefineProxy::with = DefineProxy::defaultProperties
+DefineProxy::defines = DefineProxy::defaults = DefineProxy::exports = DefineProxy::defaultProperties = DefineProxy::definePrototype
+DefineProxy::defaultsTo = DefineProxy::enhance = DefineProxy::with = DefineProxy::definePrototype
 
 # The last method of the DefineProxy chain is always going to result in
 # a call to Luca.extend.  Luca.extend wraps the call to Luca.View.extend,
@@ -105,8 +143,6 @@ DefineProxy::defaultsTo = DefineProxy::enhance = DefineProxy::with = DefineProxy
 Luca.extend = (superClassName, childName, properties={})->
   superClass = Luca.util.resolve( superClassName, (window || global) )
 
-  superClass.__initializers ||= []
-
   unless _.isFunction(superClass?.extend)
     throw "Error defining #{ childName }. #{ superClassName } is not a valid component to extend from"
 
@@ -117,9 +153,8 @@ Luca.extend = (superClassName, childName, properties={})->
     superClass
 
   properties._super = (method, context=@, args=[])->
-    # protect against a stack too deep error in weird cases
     # TODO: debug this better
-    
+    # protect against a stack too deep error in weird cases
     @_superClass().prototype[method]?.apply(context, args)
 
   definition = superClass.extend(properties)
@@ -133,50 +168,3 @@ Luca.extend = (superClassName, childName, properties={})->
 
   definition
 
-
-Luca.mixin = (mixinName)->
-  namespace = _( Luca.mixin.namespaces ).detect (space)->
-    Luca.util.resolve(space)?[ mixinName ]?
-
-  namespace ||= "Luca.modules"
-
-  resolved = Luca.util.resolve(namespace)[ mixinName ]
-
-  console.log "Could not find #{ mixinName } in ", Luca.mixin.namespaces unless resolved?
-
-  resolved
-
-Luca.mixin.namespaces = [
-  "Luca.modules"
-]
-
-Luca.mixin.namespace = (namespace)->
-  Luca.mixin.namespaces.push(namespace)
-  Luca.mixin.namespaces = _( Luca.mixin.namespaces ).uniq()
-
-# Luca.decorate('Luca.View').with('Luca.modules.MyCustomMixin')
-Luca.decorate = (componentPrototype)->
-  componentPrototype = Luca.util.resolve(componentPrototype).prototype if _.isString(componentPrototype)
-  
-  return with: (mixin)->
-    mixinDefinition = Luca.mixin(mixin)
-
-    mixinPrivates   = _( mixinDefinition ).chain().keys().select (key)-> 
-      "#{ key }".match(/^__/)
-
-    sanitized   = _( mixinDefinition ).omit( mixinPrivates.value() )
-
-    _.extend(componentPrototype, sanitized)
-
-    # When a mixin is included, we may want to do things 
-    mixinDefinition?.__included?.call(mixinDefinition, mixin) 
-
-    superclassMixins = componentPrototype._superClass()::mixins
-
-    componentPrototype.mixins ||= []
-    componentPrototype.mixins.push( mixin )
-    componentPrototype.mixins = componentPrototype.mixins.concat( superclassMixins )
-
-    componentPrototype.mixins = _( componentPrototype.mixins ).chain().uniq().compact().value()
-
-    componentPrototype

data/src/framework.coffee

@@ -19,11 +19,13 @@
     return fallback()
 
 _.extend Luca,
-  VERSION: "0.9.6"
+  VERSION: "0.9.7"
   core: {}
+  collections: {}
   containers: {}
   components: {}
-  modules: {}
+  models: {}
+  concerns: {}
   util: {}
   fields: {}
   registry:{}
@@ -33,6 +35,10 @@ _.extend Luca,
 # for triggering / binding to component definitions
 _.extend Luca, Backbone.Events
 
+Luca.config.maintainStyleHierarchy = true
+Luca.config.maintainClassHierarchy = true
+Luca.config.autoApplyClassHierarchyAsCssClasses = true
+
 # When using Luca.define() should we automatically register
 # the component with the registry?
 Luca.autoRegister = Luca.config.autoRegister = true
@@ -106,34 +112,30 @@ Luca.isCollectionPrototype = (obj)->
   obj? and obj::? and !Luca.isModelPrototype(obj) and obj::reset? and obj::select? and obj::reject?
 
 Luca.inheritanceChain = (obj)->
-  _( Luca.parentClasses(obj) ).map (className)-> Luca.util.resolve(className)
-    
+  Luca.parentClasses(obj)
+
 Luca.parentClasses = (obj)->
   list = []
 
   if _.isString(obj)
     obj = Luca.util.resolve(obj)
 
-  list.push( obj.displayName || obj::?.displayName || Luca.parentClass(obj) )
-
-  classes = until not Luca.parentClass(obj)?
-    obj = Luca.parentClass(obj)
-
-  list = list.concat(classes)
+  metaData = obj.componentMetaData?()
+  metaData ||= obj::componentMetaData?()
 
-  _.uniq list
-
-Luca.parentClass = (obj)->
-  list = []
+  list = metaData?.classHierarchy() || [obj.displayName || obj::displayName]
 
+Luca.parentClass = (obj, resolve=true)->
   if _.isString( obj )
     obj = Luca.util.resolve(obj)
 
-  if Luca.isComponent(obj)
-    obj.displayName
+  parent = obj.componentMetaData?()?.meta["super class name"]
+  parent ||= obj::componentMetaData?()?.meta["super class name"]
+
+  parent || obj.displayName || obj.prototype?.displayName
+
+  if resolve then Luca.util.resolve(parent) else parent
 
-  else if Luca.isComponentPrototype(obj)
-    obj::_superClass?()?.displayName
 
 # This is a convenience method for accessing the templates
 # available to the client side app, either the ones which ship with Luca
@@ -191,6 +193,9 @@ UnderscoreExtensions =
   # this function will ensure a function gets called at least once
   # afrer x delay.  by setting defaults, we can use this on backbone
   # view definitions
+  #
+  # Note:  I am not sure if this is the same as _.debounce or not.  I will need
+  # to look into it
   idle: (code, delay=1000)->
     delay = 0 if window.DISABLE_IDLE
     handle = undefined

data/src/index.coffee

@@ -1,10 +1,12 @@
 #= require ./util
 #= require_tree ./plugins
+#= require ./concerns
 #= require ./define
 
-#= require_tree ./modules
+#= require_tree ./concerns
 
 #= require ./core/registry
+#= require ./core/meta_data
 #= require ./core/observer
 #= require ./core/view
 #= require ./core/model

data/src/stylesheets/components/checkbox_array.scss

@@ -1,4 +1,4 @@
-.luca-ui-checkbox-array {
+.luca-ui-checkbox-array, .luca-checkbox-array {
   input.array-checkbox {
     display: inline-block;
   }

data/src/stylesheets/components/form_view.scss

@@ -1,4 +1,4 @@
-.luca-ui-form-view-wrapper {
+.luca-form-view {
   width: 100%;
   float: left;
   display: block;
@@ -7,7 +7,7 @@
 }
 
 
-.luca-ui-form-view {
+.luca-form-view {
   .luca-ui-field {
     margin: 5px;
     padding: 5px;
@@ -19,7 +19,7 @@
   }
 }
 
-.luca-ui-form-view.label-align-top {
+.luca-form-view.label-align-top {
   .luca-ui-field {
     label, input, select, textarea {
       margin: 5px 0px;
@@ -28,13 +28,13 @@
   }
 }
 
-.luca-ui-form-view.column-layout {
+.luca-form-view.column-layout {
   .luca-ui-field {
     float: left;
   }
 }
 
-.luca-ui-form-view {
+.luca-form-view {
   .toolbar-container {
     padding-right: 12px;
   }

data/src/stylesheets/components/viewport.scss

@@ -6,7 +6,8 @@ html.luca-ui-fullscreen, body.luca-ui-fullscreen {
   .fluid-viewport-wrapper {
     padding-top:40px;
   }
-  .luca-ui-viewport, .fullscreen-container {
+
+  .luca-viewport, .luca-ui-viewport, .fullscreen-container {
     min-height: 100%;
     height: auto !important;
     height: 100%;

data/src/stylesheets/containers/container.scss

@@ -1,8 +1,3 @@
-.luca-ui-container {}
-
-.luca-ui-card {
-}
-
 .toolbar-container {
   clear: both;
 }

data/src/stylesheets/containers/tab_view.scss

@@ -1,19 +1,19 @@
-.luca-ui-tab-view {
+.luca-tab-view {
   .luca-ui-card {
-    .luca-ui-grid-view, .luca-ui-form-view, .luca-ui-card {
+    .luca-ui-grid-view, .luca-form-view, .luca-ui-card {
       overflow: hidden;
     }
   }
 }
 
-.luca-ui-tab-view.tabs-below, .luca-ui-tab-view.tabs-right {
+.luca-tab-view.tabs-below, .luca-tab-view.tabs-right {
   .tab-selector-container {
     display: block;
     clear: both;
   }
 }
 
-.luca-ui-tab-view.tabs-left {
+.luca-tab-view.tabs-left {
   .tab-selector-container {
     ul.nav-tabs {
       padding: 0px;
@@ -26,7 +26,7 @@
   }
 }
 
-.luca-ui-tab-view.tabs-right {
+.luca-tab-view.tabs-right {
   .tab-selector-container {
     float: right;
   }

data/src/tools/console.coffee

@@ -10,16 +10,16 @@ developmentConsole.defines
   width: 1000
 
   componentEvents:
-    "code_input key:keyup"    : "historyUp"
-    "code_input key:keydown"  : "historyDown"
-    "code_input key:enter"    : "runCommand"
+    "input key:keyup"    : "historyUp"
+    "input key:keydown"  : "historyDown"
+    "input key:enter"    : "runCommand"
 
   compileOptions:
     bare: true
 
   components:[
     type: "code_mirror_field"
-    getter: "getCodeMirror"
+    role: "code_mirror"
     additionalClassNames: "clearfix"
     name: "code_output"
     readOnly: true
@@ -30,7 +30,7 @@ developmentConsole.defines
   ,
     type: "text_field"
     name: "code_input"
-    getter: "getInput"
+    role: "input"
     lineNumbers: false
     height: '30px'
     maxHeight: '30px'

data/src/util.coffee

@@ -36,6 +36,16 @@ Luca.util.hook = (eventId="")->
   parts = _( parts ).map (p)-> _.string.capitalize(p)
   fn = prefix + parts.join('')
 
+Luca.util.toCssClass = (componentName, exclusions...)->
+  parts = componentName.split('.')
+
+  transformed = for part in parts when _( exclusions ).indexOf(part) is -1
+    part = _.str.underscored(part)
+    part = part.replace(/_/g,'-')
+    part
+
+  transformed.join '-'
+
 Luca.util.isIE = ()->
   try
     Object.defineProperty({}, '', {})
@@ -118,3 +128,40 @@ Luca.util.badge = (contents="", type, baseClass="badge")->
   cssClass += " #{ baseClass }-#{ type }" if type?
   Luca.util.make("span",{class:cssClass},contents)
 
+Luca.util.setupHooks = (set)->
+  set ||= @hooks
+
+  _(set).each (eventId)=>
+    fn = Luca.util.hook( eventId )
+
+    callback = ()->
+      @[fn]?.apply @, arguments
+
+    callback = _.once(callback) if eventId?.match(/once:/)
+
+    @on eventId, callback, @
+
+Luca.util.setupHooksAdvanced = (set)->
+  set ||= @hooks
+
+  _(set).each (eventId)=>
+    hookSetup = @[ Luca.util.hook( eventId ) ]
+
+    unless _.isArray(hookSetup)
+      hookSetup = [hookSetup]
+    
+    for entry in hookSetup      
+      fn = if _.isString(entry)
+        @[ entry ]
+
+      if _.isFunction(entry)
+        fn = entry
+
+      callback = ()-> 
+        @[fn]?.apply @, arguments
+
+      if eventId?.match(/once:/)
+        callback = _.once(callback) 
+
+      @on eventId, callback, @
+

data/vendor/assets/javascripts/luca-ui-development-tools.js

@@ -18308,9 +18308,9 @@ if (!CodeMirror.mimeModes.hasOwnProperty("text/css"))
     historyIndex: 0,
     width: 1000,
     componentEvents: {
-      "code_input key:keyup": "historyUp",
-      "code_input key:keydown": "historyDown",
-      "code_input key:enter": "runCommand"
+      "input key:keyup": "historyUp",
+      "input key:keydown": "historyDown",
+      "input key:enter": "runCommand"
     },
     compileOptions: {
       bare: true
@@ -18318,7 +18318,7 @@ if (!CodeMirror.mimeModes.hasOwnProperty("text/css"))
     components: [
       {
         type: "code_mirror_field",
-        getter: "getCodeMirror",
+        role: "code_mirror",
         additionalClassNames: "clearfix",
         name: "code_output",
         readOnly: true,
@@ -18329,7 +18329,7 @@ if (!CodeMirror.mimeModes.hasOwnProperty("text/css"))
       }, {
         type: "text_field",
         name: "code_input",
-        getter: "getInput",
+        role: "input",
         lineNumbers: false,
         height: '30px',
         maxHeight: '30px',