luca 0.9.65 → 0.9.76

data/src/components/grid_view.coffee

@@ -57,9 +57,9 @@ _.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?
+    @loadMask = Luca.config.enableBoostrap unless @loadMask?
     @loadMaskEl ||= ".luca-ui-g-view-body" if @loadMask is true
 
     Luca.components.Panel::initialize.apply(@, arguments)
@@ -120,7 +120,7 @@ _.def('Luca.components.GridView').extend('Luca.components.Panel').with
     _( @additionalWrapperClasses ).each (containerClass)=>
       @wrapper?.addClass( containerClass )
 
-    if Luca.enableBootstrap
+    if Luca.config.enableBoostrap
       @table.addClass('table')
 
     _( @tableStyle?.split(" ") ).each (style)=>

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,7 +24,8 @@ multiView = Luca.define     "Luca.components.MultiCollectionView"
 #     ]
 multiView.extends           "Luca.containers.CardView"
 
-multiView.behavesAs         "LoadMaskable",
+multiView.mixesIn           "QueryCollectionBindings", 
+                            "LoadMaskable",
                             "Filterable",
                             "Paginatable"
 
@@ -33,7 +34,7 @@ multiView.triggers          "before:refresh",
                             "refresh",
                             "empty:results"
 
-multiView.defaultsTo
+multiView.defines
   version: 1
 
   stateful: true
@@ -48,48 +49,18 @@ multiView.defaultsTo
 
     validateComponent( view ) for view in @components    
 
+    Luca.containers.CardView::initialize.apply(@, arguments) 
+
     @on "refresh", @refresh, @
     @on "after:card:switch", @refresh, @
     @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")
 
-  getCollection: ()->
-    @collection
-
-  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 = @
 

data/src/components/pagination_control.coffee

@@ -17,7 +17,7 @@ paginationControl.defines
   afterInitialize: ()->
     _.bindAll @, "updateWithPageCount"
 
-    @state.on "change", (state, numberOfPages)=>
+    @state?.on "change", (state, numberOfPages)=>
       @updateWithPageCount( state.get('numberOfPages') )
 
   limit: ()->
@@ -70,8 +70,6 @@ paginationControl.defines
   updateWithPageCount: (@pageCount, models=[])->
     modelCount = models.length
 
-    console.log "Update With Page Count", @pageCount, modelCount
-
     @pageButtonContainer().empty()
 
     _( @pageCount ).times (index)=>

data/src/components/router.coffee

@@ -14,6 +14,8 @@ _.def("Luca.Router").extends("Backbone.Router").with
       @bind "route:#{ route_id }", ()=>
         @trigger.apply @, ["change:navigation", route_id  ].concat( _( arguments ).flatten() )
 
+    Backbone.Router.initialize?.apply(@, arguments)
+
   #### Router Functions
 
   # Intercept calls to Backbone.Router.navigate so that we can at least

data/src/components/table_view.coffee

@@ -9,6 +9,8 @@ _.def("Luca.components.TableView").extends("Luca.components.CollectionView").wit
   stateful: true
   observeChanges: true
 
+  widths: []
+  
   columns:[]
 
   emptyText: "There are no results to display"
@@ -19,13 +21,18 @@ _.def("Luca.components.TableView").extends("Luca.components.CollectionView").wit
   initialize: (@options={})->
     Luca.components.CollectionView::initialize.apply(@, arguments)
 
+    index = 0
     @columns = for column in @columns
+      if width = @widths[ index ]
+        column.width = width
+
       if _.isString(column)
         column = reader: column
 
       if !column.header?
         column.header = _.str.titleize(_.str.humanize(column.reader))
 
+      index++
       column
 
     @defer ()=> 

data/src/concerns.coffee

@@ -0,0 +1,70 @@
+Luca.concern = (mixinName)->
+  namespace = _( Luca.concern.namespaces ).detect (space)->
+    Luca.util.resolve(space)?[ mixinName ]?
+
+  namespace ||= "Luca.concerns"
+
+  resolved = Luca.util.resolve(namespace)[ mixinName ]
+
+  console.log "Could not find #{ mixinName } in ", Luca.concern.namespaces unless resolved?
+
+  resolved
+
+Luca.concern.namespaces = [
+  "Luca.concerns"
+]
+
+Luca.concern.namespace = (namespace)->
+  Luca.concern.namespaces.push(namespace)
+  Luca.concern.namespaces = _( Luca.concern.namespaces ).uniq()
+  
+Luca.concern.setup = ()->
+  if @concerns?.length > 0
+    for module in @concerns 
+      Luca.concern(module)?.__initializer?.call(@, @, module)  
+
+# Luca.decorate('Luca.View').with('Luca.concerns.MyCustomMixin')
+Luca.decorate = (target)->
+  try
+    if _.isString(target)
+      componentName = target
+      componentClass = Luca.util.resolve(componentName)
+
+    componentClass      = target if _.isFunction(target) 
+    componentPrototype  = componentClass.prototype 
+    componentName       = componentName || componentClass.displayName
+    componentName       ||= componentPrototype.displayName
+  catch e    
+    console.log e.message
+    console.log e.stack
+    console.log "Error calling Luca.decorate on ", componentClass, componentPrototype, componentName
+
+    throw(e)
+
+  return with: (mixinName)->
+    mixinDefinition = Luca.concern(mixinName)
+    mixinDefinition.__displayName ||= mixinName
+
+    mixinPrivates   = _( mixinDefinition ).chain().keys().select (key)-> 
+      "#{ key }".match(/^__/) or key is "classMethods"
+
+    sanitized   = _( mixinDefinition ).omit( mixinPrivates.value() )
+
+    _.extend(componentPrototype, sanitized)
+
+    if mixinDefinition.classMethods?
+      for method, fn of mixinDefinition.classMethods
+        componentClass[ method ] = _.bind(fn, componentClass)
+
+    # When a mixin is included, we may want to do things 
+    mixinDefinition?.__included?(componentName, componentClass, mixinDefinition)
+
+    superclassMixins = componentPrototype._superClass()::concerns
+
+    componentPrototype.concerns ||= []
+    componentPrototype.concerns.push( mixinName )
+    componentPrototype.concerns = componentPrototype.concerns.concat( superclassMixins )
+
+    componentPrototype.concerns = _( componentPrototype.concerns ).chain().uniq().compact().value()
+
+    componentPrototype

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/{modules → concerns}/filterable.coffee

@@ -1,4 +1,4 @@
-Luca.modules.Filterable = 
+Luca.concerns.Filterable = 
   __included: (component, module)->
     _.extend(Luca.Collection::, __filters:{})
 
@@ -24,21 +24,21 @@ Luca.modules.Filterable =
     @query ||= {}
     @queryOptions ||= {}
 
-    @querySources.push (()=> filter.toQuery())
-    @optionsSources.push (()=> filter.toOptions())
-
-    if @debugMode is true
-      console.log "Filterable"
-      console.log @querySources
-      console.log @optionsSources 
+    @querySources.push ((options={})=> @getFilterState().toQuery())
+    @optionsSources.push ((options={})=> @getFilterState().toOptions())
 
     filter.on "change", ()=> 
+      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()  
-        merged = _.extend(@getQuery(), @getQueryOptions())
-        @collection.applyFilter(merged, @getQueryOptions())
+        @collection.applyFilter(filter, remote: true)
       else
         @trigger "refresh" 
-
     module
 
   isRemote: ()->

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/{modules → concerns}/paginatable.coffee

@@ -1,4 +1,4 @@
-Luca.modules.Paginatable = 
+Luca.concerns.Paginatable = 
   paginatorViewClass: 'Luca.components.PaginationControl'
   paginationSelector: ".toolbar.bottom"
 
@@ -35,8 +35,14 @@ Luca.modules.Paginatable =
       _.extend(options, pager: @pager)
 
     paginationState.on "change:page", (state)=> 
-      if @isRemote() 
-        filter = _.extend(@toQuery(), @toQueryOptions()) 
+      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" 

data/src/concerns/query_collection_bindings.coffee

@@ -0,0 +1,44 @@
+Luca.concerns.QueryCollectionBindings = 
+  getCollection: ()->
+    @collection
+
+  loadModels: (models=[], options={})->
+    @getCollection()?.reset(models, options)
+
+  applyQuery: (query={},queryOptions={})->
+    @query = query
+    @queryOptions = queryOptions
+    @refresh()
+    @
+
+  # Private: returns the query that is applied to the underlying collection.
+  # accepts the same options as Luca.Collection.query's initial query option.
+  getQuery: (options={})-> 
+    query = @query ||= {}
+
+    for querySource in _( @querySources || [] ).compact()
+      query = _.extend(query, (querySource(options)||{}) ) 
+      
+    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: (options={})-> 
+    options = @queryOptions ||= {}
+
+    for optionSource in _( @optionsSources || [] ).compact()
+      options = _.extend(options, (optionSource(options)||{}) ) 
+
+    options
+
+  # 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()
+      options ||= @getQueryOptions()
+      
+      @collection.query(query, options)
+    else
+      @collection.models
+

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)