luca 0.9.42 → 0.9.65

data/src/components/collection_view.coffee

@@ -1,15 +1,33 @@
-# Public: The CollectionView renders a collection of models into a list of items.
+collectionView = Luca.define      "Luca.components.CollectionView"
+# The CollectionView facilitates the rendering of a Collection
+# of models into a group of many rendered templates
 # 
-# Examples
+# Example:
 #
-#   _.def('App.ListView').extends('Luca.components.CollectionView').with
-#     collection: new App.SampleCollection()
-#     itemTemplate: "list_view_item"
-#     loadMask: true
+#   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"
 
-_.def("Luca.components.CollectionView").extends("Luca.components.Panel").with
-  tagName: "div"
+collectionView.behavesAs          "LoadMaskable", 
+                                  "Filterable", 
+                                  "Paginatable"
+
+collectionView.triggers           "before:refresh",
+                                  "after:refresh",
+                                  "refresh",
+                                  "empty:results"
+
+collectionView.defaults
+
+  tagName: "ol"
 
   className: "luca-ui-collection-view"
 
@@ -25,89 +43,147 @@ _.def("Luca.components.CollectionView").extends("Luca.components.Panel").with
 
   itemClassName: 'collection-item'
 
-  hooks:[
-    "empty:results"
-  ]
-  
+
   initialize: (@options={})->
     _.extend(@, @options)
 
     _.bindAll @, "refresh"
 
+
     unless @collection? or @options.collection
+      console.log "Error on initialize of collection view", @
       throw "Collection Views must specify a collection"
 
     unless @itemTemplate? || @itemRenderer? || @itemProperty?
       throw "Collection Views must specify an item template or item renderer function"
 
-    Luca.components.Panel::initialize.apply(@, arguments)
+    if _.isString(@collection) 
+      if Luca.CollectionManager.get()
+        @collection = Luca.CollectionManager.get().getOrCreate(@collection)
+      else
+        console.log "String Collection but no collection manager"
 
-    if _.isString(@collection) and Luca.CollectionManager.get()
-      @collection = Luca.CollectionManager.get().getOrCreate(@collection)
+    unless Luca.isBackboneCollection(@collection)
+      console.log "Missing Collection on #{ @name || @cid }", @, @collection
+      throw "Collection Views must have a valid backbone collection"
 
-    if Luca.isBackboneCollection(@collection)
       @collection.on "before:fetch", ()=>
-        @trigger "enable:loadmask" if @loadMask is true
+        @trigger "enable:loadmask"
         
       @collection.bind "reset", ()=>
-        @trigger "disable:loadmask" if @loadMask is true
+        @refresh()
+        @trigger "disable:loadmask"
+
+      @collection.bind "remove", ()=>
         @refresh()
 
-      @collection.bind "add", @refresh
-      @collection.bind "remove", @refresh
+      @collection.bind "add", ()=>
+        @refresh()
 
       if @observeChanges is true
-        setupChangeObserver.call(@)
+        @collection.on "change", @refreshModel, @
 
-    else
-      throw "Collection Views must have a valid backbone collection"
+    Luca.components.Panel::initialize.apply(@, arguments)
+
+    unless @autoRefreshOnModelsPresent is false
+      @defer ()=> 
+        @refresh() if @collection.length > 0
+      .until("after:render")
 
-    if @collection.length > 0
-      @refresh()
+    @on "refresh", @refresh, @
 
   attributesForItem: (item, model)->
     _.extend {}, class: @itemClassName, "data-index": item.index, "data-model-id": item.model.get('id')
 
   contentForItem: (item={})->
     if @itemTemplate? and templateFn = Luca.template(@itemTemplate)
-      # this is the model
-      content = templateFn.call(@, item)
+      return content = templateFn.call(@, item)
 
     if @itemRenderer? and _.isFunction( @itemRenderer )
-      content = @itemRenderer.call(@, item, item.model, item.index)
+      return content = @itemRenderer.call(@, item, item.model, item.index)
 
-    if @itemProperty
-      content = item.model.get(@itemProperty) || item.model[ @itemProperty ]
-      content = content() if _.isFunction(content)
+    if @itemProperty and item.model?
+      return content = item.model.read( @itemProperty )
 
-    content
+    ""
 
   makeItem: (model, index)->
     item = if @prepareItem? then @prepareItem.call(@, model, index) else (model:model, index: index)
-    make(@itemTagName, @attributesForItem(item, model), @contentForItem(item))
+    attributes = @attributesForItem(item, model) 
+    content = @contentForItem(item)
+    # TEMP
+    # Figure out why calls to make are failing with an unexpected string error
+    try
+      make(@itemTagName, attributes, content)
+    catch e
+      console.log "Error generating DOM element for CollectionView", @, model, index
+      #no op
+
+  getCollection: ()->
+    @collection
+
+  applyQuery: (query={},queryOptions={})->
+    @query = query
+    @queryOptions = queryOptions
+    @refresh()
+    @
 
-  getModels: ()->
-    if @collection?.query and (@filter || @filterOptions)
-      @collection.query(@filter, @filterOptions)
+  # Private: returns the query that is applied to the underlying collection.
+  # accepts the same options as Luca.Collection.query's initial query option.
+  getQuery: ()-> 
+    query = @query ||= {}
+    for querySource in _( @querySources || [] ).compact()
+      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: ()-> 
+    options = @queryOptions ||= {}
+
+    for optionSource in _( @optionsSources || [] ).compact()
+      options = _.extend(options, (optionSource()||{}) ) 
+
+    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
 
-
   locateItemElement: (id)->
     @$(".#{ @itemClassName }[data-model-id='#{ id }']")
 
   refreshModel: (model)->
     index = @collection.indexOf( model )
     @locateItemElement(model.get('id')).empty().append( @contentForItem({model,index}, model) )
+    @trigger("model:refreshed", index, model)
+
+  refresh: (query,options,models)->
+    query   ||= @getQuery()
+    options ||= @getQueryOptions()
+    models  ||= @getModels(query, options)
 
-  refresh: ()->
     @$bodyEl().empty()
 
-    if @getModels().length is 0
+    @trigger("before:refresh", models, query, options)
+
+    if models.length is 0
       @trigger("empty:results")
 
-    _( @getModels() ).each (model, index)=>
-      @$append( @makeItem(model, index) )
+    index = 0
+    for model in models
+      @$append @makeItem(model, index++)
+
+    @trigger("after:refresh", models, query, options)
+
+    @
 
   registerEvent: (domEvent, selector, handler)->
     if !handler? and _.isFunction(selector)
@@ -124,8 +200,5 @@ _.def("Luca.components.CollectionView").extends("Luca.components.Panel").with
 
 # Private Helpers
 
-make = Luca.View::make
 
-setupChangeObserver = ()->
-  @collection.on "change", (model)=> 
-    @refreshModel(model)
+make = Luca.View::make

data/src/components/fields/checkbox_field.coffee

@@ -31,7 +31,7 @@ _.def('Luca.fields.CheckboxField').extends('Luca.core.Field').with
     @label ||= @name
 
   setValue: (checked)->
-    @input.attr('checked', checked)
+    @getInputElement().attr('checked', checked)
 
   getValue:()->
-    @input.is(":checked")
+    @getInputElement().is(":checked")

data/src/components/fields/file_upload_field.coffee

@@ -2,9 +2,6 @@ _.def('Luca.fields.FileUploadField').extends('Luca.core.Field').with
 
   template: 'fields/file_upload_field'
 
-  initialize: (@options={})->
-    Luca.core.Field::initialize.apply @, arguments
-
   afterInitialize: ()->
     @input_id ||= _.uniqueId('field')
     @input_name ||= @name

data/src/components/fields/hidden_field.coffee

@@ -2,9 +2,6 @@ _.def('Luca.fields.HiddenField').extends('Luca.core.Field').with
 
   template: 'fields/hidden_field'
 
-  initialize: (@options={})->
-    Luca.core.Field::initialize.apply @, arguments
-
   afterInitialize: ()->
     @input_id ||= _.uniqueId('field')
     @input_name ||= @name

data/src/components/fields/label_field.coffee

@@ -1,14 +1,11 @@
 _.def("Luca.components.LabelField").extends("Luca.core.Field").with
   className: "luca-ui-field luca-ui-label-field"
     
-  getValue: ()->
-    @$('input').attr('value')
-
   formatter: (value)->
     value ||= @getValue()
     _.str.titleize( value )
 
   setValue: (value)->
     @trigger("change", value, @getValue())
-    @$('input').attr('value', value)
+    @getInputElement().attr('value', value)
     @$('.value').html( @formatter(value) )

data/src/components/fields/select_field.coffee

@@ -57,9 +57,10 @@ _.def('Luca.fields.SelectField').extends('Luca.core.Field').with
 
       hash
 
-  afterRender: ()->
-    @input = $('select', @el)
+  getInputElement: ()->
+    @input ||= @$('select').eq(0)
 
+  afterRender: ()->
     if @collection?.models?.length > 0
       @populateOptions()
     else
@@ -76,11 +77,10 @@ _.def('Luca.fields.SelectField').extends('Luca.core.Field').with
     @trigger "on:change", @, e
 
   resetOptions: ()->
-    @input.html('')
+    @getInputElement().html('')
 
     if @includeBlank
-      @input.append("<option value='#{ @blankValue }'>#{ @blankText }</option>")
-
+      @getInputElement().append("<option value='#{ @blankValue }'>#{ @blankText }</option>")
 
   populateOptions: ()->
     @resetOptions()
@@ -91,7 +91,7 @@ _.def('Luca.fields.SelectField').extends('Luca.core.Field').with
         display = model.get( @displayField )
         selected = "selected" if @selected and value is @selected
         option = "<option #{ selected } value='#{ value }'>#{ display }</option>"
-        @input.append( option )
+        @getInputElement().append( option )
 
     @trigger "after:populate:options", @
     @setValue( @currentValue )

data/src/components/fields/text_area_field.coffee

@@ -19,6 +19,7 @@ _.def('Luca.fields.TextAreaField').extends('Luca.core.Field').with
     @input_name ||= @name
     @label ||= @name
     @input_class ||= @class
+    @input_value ||= ""
     @inputStyles ||= "height:#{ @height };width:#{ @width }"
 
   setValue: (value)->

data/src/components/fields/text_field.coffee

@@ -21,7 +21,11 @@ _.def('Luca.fields.TextField').extends('Luca.core.Field').with
     @input_name ||= @name
     @label ||= @name
     @input_class ||= @class
+    @input_value ||= @value || "" 
 
+    # TODO
+    # Placeholder?
+    
     if @prepend
       @$el.addClass('input-prepend')
       @addOn = @prepend

data/src/components/fields/type_ahead_field.coffee

@@ -2,21 +2,17 @@ _.def('Luca.fields.TypeAheadField').extends('Luca.fields.TextField').with
   className: 'luca-ui-field'
 
   getSource: ()->
-    return @source.call(@) if _.isFunction(@source)
-    @source || []
+    Luca.util.read(@source) || []
 
   matcher: (item)->
-    # IMPLEMENT
-    # return true where item matches @query
     true
 
   beforeRender: ()->
-    @_super("beforeRender", @, arguments)
-    @$('input').attr('data-provide','typeahead')
+    Luca.fields.TextField::beforeRender.apply(@, arguments)
+    @getInputElement().attr('data-provide','typeahead')
 
   afterRender: ()->
-    @_super("afterRender", @, arguments)
-
-    @$('input').typeahead
+    Luca.fields.TextField::afterRender.apply(@, arguments)
+    @getInputElement().typeahead
       matcher: @matcher
       source: @getSource()

data/src/components/form_view.coffee

@@ -1,20 +1,3 @@
-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
 
   tagName: 'form'
@@ -54,6 +37,8 @@ _.def("Luca.components.FormView").extends('Luca.core.Container').with
 
     Luca.core.Container::initialize.apply @, arguments
 
+    @components ||= @fields
+
     _.bindAll @, "submitHandler", "resetHandler", "renderToolbars", "applyLoadMask"
 
     @state ||= new Backbone.Model
@@ -67,7 +52,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
@@ -110,7 +95,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)
@@ -199,17 +184,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
 
@@ -273,3 +258,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/multi_collection_view.coffee

@@ -0,0 +1,121 @@
+multiView = Luca.define     "Luca.components.MultiCollectionView"
+
+# The CollectionMultiView is a collection view with multiple renderings
+# of the list.  ( e.g. Icons, Table, List ).  It works by maintaining
+# a current view, and rendering that view.  It refreshes the views
+# whenever they are activated. 
+#
+# The MultiView allows you to share one collection, filter, pagination setup
+# but render multiple versions of a model.  To do this, you  are expected to
+# define one or more objects in the @views property of the component.
+
+# Example:
+#   multiView = new Luca.components.MultiCollectionView
+#     collection: "my_collection"
+#     paginatable:
+#       page: 1
+#       limit: 20
+#     views:[
+#       type:           "table"
+#       columns:[
+#         header: "Header"
+#         reader: "attribute"
+#       ]
+#     ]
+multiView.extends           "Luca.containers.CardView"
+
+multiView.behavesAs         "LoadMaskable",
+                            "Filterable",
+                            "Paginatable"
+
+multiView.triggers          "before:refresh",
+                            "after:refresh",
+                            "refresh",
+                            "empty:results"
+
+multiView.defaultsTo
+  version: 1
+
+  stateful: true
+
+  defaultState:
+    activeView: 0
+
+  viewContainerClass: "luca-ui-multi-view-container"
+
+  initialize: (@options={})->
+    @components ||= @views
+
+    validateComponent( view ) for view in @components    
+
+    @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 = @
+
+  # 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()
+
+      getQuery: ()->
+        container.getQuery.call(container)
+
+      getQueryOptions: ()->
+        container.getQueryOptions.call(container) 
+
+validateComponent = (component)->
+  type = (component.type || component.ctype)
+
+  return if  type is "collection" or 
+             type is "collection_view" or
+             type is "table" or
+             type is "table_view" 
+
+  throw "The MultiCollectionView expects to contain multiple collection views" 

data/src/components/pagination_control.coffee

@@ -0,0 +1,106 @@
+paginationControl = Luca.register   "Luca.components.PaginationControl"
+
+paginationControl.extends           "Luca.View"
+
+paginationControl.defines
+  template: "components/pagination"
+
+  stateful: true
+
+  autoBindEventHandlers: true
+
+  events:
+    "click a[data-page-number]" : "selectPage"
+    "click a.next"              : "nextPage"
+    "click a.prev"              : "previousPage"
+
+  afterInitialize: ()->
+    _.bindAll @, "updateWithPageCount"
+
+    @state.on "change", (state, numberOfPages)=>
+      @updateWithPageCount( state.get('numberOfPages') )
+
+  limit: ()->
+    parseInt (@state.get('limit') || @collection?.length)
+
+  page: ()->
+    parseInt (@state.get('page') || 1)
+
+  nextPage: ()->
+    return unless @nextEnabled()
+    @state.set('page', @page() + 1 )
+
+  previousPage: ()->
+    return unless @previousEnabled()
+    @state.set('page', @page() - 1 )
+
+  selectPage: (e)->
+    me = my = @$( e.target )
+    me = my = my.closest('a.page') unless me.is('a.page')
+
+    my.siblings().removeClass('is-selected')
+    me.addClass('is-selected')
+
+    @setPage( my.data('page-number') )
+
+  setPage: (page=1,options={})->
+    @state.set('page', page, options)
+
+  setLimit: (limit=1,options={})->
+    @state.set('limit', limit, options)
+
+  pageButtonContainer: ()->
+    @$ '.group'
+
+  previousEnabled: ()->
+    @page() > 1
+
+  nextEnabled: ()->
+    @page() < @totalPages()
+
+  previousButton: ()->
+    @$ 'a.page.prev'
+
+  nextButton: ()->
+    @$ 'a.page.next'
+
+  pageButtons: ()->
+    @$ 'a[data-page-number]', @pageButtonContainer()
+
+  updateWithPageCount: (@pageCount, models=[])->
+    modelCount = models.length
+
+    console.log "Update With Page Count", @pageCount, modelCount
+
+    @pageButtonContainer().empty()
+
+    _( @pageCount ).times (index)=>
+      page = index + 1
+      button = @make("a","data-page-number":page, class:"page", page )
+      @pageButtonContainer().append(button)
+
+    @toggleNavigationButtons()
+    @selectActivePageButton()
+
+    @
+
+  toggleNavigationButtons: ()->
+    @$('a.next, a.prev').addClass('disabled')
+    @nextButton().removeClass('disabled') if @nextEnabled()
+    @previousButton().removeClass('disabled') if @previousEnabled()
+
+  selectActivePageButton: ()->
+    @activePageButton().addClass('is-selected')
+
+  activePageButton: ()->
+    @pageButtons().filter("[data-page-number='#{ @page() }']")
+
+  totalPages: ()->
+    @pageCount
+
+  totalItems: ()->
+    parseInt @collection?.length || 0
+
+  itemsPerPage: (value, options={})->
+    @state.set("limit", value, options) if value?
+    parseInt @state.get("limit")