luca 0.9.65 → 0.9.76

data/src/{modules → concerns}/templating.coffee

@@ -1,4 +1,4 @@
-Luca.modules.Templating =
+Luca.concerns.Templating =
   __initializer: ()->
     templateVars = Luca.util.read.call(@, @bodyTemplateVars) || {}
 

data/src/containers/card_view.coffee

@@ -39,9 +39,9 @@ component.defaults
   generateComponentElements: true
 
   initialize: (@options)->
+    @components ||= @pages ||= @cards 
     Luca.core.Container::initialize.apply @,arguments
     @setupHooks(@hooks)
-    @components ||= @pages ||= @cards 
 
   prepareComponents: ()->
     Luca.core.Container::prepareComponents?.apply(@, arguments)
@@ -99,28 +99,35 @@ component.defaults
     unless current
       return
 
-    unless silent
+    unless silent is true
       @trigger "before:card:switch", previous, current
-      previous?.trigger?.apply(previous,["before:deactivation", @, previous, current])
-      current?.trigger?.apply(previous,["before:activation", @, previous, current])
+      previous?.trigger "before:deactivation", @, previous, current
+      current?.trigger "before:activation", @, previous, current
 
       _.defer ()=>
         @$el.data( @activeAttribute || "active-card", current.name)
 
     @componentElements().hide()
 
-    unless current.previously_activated
+    unless current.previously_activated is true
       current.trigger "first:activation"
       current.previously_activated = true
 
     @activeCard = index
     @activeComponentElement().show()
 
-    unless silent
+    unless silent is true
       @trigger "after:card:switch", previous, current
-      previous.trigger?.apply(previous, ["deactivation", @, previous, current])
-      current.trigger?.apply(current, ["activation", @, previous, current])
+      previous?.trigger "deactivation", @, previous, current
+      current?.trigger "activation", @, previous, current
+
+    activationContext = @
 
+    if Luca.containers.CardView.activationContext is "current"
+      activationContext = current
 
     if _.isFunction(callback)
-      callback.apply @, [@,previous,current]
+      callback.apply activationContext, [@,previous,current]
+
+
+Luca.containers.CardView.activationContext = "current"

data/src/containers/tab_view.coffee

@@ -1,23 +1,20 @@
 _.def('Luca.containers.TabView').extends('Luca.containers.CardView').with
 
-  hooks:[
-    "before:select"
-    "after:select"
-  ]
-
-  componentType: 'tab_view'
-
-  className: 'luca-ui-tab-view tabbable'
+tabView = Luca.register       "Luca.containers.TabView"
+tabView.triggers              "before:select",
+                              "after:select"
 
+tabView.publicConfiguration
   tab_position: 'top'
-
   tabVerticalOffset: '50px'
 
+tabView.privateConfiguration
+  additionalClassNames: 'tabbable'
   navClass: "nav-tabs"
-
   bodyTemplate: "containers/tab_view"
   bodyEl: "div.tab-content"
 
+tabView.defines
   initialize: (@options={})->
     @navClass = "nav-list"if @navStyle is "list"
 
@@ -45,7 +42,7 @@ _.def('Luca.containers.TabView').extends('Luca.containers.CardView').with
     tabContainerId = @tabContainer().attr("id")
     @registerEvent("click ##{ tabContainerId } li a", "select")
 
-    if Luca.enableBootstrap and (@tab_position is "left" or @tab_position is "right")
+    if Luca.config.enableBoostrap and (@tab_position is "left" or @tab_position is "right")
       @tabContainerWrapper().addClass("span2")
       @tabContentWrapper().addClass("span9")
 

data/src/containers/viewport.coffee

@@ -12,7 +12,7 @@ _.def('Luca.containers.Viewport').extend('Luca.containers.CardView').with
   initialize: (@options={})->
     _.extend @, @options
 
-    if Luca.enableBootstrap is true
+    if Luca.config.enableBoostrap is true
       @wrapperClass = if @fluid is true then Luca.containers.Viewport.fluidWrapperClass else Luca.containers.Viewport.defaultWrapperClass 
 
     Luca.core.Container::initialize.apply(@, arguments)
@@ -42,7 +42,7 @@ _.def('Luca.containers.Viewport').extend('Luca.containers.CardView').with
   beforeRender: ()->
     Luca.containers.CardView::beforeRender?.apply(@, arguments)
 
-    #if Luca.enableBootstrap and @topNav and @fullscreen
+    #if Luca.config.enableBoostrap and @topNav and @fullscreen
     #  $('body').css('padding','40px')
 
     @renderTopNavigation() if @topNav?
@@ -57,7 +57,7 @@ _.def('Luca.containers.Viewport').extend('Luca.containers.CardView').with
   afterRender: ()->
     Luca.containers.CardView::after?.apply(@, arguments)
 
-    if Luca.enableBootstrap is true and @containerClassName
+    if Luca.config.enableBoostrap is true and @containerClassName
       @$el.children().wrap('<div class="#{ containerClassName }" />')
 
   renderTopNavigation: ()->

data/src/core/collection.coffee

@@ -1,12 +1,11 @@
 collection = Luca.define            'Luca.Collection'
-
-if Backbone.QueryCollection?
-  collection.extends                'Backbone.QueryCollection'
-else
-  collection.extends                'Backbone.Collection'
-
+collection.extends                  'Backbone.QueryCollection'
 collection.includes                 'Luca.Events'
 
+collection.triggers                 "after:initialize",  
+                                    "before:fetch",
+                                    "after:response"
+
 collection.defines    
   model: Luca.Model
   # cachedMethods refers to a list of methods on the collection
@@ -91,6 +90,9 @@ collection.defines
     if models
       @reset models, silent: true, parse: options?.parse
 
+    Luca.concern.setup.call(@)
+    Luca.util.setupHooks.call(@, @hooks)
+
     @trigger "after:initialize"
 
   # Luca.Collections will append a query string to the URL
@@ -139,11 +141,13 @@ collection.defines
     @
 
   applyFilter: (filter={}, options={})->
+    options = _( options ).clone()
+
     if options.remote? is true or @remoteFilter is true
       @applyParams(filter)
-      @fetch _.extend(options,refresh:true)
+      @fetch _.extend(options,refresh:true,remote:true)
     else
-      @reset @query filter
+      @reset @query(filter, options)
 
   # You can apply params to a collection, so that any upcoming requests
   # made to the REST API are made with the key values specified
@@ -211,7 +215,7 @@ collection.defines
     # fetch will try to pull from the bootstrap if it is setup to do so
     # you can actually make the roundtrip to the server anyway if you pass
     # refresh = true in the options hash
-    return @bootstrap() if @cached_models().length and not options.refresh
+    return @bootstrap() if @cached_models().length and not (options.refresh is true or options.remote is true)
 
     url = if _.isFunction(@url) then @url() else @url
 
@@ -230,10 +234,11 @@ collection.defines
   # reset trigger with a function wrapped in _.once
   # so that it only gets run...ahem...once.
   #
-  # that being said, if the collection already has models
   # it won't even bother fetching it it will just run
   # as if reset was already triggered
-  onceLoaded: (fn, options={autoFetch:true})->
+  onceLoaded: (fn, options={})->
+    _.defaults(options, autoFetch: true)
+
     if @length > 0 and not @fetching
       fn.apply @, [@]
       return
@@ -262,17 +267,6 @@ collection.defines
     unless @fetching is true or !options.autoFetch or @length > 0
       @fetch()
 
-  # parse is very close to the stock Backbone.Collection parse, which
-  # just returns the response.  However, it also triggers a callback
-  # after:response, and automatically parses responses which contain
-  # a JSON root like you would see in rails, if you specify the @root
-  # property.
-  #
-  # it will also update the Luca.Collection.cache with the models from
-  # the response, so that any subsequent calls to fetch() on a bootstrapped
-  # collection, will have updated models from the server.  Really only
-  # useful if you call fetch(refresh:true) manually on any bootstrapped
-  # collection
   parse: (response)->
     @fetching = false
     @trigger "after:response", response
@@ -350,17 +344,34 @@ _.extend Luca.Collection.prototype,
 
     Backbone.View.prototype.trigger.apply @, arguments
 
+Luca.Collection._originalExtend = Backbone.Collection.extend
+
+Luca.Collection.extend = (definition={})->
+  # for backward compatibility
+  definition.concerns ||= definition.concerns if definition.concerns?
+
+  componentClass = Luca.Collection._originalExtend.call(@, definition)
+
+  if definition.concerns? and _.isArray( definition.concerns )
+    for module in definition.concerns
+      Luca.decorate( componentClass ).with( module )
+
+  componentClass
+
+Luca.Collection.namespace = (namespace)->
+  namespace = Luca.util.resolve(namespace) if _.isString(namespace)
+  Luca.Collection.__defaultNamespace = namespace if namespace?
+  Luca.Collection.__defaultNamespace ||= (window || global)
+  Luca.util.read( Luca.Collection.__defaultNamespace )
+  
 # Always include these parameters in every request to your REST API.
 #
 # either specify a function which returns a hash, or just a normal hash
 Luca.Collection.baseParams = (obj)->
-  return Luca.Collection._baseParams = obj if obj
-
-  if _.isFunction( Luca.Collection._baseParams )
-    return Luca.Collection._baseParams()
+  obj = Luca.util.resolve(obj) if _.isString(obj)
+  Luca.Collection._baseParams = obj if obj
 
-  if _.isObject( Luca.Collection._baseParams )
-    Luca.Collection._baseParams
+  Luca.util.read( Luca.Collection._baseParams )
 
 # In order to make our Backbone Apps super fast it is a good practice
 # to pre-populate your collections by what is referred to as bootstrapping

data/src/core/container.coffee

@@ -42,10 +42,18 @@ container.defines
   initialize: (@options={})->
     _.extend @, @options
 
-    @setupHooks( Luca.core.Container::hooks )
-
     # aliases for the components property
     @components ||= @fields ||= @pages ||= @cards ||= @views
+    
+    # accept components as an array of strings representing
+    # the luca component type
+    for component in @components when _.isString(component)
+      component = (type: component, role: component, name: component)
+
+    _.bindAll(@, "beforeRender")
+
+    @setupHooks( Luca.core.Container::hooks )
+
 
     validateContainerConfiguration(@)
 
@@ -115,10 +123,8 @@ container.defines
       applyDOMConfig.call(container, component, index)
 
   prepareComponents: ()->
-    # accept components as an array of strings representing
-    # the luca component type
-    for component in @components when _.isString(component)
-      component = (type: component)
+    container = @
+
 
     _( @components ).each (component, index)=>
       ce = componentContainerElement = @componentContainers?[index]
@@ -130,6 +136,26 @@ container.defines
         panel = @make(@componentTag, componentContainerElement, '')
         @$append( panel )
 
+      # if the container defines a @defaults property
+      # then we should make sure our child components inherit
+      # these values unless specifically defined
+      if container.defaults?
+        component = _.defaults(component, (container.defaults || {}))
+
+      # if the container defines an @extensions property as an array of
+      # configuration objects, then we will extend the component config with
+      # the object in the matching position of the @extensions array.
+      if _.isArray(container.extensions) and _.isObject(container.extensions?[ index ])
+        componentExtension = container.extensions[index]
+        component = _.extend(component, componentExtension)
+
+      # if the container defines an @extensions property as an object of nested hashes,
+      # then extensions is a key/value pair whose key represents the role of the component
+      # that we wish to extend / customize 
+      if component.role? and _.isObject(container.extensions) and _.isObject(container.extensions[component.role])
+        componentExtension = container.extensions[component.role]
+        component = _.extend(component, componentExtension)
+        
       unless component.container?
         component.container = "##{ componentContainerElement.id }" if @generateComponentElements
         component.container ||= @$bodyEl()
@@ -170,11 +196,7 @@ container.defines
           else
             object.type = object.ctype = Luca.defaultComponentType
 
-        # if the container defines a @defaults property
-        # then we should make sure our child components inherit
-        # these values unless specifically defined
-        object = _.defaults(object, (container.defaults || {}))
-
+        object._parentCid ||= container.cid
         created = Luca.util.lazyComponent( object )
 
       # if we're using base backbone views, then they don't extend themselves
@@ -183,6 +205,8 @@ container.defines
       if !component.container and component.options?.container
         component.container = component.options.container
 
+      component.getParent ||= ()-> Luca( component._parentCid )
+
       if not component.container?
         console.log component,index,@
         console.error "could not assign container property to component on container #{ @name || @cid }"
@@ -201,10 +225,8 @@ container.defines
     @debug "container render components"
 
     container = @
-    _(@components).each (component)->
-      component.getParent = ()->
-        container
 
+    _(@components).each (component)->
       try
         @$( component.container ).eq(0).append( component.el )
         component.render()
@@ -348,7 +370,7 @@ container.defines
     @components[ needle ]
 
   isRootComponent:()->
-    !@getParent?
+    @rootComponent is true || !@getParent?
 
   getRootComponent: ()->
     if @isRootComponent() then @ else @getParent().getRootComponent()

data/src/core/field.coffee

@@ -1,26 +1,51 @@
-_.def('Luca.core.Field').extends('Luca.View').with
+field = Luca.register         "Luca.core.Field"
 
-  className: 'luca-ui-text-field luca-ui-field'
-
-  isField: true
+field.extends                 "Luca.View"
 
-  template: 'fields/text_field'
+field.triggers                "before:validation",
+                              "after:validation",
+                              "on:change"
 
+field.publicConfiguration   
   labelAlign: 'top'
-
-  hooks:[
-    "before:validation",
-    "after:validation",
-    "on:change"
-  ]
-
-  # see: http://twitter.github.com/bootstrap/base-css.html
+  className: 'luca-ui-text-field luca-ui-field'
   statuses: [
     "warning"
     "error"
     "success"
   ]
 
+field.publicInterface
+  disable: ()->
+    @getInputElement().attr('disabled', true)
+
+  enable: ()->
+    @getInputElement().attr('disabled', false)
+
+  getValue: ()->
+    raw = @getInputElement()?.attr('value')
+
+    return raw if _.str.isBlank( raw )
+
+    switch @valueType
+      when "integer" then parseInt(raw)
+      when "string" then "#{ raw }"
+      when "float" then parseFloat(raw)
+      else raw
+
+  setValue: (value)->
+    @getInputElement()?.attr('value', value)
+
+  updateState: (state)->
+    _( @statuses ).each (cls)=>
+      @$el.removeClass(cls)
+      @$el.addClass(state)
+
+field.privateConfiguration
+  isField: true
+  template: 'fields/text_field'
+
+field.defines
   initialize: (@options={})->
     _.extend @, @options
 
@@ -29,6 +54,7 @@ _.def('Luca.core.Field').extends('Luca.View').with
     @input_class ||= ""
     @input_type ||= ""
     @helperText ||= ""
+    @label = @name if not @label? or @label.length is 0
     @label ||= "*#{ @label }" if @required and not @label?.match(/^\*/)
     @inputStyles ||= ""
     @input_value ||= @value || ""
@@ -45,7 +71,7 @@ _.def('Luca.core.Field').extends('Luca.View').with
     Luca.View::initialize.apply(@, arguments)
 
   beforeRender: ()->
-    if Luca.enableBootstrap
+    if Luca.config.enableBoostrap
       @$el.addClass('control-group')
 
     @$el.addClass('required') if @required
@@ -53,30 +79,5 @@ _.def('Luca.core.Field').extends('Luca.View').with
   change_handler: (e)->
     @trigger "on:change", @, e
 
-  disable: ()->
-    @getInputElement().attr('disabled', true)
-
-  enable: ()->
-    @getInputElement().attr('disabled', false)
-
-  getValue: ()->
-    raw = @getInputElement()?.attr('value')
-
-    return raw if _.str.isBlank( raw )
-
-    switch @valueType
-      when "integer" then parseInt(raw)
-      when "string" then "#{ raw }"
-      when "float" then parseFloat(raw)
-      else raw
-
-  setValue: (value)->
-    @getInputElement()?.attr('value', value)
-
   getInputElement: ()->
     @input ||= @$('input').eq(0)
-
-  updateState: (state)->
-    _( @statuses ).each (cls)=>
-      @$el.removeClass(cls)
-      @$el.addClass(state)