luca 0.9.4 → 0.9.6

data/src/core/field.coffee

@@ -27,15 +27,21 @@ _.def('Luca.core.Field').extends('Luca.View').with
     @input_id ||= _.uniqueId('field')
     @input_name ||= @name
     @input_class ||= ""
+    @input_type ||= ""
     @helperText ||= ""
     @label ||= "*#{ @label }" if @required and not @label?.match(/^\*/)
     @inputStyles ||= ""
+    @input_value ||= @value || ""
 
     @disable() if @disabled
 
     @updateState( @state )
     @placeHolder ||= ""
 
+    # In order to support using Luca.View template properties everywhere.
+
+    # Will need to work around how the field classes
+    # apply templates to themselves.
     Luca.View::initialize.apply(@, arguments)
 
   beforeRender: ()->
@@ -44,20 +50,17 @@ _.def('Luca.core.Field').extends('Luca.View').with
 
     @$el.addClass('required') if @required
 
-    @$el.html Luca.template(@template, @)
-    @input = $('input', @el)
-
   change_handler: (e)->
     @trigger "on:change", @, e
 
   disable: ()->
-    $("input",@el).attr('disabled', true)
+    @getInputElement().attr('disabled', true)
 
   enable: ()->
-    $("input", @el).attr('disabled', false)
+    @getInputElement().attr('disabled', false)
 
   getValue: ()->
-    raw = @input.attr('value')
+    raw = @getInputElement()?.attr('value')
 
     return raw if _.str.isBlank( raw )
 
@@ -67,11 +70,11 @@ _.def('Luca.core.Field').extends('Luca.View').with
       when "float" then parseFloat(raw)
       else raw
 
-  render: ()->
-    $( @container ).append( @$el )
-
   setValue: (value)->
-    @input.attr('value', value)
+    @getInputElement()?.attr('value', value)
+
+  getInputElement: ()->
+    @input ||= @$('input').eq(0)
 
   updateState: (state)->
     _( @statuses ).each (cls)=>

data/src/core/model.coffee

@@ -1,16 +1,26 @@
-# Computed Properties Support
-# ###
-#
-# Luca.Model supports computed properties, which are 
-# object methods which are composed of model attributes or
-# of calculations which are dependent on these attributes.
-
-# When these model attributes change, the computed property
-# needs to be re-evaluated.  
-#
-# The configuration API for computed properties expects a hash
-# whose keys are the name of the method, and whose value is
-# an array of the attribute dependencies for that method.  
+model = Luca.define       'Luca.Model'
+
+model.extends             'Backbone.Model'
+
+model.includes            'Luca.Events'
+
+model.defines
+  initialize: ()->
+    Backbone.Model::initialize(@, arguments)
+    setupComputedProperties.call(@)
+
+  read: (attr)->
+    if _.isFunction(@[attr])
+      @[attr].call(@)
+    else
+      @get(attr)
+
+  get: (attr)->
+    if @computed?.hasOwnProperty(attr)
+      @_computed[attr]
+    else
+      Backbone.Model::get.call @, attr
+
 setupComputedProperties = ()->
   return if _.isUndefined(@computed)
 
@@ -27,17 +37,3 @@ setupComputedProperties = ()->
         @trigger "change:#{attr}"
         
       @trigger "change:#{attr}" if @has(dep) 
-
-
-_.def('Luca.Model').extends('Backbone.Model').with
-  include: ['Luca.Events']
-
-  initialize: ()->
-    Backbone.Model::initialize @, arguments
-    setupComputedProperties.call(@)
-
-  get: (attr)->
-    if @computed?.hasOwnProperty(attr)
-      @_computed[attr]
-    else
-      Backbone.Model::get.call @, attr

data/src/core/registry.coffee

@@ -4,26 +4,41 @@ registry =
   collection_classes: {}
   namespaces:['Luca.containers','Luca.components']
 
-component_cache =
+componentCacheStore =
   cid_index: {}
   name_index: {}
 
 # For container views, if a component is defined with no ctype
 # then we will pick this one when using
-Luca.defaultComponentType = 'view'
+Luca.config.defaultComponentClass = Luca.defaultComponentClass  = 'Luca.View'
+Luca.config.defaultComponentType  = Luca.defaultComponentType   = 'view'
+
+Luca.registry.aliases = 
+  grid:         "grid_view"
+  form:         "form_view"
+  text:         "text_field"
+  button:       "button_field"
+  select:       "select_field"
+  card:         "card_view"
+  paged:        "card_view"
+  wizard:       "card_view"
+  collection:   "collection_view"
+  list:         "collection_view"
+  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:
-Luca.register = (component, prototypeName, componentType="view")->
+Luca.registerComponent = (component, prototypeName, componentType="view")->
   Luca.trigger "component:registered", component, prototypeName
 
   switch componentType
     when "model"
       registry.model_classes[ component ] = prototypeName
     when "collection"
-      registry.model_classes[ component ] = prototypeName
+      registry.collection_classes[ component ] = prototypeName
     else
       registry.classes[ component ] = prototypeName
 
@@ -38,7 +53,7 @@ Luca.development_mode_register = (component, prototypeName)->
     _( liveInstances ).each (instance)->
       instance?.refreshCode?.call(instance, prototypeDefinition)
 
-  Luca.register( component, prototypeName )
+  Luca.registerComponent( component, prototypeName )
 
 # We create a @ctype alias for this component definition, and register
 # the class in a registry.
@@ -46,7 +61,7 @@ Luca.development_mode_register = (component, prototypeName)->
 # If you use a custom namespace like MyApp.views.ListView,
 # then we will register MyApp.views as a namespace.  You can
 # do this yourself too.
-Luca.registry.addNamespace = (identifier)->
+Luca.registry.addNamespace = Luca.registry.namespace = (identifier)->
   registry.namespaces.push( identifier )
   registry.namespaces = _( registry.namespaces ).uniq()
 
@@ -61,16 +76,7 @@ Luca.registry.namespaces = (resolve=true)->
   _( registry.namespaces ).map (namespace)->
     if resolve then Luca.util.resolve( namespace ) else namespace
 
-Luca.registry.aliases = 
-  grid:       "grid_view"
-  form:       "form_view"
-  text:       "text_field"
-  button:     "button_field"
-  select:     "select_field"
-  card:       "card_view"
-  paged:      "card_view"
-  wizard:     "card_view"
-  collection: "collection_view"
+
 
 # Lookup a component in the Luca component registry
 # by it's ctype identifier.  If it doesn't exist,
@@ -87,15 +93,22 @@ Luca.registry.lookup = (ctype)->
 
   parents = Luca.registry.namespaces()
 
-  fullPath = _( parents ).chain().map((parent)->
-    parent[className]).compact().value()?[0]
+  fullPath = _( parents ).chain().map (parent)->
+    parent[className]
+  .compact().value()?[0]
 
 Luca.registry.instances = ()->
-  _( component_cache.cid_index ).values()
-  
+  _( componentCacheStore.cid_index ).values()
+ 
+Luca.registry.findInstancesByClass = (componentClass)->
+  Luca.registry.findInstancesByClassName( componentClass.displayName )
+
 Luca.registry.findInstancesByClassName = (className)->
+  className = className.displayName if not _.isString( className )
   instances = Luca.registry.instances() 
   _( instances ).select (instance)->
+    isClass = instance.displayName is className
+
     instance.displayName is className or instance._superClass?()?.displayName is className
 
 Luca.registry.classes = (toString=false)->
@@ -106,24 +119,24 @@ Luca.registry.classes = (toString=false)->
       className: className
       ctype: ctype
 
-Luca.cache = (needle, component)->
-  component_cache.cid_index[ needle ] = component if component?
+Luca.cache = Luca.cacheInstance = (cacheKey, object)->
+  return unless cacheKey?
+  return object if object?.doNotCache is true
 
-  component = component_cache.cid_index[ needle ]
+  if object?
+    componentCacheStore.cid_index[ cacheKey ] = object 
 
-  # optionally, cache it by tying its name to its cid for easier lookups
-  if component?.component_name?
-    Luca.trigger "component:created:#{ component.component_name }", component
-    component_cache.name_index[ component.component_name ] = component.cid
-  else if component?.name?
-    Luca.trigger "component:created:#{ component.component_name }", component
-    component_cache.name_index[ component.name ] = component.cid
+  object = componentCacheStore.cid_index[ cacheKey ]
 
-  return component if component?
-
-  # perform a lookup by name if the component_id didn't turn anything
-  lookup_id = component_cache.name_index[ needle ]
+  # optionally, cache it by tying its name to its cid for easier lookups
+  if object?.component_name?
+    componentCacheStore.name_index[ object.component_name ] = object.cid
+  else if object?.name?
+    componentCacheStore.name_index[ object.name ] = object.cid
 
-  component_cache.cid_index[ lookup_id ]
+  return object if object?
 
+  # perform a lookup by name if the cid lookup didn't turn anything
+  lookup_id = componentCacheStore.name_index[ cacheKey ]
 
+  componentCacheStore.cid_index[ lookup_id ]

data/src/core/view.coffee

@@ -1,100 +1,61 @@
-_.def("Luca.View").extends("Backbone.View").with
-  include: ['Luca.Events']
-
-  additionalClassNames:[]
-
-  hooks:[
-    "after:initialize"
-    "before:render"
-    "after:render"
-    "first:activation"
-    "activation"
-    "deactivation"
-  ]
-
+view = Luca.register    "Luca.View"
+
+view.extends            "Backbone.View"
+
+# includes are extensions to the prototype, and have no special behavior
+view.includes           "Luca.Events",
+                        "Luca.modules.DomHelpers"
+
+# mixins are includes with special property / method conventions
+# which customize the components through the use of __initializer and
+# __included method names.  These will be called every time an instance
+# is created, and the first time the mixin is used to enhance a component.
+view.mixesIn            "DomHelpers", 
+                        "Templating",
+                        "EnhancedProperties",
+                        "CollectionEventBindings",
+                        "ApplicationEventBindings",
+                        "StateModel"
+
+# Luca.View classes have the concept of special events called hooks
+# which allow you to tap into the lifecycle events of your view to 
+# customize their behavior.  This is especially useful in subclasses.
+#
+# You can utilize a @hook method by camelcasing the triggers defined below: 
+view.triggers           "before:initialize",
+                        "after:initialize",
+                        "before:render",
+                        "after:render",
+                        "first:activation",
+                        "activation",
+                        "deactivation"
+
+# Luca.View decorates Backbone.View with some patterns and conventions.
+view.defines
   initialize: (@options={})->
     @trigger "before:initialize", @, @options
 
     _.extend @, @options
 
-    @cid = _.uniqueId(@name) if @name?
+    if @autoBindEventHandlers is true or @bindAllEvents is true
+      bindAllEventHandlers.call(@) 
 
-    templateVars = if @bodyTemplateVars
-      @bodyTemplateVars.call(@)
-    else
-      @
-
-    if template = @bodyTemplate
-      @$el.empty()
-      Luca.View::$html.call(@, Luca.template(template, templateVars ) )
+    @cid = _.uniqueId(@name) if @name?
 
-    Luca.cache( @cid, @ )
+    @$el.attr("data-luca-id", @name || @cid)
+    
+    Luca.cacheInstance( @cid, @ )
 
     @setupHooks _( Luca.View::hooks.concat( @hooks ) ).uniq()
 
-    bindAllEventHandlers.call(@) if @autoBindEventHandlers is true or @bindAllEvents is true
-
-    if @additionalClassNames
-      @additionalClassNames = @additionalClassNames.split(" ") if _.isString(@additionalClassNames)
-
-    if @gridSpan
-      @additionalClassNames.push "span#{ @gridSpan }"
-
-    if @gridOffset
-      @additionalClassNames.push "offset#{ @gridOffset }"
-
-    if @gridRowFluid
-      @additionalClassNames.push "row-fluid"
-
-    if @gridRow
-      @additionalClassNames.push "row"
-
-    if @additionalClassNames?.length > 0
-      @$el.addClass( additional ) for additional in @additionalClassNames
-
-    @$wrap( @wrapperClass ) if @wrapperClass?
-
-    registerCollectionEvents.call(@)
-    registerApplicationEvents.call( @)
+    if @mixins?.length > 0
+      for module in @mixins 
+        Luca.mixin(module)?.__initializer?.call(@, @, module)
 
     @delegateEvents()
 
-    if @stateful is true and not @state?
-      @state = new Backbone.Model(@defaultState || {})
-      unless @set?
-        @set = _.bind @, @state.set
-        @get = _.bind @, @state.get
-
-    if @mixins?.length > 0
-      for module in @mixins
-        Luca.modules[ module ]._included.call(@, @, module)
-
     @trigger "after:initialize", @
 
-  $wrap: (wrapper)->
-    if _.isString(wrapper) and not wrapper.match(/[<>]/)
-      wrapper = @make("div",class:wrapper)
-
-    @$el.wrap( wrapper )
-
-  $template: (template, variables={})->
-    @$el.html( Luca.template(template,variables) )
-
-  $html: (content)->
-    @$el.html( content )
-
-  $append: (content)->
-    @$el.append( content )
-
-  $attach: ()->
-    @$container().append( @el )
-
-  $bodyEl: ()->
-    @$el
-    
-  $container: ()->
-    $(@container)
-
   #### Hooks or Auto Event Binding
   #
   # views which inherit from Luca.View can define hooks
@@ -114,12 +75,12 @@ _.def("Luca.View").extends("Backbone.View").with
     _(set).each (eventId)=>
       fn = Luca.util.hook( eventId )
 
-      callback = ()=>
+      callback = ()->
         @[fn]?.apply @, arguments
 
       callback = _.once(callback) if eventId?.match(/once:/)
 
-      @bind eventId, callback
+      @on eventId, callback, @
 
   registerEvent: (selector, handler)->
     @events ||= {}
@@ -146,9 +107,9 @@ _.def("Luca.View").extends("Backbone.View").with
     Backbone.View.prototype.trigger.apply @, arguments
 
 
-originalExtend = Backbone.View.extend
+Luca.View._originalExtend = Backbone.View.extend
 
-customizeRender = (definition)->
+Luca.View.renderWrapper = (definition)->
   _base = definition.render
 
   _base ||= Luca.View::$attach
@@ -164,7 +125,7 @@ customizeRender = (definition)->
         @deferrable = @collection
 
       target ||= @deferrable
-      trigger = if @deferrable_event then @deferrable_event else "reset"
+      trigger = if @deferrable_event then @deferrable_event else Luca.View.deferrableEvent 
 
       deferred = ()->
         _base.call(view)
@@ -194,63 +155,22 @@ customizeRender = (definition)->
   definition
 
 bindAllEventHandlers = ()->
-  _( @events ).each (handler,event)=>
-    if _.isString(handler)
-      _.bindAll @, handler
-
-registerApplicationEvents = ()->
-  return if _.isEmpty(@applicationEvents)
-
-  app = @app
-
-  if _.isString( app ) or _.isUndefined( app )
-    app = Luca.Application?.get?(app)
-
-  unless Luca.supportsEvents( app )
-    throw "Error binding to the application object on #{ @name || @cid }"
-
-  for eventTrigger, handler in @applicationEvents
-    handler = @[handler] if _.isString(handler) 
-
-    unless _.isFunction(handler)
-      throw "Error registering application event #{ eventTrigger } on #{ @name || @cid }"
-
-    app.on(eventTrigger, handler)
-
-registerCollectionEvents = ()->
-  return if _.isEmpty( @collectionEvents )
-
-  manager = @collectionManager
-
-  if _.isString( manager ) or _.isUndefined( manager )
-    manager = Luca.CollectionManager.get( manager )
-
-  for signature, handler of @collectionEvents
-    console.log "Sig", signature, "Handler", handler
-    [key,eventTrigger] = signature.split(" ")
-
-    collection = manager.getOrCreate( key )
-
-    if !collection
-      throw "Could not find collection specified by #{ key }"
+  for config in [@events, @componentEvents, @collectionEvents, @applicationEvents] when not _.isEmpty(config)
+    bindEventHandlers.call(@, config)    
 
+bindEventHandlers = (events={})->
+  for eventSignature, handler of events
     if _.isString(handler)
-      handler = @[handler]
-
-    unless _.isFunction(handler)
-      throw "invalid collectionEvents configuration"
-
-    try
-      collection.bind(eventTrigger, handler)
-    catch e
-      console.log "Error Binding To Collection in registerCollectionEvents", @
-      throw e
-
+      _.bindAll @, handler
 
 Luca.View.extend = (definition)->
-  definition = customizeRender( definition )
+  definition = Luca.View.renderWrapper( definition )
 
   if definition.mixins? and _.isArray( definition.mixins )
-    _.extend(definition, Luca.modules[module]) for module in definition.mixins
+    for module in definition.mixins
+      Luca.decorate( definition ).with( module )
+
+  Luca.View._originalExtend.call(@, definition)
+
 
-  originalExtend.call(@, definition)
+Luca.View.deferrableEvent = "reset"