luca 0.9.76 → 0.9.89

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.
@@ -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
@@ -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/{src → 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/{src → 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.core.Container::initialize.apply(@, arguments)
+    Luca.Container::initialize.apply(@, arguments)
 
-    @enableFullscreen() if @fullscreen is true
+    if @fullscreen is true
+      @enableFullscreen() 
 
   enableFluid: ()-> @enableWrapper()
 
@@ -79,5 +78,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/{src → app/assets/javascripts/luca}/core/collection.coffee

@@ -24,7 +24,6 @@ collection.defines
 
   initialize: (models=[], @options)->
     _.extend @, @options
-    @setupMethodCaching()
     @_reset()
 
     # By specifying a @cache_key property or method, you can instruct
@@ -36,7 +35,7 @@ collection.defines
       console.log 'The @cached property of Luca.Collection is being deprecated.  Please change to cache_key'
 
     if @cache_key ||= @cached
-      @bootstrap_cache_key = if _.isFunction( @cache_key ) then @cache_key() else @cache_key
+      @bootstrap_cache_key = Luca.util.read(@cache_key) 
 
     if @registerAs or @registerWith
       console.log "This configuration API is deprecated.  use @name and @manager properties instead"
@@ -57,8 +56,8 @@ collection.defines
     # to be scoped with some sort of unique id, as say some sort of belongsTo relationship
     # then you can specify @registerAs as a method()
     if @manager
-      @name ||= @cache_key()
-      @name = if _.isFunction( @name ) then @name() else @name
+      @name ||= Luca.util.read(@cache_key) 
+      @name = Luca.util.read(@name) 
 
       unless @private or @anonymous
         @bind "after:initialize", ()=>
@@ -69,7 +68,7 @@ collection.defines
     # locally in localStorage
     if @useLocalStorage is true and window.localStorage?
       table = @bootstrap_cache_key || @name
-      throw "Must specify either a cached or registerAs property to use localStorage"
+      throw "Must specify a cache_key property or method to use localStorage"
       @localStorage = new Luca.LocalStore( table )
 
     # Populating a collection with local data
@@ -93,6 +92,8 @@ collection.defines
     Luca.concern.setup.call(@)
     Luca.util.setupHooks.call(@, @hooks)
 
+    @setupMethodCaching()
+
     @trigger "after:initialize"
 
   # Luca.Collections will append a query string to the URL
@@ -152,34 +153,32 @@ collection.defines
   # You can apply params to a collection, so that any upcoming requests
   # made to the REST API are made with the key values specified
   applyParams: (params)->
-    @base_params = _( Luca.Collection.baseParams() ).clone()
+    @base_params = _( Luca.Collection.baseParams() ).clone() || {}
     _.extend @base_params, params
 
     @
 
-  # If this collection is to be registered with some global collection
-  # tracker such as new Luca.CollectionManager() then we will register
-  # ourselves automatically
-  #
-  # To automatically register a collection with the registry, instantiate
-  # it with the registerWith property, which can either be a reference to
-  # the manager itself, or a string in case the manager isn't available
-  # at compile time
-  register: (collectionManager=Luca.CollectionManager.get(), key="", collection)->
-    throw "Can not register with a collection manager without a key" unless key.length >= 1
-    throw "Can not register with a collection manager without a valid collection manager" unless collectionManager?
+  register: (collectionManager, key="", collection)->
+    collectionManager ||= Luca.CollectionManager.get()
+
+    unless key.length >= 1
+      throw "Attempt to register a collection without specifying a key." 
+
 
     # by passing a string instead of a reference to an object, we can look up
     # that object only when necessary.  this prevents us from having to create
     # the manager instance before we can define our collections
     if _.isString( collectionManager )
-      collectionManager = Luca.util.nestedValue( collectionManager, (window || global) )
+      collectionManager = Luca.util.resolve( collectionManager )
 
-    throw "Could not register with collection manager" unless collectionManager
+    unless collectionManager?
+      throw "Attempt to register with a non existent collection manager." 
 
     if _.isFunction( collectionManager.add )
       return collectionManager.add(key, collection)
 
+    # If we don't want to use the CollectionManager class, and just want
+    # to cache collection instances on an object, we can do that too.
     if _.isObject( collectionManager )
       collectionManager[ key ] = collection
 
@@ -249,7 +248,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
@@ -296,6 +295,8 @@ collection.defines
       @clearMethodCache(name)
 
   setupMethodCaching: ()->
+    return unless @cachedMethods?.length > 0 
+
     collection = @
     membershipEvents = ["reset","add","remove"]
     cache = @_methodCache = {}
@@ -310,7 +311,7 @@ collection.defines
 
       # wrap the collection method with a basic memoize operation
       collection[ method ] = ()->
-        cache[method].value ||= cache[method].original.apply collection, arguments
+        cache[method].value ||= cache[method].original.apply(collection, arguments)
 
       # bind to events on the collection, which once triggered, will
       # invalidate the cached value.  causing us to have to restore it
@@ -321,7 +322,9 @@ collection.defines
       dependencies = method.split(':')[1]
 
       if dependencies
-        for dependency in dependencies.split(",")
+        watchForChangesOn = dependencies.split(",")
+
+        _( watchForChangesOn ).each (dependency)->
           collection.bind "change:#{dependency}", ()->
             collection.clearMethodCache(method: method)
 
@@ -329,9 +332,17 @@ collection.defines
   # make sure the querying interface from backbone.query is present
   # in the case backbone-query isn't loaded.  without it, it will
   # just return the models
+  #
+  # TODO:
+  # 
+  # Currently the View mixins: Filterable, Sortable, and Paginatable
+  # implement a lot of logic that belongs in this interface.
   query: (filter={},options={})->
     if Backbone.QueryCollection?
-      return Backbone.QueryCollection::query.apply(@, arguments)
+      if _.isFunction(prepare = options.prepare || @prepareQuery)
+        filter = prepare(filter) 
+
+      return Backbone.QueryCollection::query.call(@, filter, options)
     else
       @models
 
@@ -373,6 +384,9 @@ Luca.Collection.baseParams = (obj)->
 
   Luca.util.read( Luca.Collection._baseParams )
 
+Luca.Collection.resetBaseParams = ()->
+  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/components → app/assets/javascripts/luca/core}/collection_view.coffee

@@ -1,25 +1,14 @@
+# The CollectionView handles rendering a set of models from a 
+# collection
 collectionView = Luca.register      "Luca.components.CollectionView"
-# The CollectionView facilitates the rendering of a Collection
-# of models into a group of many rendered templates
-# 
-# Example:
-#
-#   new Luca.components.CollectionView 
-#     itemTemplate: "template_name"
-#     collection:   "collection_class_name"
-#     pagination:
-#       page: 1
-#       limit: 15
-#     filterable:
-#       query:
-#         default: 'value'     
-#
-collectionView.extends            "Luca.components.Panel"
+
+collectionView.extends            "Luca.Panel"
 
 collectionView.mixesIn            "QueryCollectionBindings", 
                                   "LoadMaskable", 
                                   "Filterable", 
-                                  "Paginatable"
+                                  "Paginatable",
+                                  "Sortable"
 
 collectionView.triggers           "before:refresh",
                                   "after:refresh",
@@ -73,25 +62,21 @@ collectionView.defines
       console.log "Missing Collection on #{ @name || @cid }", @, @collection
       throw "Collection Views must have a valid backbone collection"
 
-    @collection.on "before:fetch", ()=>
-      @trigger "enable:loadmask"
-      
-    @collection.bind "reset", ()=>
-      @refresh()
-      @trigger "disable:loadmask"
+    @on "data:refresh", @refresh, @
 
-    @collection.bind "remove", ()=>
-      @refresh()
+    @on "collection:reset", @refresh, @
+    @on "collection:remove", @refresh, @
+    @on "collection:add", @refresh, @
+    @on "collection:change", @refreshModel, @ if @observeChanges is true
 
-    @collection.bind "add", ()=>
-      @refresh()
+    Luca.Panel::initialize.apply(@, arguments)
 
-    if @observeChanges is true
-      @collection.on "change", @refreshModel, @
+    view = @
+    if @getCollection()?.length > 0
+      @on "after:render", ()->
+        view.refresh()
+        view.unbind "after:render", @
 
-    Luca.components.Panel::initialize.apply(@, arguments)
-
-    @on "refresh", @refresh, @
 
   attributesForItem: (item, model)->
     _.extend {}, class: @itemClassName, "data-index": item.index, "data-model-id": item.model.get('id')
@@ -138,7 +123,10 @@ collectionView.defines
     @trigger("before:refresh", models, query, options)
 
     if models.length is 0
-      @trigger("empty:results")
+      @trigger("empty:results", query, options)
+
+    if @getCollection()?.length > 0 and models.length is 0
+      @trigger("empty:filter", query, options)
 
     index = 0
     for model in models
@@ -156,11 +144,6 @@ collectionView.defines
     eventTrigger = _([domEvent,"#{ @itemTagName }.#{ @itemClassName }", selector]).compact().join(" ")
     Luca.View::registerEvent(eventTrigger,handler)
 
-  render: ()->
-    @refresh()
-    @$attach() if @$el.parent().length > 0 and @container?
-    @
-
 # Private Helpers
 
 

data/{src/plugins → app/assets/javascripts/luca/core}/events.coffee

@@ -9,7 +9,7 @@
 # or
 #
 # view.defer( myCallback ).until("triggered:event")
-class DeferredBindingProxy
+class Luca.DeferredBindingProxy
   constructor: (@object, operation, wrapWithUnderscore=true)->
     if _.isFunction(operation)
       fn = operation
@@ -41,10 +41,42 @@ class DeferredBindingProxy
 
     @object
 
+class Luca.EventRelayer
+  constructor: (options={})->
+    {@target,@events,@prefix,@source} = options
+
+    if @events.length > 0 and @target and @source
+      @setup()
+    @
+
+  prefixedBy: (@prefix="")->
+    @
+
+  from:(@source)->
+    @
+
+  to: (@target)->
+    @
+
+  setup: (@target)->
+    prefix = @prefix
+    target = @target
+
+    for eventId in @events
+      console.log "Binding to ", eventId, prefix, @target.name, @source.name
+      @source.on eventId, (args...)->
+        trigger = _( [prefix,eventId] ).compact().join(':')
+        args.unshift(trigger)
+        @trigger.apply(@, args)
+      , target
+
+
 Luca.Events =
+  relays: (events...)->
+    new Luca.EventRelayer(relayer: @, events: events)
 
   defer: (operation, wrapWithUnderscore=true)->
-    new DeferredBindingProxy(@, operation, wrapWithUnderscore)
+    new Luca.DeferredBindingProxy(@, operation, wrapWithUnderscore)
 
   once: (trigger, callback, context)->
     context ||= @
@@ -56,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