luca 0.9.6 → 0.9.7

data/src/components/form_view.coffee

@@ -1,42 +1,28 @@
-defaultToolbar =
-  buttons:[
-    icon:"remove-sign"
-    label: "Reset"
-    eventId: "click:reset"
-    className:"reset-button"
-    align: 'right'
-  ,
-    icon:"ok-sign"
-    white: true
-    label: "Save Changes"
-    eventId: "click:submit"
-    color: "success"
-    className: 'submit-button'
-    align: 'right'
-  ]
-
-_.def("Luca.components.FormView").extends('Luca.core.Container').with
-
+#_.def("Luca.components.FormView").extends('Luca.core.Container').with
+
+formView = Luca.register        "Luca.components.FormView"
+formView.extends                "Luca.core.Container"
+
+formView.triggers               "before:submit",
+                                "before:reset",
+                                "before:load",
+                                "before:load:new",
+                                "before:load:existing",
+                                "after:submit",
+                                "after:reset",
+                                "after:load",
+                                "after:load:new",
+                                "after:load:existing",
+                                "after:submit:success",
+                                "after:submit:fatal_error",
+                                "after:submit:error"
+
+
+formView.defines
   tagName: 'form'
 
   className: 'luca-ui-form-view'
 
-  hooks:[
-    "before:submit"
-    "before:reset"
-    "before:load"
-    "before:load:new"
-    "before:load:existing"
-    "after:submit"
-    "after:reset"
-    "after:load"
-    "after:load:new"
-    "after:load:existing"
-    "after:submit:success"
-    "after:submit:fatal_error"
-    "after:submit:error"
-  ]
-
   events:
     "click .submit-button" : "submitHandler"
     "click .reset-button" : "resetHandler"
@@ -47,7 +33,7 @@ _.def("Luca.components.FormView").extends('Luca.core.Container').with
 
   bodyClassName: "form-view-body"
 
-  version: "0.9.33333333"
+  version: 1 
 
   initialize: (@options={})->
     @loadMask = Luca.enableBootstrap unless @loadMask?
@@ -56,8 +42,7 @@ _.def("Luca.components.FormView").extends('Luca.core.Container').with
 
     @components ||= @fields
 
-    _.bindAll @, "submitHandler", "resetHandler", "renderToolbars", "applyLoadMask"
-
+    _.bindAll @, "submitHandler", "resetHandler", "renderToolbars"
     @state ||= new Backbone.Model
 
     @setupHooks( @hooks )
@@ -69,7 +54,7 @@ _.def("Luca.components.FormView").extends('Luca.core.Container').with
       @bottomToolbar = @getDefaultToolbar() unless @toolbar is "top"
 
   getDefaultToolbar: ()->
-    defaultToolbar
+    Luca.components.FormView.defaultFormViewToolbar
 
   applyStyleClasses: ()->
     if Luca.enableBootstrap
@@ -112,7 +97,7 @@ _.def("Luca.components.FormView").extends('Luca.core.Container').with
     passOne = _( @getFields('name', name) ).first()
     return passOne if passOne?
 
-    _( @getFields('input_name', name) ).first() 
+    _( @getFields('input_name', name) ).first()
 
   getFields: (attr,value)->
     fields = @selectByAttribute("isField", true, true)
@@ -201,17 +186,17 @@ _.def("Luca.components.FormView").extends('Luca.core.Container').with
       if options.skip_buttons and field.ctype is "button_field"
         skip = true
       else
-        if valueIsBlank and allowBlankValues is false 
-          skip = true 
+        if valueIsBlank and allowBlankValues is false
+          skip = true
 
         if field.input_name is "id" and valueIsBlank is true
           skip = true
 
       if options.debug
         console.log "Skip is true on #{ key }"
-        
+
       if skip isnt true
-        memo[ key ] = value 
+        memo[ key ] = value
 
       memo
 
@@ -275,3 +260,23 @@ _.def("Luca.components.FormView").extends('Luca.core.Container').with
   errorMessage: (message)->
     @$('.alert.alert-error').remove()
     @flash Luca.template("components/form_alert", className:"alert alert-error", message: message)
+
+
+Luca.components.FormView.defaultFormViewToolbar =
+  buttons:[
+    icon:"remove-sign"
+    label: "Reset"
+    eventId: "click:reset"
+    className:"reset-button"
+    align: 'right'
+  ,
+    icon:"ok-sign"
+    white: true
+    label: "Save Changes"
+    eventId: "click:submit"
+    color: "success"
+    className: 'submit-button'
+    align: 'right'
+  ]
+
+

data/src/components/grid_view.coffee

@@ -57,7 +57,7 @@ _.def('Luca.components.GridView').extend('Luca.components.Panel').with
 
   initialize: (@options={})->
     _.extend @, @options
-    _.extend @, Luca.modules.Deferrable
+    _.extend @, Luca.concerns.Deferrable
 
     @loadMask = Luca.enableBootstrap unless @loadMask?
     @loadMaskEl ||= ".luca-ui-g-view-body" if @loadMask is true

data/src/components/multi_collection_view.coffee

@@ -1,4 +1,4 @@
-multiView = Luca.define     "Luca.components.MultiCollectionView"
+multiView = Luca.register     "Luca.components.MultiCollectionView"
 
 # The CollectionMultiView is a collection view with multiple renderings
 # of the list.  ( e.g. Icons, Table, List ).  It works by maintaining
@@ -24,9 +24,9 @@ multiView = Luca.define     "Luca.components.MultiCollectionView"
 #     ]
 multiView.extends           "Luca.containers.CardView"
 
-multiView.behavesAs         "LoadMaskable",
-                            "Filterable",
-                            "Paginatable"
+multiView.mixesIn         "LoadMaskable",
+                          "Filterable",
+                          "Paginatable"
 
 multiView.triggers          "before:refresh",
                             "after:refresh",
@@ -48,29 +48,47 @@ multiView.defaultsTo
 
     validateComponent( view ) for view in @components    
 
-    @on "collection:change", @refresh, @
+    @on "refresh", @refresh, @
     @on "after:card:switch", @refresh, @
-    @on "before:components", propagateCollectionComponents, @
-    @on "after:components", bubbleCollectionEvents, @
+    @on "after:components", propagateCollectionComponents, @
+
+    @debug("multi collection , proto initialize")
 
     Luca.containers.CardView::initialize.apply(@, arguments) 
 
+  relayAfterRefresh: (models,query,options)->
+    @trigger "after:refresh", models, query, options
+
   refresh: ()->
     @activeComponent()?.trigger("refresh")
 
-  getQuery: Luca.components.CollectionView::getQuery
-  getQueryOptions: Luca.components.CollectionView::getQueryOptions
-  getCollection: Luca.components.CollectionView::getCollection
-  
-#### Private Helpers
+  getCollection: ()->
+    @collection
 
-bubbleCollectionEvents = ()->
-  container = @
-  container.eachComponent (component)->
-    for eventId in ['refresh','before:refresh','after:refresh','empty:results']
-      component.on eventId, ()->
-        if component is container.activeComponent()
-          container.trigger(eventId)
+  applyQuery: (query={},queryOptions={})->
+    @query = query
+    @queryOptions = queryOptions
+    @
+
+  # Private: returns the query that is applied to the underlying collection.
+  # accepts the same options as Luca.Collection.query's initial query option.
+  getQuery: ()-> 
+    @debug("Get Query")
+    query = @query ||= {}
+    for querySource in @querySources 
+      query = _.extend(query, (querySource()||{}) ) 
+    query
+
+  # Private: returns the query that is applied to the underlying collection.
+  # accepts the same options as Luca.Collection.query's initial query option.
+  getQueryOptions: ()-> 
+    @debug("Get Query Options")
+    options = @queryOptions ||= {}
+
+    for optionSource in @optionsSources 
+      options = _.extend(options, (optionSource()||{}) ) 
+
+    options  
 
 propagateCollectionComponents = ()->
   container = @
@@ -78,10 +96,19 @@ propagateCollectionComponents = ()->
   # in the multi view will share the same
   # collection, filter state, pagination options, etc
   for component in @components
+
+    component.on "after:refresh", (models,query,options)=> 
+      @debug "collection member after refresh"
+      @trigger("after:refresh",models,query,options)
+
     _.extend component, 
-      collection: container.getCollection?() || @collection 
-      getQuery: container.getQuery
-      getQueryOptions: container.getQueryOptions
+      collection: container.getCollection()
+
+      getQuery: ()->
+        container.getQuery.call(container)
+
+      getQueryOptions: ()->
+        container.getQueryOptions.call(container) 
 
 validateComponent = (component)->
   type = (component.type || component.ctype)

data/src/components/pagination_control.coffee

@@ -9,15 +9,16 @@ paginationControl.defines
 
   autoBindEventHandlers: true
 
-  events: 
+  events:
     "click a[data-page-number]" : "selectPage"
     "click a.next"              : "nextPage"
-    "click a.prev"              : "previousPage"  
+    "click a.prev"              : "previousPage"
 
   afterInitialize: ()->
-    _.bindAll @, "refresh"
+    _.bindAll @, "updateWithPageCount"
 
-    @state.on("change", @refresh, @)
+    @state?.on "change", (state, numberOfPages)=>
+      @updateWithPageCount( state.get('numberOfPages') )
 
   limit: ()->
     parseInt (@state.get('limit') || @collection?.length)
@@ -35,7 +36,7 @@ paginationControl.defines
 
   selectPage: (e)->
     me = my = @$( e.target )
-    me = my = my.closest('a.page') unless me.is('a.page') 
+    me = my = my.closest('a.page') unless me.is('a.page')
 
     my.siblings().removeClass('is-selected')
     me.addClass('is-selected')
@@ -50,9 +51,9 @@ paginationControl.defines
 
   pageButtonContainer: ()->
     @$ '.group'
-  
+
   previousEnabled: ()->
-    @page() > 1  
+    @page() > 1
 
   nextEnabled: ()->
     @page() < @totalPages()
@@ -64,14 +65,17 @@ paginationControl.defines
     @$ 'a.page.next'
 
   pageButtons: ()->
-    @$ 'a[data-page-number]', @pageButtonContainer()  
+    @$ 'a[data-page-number]', @pageButtonContainer()
+
+  updateWithPageCount: (@pageCount, models=[])->
+    modelCount = models.length
 
-  refresh: ()->
     @pageButtonContainer().empty()
 
-    for page in [1..@totalPages()]
+    _( @pageCount ).times (index)=>
+      page = index + 1
       button = @make("a","data-page-number":page, class:"page", page )
-      @pageButtonContainer().append(button) 
+      @pageButtonContainer().append(button)
 
     @toggleNavigationButtons()
     @selectActivePageButton()
@@ -90,11 +94,11 @@ paginationControl.defines
     @pageButtons().filter("[data-page-number='#{ @page() }']")
 
   totalPages: ()->
-    parseInt( Math.ceil(@totalItems() / @itemsPerPage()) )
+    @pageCount
 
   totalItems: ()->
     parseInt @collection?.length || 0
 
-  itemsPerPage: (value, options={})-> 
+  itemsPerPage: (value, options={})->
     @state.set("limit", value, options) if value?
     parseInt @state.get("limit")

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

@@ -1,4 +1,4 @@
-Luca.modules.ApplicationEventBindings = 
+Luca.concerns.ApplicationEventBindings = 
   __initializer: ()->
     return if _.isEmpty(@applicationEvents)
 

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

@@ -1,4 +1,4 @@
-Luca.modules.CollectionEventBindings = 
+Luca.concerns.CollectionEventBindings = 
   __initializer: ()->
     return if _.isEmpty( @collectionEvents )
 

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

@@ -1,7 +1,7 @@
 # TODO
 # 
 # This is horrendous code.  I need to replace it ASAP
-Luca.modules.Deferrable = 
+Luca.concerns.Deferrable = 
   configure_collection: (setAsDeferrable=true)->
     return unless @collection
 

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

@@ -1,4 +1,4 @@
-Luca.modules.DomHelpers = 
+Luca.concerns.DomHelpers = 
   __initializer: ()->
     additionalClasses = _( @additionalClassNames || [] ).clone()
 
@@ -24,12 +24,21 @@ Luca.modules.DomHelpers =
     for additional in additionalClasses
       @$el.addClass( additional )     
 
+    if Luca.config.autoApplyClassHierarchyAsCssClasses is true
+      classes = @componentMetaData?()?.styleHierarchy() || []
+
+      for cssClass in classes when (cssClass isnt "luca-view" and cssClass isnt "backbone-view")
+        @$el.addClass(cssClass)
+
   $wrap: (wrapper)->
     if _.isString(wrapper) and not wrapper.match(/[<>]/)
-      wrapper = @make("div",class:wrapper)
+      wrapper = @make("div",class:wrapper,"data-wrapper":true)
 
     @$el.wrap( wrapper )
 
+  $wrapper: ()->
+    @$el.parent('[data-wrapper="true"]')  
+
   $template: (template, variables={})->
     @$el.html( Luca.template(template,variables) )
 

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

@@ -1,4 +1,4 @@
-Luca.modules.EnhancedProperties = 
+Luca.concerns.EnhancedProperties = 
   __initializer: ()->
     return unless Luca.config.enhancedViewProperties is true 
 

data/src/concerns/filterable.coffee

@@ -0,0 +1,82 @@
+Luca.concerns.Filterable = 
+  __included: (component, module)->
+    _.extend(Luca.Collection::, __filters:{})
+
+  __initializer: (component, module)->
+    if @filterable is false
+      return
+
+    # TEMP HACK
+    unless Luca.isBackboneCollection(@collection)
+      @collection = Luca.CollectionManager.get?()?.getOrCreate(@collection)
+       
+    unless Luca.isBackboneCollection(@collection)
+      @debug "Skipping Filterable due to no collection being present on #{ @name || @cid }"
+      @debug "Collection", @collection
+      return
+
+    @getCollection ||= ()-> @collection
+
+    filter = @getFilterState()
+
+    @querySources ||= []
+    @optionsSources ||= []
+    @query ||= {}
+    @queryOptions ||= {}
+
+    @querySources.push (()=> filter.toQuery())
+    @optionsSources.push (()=> filter.toOptions())
+
+    if @debugMode is true
+      console.log "Filterable"
+      console.log @querySources
+      console.log @optionsSources 
+
+    filter.on "change", ()=> 
+      if @isRemote()  
+        merged = _.extend(@getQuery(), @getQueryOptions())
+        @collection.applyFilter(merged, @getQueryOptions())
+      else
+        @trigger "refresh" 
+
+    module
+
+  isRemote: ()->
+    @getQueryOptions().remote is true    
+
+  getFilterState: ()->
+    @collection.__filters[ @cid ] ||= new FilterModel(@filterable)
+
+  setSortBy: (sortBy, options={})->
+   @getFilterState().setOption('sortBy', sortBy, options)
+
+  applyFilter: (query={}, options={})->
+    options = _.defaults(options, @getQueryOptions())
+    query = _.defaults(query, @getQuery())
+
+    @getFilterState().set({query,options}, options)
+
+class FilterModel extends Backbone.Model
+  defaults:
+    options: {}
+    query: {}
+    
+  setOption: (option, value, options)->
+    payload = {}
+    payload[option] = value
+    @set 'options', _.extend(@toOptions(), payload), options
+
+  setQueryOption: (option, value, options)->
+    payload = {}
+    payload[option] = value
+    @set 'query', _.extend(@toQuery(), payload), options
+
+  toOptions: ()->
+    @toJSON().options
+
+  toQuery: ()->
+    @toJSON().query
+
+  toRemote: ()->
+    options = @toOptions() 
+    _.extend( @toQuery(), limit: options.limit, page: options.page, sortBy: options.sortBy )

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

@@ -1,4 +1,4 @@
-Luca.modules.GridLayout = 
+Luca.concerns.GridLayout = 
   _initializer: ()->
     if @gridSpan
       @$el.addClass "span#{ @gridSpan }"

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

@@ -1,4 +1,4 @@
-Luca.modules.LoadMaskable = 
+Luca.concerns.LoadMaskable = 
   __initializer: ()->
     return unless @loadMask is true
 

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

@@ -1,4 +1,4 @@
-Luca.modules.ModalView = 
+Luca.concerns.ModalView = 
   closeOnEscape: true
 
   showOnInitialize: false

data/src/concerns/model_presenter.coffee

@@ -0,0 +1,23 @@
+Luca.concerns.ModelPresenter = 
+  classMethods:
+    getPresenter: (format)->
+      @presenters?[format]
+
+    registerPresenter: (format, config)->
+      @presenters ||= {} 
+      @presenters[ format ] = config
+
+  presentAs: (format)->
+    try
+      attributeList = @componentMetaData().componentDefinition().getPresenter(format) 
+
+      return @toJSON() unless attributeList?
+
+      _( attributeList ).reduce (memo, attribute)=>
+        memo[ attribute ] = @read(attribute)
+        memo 
+      , {}
+
+    catch e
+      console.log "Error presentAs", e.stack, e.message
+      return @toJSON()

data/src/concerns/paginatable.coffee

@@ -0,0 +1,87 @@
+Luca.concerns.Paginatable = 
+  paginatorViewClass: 'Luca.components.PaginationControl'
+  paginationSelector: ".toolbar.bottom"
+
+  __included: ()->
+    _.extend(Luca.Collection::, __paginators: {})
+
+  __initializer:()->
+    if @paginatable is false
+      return
+
+    # TEMP HACK
+    unless Luca.isBackboneCollection(@collection)
+      @collection = Luca.CollectionManager.get?()?.getOrCreate(@collection)
+
+    unless Luca.isBackboneCollection(@collection)
+      @debug "Skipping Paginatable due to no collection being present on #{ @name || @cid }"
+      @debug "collection", @collection
+      return
+
+    _.bindAll @, "paginationControl", "pager"
+
+    @getCollection ||= ()-> 
+      @collection
+
+    collection = @getCollection()
+
+    paginationState = @getPaginationState()
+
+    @optionsSources ||= []
+    @queryOptions ||= {}
+
+    @optionsSources.push ()=> 
+      options = _( paginationState.toJSON() ).pick('limit','page','sortBy')
+      _.extend(options, pager: @pager)
+
+    paginationState.on "change:page", (state)=> 
+      if @isRemote() 
+        filter = _.extend(@toQuery(), @toQueryOptions()) 
+        @collection.applyFilter(filter, remote: true)
+      else
+        @trigger "refresh" 
+
+    @on "before:render", @renderPaginationControl, @
+
+  pager: (numberOfPages, models)->
+    @getPaginationState().set(numberOfPages: numberOfPages, itemCount: models.length)
+    @paginationControl().updateWithPageCount( numberOfPages, models )
+
+  isRemote: ()->
+    @getQueryOptions().remote is true    
+
+  getPaginationState: ()->
+    @collection.__paginators[ @cid ] ||= @paginationControl().state
+
+  paginationContainer: ()->
+    @$(">#{ @paginationSelector }")
+
+  setCurrentPage: (page=1, options={})->
+    @getPaginationState().set('page', page, options)
+
+  setPage: (page=1, options={})->
+    @getPaginationState().set('page', page, options)
+
+  setLimit: (limit=0,options={})->
+    @getPaginationState().set('limit', limit, options)
+
+  paginationControl: ()->
+    return @paginator if @paginator?
+
+    _.defaults(@paginatable ||= {}, page: 1, limit: 20)
+
+    @paginator = Luca.util.lazyComponent
+      type: "pagination_control" 
+      collection: @getCollection()
+      defaultState: @paginatable 
+      parent: (@name || @cid)
+      debugMode: @debugMode
+
+    @paginator
+
+  renderPaginationControl: ()->
+    control = @paginationControl()
+    @paginationContainer().append( control.render().$el )
+    control
+
+

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

@@ -1,4 +1,4 @@
-Luca.modules.StateModel =
+Luca.concerns.StateModel =
   __initializer: ()->
     return unless @stateful is true
     return if @state? and not Luca.isBackboneModel(@state)

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

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