luca 0.9.7 → 0.9.8

data/app/assets/javascripts/luca/concerns/sortable.coffee

@@ -0,0 +1,69 @@
+Luca.concerns.Sortable = 
+  __included: (component, module)->
+    _.extend(Luca.Collection::, __sortables:{})
+
+  __initializer:()->
+    if @sortable is false
+      return
+
+    if _.isString(@sortable)
+      @sortable = sortBy: @sortable
+
+    unless Luca.isBackboneCollection(@collection)
+      @debug "Skipping Sortable due to no collection being present on #{ @name || @cid }"
+      @debug "collection", @collection
+      return
+
+    collection = (@getCollection ||= ()-> @collection)()
+
+    sortableState = @getSortableState()
+
+    @optionsSources ||= []
+    @queryOptions ||= {}
+
+    @optionsSources.push -> 
+      _(sortableState.toJSON()).pick('sortBy','order')
+
+    sortableState.on "change", ()=> @trigger "sortable:change"
+
+    @defer ()=>
+      @$(".sortable-toggle").on "click", (e)=>
+        me = my = @$( e.target )
+        me = my = my.closest('.sortable-toggle') 
+        @toggleSortOrderDirection( my.data('sortableSortBy') )
+
+    .until "after:render"
+
+    @on "sortable:change", Luca.concerns.Filterable.classMethods.prepare, @
+
+  isRemote: ()->
+    @getQueryOptions().remote is true    
+
+  getSortableState: ()->
+    options = _( @sortable || {} ).pick 'sortBy', 'order'
+    @collection.__sortables[ @cid ] ||= new SortableState(options)
+
+  sortBy: (field,order)->
+    @setSortBy(field) if field?
+    @setOrder(order) if order?
+    @
+
+  setSortBy: (field, options={})->
+    @getSortableState().set('sortBy', field, options)
+    @
+
+  toggleSortOrderDirection: (sortBy)->
+    current = @getSortableState().get('order') || "ASC"
+    changeTo = if current is "ASC" then "DESC" else "ASC"  
+    sortBy ||= @getSortableState().get('sortBy')
+    @sortBy(sortBy, changeTo)
+
+  setOrder: (order, options={})->
+    @getSortableState().set('order', order, options)
+    @
+
+Luca.util.makeSortableToggleElement = (el, sortBy, order)->
+  $(el).attr('data-sortable-sort-by', sortBy ).attr('data-sortable-order', order)
+  $(el)
+
+SortableState = Backbone.Model.extend()

data/app/assets/javascripts/luca/concerns/state_model.coffee

@@ -0,0 +1,44 @@
+Luca.concerns.StateModel =
+  __initializer: ()->
+    @stateful = @stateAttributes if @stateAttributes?
+
+    return unless @stateful?
+    return if @state? 
+    
+    if _.isObject(@stateful) and not @defaultState?
+      @defaultState = @stateful 
+
+    @state = new Backbone.Model(@defaultState || {})
+    @set = _.bind(@state.set, @state) 
+    @get = _.bind(@state.get, @state) 
+
+    for key, value of @state.toJSON()
+      hook = "on" + _.str.capitalize(key) + "Change"
+      getter = "get" + _.str.capitalize(key) 
+      unless _.isFunction(@[getter])
+        1
+        #console.log("State Change Getter", getter)
+        # @[getter] = ()=> @state.get(key)
+        # WE COULD CREATE AUTO GETTERS HERE
+
+      if _.isFunction(@[hook])
+        1
+        #console.log("State Change Hook", hook)
+        # @stateChangeEvents[ key ] = hook
+        # WE COULD AUTO BIND TO STATE CHANGE EVENTS HERE
+
+    unless _.isEmpty(@stateChangeEvents)
+      for attribute, handler of @stateChangeEvents
+        fn = if _.isString(handler) then @[handler] else handler 
+        
+        if attribute is "*"
+          @on "state:change", fn, @
+        else
+          @on "state:change:#{ attribute }", fn, @
+
+    @state.on "change", (state)=>
+      @trigger "state:change", state
+
+      for changed, value of state.changedAttributes()
+        @trigger "state:change:#{ changed }", state, value, state.previous(changed)
+

data/{src → app/assets/javascripts/luca}/concerns/templating.coffee

@@ -4,5 +4,8 @@ Luca.concerns.Templating =
 
     if template = @bodyTemplate
       @$el.empty()
-      templateContent = Luca.template(template, templateVars)      
+      try
+        templateContent = Luca.template(template, templateVars)      
+      catch e
+        console.log "Error Rendering #{ bodyTemplate} in View: #{ @identifier?() || @name || @cid }"
       Luca.View::$html.call(@, templateContent)

data/app/assets/javascripts/luca/config.coffee

@@ -0,0 +1,49 @@
+Luca.config.maintainStyleHierarchy = true
+Luca.config.maintainClassHierarchy = true
+Luca.config.autoApplyClassHierarchyAsCssClasses = true
+
+Luca.config.idAttributeType = "integer"
+
+Luca.config.apiSortByParameter  = 'sortBy'
+Luca.config.apiPageParameter    = 'page'
+Luca.config.apiLimitParameter   = 'limit'
+
+# When using Luca.define() should we automatically register
+# the component with the registry?
+Luca.autoRegister = Luca.config.autoRegister = true
+
+# if developmentMode is true, you have access to some neat development tools
+Luca.developmentMode = Luca.config.developmentMode = false
+
+# The Global Observer is very helpful in development
+# it observes every event triggered on every view, collection, model
+# and allows you to inspect / respond to them.  Use in production
+# may have performance impacts which has not been tested
+Luca.enableGlobalObserver = Luca.config.enableGlobalObserver = false
+
+# let's use the Twitter 2.0 Bootstrap Framework
+# for what it is best at, and not try to solve this
+# problem on our own!
+Luca.config.enableBoostrap = Luca.config.enableBootstrap = true
+
+Luca.config.enhancedViewProperties = true
+
+Luca.keys = Luca.config.keys =
+  ENTER: 13
+  ESCAPE: 27
+  KEYLEFT: 37
+  KEYUP: 38
+  KEYRIGHT: 39
+  KEYDOWN: 40
+  SPACEBAR: 32
+  FORWARDSLASH: 191
+
+Luca.config.toolbarContainerClass = "toolbar-container"
+
+# build a reverse map
+Luca.keyMap = Luca.config.keyMap = _( Luca.keys ).inject (memo, value, symbol)->
+  memo[value] = symbol.toLowerCase()
+  memo
+, {}
+
+Luca.config.showWarnings = true

data/{src → app/assets/javascripts/luca}/containers/card_view.coffee

@@ -1,5 +1,7 @@
 component = Luca.define         "Luca.containers.CardView"
-component.extends               "Luca.core.Container"
+component.extends               "Luca.Container"
+
+component.aliases               "Luca.PageView"
 #
 # The CardView is a type of Container which has many sub-views
 # which are only going to be visible one at a time.  A CardView
@@ -39,12 +41,20 @@ component.defaults
   generateComponentElements: true
 
   initialize: (@options)->
-    Luca.core.Container::initialize.apply @,arguments
-    @setupHooks(@hooks)
     @components ||= @pages ||= @cards 
+    Luca.Container::initialize.apply @,arguments
+    @setupHooks(@hooks)
+
+    @defer( @simulateActivationEvent, @ ).until("after:render")
+
+  simulateActivationEvent: ()->
+    c = @activeComponent()
+
+    if c? and @$el.is(":visible")
+      c?.trigger "activation", @, c, c 
 
   prepareComponents: ()->
-    Luca.core.Container::prepareComponents?.apply(@, arguments)
+    Luca.Container::prepareComponents?.apply(@, arguments)
     @componentElements().hide()
     @activeComponentElement().show()
 
@@ -80,7 +90,7 @@ component.defaults
   find: (name)-> Luca(name)
 
   firstActivation: ()->
-    @activeComponent().trigger "first:activation", @, @activeComponent()
+    @activeComponent()?.trigger "first:activation", @, @activeComponent()
 
   activate: (index, silent=false, callback)->
     if _.isFunction(silent)
@@ -99,28 +109,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/core → app/assets/javascripts/luca/containers}/container.coffee

@@ -1,6 +1,6 @@
-container = Luca.register         "Luca.core.Container"
+container = Luca.register         "Luca.Container"
 
-container.extends                 "Luca.components.Panel"
+container.extends                 "Luca.Panel"
 
 container.triggers                "before:components",
                                   "before:render:components",
@@ -9,6 +9,8 @@ container.triggers                "before:components",
                                   "after:layout",
                                   "first:activation"
 
+container.replaces                "Luca.Container"
+
 container.defines
   className: 'luca-ui-container'
 
@@ -31,7 +33,7 @@ container.defines
   # where component_accessor is either the name of the role, or a method on the container
   # which will find the component in question.
   #
-  # myContainer = new Luca.core.Container
+  # myContainer = new Luca.Container
   #   componentEvents:
   #     "name component:trigger"    : "handler"
   #     "role component:trigger"    : "handler"
@@ -42,10 +44,17 @@ 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.Container::hooks )
 
     validateContainerConfiguration(@)
 
@@ -100,9 +109,9 @@ container.defines
   beforeRender: ()->
     doLayout.call(@)
     doComponents.call(@)
-    Luca.components.Panel::beforeRender?.apply(@, arguments)
+    Luca.Panel::beforeRender?.apply(@, arguments)
 
-  # Components which inherit from Luca.core.Container can implement
+  # Components which inherit from Luca.Container can implement
   # their own versions of this method, if they need to apply any sort
   # of additional styling / configuration for the DOM elements that
   # are created to wrap each container.
@@ -114,13 +123,27 @@ container.defines
     @componentContainers = _( @components ).map (component, index)->
       applyDOMConfig.call(container, component, index)
 
+    componentsWithClassBasedAssignment = @_().select (component)->
+      _.isString(component.container) and component.container?.match(/^\./) and container.$( component.container ).length > 0
+
+    # TEMP / HACK / Workaround
+    #
+    # Containers with components assigned to .class-based-containers
+    # seem to get double rendered in the renderComponents() method.
+    #
+    # So here I am uniquely identifying the containers in a way that is not possible
+    # in the templates ( since we want to be able to inherit templates and component assignments )
+    if componentsWithClassBasedAssignment.length > 0
+      for specialComponent in componentsWithClassBasedAssignment
+        containerAssignment = _.uniqueId('container')
+        targetEl = container.$( specialComponent.container )
+        if targetEl.length > 0
+          $(targetEl).attr('data-container-assignment', containerAssignment)
+          specialComponent.container += "[data-container-assignment='#{ containerAssignment }']"
+
   prepareComponents: ()->
     container = @
 
-    # accept components as an array of strings representing
-    # the luca component type
-    for component in @components when _.isString(component)
-      component = (type: component)
 
     _( @components ).each (component, index)=>
       ce = componentContainerElement = @componentContainers?[index]
@@ -192,6 +215,7 @@ container.defines
           else
             object.type = object.ctype = Luca.defaultComponentType
 
+        object._parentCid ||= container.cid
         created = Luca.util.lazyComponent( object )
 
       # if we're using base backbone views, then they don't extend themselves
@@ -200,6 +224,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 }"
@@ -218,12 +244,25 @@ 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.trigger "before:attach"
+
+        containerElement = container.$(component.container)
+
+        if containerElement.length is 0
+          if _.isString( component.container )
+            # the container trying to assign this component to is not in the dom
+            1
+
+          # try in the window context.  this is almost always certainly a bug
+          # so look into wtf is going on and which components are problematic
+          containerElement = @$( component.container ).eq(0) if containerElement.length is 0
+
+        containerElement.append( component.el )
+
+        component.trigger "after:attach"
         component.render()
       catch e
         console.log "Error Rendering Component #{ component.name || component.cid }", component
@@ -365,7 +404,7 @@ container.defines
     @components[ needle ]
 
   isRootComponent:()->
-    !@getParent?
+    @rootComponent is true || !@getParent?
 
   getRootComponent: ()->
     if @isRootComponent() then @ else @getParent().getRootComponent()
@@ -389,7 +428,7 @@ container.defines
 # This is the method by which a container injects the rendered child views
 # into the DOM.  It will get passed the container object, and the component
 # that is being rendered.
-Luca.core.Container.componentRenderer = (container, component)->
+Luca.Container.componentRenderer = (container, component)->
   attachMethod = $( component.container )[ component.attachWith || "append" ]
   attachMethod( component.render().el )
 
@@ -429,7 +468,6 @@ createGetterMethods = ()->
 
   _( childrenWithGetter ).each (component)->
     container[ component.getter ] ||= ()->
-      console.log component.getter, component, container
       component
 
 createMethodsToGetComponentsByRole = ()->
@@ -446,6 +484,7 @@ createMethodsToGetComponentsByRole = ()->
 doComponents = ()->
   @trigger "before:components", @, @components
   @prepareComponents()
+  @trigger "before:create:components", @, @components
   @createComponents()
   @trigger "before:render:components", @, @components
   @renderComponents()

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

@@ -0,0 +1,2 @@
+#= require ./container
+#= require_directory .

data/{src → app/assets/javascripts/luca}/containers/modal_view.coffee

@@ -1,4 +1,4 @@
-_.def("Luca.ModalView").extends("Luca.core.Container").with
+_.def("Luca.ModalView").extends("Luca.Container").with
 
   closeOnEscape: true
 

data/{src → app/assets/javascripts/luca}/containers/panel_toolbar.coffee

@@ -1,4 +1,4 @@
-panelToolbar = Luca.register        "Luca.components.PanelToolbar"
+panelToolbar = Luca.register        "Luca.PanelToolbar"
 # The Panel Toolbar is a collection of buttons and / or dropdowns
 # which are automatically created by BasicPanel classes, or can be
 # added to any other view component.

data/{src → app/assets/javascripts/luca}/containers/tab_view.coffee

@@ -42,7 +42,7 @@ tabView.defines
     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 → app/assets/javascripts/luca}/containers/viewport.coffee

@@ -12,10 +12,10 @@ _.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)
+    Luca.Container::initialize.apply(@, arguments)
 
     @enableFullscreen() if @fullscreen is true
 
@@ -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: ()->