luca 0.9.1 → 0.9.2

data/src/core/collection.coffee

@@ -12,54 +12,13 @@ _.def("Luca.Collection").extends( source ).with
   # @resetEvents are 'add','remove',reset' and 'change'.
   cachedMethods: []
 
-  restoreMethodCache: ()->
-    for name, config of @_methodCache
-      if config.original?
-        config.args = undefined
-        @[ name ] = config.original
-
-  clearMethodCache: (method)->
-    @_methodCache[method].value = undefined
-
-  clearAllMethodsCache: ()->
-    for name, config of @_methodCache
-      @clearMethodCache(name)
-
-  setupMethodCaching: ()->
-    collection = @
-    membershipEvents = ["reset","add","remove"]
-    cache = @_methodCache = {}
-
-    _( @cachedMethods ).each (method)->
-      # store a reference to the unwrapped version of the method
-      # and a placeholder for the cached value
-      cache[ method ] =
-        name: method
-        original: collection[method]
-        value: undefined
-
-      # wrap the collection method with a basic memoize operation
-      collection[ method ] = ()->
-        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
-      for membershipEvent in membershipEvents
-        collection.bind membershipEvent, ()->
-          collection.clearAllMethodsCache()
-
-      dependencies = method.split(':')[1]
-
-      if dependencies
-        for dependency in dependencies.split(",")
-          collection.bind "change:#{dependency}", ()->
-            collection.clearMethodCache(method: method)
+  # if filtering a collection should handle via a call to a REST API
+  # and return the filtered results that way, then leave this true
+  remoteFilter: false
 
   initialize: (models=[], @options)->
     _.extend @, @options
-
     @setupMethodCaching()
-
     @_reset()
 
     # By specifying a @cache_key property or method, you can instruct
@@ -80,6 +39,8 @@ _.def("Luca.Collection").extends( source ).with
     @name ||= @registerAs
     @manager ||= @registerWith
 
+    @manager = if _.isFunction(@manager) then @manager() else @manager
+
     # if they specify a
     if @name and not @manager
       @manager = Luca.CollectionManager.get()
@@ -162,15 +123,11 @@ _.def("Luca.Collection").extends( source ).with
     _.uniq(parts).join("&")
 
   resetFilter: ()->
-    @base_params = Luca.Collection.baseParams()
+    @base_params = _( Luca.Collection.baseParams() ).clone()
     @
 
-  # if filtering a collection should handle via a call to a REST API
-  # and return the filtered results that way, then leave this true
-  remoteFilter: true
-
   applyFilter: (filter={}, options={})->
-    if options.remote? is true
+    if options.remote? is true or @remoteFilter is true
       @applyParams(filter)
       @fetch _.extend(options,refresh:true)
     else
@@ -179,9 +136,11 @@ _.def("Luca.Collection").extends( source ).with
   # 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
@@ -286,7 +245,7 @@ _.def("Luca.Collection").extends( source ).with
     if @length > 0 and not @fetching
       fn.apply scope, [@]
 
-    @bind "reset", (collection)=> fn.apply scope, [collection]
+    @bind "reset", (collection)=> fn.call(scope,collection)
 
     unless @fetching is true or !options.autoFetch or @length > 0
       @fetch()
@@ -312,6 +271,62 @@ _.def("Luca.Collection").extends( source ).with
 
     models
 
+  # Method Caching
+  #
+  # Method Caching is a way of saving the output of a method on your collection.
+  # And then expiring that value if any changes are detected to the models in
+  # the collection
+  restoreMethodCache: ()->
+    for name, config of @_methodCache
+      if config.original?
+        config.args = undefined
+        @[ name ] = config.original
+
+  clearMethodCache: (method)->
+    @_methodCache[method].value = undefined
+
+  clearAllMethodsCache: ()->
+    for name, config of @_methodCache
+      @clearMethodCache(name)
+
+  setupMethodCaching: ()->
+    collection = @
+    membershipEvents = ["reset","add","remove"]
+    cache = @_methodCache = {}
+
+    _( @cachedMethods ).each (method)->
+      # store a reference to the unwrapped version of the method
+      # and a placeholder for the cached value
+      cache[ method ] =
+        name: method
+        original: collection[method]
+        value: undefined
+
+      # wrap the collection method with a basic memoize operation
+      collection[ method ] = ()->
+        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
+      for membershipEvent in membershipEvents
+        collection.bind membershipEvent, ()->
+          collection.clearAllMethodsCache()
+
+      dependencies = method.split(':')[1]
+
+      if dependencies
+        for dependency in dependencies.split(",")
+          collection.bind "change:#{dependency}", ()->
+            collection.clearMethodCache(method: method)
+
+  # 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
+  query: (filter={},options={})->
+    if Backbone.QueryCollection?
+      return Backbone.QueryCollection::query.apply(@, arguments)
+    else
+      @models
 
 # Global Collection Observer
 _.extend Luca.Collection.prototype,
@@ -329,7 +344,7 @@ Luca.Collection.baseParams = (obj)->
   return Luca.Collection._baseParams = obj if obj
 
   if _.isFunction( Luca.Collection._baseParams )
-    return Luca.Collection._baseParams.call()
+    return Luca.Collection._baseParams()
 
   if _.isObject( Luca.Collection._baseParams )
     Luca.Collection._baseParams

data/src/core/core.coffee

@@ -59,8 +59,13 @@ class DefineProxy
 
     at[@componentId] = Luca.extend(@superClassName,@componentName, properties)
 
-    # automatically register this with the component registry
-    Luca.register( _.string.underscored(@componentId), @componentName)
+    if Luca.autoRegister is true 
+      componentType = "view" if Luca.isViewPrototype( at[@componentId] )
+      componentType = "collection" if Luca.isCollectionPrototype( at[@componentId] )
+      componentType = "model" if Luca.isModelPrototype( at[@componentId] )
+
+      # automatically register this with the component registry
+      Luca.register( _.string.underscored(@componentId), @componentName, componentType)
 
     at[@componentId]
 

data/src/core/panel.coffee

@@ -1,7 +1,7 @@
 # This is a helper for creating the DOM element that go along with
 # a given component, if it is configured to use one via the topToolbar
 # and bottomToolbar properties
-attachToolbar = (config={})->
+attachToolbar = (config={}, targetEl)->
   config.orientation ||= "top"
   config.ctype ||= @toolbarType || "panel_toolbar"
 
@@ -25,7 +25,7 @@ attachToolbar = (config={})->
     when "bottom", "right"
       if hasBody then "after" else "append"
 
-  @$bodyEl()[action]( container )
+  (targetEl || @$bodyEl() )[action]( container )
 
 # A Panel is a basic Luca.View but with Toolbar extensions
 #
@@ -42,10 +42,13 @@ _.def("Luca.components.Panel").extends("Luca.View").with
   # hidden upon successful response
   loadMask: false
   loadMaskTemplate: ["components/load_mask"]
+  loadMaskTimeout: 3000
 
   initialize: (@options={})->
     Luca.View::initialize.apply(@, arguments)
 
+    _.bindAll @, "applyLoadMask", "disableLoadMask"
+
     if @loadMask is true
       @defer ()=>
         @$el.addClass('with-mask')
@@ -61,22 +64,34 @@ _.def("Luca.components.Panel").extends("Luca.View").with
   loadMaskTarget: ()->
     if @loadMaskEl? then @$(@loadMaskEl) else @$bodyEl()
 
+  disableLoadMask: ()->
+    @$('.load-mask .bar').css("width","100%")
+    @$('.load-mask').hide()
+    clearInterval(@loadMaskInterval)
+
+  enableLoadMask: ()->
+    @$('.load-mask').show().find('.bar').css("width","0%")
+    maxWidth = @$('.load-mask .progress').width()
+    if maxWidth < 20 and (maxWidth = @$el.width()) < 20
+      maxWidth = @$el.parent().width()
+
+    @loadMaskInterval = setInterval ()=>
+      currentWidth = @$('.load-mask .bar').width()
+      newWidth = currentWidth + 12
+      @$('.load-mask .bar').css('width', newWidth)
+    , 200
+
+    return unless @loadMaskTimeout?
+
+    _.delay ()=>
+      @disableLoadMask()
+    , @loadMaskTimeout
+
   applyLoadMask: ()->
     if @$('.load-mask').is(":visible")
-      @$('.load-mask .bar').css("width","100%")
-      @$('.load-mask').hide()
-      clearInterval(@loadMaskInterval)
+      @disableLoadMask()
     else
-      @$('.load-mask').show().find('.bar').css("width","0%")
-      maxWidth = @$('.load-mask .progress').width()
-      if maxWidth < 20 and (maxWidth = @$el.width()) < 20
-        maxWidth = @$el.parent().width()
-
-      @loadMaskInterval = setInterval ()=>
-        currentWidth = @$('.load-mask .bar').width()
-        newWidth = currentWidth + 12
-        @$('.load-mask .bar').css('width', newWidth)
-      , 200
+      @enableLoadMask()
 
   applyStyles: (styles={},body=false)->
 
@@ -114,7 +129,7 @@ _.def("Luca.components.Panel").extends("Luca.View").with
     $(@el)
 
   $wrap: (wrapper)->
-    if !wrapper.match(/[<>]/)
+    if _.isString(wrapper) and not wrapper.match(/[<>]/)
       wrapper = @make("div",class:wrapper)
 
     @$el.wrap( wrapper )
@@ -140,4 +155,4 @@ _.def("Luca.components.Panel").extends("Luca.View").with
     config.parent = @
     config.orientation = orientation
 
-    attachToolbar.call(@, config)
+    attachToolbar.call(@, config, config.targetEl )

data/src/core/registry.coffee

@@ -1,5 +1,7 @@
 registry =
   classes:{}
+  model_classes: {}
+  collection_classes: {}
   namespaces:['Luca.containers','Luca.components']
 
 component_cache =
@@ -13,11 +15,17 @@ Luca.defaultComponentType = 'view'
 
 # When you use _.def to define a component, you say
 # which class it extends() from, and with() which enhancements.
-
 # We register that component class for you:
-Luca.register = (component, prototypeName)->
+Luca.register = (component, prototypeName, componentType="view")->
   Luca.trigger "component:registered", component, prototypeName
-  registry.classes[ component ] = prototypeName
+
+  switch componentType
+    when "model"
+      registry.model_classes[ component ] = prototypeName
+    when "collection"
+      registry.model_classes[ component ] = prototypeName
+    else
+      registry.classes[ component ] = prototypeName
 
 Luca.development_mode_register = (component, prototypeName)->
   existing = registry.classes[component]

data/src/core/util.coffee

@@ -79,4 +79,20 @@ Luca.util.loadScript = (url, callback) ->
           callback()
 
   script.src = url
-  document.body.appendChild(script)
+  document.body.appendChild(script)
+
+Luca.util.make = Backbone.View::make
+
+# generates a badge element
+# valid types are success, warning, important, info, inverse
+Luca.util.label = (contents="", type, baseClass="label")->
+  cssClass = baseClass
+  cssClass += " #{ baseClass}-#{ type }" if type?
+  Luca.util.make("span",{class:cssClass},contents)
+
+# generates a badge element
+# valid types are success, warning, important, info, inverse
+Luca.util.badge = (contents="", type, baseClass="badge")->
+  cssClass = baseClass
+  cssClass += " #{ baseClass }-#{ type }" if type?
+  Luca.util.make("span",{class:cssClass},contents)

data/src/core/view.coffee

@@ -66,7 +66,7 @@ _.def("Luca.View").extends("Backbone.View").with
 
   #### JQuery / DOM Selector Helpers
   $wrap: (wrapper)->
-    if !wrapper.match(/[<>]/)
+    if _.isString(wrapper) and not wrapper.match(/[<>]/)
       wrapper = @make("div",class:wrapper)
 
     @$el.wrap( wrapper )
@@ -130,7 +130,7 @@ _.def("Luca.View").extends("Backbone.View").with
   # if you want to use more than one collection manager, over ride this
   # function in your views with your own logic
   getCollectionManager: ()->
-    @collectionManager || Luca.CollectionManager.get?.call()
+    @collectionManager || Luca.CollectionManager.get?()
 
   ##### Collection Events
   #
@@ -247,10 +247,11 @@ customizeRender = (definition)->
       target ||= @deferrable
       trigger = if @deferrable_event then @deferrable_event else "reset"
 
-      view.defer ()->
+      deferred = ()->
         _base.call(view)
-        view.trigger "after:render", view
-      .until(target,trigger)
+        view.trigger("after:render", view)
+
+      view.defer(deferred).until(target, trigger)
 
       view.trigger "before:render", @
 

data/src/framework.coffee

@@ -15,12 +15,11 @@
     definition = payload.defines
     inheritsFrom = payload.extends
 
-
   if _.isFunction( fallback = _(args).last() )
     return fallback()
 
 _.extend Luca,
-  VERSION: "0.9.1"
+  VERSION: "0.9.2"
   core: {}
   containers: {}
   components: {}
@@ -32,6 +31,10 @@ _.extend Luca,
 # for triggering / binding to component definitions
 _.extend Luca, Backbone.Events
 
+# When using Luca.define() should we automatically register
+# the component with the registry?
+Luca.autoRegister = true
+
 # if developmentMode is true, you have access to some neat development tools
 Luca.developmentMode = false
 
@@ -72,6 +75,9 @@ Luca.supportsEvents = Luca.supportsBackboneEvents = (obj)->
 Luca.isComponent = (obj)->
   Luca.isBackboneModel(obj) or Luca.isBackboneView(obj) or Luca.isBackboneCollection(obj)
 
+Luca.isComponentPrototype = (obj)->
+  Luca.isViewPrototype(obj) or Luca.isModelPrototype(obj) or Luca.isCollectionPrototype(obj)
+
 Luca.isBackboneModel = (obj)->
   _.isFunction(obj?.set) and _.isFunction(obj?.get) and _.isObject(obj?.attributes)
 
@@ -81,6 +87,44 @@ Luca.isBackboneView = (obj)->
 Luca.isBackboneCollection = (obj)->
   _.isFunction(obj?.fetch) and _.isFunction(obj?.reset)
 
+Luca.isViewPrototype = (obj)->
+  obj? and obj::? and obj::make? and obj::$? and obj::render?
+
+Luca.isModelPrototype = (obj)->
+  obj? and obj::? obj::save? and obj::changedAttributes?
+
+Luca.isCollectionPrototype = (obj)->
+  obj? and obj::? and !Luca.isModelPrototype(obj) and obj::reset? and obj::select? and obj::reject?
+
+Luca.inheritanceChain = (obj)->
+  _( Luca.parentClasses(obj) ).map (className)-> Luca.util.resolve(className)
+    
+Luca.parentClasses = (obj)->
+  list = []
+
+  if _.isString(obj)
+    obj = Luca.util.resolve(obj)
+
+  list.push( obj.displayName || obj::?.displayName || Luca.parentClass(obj) )
+
+  classes = until not Luca.parentClass(obj)?
+    obj = Luca.parentClass(obj)
+
+  list = list.concat(classes)
+
+  _.uniq list
+
+Luca.parentClass = (obj)->
+  list = []
+
+  if _.isString( obj )
+    obj = Luca.util.resolve(obj)
+
+  if Luca.isComponent(obj)
+    obj.displayName
+
+  else if Luca.isComponentPrototype(obj)
+    obj::_superClass?()?.displayName
 
 # This is a convenience method for accessing the templates
 # available to the client side app, either the ones which ship with Luca

data/src/managers/collection_manager.coffee

@@ -1,57 +1,28 @@
-#### Collection Manager
-#
-# The purpose of the collection manager is to provide an interface
-# for tracking the creation of collections, so that you only create
-# one instance of a given collection class per instance of some scope
-#
-# For example:
-
-# LucaApp = Luca.containers.Viewport.extend
-#  initialize: (@options={})->
-#     @collectionManager = new Luca.CollectionManager
-#       getScope: ()-> @someParentValue
-#  collection: (key,options={},models=[])->
-#    @collectionManager.getOrCreate(key,options,models)
-#
-# Now in the single global instance of LucaApp you have
-# one central place to access a collection of models, one
-# interface to listen to for add, remove, reset, change events
-#
-# If you don't want this, you can either do it the old fashioned way
-# or just use the private option to get an unregistered instance.
-#
-
-#### View Event Binding Interface
-#
-# Luca.Views can specify a @collectionEvents property very similar to
-# the DOM @events property in Backbone.Views and this provides a very
-# clean API for binding to events on the collection manager and doing
-# the necessary things on the view.  This does assume that by default
-# there is only one instance of the collection manager running, otherwise
-# a configuration directive is provided at a view level to know which
-# collection manager to pull from.
-#
-# Special Thanks to @tjbladez for this wonderful initialModelsa
-#
-
-instances = []
-
-# _.def('Luca.CollectionManager').extends('Luca').with
 class Luca.CollectionManager
+  name: "primary"
+
   __collections: {}
 
   constructor: (@options={})->
     _.extend @, @options
+
+    manager = @
+
+    if existing = Luca.CollectionManager.get?(@name)
+      throw 'Attempt to create a collection manager with a name which already exists'
+
+    Luca.CollectionManager.instances ||= {}
+
     _.extend @, Backbone.Events
+    _.extend @, Luca.Events
 
-    # if you are going to use more than one collection
-    # manager, then you will have to specify which
-    # collection manager your views need to interact
-    # with for their collectionEvents configuration handling
-    instances.push(@)
+    Luca.CollectionManager.instances[ @name ] = manager
 
-    # model to maintain state of the collection manager
-    @state = new Backbone.Model
+    Luca.CollectionManager.get = (name)->
+      return manager unless name?
+      Luca.CollectionManager.instances[name]
+
+    @state = new Luca.Model()
 
     if @initialCollections
       @state.set({loaded_collections_count: 0, collections_count: @initialCollections.length })
@@ -84,42 +55,22 @@ class Luca.CollectionManager
 
     return collection
 
-  #### Collection Prefix
-  #
-  # If you are doing things right, you are namespacing all of your collection
-  # definitions, for example
-  #
-  # LucaApp.collections.SomeCollection = Luca.Collection.extend
-  #   registerAs: "some_collection"
-  #   registerWith: ""
-  #
-  # You should override this attribute when you create or define your collection manager
-  #
-  #
-  collectionNamespace: Luca.Collection.namespace
 
-  #### Collection Scopes
+  collectionNamespace: Luca.Collection.namespace
 
-  # any time you create a collection, or use getOrCreate, the key
-  # value ( @registerAs ) for your collection will be used to retrieve it
-  #
-  # if you plan to have multiple instances per key, but with some sort of
-  # scope based on a parent attribute, you should define a
+ 
   currentScope: ()->
     if current_scope = @getScope()
       @__collections[ current_scope ] ||= {}
     else
       @__collections
 
-  # do something to each collection in the scope
   each: (fn)->
     _( @all() ).each(fn)
 
   get:(key)->
     @currentScope()[key]
 
-  # by default, we won't use a scope, but if you wish to use one
-  # you should define this method on your collection manager
   getScope: ()-> undefined
 
   getOrCreate: (key,collectionOptions={},initialModels=[])->
@@ -131,9 +82,6 @@ class Luca.CollectionManager
     guess ||= (@collectionNamespace || (window || global) )[ "#{classified}Collection" ]
     guess
 
-  # load collection, iterates over each name you have passed for the
-  # your collections in the currentScope, makes sure they exist and
-  # fetched
   loadInitialCollections: ()->
     collectionDidLoad = (collection) =>
       collection.unbind "reset"
@@ -153,16 +101,9 @@ class Luca.CollectionManager
 
   loadedCollectionsCount: ()->
     @state.get("loaded_collections_count")
-  # in most cases, the collections we use can be used only once
-  # and any reset events should be respected, bound to, etc.  however
-  # if this ever isn't the case, you can create an instance
-  # of a collection which is "private" in that once it is
-  # returned from the collection manager, it isn't tracked so
-  # you can make sure any add / reset / remove / filter events
-  # don't effect other views
+
   private: (key, collectionOptions={}, initialModels=[])->
     @create(key,collectionOptions,initialModels,true)
 
-Luca.CollectionManager.destroyAll = ()-> instances = []
-Luca.CollectionManager.instances = ()-> instances
-Luca.CollectionManager.get = ()-> _( instances ).last()
+Luca.CollectionManager.destroyAll = ()-> 
+  Luca.CollectionManager.instances = {} 

data/src/stylesheets/components/checkbox_array.scss

@@ -0,0 +1,5 @@
+.luca-ui-checkbox-array {
+  input.array-checkbox {
+    display: inline-block;
+  }
+}

data/src/templates/components/form_alert.luca

@@ -0,0 +1,3 @@
+%div{:class=>"<%= className %>"}
+  %a.close{:href=>"#",:data=>{:dismiss=>"alert"}} x
+  <%= message %>

data/src/templates/containers/tab_view.luca

@@ -1,2 +1,2 @@
-%ul.nav.nav-tabs{:id=>"<%= cid %>-tabs-selector"}
+%ul{:id=>"<%= cid %>-tabs-selector",:class=>"nav <%= navClass %>"}
 %div{:id=>"<%= cid %>-tab-view-content",:class=>"tab-content"}

data/src/tools/console.coffee

@@ -56,6 +56,9 @@ Luca.define("Luca.tools.DevelopmentConsole").extends("Luca.core.Container").with
       @$('input').focus()
   ]
 
+  show: (options={})->
+    @$el.addClass('modal').modal(options)
+
   getContext: ()->
     window