luca 0.9.6 → 0.9.7

data/src/components/application.coffee

@@ -1,9 +1,12 @@
-# Luca.Application 
+application = Luca.register       "Luca.Application"
+application.extends               "Luca.containers.Viewport"
+
+# Luca.Application
 #
 # The Application class is the global state tracking mechanism
 # for your single page application, as well as the entry point.
 #
-# By default it contains a main controller which is a Luca.components.Controller instance. 
+# By default it contains a main controller which is a Luca.components.Controller instance.
 #
 # In a typical Luca application, the router will use the applications @navigate_to() method to switch
 # from page to page on the main controller, or any other controllers nested inside of it.
@@ -12,11 +15,8 @@
 #
 # Decoupling application control flow from the URL Fragment from Backbone.History and preventing
 # your components from directly caring about the URL Fragment, allows you to build applications as
-# isolated components which can run separately or nested inside of other applications.   
-
-startHistory = ()-> Backbone.history.start()
-
-_.def('Luca.Application').extends('Luca.containers.Viewport').with
+# isolated components which can run separately or nested inside of other applications.
+application.defines
   name: "MyApp"
 
   # The Application uses a Backbone.Model as a state machine, which
@@ -26,18 +26,18 @@ _.def('Luca.Application').extends('Luca.containers.Viewport').with
   # the @defaultState property will be the default attributes
   defaultState: {}
 
-  # if autoBoot is set to true, the application will 
+  # if autoBoot is set to true, the application will
   # attempt to boot on document ready.
   autoBoot: false
 
-  # automatically starts the @router if it exists, 
-  # once the components for the application have 
+  # automatically starts the @router if it exists,
+  # once the components for the application have
   # been created.  Pass the event name you want to
   # listen for on this component before you start history
   autoStartHistory: "before:render"
 
   # we will create a collection manager singleton
-  # by default unless otherwise specified. 
+  # by default unless otherwise specified.
   useCollectionManager: true
 
   # to pass options to the collection manager, set the @collectionManager
@@ -46,7 +46,7 @@ _.def('Luca.Application').extends('Luca.containers.Viewport').with
 
   # by default we will use the standard collection manager which ships with
   # Luca.  If you would like to use your own extension of the collection manager
-  # just pass a reference to the class you would like to use. 
+  # just pass a reference to the class you would like to use.
   collectionManagerClass: "Luca.CollectionManager"
 
   # Luca plugin apps are apps which mount onto existing
@@ -61,7 +61,7 @@ _.def('Luca.Application').extends('Luca.containers.Viewport').with
   useController: true
 
   # Key Handler
-  # 
+  #
   # One responsibility of the application, since it is a viewport which monopolizes the entire screen
   # is to relay keypress events from the document, to whatever views are interested in responding to them.
   #
@@ -70,7 +70,7 @@ _.def('Luca.Application').extends('Luca.containers.Viewport').with
 
   # You can configure key events by specifying them by their name, as it exists in Luca.keyMap. For example:
   #
-  keyEvents: {} 
+  keyEvents: {}
 
   # keyEvents
   #   keyup: keyUpHandler
@@ -103,7 +103,7 @@ _.def('Luca.Application').extends('Luca.containers.Viewport').with
 
     Luca.Application.instances ||= {}
     Luca.Application.instances[ appName ] = app
-    
+
     Luca.containers.Viewport::initialize.apply @, arguments
 
     @state = new Luca.Model( @defaultState )
@@ -115,7 +115,7 @@ _.def('Luca.Application').extends('Luca.containers.Viewport').with
     # with the state machine of the application
     @setupMainController() if @useController is true
 
-    # The Collection Manager is responsible 
+    # The Collection Manager is responsible
     @setupCollectionManager()
 
     # we will render when all of the various components
@@ -137,23 +137,23 @@ _.def('Luca.Application').extends('Luca.containers.Viewport').with
     #     forwardslash: "altSlashHandler"
     if @useKeyRouter is true
       console.log "The useKeyRouter property is being deprecated. switch to useKeyHandler instead"
-    
+
     @setupKeyHandler() if (@useKeyHandler is true or @useKeyRouter is true) and @keyEvents?
 
     # if the application is a plugin designed to modify the behavior
     # of another app, then don't claim ownership.  otherwise the most common
     # use-case is that there will be one application instance
     unless @plugin is true or alreadyRunning
-      Luca.getApplication = (name)=> 
+      Luca.getApplication = (name)=>
         return app unless name?
-        Luca.Application.instances[ name ] 
+        Luca.Application.instances[ name ]
 
     if @autoBoot
       if Luca.util.resolve(@name)
         throw "Attempting to override window.#{ @name } when it already exists"
 
       $ ->
-        window[ appName ] = app 
+        window[ appName ] = app
         app.boot()
 
   # @activeView() returns a reference to the instance of the view
@@ -161,14 +161,14 @@ _.def('Luca.Application').extends('Luca.containers.Viewport').with
   #
   # this will be whicever component is active on the controllers
   # nested within the main controller, if there are any, or the view
-  # itself which is active on the main controller. 
+  # itself which is active on the main controller.
   activeView: ()->
     if active = @activeSubSection()
       @view( active )
     else
       @view( @activeSection() )
 
-  # Returns the name of the active component on the main controller 
+  # Returns the name of the active component on the main controller
   activeSection: ()->
     @get("active_section")
 
@@ -216,7 +216,7 @@ _.def('Luca.Application').extends('Luca.containers.Viewport').with
     return @components[0] if @useController is true
     Luca.cache('main_controller')
 
-  # 
+  #
   keyHandler: (e)->
     return unless e and @keyEvents
 
@@ -256,7 +256,7 @@ _.def('Luca.Application').extends('Luca.containers.Viewport').with
       type = component.type || component.type
       if type.match(/controller$/)
         component.bind "after:card:switch", (previous,current)=>
-          @state.set(active_sub_section:current.name)       
+          @state.set(active_sub_section:current.name)
           app.trigger "sub:page:change"
 
   setupMainController: ()->
@@ -275,9 +275,9 @@ _.def('Luca.Application').extends('Luca.containers.Viewport').with
     return unless @useCollectionManager is true
 
     return if @collectionManager? and @collectionManager?.get?
-    
+
     if _.isString( @collectionManagerClass )
-      @collectionManagerClass = Luca.util.resolve( @collectionManagerClass ) 
+      @collectionManagerClass = Luca.util.resolve( @collectionManagerClass )
 
     collectionManagerOptions = @collectionManagerOptions || {}
 
@@ -291,9 +291,9 @@ _.def('Luca.Application').extends('Luca.containers.Viewport').with
 
     # if the collection manager property is a string, then it is a
     # reference to a name of a collection manager to use.  so let's
-    # stash it 
+    # stash it
     if _.isString(@collectionManager)
-      collectionManagerOptions = 
+      collectionManagerOptions =
         name: @collectionManager
 
     # let's try and get the collection manager by name if we can
@@ -301,7 +301,7 @@ _.def('Luca.Application').extends('Luca.containers.Viewport').with
 
     # if we can't, then we will have to create one ourselves
     unless _.isFunction(@collectionManager?.get)
-      @collectionManager = new @collectionManagerClass( collectionManagerOptions )    
+      @collectionManager = new @collectionManagerClass( collectionManagerOptions )
 
   setupRouter: ()->
     app = @
@@ -315,7 +315,7 @@ _.def('Luca.Application').extends('Luca.containers.Viewport').with
     # you can control which by setting the @startHistoryOn property
     if @router and @autoStartHistory
       @autoStartHistory = "before:render" if @autoStartHistory is true
-      @defer(startHistory, false).until(@, @autoStartHistory)   
+      @defer( Luca.util.startHistory, false).until(@, @autoStartHistory)
 
   setupKeyHandler: ()->
     return unless @keyEvents
@@ -330,3 +330,5 @@ _.def('Luca.Application').extends('Luca.containers.Viewport').with
     for keyEvent in (@keypressEvents || ["keydown"])
       $( document ).on( keyEvent, handler )
 
+Luca.util.startHistory = ()->
+  Backbone.history.start()

data/src/components/base_toolbar.coffee

@@ -1,15 +1,17 @@
 _.def('Luca.components.Toolbar').extends('Luca.core.Container').with
 
+toolbar = Luca.register     "Luca.components.Toolbar"
+toolbar.extends             "Luca.core.Container"
+
+toolbar.defines
   className: 'luca-ui-toolbar toolbar'
 
   position: 'bottom'
 
-  initialize: (@options={})->
-    Luca.core.Container::initialize.apply @, arguments
-
   prepareComponents: ()->
     _( @components ).each (component)=>
       component.container = @$el
 
   render: ()->
-    $(@container).append(@el)
+    $(@container).append(@el)
+    @

data/src/components/collection_loader_view.coffee

@@ -3,8 +3,10 @@
 # if you want to. Default implementation uses twitter bootstrap modal and
 # progress bar (http://twitter.github.com/bootstrap/). You template
 # should contain `progress`, `bar` and `message` classes
-_.def('Luca.components.CollectionLoaderView').extends('Luca.components.Template').with
+loaderView = Luca.register        "Luca.components.CollectionLoaderView"
+loaderView.extends                "Luca.View"
 
+loaderView.defines
   className: 'luca-ui-collection-loader-view'
 
   template: "components/collection_loader_view"

data/src/components/collection_view.coffee

@@ -1,4 +1,4 @@
-collectionView = Luca.define      "Luca.components.CollectionView"
+collectionView = Luca.register      "Luca.components.CollectionView"
 # The CollectionView facilitates the rendering of a Collection
 # of models into a group of many rendered templates
 # 
@@ -16,17 +16,16 @@ collectionView = Luca.define      "Luca.components.CollectionView"
 #
 collectionView.extends            "Luca.components.Panel"
 
-collectionView.behavesAs          "LoadMaskable", 
-                                  "Filterable", 
-                                  "Paginatable"
+collectionView.mixesIn          "LoadMaskable", 
+                                "Filterable", 
+                                "Paginatable"
 
-collectionView.triggers           "before:refresh",
-                                  "after:refresh",
-                                  "refresh",
-                                  "empty:results"
-
-collectionView.defaults
+collectionView.triggers         "before:refresh",
+                                "after:refresh",
+                                "refresh",
+                                "empty:results"
 
+collectionView.defines
   tagName: "ol"
 
   className: "luca-ui-collection-view"
@@ -43,11 +42,13 @@ collectionView.defaults
 
   itemClassName: 'collection-item'
 
+
   initialize: (@options={})->
     _.extend(@, @options)
 
     _.bindAll @, "refresh"
 
+
     unless @collection? or @options.collection
       console.log "Error on initialize of collection view", @
       throw "Collection Views must specify a collection"
@@ -55,12 +56,14 @@ collectionView.defaults
     unless @itemTemplate? || @itemRenderer? || @itemProperty?
       throw "Collection Views must specify an item template or item renderer function"
 
-    Luca.components.Panel::initialize.apply(@, arguments)
-
-    if _.isString(@collection) and Luca.CollectionManager.get()
-      @collection = Luca.CollectionManager.get().getOrCreate(@collection)
+    if _.isString(@collection) 
+      if Luca.CollectionManager.get()
+        @collection = Luca.CollectionManager.get().getOrCreate(@collection)
+      else
+        console.log "String Collection but no collection manager"
 
     unless Luca.isBackboneCollection(@collection)
+      console.log "Missing Collection on #{ @name || @cid }", @, @collection
       throw "Collection Views must have a valid backbone collection"
 
       @collection.on "before:fetch", ()=>
@@ -79,12 +82,14 @@ collectionView.defaults
       if @observeChanges is true
         @collection.on "change", @refreshModel, @
 
+    Luca.components.Panel::initialize.apply(@, arguments)
+
     unless @autoRefreshOnModelsPresent is false
       @defer ()=> 
         @refresh() if @collection.length > 0
       .until("after:render")
 
-    @on "collection:change", @refresh, @
+    @on "refresh", @refresh, @
 
   attributesForItem: (item, model)->
     _.extend {}, class: @itemClassName, "data-index": item.index, "data-model-id": item.model.get('id')
@@ -116,15 +121,32 @@ collectionView.defaults
   getCollection: ()->
     @collection
 
+  loadModels: (models=[], options={})->
+    @getCollection()?.reset(models, options)
+
+  applyQuery: (query={},queryOptions={})->
+    @query = query
+    @queryOptions = queryOptions
+    @refresh()
+    @
+
   # Private: returns the query that is applied to the underlying collection.
   # accepts the same options as Luca.Collection.query's initial query option.
   getQuery: ()-> 
-    @query ||= {}
+    query = @query ||= {}
+    for querySource in _( @querySources || [] ).compact()
+      query = _.extend(query, (querySource()||{}) ) 
+    query
 
   # Private: returns the query that is applied to the underlying collection.
   # accepts the same options as Luca.Collection.query's initial query option.
   getQueryOptions: ()-> 
-    @queryOptions ||= {}
+    options = @queryOptions ||= {}
+
+    for optionSource in _( @optionsSources || [] ).compact()
+      options = _.extend(options, (optionSource()||{}) ) 
+
+    options
 
   # Private: returns the models to be rendered.  If the underlying collection
   # responds to @query() then it will use that interface. 
@@ -145,12 +167,12 @@ collectionView.defaults
     @locateItemElement(model.get('id')).empty().append( @contentForItem({model,index}, model) )
     @trigger("model:refreshed", index, model)
 
-  refresh: (query,options)->
-    query ||= @getQuery()
+  refresh: (query,options,models)->
+    query   ||= @getQuery()
     options ||= @getQueryOptions()
+    models  ||= @getModels(query, options)
 
     @$bodyEl().empty()
-    models = @getModels(query, options)
 
     @trigger("before:refresh", models, query, options)
 
@@ -158,7 +180,6 @@ collectionView.defaults
       @trigger("empty:results")
 
     index = 0
-
     for model in models
       @$append @makeItem(model, index++)
 

data/src/components/controller.coffee

@@ -1,5 +1,7 @@
-_.def('Luca.components.Controller').extends('Luca.containers.CardView').with
+controller = Luca.register        "Luca.components.Controller"
+controller.extends                "Luca.containers.CardView"
 
+controller.defines
   additionalClassNames:['luca-ui-controller']
 
   activeAttribute: "active-section"

data/src/components/fields/button_field.coffee

@@ -1,18 +1,23 @@
-_.def('Luca.fields.ButtonField').extends('Luca.core.Field').with
+buttonField = Luca.register         "Luca.fields.ButtonField"
 
-  readOnly: true
+buttonField.extends                 "Luca.core.Field"
 
-  events:
-    "click input" : "click_handler"
-
-  hooks:[
-    "button:click"
-  ]
+buttonField.triggers                "button:click"
 
-  className: 'luca-ui-field luca-ui-button-field'
+buttonField.publicConfiguration
+  readOnly:     true
+  input_value:  undefined 
+  input_type:   "button" 
+  icon_class:   undefined
+  input_name:   undefined
+  white:        undefined
 
-  template: 'fields/button_field'
+buttonField.privateConfiguration
+  template: "fields/button_field"
+  events:
+    "click input" : "click_handler"
 
+buttonField.privateInterface
   click_handler: (e)->
     me = my = $( e.currentTarget )
     @trigger "button:click"
@@ -29,10 +34,12 @@ _.def('Luca.fields.ButtonField').extends('Luca.core.Field').with
     @input_id ||= _.uniqueId('button')
     @input_name ||= @name ||= @input_id
     @input_value ||= @label ||= @text
-    @input_type ||= "button"
     @input_class ||= @class
     @icon_class ||= ""
     @icon_class = "icon-#{ @icon_class }" if @icon_class.length and !@icon_class.match(/^icon-/)
     @icon_class += " icon-white" if @white
 
-  setValue: ()-> true
+  setValue: ()-> true
+
+buttonField.defines
+  version: 1

data/src/components/fields/checkbox_array.coffee

@@ -1,6 +1,9 @@
 make = Luca.View::make
 
-_.def('Luca.fields.CheckboxArray').extends('Luca.core.Field').with
+checkboxArray = Luca.register     "Luca.fields.CheckboxArray"
+checkboxArray.extends             "Luca.core.Field"
+
+checkboxArray.defines
   version: 2
 
   template: "fields/checkbox_array"
@@ -14,7 +17,7 @@ _.def('Luca.fields.CheckboxArray').extends('Luca.core.Field').with
 
   initialize: (@options={})->
     _.extend @, @options
-    _.extend @, Luca.modules.Deferrable
+    _.extend @, Luca.concerns.Deferrable
     _.bindAll @, "renderCheckboxes", "clickHandler", "checkSelected"
 
     Luca.core.Field::initialize.apply @, arguments
@@ -33,6 +36,9 @@ _.def('Luca.fields.CheckboxArray').extends('Luca.core.Field').with
 
     cbArray = @
 
+    unless Luca.isBackboneCollection(@collection)
+      throw "Checkbox Array Fields must specify a @collection property"
+      
     if @collection.length > 0
       @renderCheckboxes()
     else

data/src/components/fields/checkbox_field.coffee

@@ -1,13 +1,20 @@
-_.def('Luca.fields.CheckboxField').extends('Luca.core.Field').with
+checkboxField = Luca.register         "Luca.fields.CheckboxField"
 
-  events:
-    "change input" : "change_handler"
+checkboxField.extends                 "Luca.core.Field"
 
-  className: 'luca-ui-checkbox-field luca-ui-field'
-  template: 'fields/checkbox_field'
-  hooks: ["checked","unchecked"]
+checkboxField.triggers                "checked",
+                                      "unchecked"
+
+checkboxField.publicConfiguration
   send_blanks: true
+  input_value: 1
 
+checkboxField.privateConfiguration
+  template: 'fields/checkbox_field'
+  events:
+    "change input" : "change_handler"
+
+checkboxField.privateInterface
   change_handler: (e)->
     me = my = $(e.target)
 
@@ -24,14 +31,16 @@ _.def('Luca.fields.CheckboxField').extends('Luca.core.Field').with
 
     Luca.core.Field::initialize.apply @, arguments
 
-  afterInitialize: ()->
     @input_id ||= _.uniqueId('field')
     @input_name ||= @name
-    @input_value ||= 1
     @label ||= @name
 
+checkboxField.publicInterface
   setValue: (checked)->
     @getInputElement().attr('checked', checked)
 
   getValue:()->
-    @getInputElement().is(":checked")
+    @getInputElement().is(":checked")
+
+checkboxField.defines
+  version: 1

data/src/components/fields/file_upload_field.coffee

@@ -1,4 +1,8 @@
-_.def('Luca.fields.FileUploadField').extends('Luca.core.Field').with
+fileUpload = Luca.register              "Luca.fields.FileUploadField"
+fileUpload.extends                      "Luca.core.Field"
+
+fileUpload.defines
+  version: 1
 
   template: 'fields/file_upload_field'
 

data/src/components/fields/hidden_field.coffee

@@ -1,5 +1,7 @@
-_.def('Luca.fields.HiddenField').extends('Luca.core.Field').with
+hiddenField = Luca.register       "Luca.fields.HiddenField"
+hiddenField.extends               "Luca.core.Field"
 
+hiddenField.defines
   template: 'fields/hidden_field'
 
   afterInitialize: ()->

data/src/components/fields/label_field.coffee

@@ -1,6 +1,7 @@
-_.def("Luca.components.LabelField").extends("Luca.core.Field").with
-  className: "luca-ui-field luca-ui-label-field"
-    
+labelField = Luca.register          "Luca.components.LabelField"
+labelField.extends                  "Luca.core.Field"
+
+labelField.defines
   formatter: (value)->
     value ||= @getValue()
     _.str.titleize( value )

data/src/components/fields/select_field.coffee

@@ -1,13 +1,12 @@
-_.def('Luca.fields.SelectField').extends('Luca.core.Field').with
+selectField = Luca.register   "Luca.fields.SelectField"
 
-  events:
-    "change select" : "change_handler"
+selectField.extends           "Luca.core.Field"
 
-  hooks:[
-    "after:select"
-  ]
+selectField.triggers          "after:select"
 
-  className: 'luca-ui-select-field luca-ui-field'
+selectField.defines
+  events:
+    "change select" : "change_handler"
 
   template: "fields/select_field"
 
@@ -19,7 +18,7 @@ _.def('Luca.fields.SelectField').extends('Luca.core.Field').with
 
   initialize: (@options={})->
     _.extend @, @options
-    _.extend @, Luca.modules.Deferrable
+    _.extend @, Luca.concerns.Deferrable
     _.bindAll @, "change_handler", "populateOptions", "beforeFetch"
 
     Luca.core.Field::initialize.apply @, arguments

data/src/components/fields/text_field.coffee

@@ -1,5 +1,7 @@
+textField = Luca.register     'Luca.fields.TextField'
+textField.extends             'Luca.core.Field'
 
-_.def('Luca.fields.TextField').extends('Luca.core.Field').with
+textField.defines
   events:
     "blur input" : "blur_handler"
     "focus input" : "focus_handler"

data/src/components/fields/type_ahead_field.coffee

@@ -1,6 +1,8 @@
-_.def('Luca.fields.TypeAheadField').extends('Luca.fields.TextField').with
-  className: 'luca-ui-field'
+typeAheadField = Luca.register      "Luca.fields.TypeAheadField"
+typeAheadField.extends              "Luca.fields.TextField" 
 
+
+typeAheadField.defines
   getSource: ()->
     Luca.util.read(@source) || []
 

data/src/components/form_button_toolbar.coffee

@@ -1,5 +1,7 @@
-_.def('Luca.components.FormButtonToolbar').extends('Luca.components.Toolbar').with
+toolbar = Luca.register         "Luca.components.FormButtonToolbar"
+toolbar.extends                 "Luca.components.Toolbar"
 
+toolbar.defines
   className: 'luca-ui-form-toolbar form-actions'
 
   position: 'bottom'
@@ -8,6 +10,7 @@ _.def('Luca.components.FormButtonToolbar').extends('Luca.components.Toolbar').wi
 
   render: ()->
     $(@container).append(@el)
+    @
 
   initialize: (@options={})->
     Luca.components.Toolbar.prototype.initialize.apply @, arguments