luca 0.9.76 → 0.9.89

data/app/assets/javascripts/luca/components/table_view_scrollable.coffee

@@ -0,0 +1,23 @@
+scrollable = Luca.register      'Luca.components.ScrollableTable'
+
+scrollable.extends              'Luca.components.TableView'
+
+scrollable.replaces             'Luca.components.GridView'
+
+scrollable.publicConfiguration
+  maxHeight: undefined
+
+scrollable.privateMethods
+  $scrollableWrapperEl: ()->
+    @$el.parent('.scrollable-wrapper')
+
+  setMaxHeight: ()->
+    parent = @$scrollableWrapperEl()
+    parent.css('overflow':'auto', 'max-height': @maxHeight)
+
+  afterRender: ()->
+    @$wrap 'scrollable-wrapper'
+    @setMaxHeight()
+
+scrollable.defines
+  version: 1

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

@@ -16,4 +16,4 @@ Luca.concerns.ApplicationEventBindings =
       unless _.isFunction(handler)
         throw "Error registering application event #{ eventTrigger } on #{ @name || @cid }"
 
-      app.on(eventTrigger, handler)
+      app.on(eventTrigger, handler, @)

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

@@ -0,0 +1,47 @@
+Luca.concerns.CollectionEventBindings = 
+  __initializer: ()->
+
+    @defer ()=>
+      Luca.concerns.CollectionEventBindings.__setup.call(@)
+    .until("after:initialize")
+
+    unless @collectionEventBindingsSetup is true
+      if Luca.isBackboneCollection(@collection)
+        @collection.on "reset",         relayAs("collection:reset"), @
+        @collection.on "add",           relayAs("collection:add"), @
+        @collection.on "remove",        relayAs("collection:remove"), @
+        @collection.on "change",        relayAs("collection:change"), @
+        @collection.on "before:fetch",  relayAs("collection:fetch"), @
+        
+      @collectionEventBindingsSetup = true
+
+  __setup: ()->
+    return if _.isEmpty( @collectionEvents )
+
+    manager = @collectionManager || Luca.CollectionManager.get()
+
+    for signature, handler of @collectionEvents
+      [key,eventTrigger] = signature.split(" ")
+
+      collection = manager.getOrCreate( key )
+
+      if !collection
+        throw "Could not find collection specified by #{ key }"
+
+      if _.isString(handler)
+        handler = @[handler]
+
+      unless _.isFunction(handler)
+        throw "invalid collectionEvents configuration"
+
+      try
+        collection.on(eventTrigger, handler, @)
+      catch e
+        console.log "Error Binding To Collection in registerCollectionEvents", @
+        throw e
+
+
+relayAs = (eventName)->
+  (args...)->
+    args.unshift(eventName)
+    @trigger.apply(@, args)

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

@@ -8,8 +8,7 @@ Luca.concerns.Deferrable =
     if _.isString( @collection ) and collectionManager = Luca.CollectionManager?.get()
       @collection = collectionManager.getOrCreate(@collection)
 
-    # if there is already an instantiated backbone collection don't do anything
-    unless @collection and _.isFunction( @collection.fetch ) and _.isFunction( @collection.reset )
+    if _.isObject(@collection) and not Luca.isBackboneCollection(@collection) 
       @collection = new Luca.Collection( @collection.initial_set, @collection )
     
     if @collection?.deferrable_trigger

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

@@ -0,0 +1,30 @@
+Luca.concerns.DevelopmentToolHelpers = 
+  refreshEventBindings: ()->
+    view = @
+
+    console.log "Refreshing Event Bindings ON ", view.name || view.cid
+
+    view.undelegateEvents()
+
+    domEvents = view.definitionClass?()?.events || view.events
+
+    for eventSignature, eventName of domEvents when _.isString(eventName) is true
+      defaultEventHandler = view.definitionClass?()?[ eventName ]
+      console.log "Rebinding dom event", eventSignature, eventName, defaultEventHandler
+      view.events[ eventSignature ] = defaultEventHandler
+
+    if view.state? and view.stateful?
+      Luca.concerns.StateModel.__setupModelBindings.call(view, "off")
+      Luca.concerns.StateModel.__setupModelBindings.call(view, "on")
+
+    if view.isContainer is true and not _.isEmpty(view.componentEvents)
+      Luca.Container::registerComponentEvents.call(@,undefined,"off")
+      newBindings = view.definitionClass?()?.componentEvents
+
+      Luca.Container::registerComponentEvents.call(@,newBindings,"on")
+
+
+    #if @autoBindEventHandlers is true
+    #  @bindAllEventHandlers()
+
+    view.delegateEvents()

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

@@ -7,16 +7,16 @@ Luca.concerns.DomHelpers =
     if _.isString additionalClasses
       additionalClasses = additionalClasses.split(" ")
 
-    if @gridSpan
-      additionalClasses.push "span#{ @gridSpan }"
+    if span = @gridSpan || @span
+      additionalClasses.push "span#{ span }"
 
-    if @gridOffset
-      additionalClasses.push "offset#{ @gridOffset }"
+    if offset = @gridOffset || @offset
+      additionalClasses.push "offset#{ offset }"
 
-    if @gridRowFluid
+    if @gridRowFluid || @rowFluid
       additionalClasses.push "row-fluid"
 
-    if @gridRow
+    if @gridRow || @row
       additionalClasses.push "row"
 
     return unless additionalClasses?
@@ -40,7 +40,10 @@ Luca.concerns.DomHelpers =
     @$el.parent('[data-wrapper="true"]')  
 
   $template: (template, variables={})->
-    @$el.html( Luca.template(template,variables) )
+    try 
+      @$el.html( Luca.template(template,variables) )
+    catch e
+      console.log "Error in $template: #{ template } #{ @identifier?() ? @name || @cid }"
 
   $html: (content)->
     @$el.html( content )

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

@@ -1,4 +1,16 @@
-Luca.concerns.Filterable = 
+Luca.concerns.Filterable =
+  classMethods:
+    prepare: ()->
+      @trigger "data:refresh"
+      return unless @isRemote()
+
+      filter = _.clone(@getRemoteQuery())
+      options = _.clone(@getQueryOptions())
+
+      prepared = @prepareRemoteFilter(filter, options)
+
+      @collection.applyFilter(prepared, remote: true)
+
   __included: (component, module)->
     _.extend(Luca.Collection::, __filters:{})
 
@@ -6,6 +18,8 @@ Luca.concerns.Filterable =
     if @filterable is false
       return
 
+    @filterable = {} if @filterable is true
+
     # TEMP HACK
     unless Luca.isBackboneCollection(@collection)
       @collection = Luca.CollectionManager.get?()?.getOrCreate(@collection)
@@ -27,33 +41,39 @@ Luca.concerns.Filterable =
     @querySources.push ((options={})=> @getFilterState().toQuery())
     @optionsSources.push ((options={})=> @getFilterState().toOptions())
 
-    filter.on "change", ()=> 
-      filter = _.clone( @getQuery() )
-      options = _.clone( @getQueryOptions() )
+    filter.on "change", ()=> @trigger "filter:change"
 
-      filter.limit = options.limit if options.limit?
-      filter.page = options.page if options.page?
-      filter.sortBy = options.sortBy if options.sortBy?
+    @on "filter:change", Luca.concerns.Filterable.classMethods.prepare, @
 
-      if @isRemote()  
-        @collection.applyFilter(filter, remote: true)
-      else
-        @trigger "refresh" 
     module
 
+  prepareRemoteFilter: (filter={}, options={})->
+    filter[ Luca.config.apiLimitParameter ] = options.limit if options.limit?
+    filter[ Luca.config.apiPageParameter ] = options.page if options.page?
+    filter[ Luca.config.apiSortByParameter ] = options.sortBy if options.sortBy?
+    
+    filter
+
   isRemote: ()->
-    @getQueryOptions().remote is true    
+    return true if @getQueryOptions().remote is true
+    return true if @remoteFilterFallback is true and @getCollection()?.length is 0
 
   getFilterState: ()->
-    @collection.__filters[ @cid ] ||= new FilterModel(@filterable)
+    {options,query} = config = @filterable || {}
+
+    if !_.isEmpty(config) and (_.isEmpty(query) and _.isEmpty(options))
+      _.extend(options, _( config ).pluck('sortBy','page','limit') )
+
+    @collection.__filters[ @cid ] ||= new FilterModel
+      query: query || {}
+      options: options || {}
 
   setSortBy: (sortBy, options={})->
-   @getFilterState().setOption('sortBy', sortBy, options)
+    @getFilterState().setOption('sortBy', sortBy, options)
 
   applyFilter: (query={}, options={})->
     options = _.defaults(options, @getQueryOptions())
-    query = _.defaults(query, @getQuery())
-
+    @getFilterState().clear(silent: true)
     @getFilterState().set({query,options}, options)
 
 class FilterModel extends Backbone.Model
@@ -72,11 +92,10 @@ class FilterModel extends Backbone.Model
     @set 'query', _.extend(@toQuery(), payload), options
 
   toOptions: ()->
-    @toJSON().options
+    _.clone(@toJSON().options)
 
   toQuery: ()->
-    @toJSON().query
+    _.clone(@toJSON().query)
 
   toRemote: ()->
-    options = @toOptions() 
-    _.extend( @toQuery(), limit: options.limit, page: options.page, sortBy: options.sortBy )
+    Luca.concerns.Filterable.prepareRemoteFilter.call(@, @toQuery(), @toOptions())

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

@@ -0,0 +1,20 @@
+Luca.concerns.FormModelBindings = 
+  __initializer: ()->
+    return unless @trackModelChanges is true
+
+    @on "state:change:currentModel", @onStateChangeCurrentModel, @
+
+    _.bindAll(@, "onStateChangeCurrentModel", "unbindFromModel", "onModelChange", "bindToModel")
+
+  onStateChangeCurrentModel: (state, current, previous)->
+    @unbindFromModel(previous) if Luca.isBackboneModel(previous)
+    @bindToModel(current) if Luca.isBackboneModel(current)
+
+  unbindFromModel: (model)->
+    (model || @currentModel())?.unbind("change", @onModelChange)  
+
+  onModelChange: (model)->
+    @setValues(model, modelChange: true)
+
+  bindToModel: (model)->
+    (model || @currentModel())?.bind("change", @onModelChange, @)  

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

@@ -1,18 +1,24 @@
 Luca.concerns.LoadMaskable = 
   __initializer: ()->
-    return unless @loadMask is true
+    return if @loadMask is false or not @loadMask?
 
     if @loadMask is true
-      @defer ()=>
-        @$el.addClass('with-mask')
-
-        if @$('.load-mask').length is 0
-          @loadMaskTarget().prepend Luca.template(@loadMaskTemplate, @)
-          @$('.load-mask').hide()
-      .until("after:render")
-
-      @on (@loadmaskEnableEvent || "enable:loadmask"), @applyLoadMask, @
-      @on (@loadmaskDisableEvent || "disable:loadmask"), @applyLoadMask, @
+      @loadMask = 
+        enableEvent: "enable:loadmask"
+        disableEvent: "disable:loadmask"
+
+    @on "collection:fetch", ()=> @trigger "enable:loadmask"
+    @on "collection:reset", ()=> @trigger "disable:loadmask"
+
+    @on "after:render", ()->
+      @$el.addClass('with-mask')
+      if @$('.load-mask').length is 0 and @loadMaskTemplate?
+        @loadMaskTarget().prepend Luca.template(@loadMaskTemplate, @)
+        @$('.load-mask').hide()
+    , @
+
+    @on(@loadMask.enableEvent, @applyLoadMask, @)
+    @on(@loadMask.disableEvent, @applyLoadMask, @)
 
   showLoadMask: ()->
     @trigger("enable:loadmask")

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

@@ -0,0 +1,63 @@
+Luca.concerns.ModalView = 
+  version: 3
+
+  closeOnEscape: true
+
+  showOnInitialize: false
+
+  backdrop: false
+
+  __initializer: ()->
+    return unless @modal is true
+
+    @on "before:render", @applyModalConfig, @
+    
+    @
+
+  applyModalConfig: ()->
+    @$el.addClass 'modal'
+    @$el.addClass 'fade' if @fade is true
+
+    @$el.modal
+      backdrop: @backdrop is true
+      keyboard: @closeOnEscape is true
+      show: @showOnInitialize is true
+
+    @$el.css('display','none') unless @showOnInitialize is true
+    @      
+ 
+  container: ()->
+    $('body')
+
+  toggle: ()->
+    @$el.modal('toggle')
+
+  show: ()->
+    @render() unless @rendered is true
+    @trigger "before:show"
+    @$el.modal('show')
+    @trigger "after:show"
+
+  hide: ()->
+    @trigger "before:hide"
+    @$el.modal('hide')
+    @trigger "after:hide"
+
+  setModalDimensions: (height, width)->
+    if _.isObject(height)
+      {height,width} = height
+
+    @setModalHeight( height ) if height?
+    @setModalWidth( width ) if width?
+
+  setModalWidth: (width)->
+    @$el.css
+      "width": width
+      "max-width": width
+      "margin-left": width * 0.5 * -1
+
+  setModalHeight: (height)->
+    @$el.css
+      "max-height": height
+      "margin-top": height * 0.5 * -1
+      "height": height 

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

@@ -1,6 +1,6 @@
 Luca.concerns.Paginatable = 
   paginatorViewClass: 'Luca.components.PaginationControl'
-  paginationSelector: ".toolbar.bottom"
+  paginationSelector: ".toolbar.bottom.pagination-container"
 
   __included: ()->
     _.extend(Luca.Collection::, __paginators: {})
@@ -9,9 +9,8 @@ Luca.concerns.Paginatable =
     if @paginatable is false
       return
 
-    # TEMP HACK
-    unless Luca.isBackboneCollection(@collection)
-      @collection = Luca.CollectionManager.get?()?.getOrCreate(@collection)
+    if _.isNumber(@paginatable) or _.isString(@paginatable)
+      @paginatable = limit: parseInt(@paginatable), page: 1
 
     unless Luca.isBackboneCollection(@collection)
       @debug "Skipping Paginatable due to no collection being present on #{ @name || @cid }"
@@ -20,10 +19,7 @@ Luca.concerns.Paginatable =
 
     _.bindAll @, "paginationControl", "pager"
 
-    @getCollection ||= ()-> 
-      @collection
-
-    collection = @getCollection()
+    collection = (@getCollection ||= ()-> @collection)()
 
     paginationState = @getPaginationState()
 
@@ -34,19 +30,9 @@ Luca.concerns.Paginatable =
       options = _( paginationState.toJSON() ).pick('limit','page','sortBy')
       _.extend(options, pager: @pager)
 
-    paginationState.on "change:page", (state)=> 
-      filter = _.clone( @getQuery() )
-      options = _.clone( @getQueryOptions() )
-
-      filter.limit = options.limit if options.limit?
-      filter.page = options.page if options.page?
-      filter.sortBy = options.sortBy if options.sortBy?
-
-      if @isRemote()  
-        @collection.applyFilter(filter, remote: true)
-      else
-        @trigger "refresh" 
+    paginationState.on "change:page", ()=> @trigger "pagination:change"
 
+    @on "pagination:change",  Luca.concerns.Filterable.classMethods.prepare, @
     @on "before:render", @renderPaginationControl, @
 
   pager: (numberOfPages, models)->

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

@@ -18,26 +18,34 @@ Luca.concerns.QueryCollectionBindings =
 
     for querySource in _( @querySources || [] ).compact()
       query = _.extend(query, (querySource(options)||{}) ) 
-      
-    query
+          
+    Luca.util.readAll(query)
+
+  getRemoteQuery: (options = {}) ->
+    @getQuery(options)
+
+  getLocalQuery: (options = {}) ->
+    @getQuery(options)
 
   # Private: returns the query that is applied to the underlying collection.
   # accepts the same options as Luca.Collection.query's initial query option.
   getQueryOptions: (options={})-> 
-    options = @queryOptions ||= {}
+    queryOptions = @queryOptions ||= {}
 
     for optionSource in _( @optionsSources || [] ).compact()
-      options = _.extend(options, (optionSource(options)||{}) ) 
-
-    options
+      queryOptions = _.extend(queryOptions, (optionSource(options)||{}) ) 
 
+    queryOptions
   # Private: returns the models to be rendered.  If the underlying collection
   # responds to @query() then it will use that interface. 
   getModels: (query,options)->
     if @collection?.query
-      query ||= @getQuery()
+      query ||= @getLocalQuery()
       options ||= @getQueryOptions()
-      
+      options.prepare ||= @prepareQuery
+
+      # TODO
+      # Need to write specs for this  
       @collection.query(query, options)
     else
       @collection.models