luca 0.9.8 → 0.9.9

data/app/assets/javascripts/luca/containers/modal_view.coffee

@@ -1,13 +1,13 @@
-_.def("Luca.ModalView").extends("Luca.Container").with
+view = Luca.register      "Luca.containers.ModalView"
+view.extends              "Luca.Container"
 
+view.publicConfiguration
   closeOnEscape: true
-
   showOnInitialize: false
-
   backdrop: false
+  className: "modal"
 
-  className: "luca-ui-container modal"
-
+view.publicMethods
   container: ()->
     $('body')
 
@@ -27,10 +27,10 @@ _.def("Luca.ModalView").extends("Luca.Container").with
     $('body').append( @$el )
     
     @$el.modal
-      backdrop: @backdrop is true
-      keyboard: @closeOnEscape is true
-      show: @showOnInitialize is true
+      backdrop: !!(@backdrop is true)
+      keyboard: !!(@closeOnEscape is true)
+      show: !!(@showOnInitialize is true)
 
     @
 
-_.def("Luca.containers.ModalView").extends("Luca.ModalView").with()
+view.register()

data/app/assets/javascripts/luca/containers/page_controller.coffee

@@ -0,0 +1,25 @@
+# The PageController container is a special type of container whose components or pages
+# will always monopolize the entire element's display and where only one page or component
+# will be visible at a time.  The PageController is typically going to be at the very root
+# of every application, and will be directly integrated with the application's router. 
+# A typical application hierarchy will be an abstract `Viewport` with a single top level
+# `PageController` named 'main_controller'. 
+#
+#       - Viewport / Application
+#         - Router. ( maps urls to named pages on the controller )
+#         - Main Page Controller
+#           - Pages
+#             - Named views / containers
+view = Luca.register    "Luca.containers.PageController"
+view.extends            "Luca.Container"
+
+view.privateMethods
+  initialize: (@options={})->
+    @components ||= @pages || @options.pages
+    for component in @components
+      component.components ||= component.pages
+
+    Luca.Container::initialize.apply(@, arguments)
+
+view.register()  
+

data/app/assets/javascripts/luca/containers/panel_toolbar.coffee

@@ -19,10 +19,6 @@ panelToolbar.defines
   # color       options are primary, info, success, warning, danger, inverse
   buttons:[]
 
-  className: "luca-ui-toolbar btn-toolbar"
-
-  well: true
-
   orientation: 'top'
 
   autoBindEventHandlers: true
@@ -79,7 +75,7 @@ panelToolbar.defines
     @
 
 
-make = Backbone.View::make
+make = Luca.View::make
 
 buildButton = (config, wrap=true)->
   if config.ctype? or config.type?
@@ -134,7 +130,10 @@ buildButton = (config, wrap=true)->
       buttonAttributes["class"] += " dropdown-toggle"
       buttonAttributes["data-toggle"] = "dropdown"
 
-      dropdownItems = _(config.dropdown).map (dropdownItem)=>
+      dropdownItems = for dropdownItem in config.dropdown
+        if _.isObject(dropdownItem)
+          dropdownItem = _.values(dropdownItem).reverse()
+
         link = make "a", {}, dropdownItem[1]
         make "li", {"data-eventId": dropdownItem[0]}, link
 

data/app/assets/javascripts/luca/containers/tab_view.coffee

@@ -1,6 +1,6 @@
-_.def('Luca.containers.TabView').extends('Luca.containers.CardView').with
-
 tabView = Luca.register       "Luca.containers.TabView"
+tabView.extends               "Luca.containers.CardView"
+
 tabView.triggers              "before:select",
                               "after:select"
 
@@ -12,7 +12,8 @@ tabView.privateConfiguration
   additionalClassNames: 'tabbable'
   navClass: "nav-tabs"
   bodyTemplate: "containers/tab_view"
-  bodyEl: "div.tab-content"
+  bodyClassName: "tab-content"
+  skipGetterMethods: true
 
 tabView.defines
   initialize: (@options={})->
@@ -40,9 +41,9 @@ tabView.defines
   afterRender: ()->
     Luca.containers.CardView::afterRender?.apply @, arguments
     tabContainerId = @tabContainer().attr("id")
-    @registerEvent("click ##{ tabContainerId } li a", "select")
+    @registerEvent("click ##{ tabContainerId } li a", "tabSelectClickHandler")
 
-    if Luca.config.enableBoostrap and (@tab_position is "left" or @tab_position is "right")
+    if Luca.config.enableBootstrap and (@tab_position is "left" or @tab_position is "right")
       @tabContainerWrapper().addClass("span2")
       @tabContentWrapper().addClass("span9")
 
@@ -63,13 +64,17 @@ tabView.defines
     @tabSelectors().removeClass('active')
     @activeTabSelector().addClass('active')
 
-  select: (e)->
-    e.preventDefault()
-
+  tabSelectClickHandler: (e)->
+    e?.preventDefault()
     me = my = $( e.target )
+    me = my ||= @tabSelectors()[0]
+    tabName = my.parent().data('target')
 
+    @select(tabName)
+
+  select: (tabName=0)->
     @trigger "before:select", @
-    @activate my.parent().data('target')
+    @activate(tabName)
     @trigger "after:select", @
 
   componentElements: ()->
@@ -85,4 +90,8 @@ tabView.defines
     @$("ul.#{ @navClass }", @tabContainerWrapper() )
 
   tabSelectors: ()->
-    @$( 'li.tab-selector', @tabContainer() )
+    @$( 'li.tab-selector', @tabContainer() )
+
+  bodyTemplateVars: ()->
+    cid: @cid  
+    navClass: @navClass

data/app/assets/javascripts/luca/containers/viewport.coffee

@@ -1,23 +1,22 @@
-_.def('Luca.containers.Viewport').extend('Luca.containers.CardView').with
-
-  activeItem: 0
-
-  additionalClassNames: 'luca-ui-viewport'
+viewport = Luca.register    "Luca.containers.Viewport"
+viewport.extends            "Luca.Container"
 
+viewport.defines
   fullscreen: true
-
   fluid: false
 
+  applyWrapper: true
 
   initialize: (@options={})->
     _.extend @, @options
 
-    if Luca.config.enableBoostrap is true
-      @wrapperClass = if @fluid is true then Luca.containers.Viewport.fluidWrapperClass else Luca.containers.Viewport.defaultWrapperClass 
+    if Luca.config.enableBoostrap is true and @applyWrapper is true
+      @wrapperClass = if @fluid is true then Luca.config.fluidWrapperClass else Luca.config.wrapperClass
 
     Luca.Container::initialize.apply(@, arguments)
 
-    @enableFullscreen() if @fullscreen is true
+    if @fullscreen is true
+      @enableFullscreen() 
 
   enableFluid: ()-> @enableWrapper()
 
@@ -40,10 +39,7 @@ _.def('Luca.containers.Viewport').extend('Luca.containers.CardView').with
     @$el.removeClass('fullscreen-enabled')
 
   beforeRender: ()->
-    Luca.containers.CardView::beforeRender?.apply(@, arguments)
-
-    #if Luca.config.enableBoostrap and @topNav and @fullscreen
-    #  $('body').css('padding','40px')
+    Luca.Container::beforeRender?.apply(@, arguments)
 
     @renderTopNavigation() if @topNav?
     @renderBottomNavigation() if @bottomNav?
@@ -55,7 +51,7 @@ _.def('Luca.containers.Viewport').extend('Luca.containers.CardView').with
     @$el.width()
 
   afterRender: ()->
-    Luca.containers.CardView::after?.apply(@, arguments)
+    Luca.Container::afterRender?.apply(@, arguments)
 
     if Luca.config.enableBoostrap is true and @containerClassName
       @$el.children().wrap('<div class="#{ containerClassName }" />')
@@ -79,5 +75,5 @@ _.def('Luca.containers.Viewport').extend('Luca.containers.CardView').with
     # IMPLEMENT
 
 
-Luca.containers.Viewport.defaultWrapperClass  = 'row'
-Luca.containers.Viewport.fluidWrapperClass    = 'row-fluid'
+Luca.containers.Viewport.defaultWrapperClass  = Luca.config.wrapperClass || 'container'
+Luca.containers.Viewport.fluidWrapperClass    = Luca.config.fluidWrapperClass || 'container-fluid'

data/app/assets/javascripts/luca/core/collection.coffee

@@ -1,4 +1,4 @@
-collection = Luca.define            'Luca.Collection'
+collection = Luca.register          'Luca.Collection'
 collection.extends                  'Backbone.QueryCollection'
 collection.includes                 'Luca.Events'
 
@@ -6,13 +6,13 @@ collection.triggers                 "after:initialize",
                                     "before:fetch",
                                     "after:response"
 
-collection.defines    
+collection.publicConfiguration    
   model: Luca.Model
   # cachedMethods refers to a list of methods on the collection
   # whose value gets cached once it is ran.  the collection then
   # binds to change, add, remove, and reset events and then expires
   # the cached value once these events are fired.
-
+  #
   # cachedMethods expects an array of strings representing the method name
   # or objects containing @method and @resetEvents properties.  by default
   # @resetEvents are 'add','remove',reset' and 'change'.
@@ -22,6 +22,17 @@ collection.defines
   # and return the filtered results that way, then set this to true
   remoteFilter: false
 
+  # setting a cache key to a string, or to a function which returns
+  # a string, will determine where the collections' models are pulled
+  # from if they are available on page load.  also known as "bootstrapping"
+  # your collections with data.  The cache key will look in whatever object
+  # is set in Luca.config.modelBootstrap for its models.
+  cache_key: undefined
+
+  # Which CollectionManager should we register with? Expects either a string
+  # which will get resolved into a global variable, or a 
+  manager: undefined
+
   initialize: (models=[], @options)->
     _.extend @, @options
     @_reset()
@@ -44,7 +55,7 @@ collection.defines
     @name ||= @registerAs
     @manager ||= @registerWith
 
-    @manager = if _.isFunction(@manager) then @manager() else @manager
+    @manager = Luca.util.read(@manager) if @manager? 
 
     # if they specify a
     if @name and not @manager
@@ -248,7 +259,7 @@ collection.defines
       wrapped()
       @unbind "reset", @
 
-    unless @fetching or not options.autoFetch
+    unless @fetching or not !!options.autoFetch
       @fetch()
 
   # ifLoaded is equivalent to binding to the reset trigger with
@@ -346,6 +357,9 @@ collection.defines
     else
       @models
 
+collection.register()
+
+
 # Global Collection Observer
 _.extend Luca.Collection.prototype,
   trigger: ()->

data/app/assets/javascripts/luca/core/events.coffee

@@ -68,7 +68,7 @@ class Luca.EventRelayer
         trigger = _( [prefix,eventId] ).compact().join(':')
         args.unshift(trigger)
         @trigger.apply(@, args)
-      , target 
+      , target
 
 
 Luca.Events =
@@ -88,14 +88,14 @@ Luca.Events =
     @bind trigger, onceFn
 
 
-Luca.EventsExt = 
+Luca.EventsExt =
   waitUntil:(trigger, context)->
     @waitFor.call(@, trigger, context )
-    
+
   waitFor: (trigger, context)->
     self = @
-    proxy = 
-      on:(target)-> 
+    proxy =
+      on:(target)->
         target.waitFor.call(target,trigger,context)
       and:(runList...)->
         for fn in runList

data/app/assets/javascripts/luca/core/model.coffee

@@ -1,4 +1,4 @@
-model = Luca.define       'Luca.Model'
+model = Luca.register     'Luca.Model'
 
 model.extends             'Backbone.Model'
 

data/app/assets/javascripts/luca/core/panel.coffee

@@ -7,8 +7,6 @@ panel.replaces                  "Luca.Panel"
 
 panel.extends                   "Luca.View"
 
-#panel.mixesIn                   "LoadMaskable"
-
 panel.configuration
   topToolbar: undefined
   bottomToolbar: undefined
@@ -56,7 +54,7 @@ panel.publicMethods
     @$bodyEl().empty()
     
   $html: (content)->
-    @$bodyEl().html( content )
+    if content? then @$bodyEl().html( content ) else @$bodyEl().html()
 
   $append: (content)->
     @$bodyEl().append(content)
@@ -79,7 +77,6 @@ panel.privateMethods
     el = Luca.util.read( config.container )
     el ||= Luca.util.read( config.targetEl )
 
-    console.log "Rendering toolbar to", config, el 
     Luca.Panel.attachToolbar.call(@, config, el )
 
 panel.classMethods
@@ -88,16 +85,31 @@ panel.classMethods
     config.type ||= config.ctype ||= @toolbarType || "panel_toolbar"
 
     config.additionalClassNames = "#{ Luca.config.toolbarContainerClass } #{ config.orientation }"
-     
+  
     toolbar = Luca.util.lazyComponent( config )
+    # TEMP
+    # Do this properly
+    if config.orientation is "bottom"
+      @getBottomToolbar ||= ()-> toolbar   
+
+    if config.orientation is "top"
+      @getTopToolbar ||= ()-> toolbar   
+
+    if config.orientation is "right"
+      @getRightToolbar ||= ()-> toolbar   
+
+    if config.orientation is "left"
+      @getLeftToolbar ||= ()-> toolbar   
 
     hasBody = @bodyClassName or @bodyTagName
 
+    action = config.attachmentAction
     # there will be a body panel inside of the views $el
     # so just place the toolbar before, or after the body
-    action = switch config.orientation
+    action ||= switch config.orientation
       when "top", "left"
         if hasBody and not targetEl?.length > 0 then "before" else "prepend"
+
       when "bottom", "right"
         if hasBody and not targetEl?.length > 0 then "after" else "append"
 

data/app/assets/javascripts/luca/core/registry/component_definition.coffee

@@ -234,7 +234,8 @@ class ComponentDefinition
       componentType = "model" if Luca.isModelPrototype( definition )
 
       # automatically register this with the component registry
-      Luca.registerComponent( _.string.underscored(@componentId), @componentName, componentType)
+      type_alias = _.string.underscored(@componentId)
+      Luca.registerComponent( type_alias, @componentName, componentType)
 
     @defined = true
 

data/app/assets/javascripts/luca/core/registry/meta_data.coffee

@@ -22,6 +22,8 @@ class MetaDataProxy
       "class configuration" : []
       "class interface" : []
 
+  className: ()->
+    @meta["display name"]
   superClass: ()->
     Luca.util.resolve(@meta["super class name"])
 

data/app/assets/javascripts/luca/core/registry/registry.coffee

@@ -30,7 +30,6 @@ Luca.registry.typeAliases =
   multi:        "collection_multi_view"
   table:        "table_view"
 
-
 # When you use _.def to define a component, you say
 # which class it extends() from, and with() which enhancements.
 # We register that component class for you:
@@ -39,24 +38,23 @@ Luca.registerComponent = (component, prototypeName, componentType="view")->
 
   switch componentType
     when "model"
+      existing = registry.model_classes[ component ]
       registry.model_classes[ component ] = prototypeName
     when "collection"
+      existing = registry.collection_classes[ component ]
       registry.collection_classes[ component ] = prototypeName
+    when "view"
+      existing = registry.classes[ component ]
+      registry.classes[ component ] = prototypeName
     else
+      existing = registry.classes[ component ]
       registry.classes[ component ] = prototypeName
 
-Luca.development_mode_register = (component, prototypeName)->
-  existing = registry.classes[component]
-
-  if Luca.enableDevelopmentTools is true and existing?
-    prototypeDefinition = Luca.util.resolve( existing, window)
-
+  if existing? and Luca.config.developmentMode is true 
     liveInstances = Luca.registry.findInstancesByClassName( prototypeName )
+    if liveInstances.length > 0
+      existingInstance.refreshEventBindings?() for existingInstance in liveInstances
 
-    _( liveInstances ).each (instance)->
-      instance?.refreshCode?.call(instance, prototypeDefinition)
-
-  Luca.registerComponent( component, prototypeName )
 
 # We create a @ctype alias for this component definition, and register
 # the class in a registry.
@@ -123,6 +121,11 @@ Luca.registry.classes = (toString=false)->
 Luca.registry.find = (search)->
   Luca.util.resolve(search) || Luca.define.findDefinition(search)
 
+Luca.remove = Luca.registry.removeInstance = (cacheKey)->
+  return unless cacheKey?
+  _( componentCacheStore.name_index ).delete( cacheKey )
+  _( componentCacheStore.cid_index ).delete( cacheKey )
+
 Luca.cache = Luca.registry.cacheInstance = (cacheKey, object)->
   return unless cacheKey?
   return object if object?.doNotCache is true