luca 0.9.2 → 0.9.4

data/src/components/form_view.coffee

@@ -47,6 +47,8 @@ _.def("Luca.components.FormView").extends('Luca.core.Container').with
 
   bodyClassName: "form-view-body"
 
+  version: "0.9.33333333"
+
   initialize: (@options={})->
     @loadMask = Luca.enableBootstrap unless @loadMask?
 
@@ -105,19 +107,19 @@ _.def("Luca.components.FormView").extends('Luca.core.Container').with
     _( @getFields() ).map( iterator )
 
   getField: (name)->
-    _( @getFields('name', name) ).first()
+    passOne = _( @getFields('name', name) ).first()
+    return passOne if passOne?
+
+    _( @getFields('input_name', name) ).first() 
 
   getFields: (attr,value)->
-    # do a deep search of all of the nested components
-    # to find the fields
-    fields = @select("isField", true, true)
+    fields = @selectByAttribute("isField", true, true)
 
-    return fields unless attr and value
-    # if an optional attribute and value pair is passed
-    # then you can limit the array of fields even further
-    _(fields).select (field)->
-      property = field[ attr ]
-      property? and value is (if _.isFunction(property) then property() else property)
+    if attr? and value?
+      fields = _(fields).select (field)->
+        property  = field[ attr ]
+        property  = property.call(field) if _.isFunction(property)
+        property is value
 
     fields
 
@@ -172,30 +174,48 @@ _.def("Luca.components.FormView").extends('Luca.core.Container').with
 
     @syncFormWithModel() unless options.silent? is true
 
+  # Public: returns a hash of values for the form fields in this view.
+  #
+  # options - An options Hash to control the behavior of values returned (default: {}):
+  #           reject_blank: don't include values which are blank (default: true)
+  #           skip_buttons: don't include button fields (default: true)
+  #           blanks: an inverse alias for reject_blank (default: false)
   getValues: (options={})->
     options.reject_blank = true unless options.reject_blank?
     options.skip_buttons = true unless options.skip_buttons?
+    options.reject_blank = true if options.blanks is false
+
+    values = _( @getFields() ).inject (memo,field)=>
+      value   = field.getValue()
+      key     = field.input_name || field.name
+
+      valueIsBlank      = !!(_.str.isBlank( value ) || _.isUndefined( value ))
 
-    _( @getFields() ).inject (memo,field)->
-      value = field.getValue()
-      key = field.input_name || field.name
+      allowBlankValues  = not options.reject_blank and not field.send_blanks
 
-      skip = false
+      if options.debug
+        console.log "#{ key } Options", options, "Value", value, "Value Is Blank?", valueIsBlank, "Allow Blanks?", allowBlankValues
 
-      # don't include the values of buttons in our values hash
-      skip = true if options.skip_buttons and field.ctype is "button_field"
+      if options.skip_buttons and field.ctype is "button_field"
+        skip = true
+      else
+        if valueIsBlank and allowBlankValues is false 
+          skip = true 
 
-      # if the value is blank and we are passed reject_blank in the options
-      # then we should not include this field in our hash.  however, if the
-      # field is setup to send blanks, then we will send this value anyway
-      if _.string.isBlank( value )
-        skip = true if options.reject_blank and !field.send_blanks
-        skip = true if field.input_name is "id"
+        if field.input_name is "id" and valueIsBlank is true
+          skip = true
 
-      memo[ key ] = value unless skip is true
+      if options.debug
+        console.log "Skip is true on #{ key }"
+        
+      if skip isnt true
+        memo[ key ] = value 
 
       memo
-    , {}
+
+    , (options.defaults || {})
+
+    values
 
   submit_success_handler: (model, response, xhr)->
     @trigger "after:submit", @, model, response
@@ -253,4 +273,3 @@ _.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)
-

data/src/components/page_controller.coffee

@@ -0,0 +1,2 @@
+_.def("Luca.PageController").extends("Luca.components.Controller").with
+  version: 2

data/src/containers/card_view.coffee

@@ -13,7 +13,7 @@ _.def("Luca.containers.CardView").extends("Luca.core.Container").with
   ]
 
   componentClass: 'luca-ui-card'
-  appendContainers: true
+  generateComponentElements: true
 
   initialize: (@options)->
     Luca.core.Container::initialize.apply @,arguments
@@ -71,6 +71,9 @@ _.def("Luca.containers.CardView").extends("Luca.core.Container").with
       previous?.trigger?.apply(previous,["before:deactivation", @, previous, current])
       current?.trigger?.apply(previous,["before:activation", @, previous, current])
 
+      _.defer ()=>
+        @$el.data( @activeAttribute || "active-card", current.name)
+
     @componentElements().hide()
 
     unless current.previously_activated

data/src/containers/column_view.coffee

@@ -6,6 +6,7 @@ _.def('Luca.containers.ColumnView').extends('Luca.core.Container').with
   components: []
 
   initialize: (@options={})->
+    console.log "Column Views are deprecated in favor of just using grid css on a normal container"
     Luca.core.Container::initialize.apply @, arguments
     @setColumnWidths()
 
@@ -13,7 +14,7 @@ _.def('Luca.containers.ColumnView').extends('Luca.core.Container').with
 
   containerTemplate: "containers/basic"
 
-  appendContainers: true
+  generateComponentElements: true
 
   autoColumnWidths: ()->
     widths = []

data/src/containers/modal_view.coffee

@@ -1,4 +1,4 @@
-_.def("Luca.ModalView").extends("Luca.View").with
+_.def("Luca.ModalView").extends("Luca.core.Container").with
 
   closeOnEscape: true
 
@@ -6,6 +6,8 @@ _.def("Luca.ModalView").extends("Luca.View").with
 
   backdrop: false
 
+  className: "luca-ui-container modal"
+
   container: ()->
     $('body')
 
@@ -23,10 +25,12 @@ _.def("Luca.ModalView").extends("Luca.View").with
     @$el.addClass 'fade' if @fade is true
 
     $('body').append( @$el )
-
+    
     @$el.modal
       backdrop: @backdrop is true
       keyboard: @closeOnEscape is true
       show: @showOnInitialize is true
 
+    @
+
 _.def("Luca.containers.ModalView").extends("Luca.ModalView").with()

data/src/containers/page_view.coffee

@@ -0,0 +1,2 @@
+_.def("Luca.PageView").extends("Luca.containers.CardView").with
+  version: 2

data/src/containers/panel_toolbar.coffee

@@ -149,8 +149,3 @@ _.def("Luca.containers.PanelToolbar").extends("Luca.View").with
     elements = prepareButtons(@buttons)
     _( elements ).each (element)=>
       @$el.append( element )
-
-  afterRender: ()->
-    @_super("afterRender", @, arguments)
-    #  @$('.toolbar-component label').remove()
-    #  @$('.toolbar-component').addClass('btn-group')

data/src/containers/viewport.coffee

@@ -2,24 +2,36 @@ _.def('Luca.containers.Viewport').extend('Luca.containers.CardView').with
 
   activeItem: 0
 
-  className: 'luca-ui-viewport'
+  additionalClassNames: 'luca-ui-viewport'
 
   fullscreen: true
 
   fluid: false
 
-  wrapperClass: 'row'
 
   initialize: (@options={})->
     _.extend @, @options
 
     if Luca.enableBootstrap is true
-      @wrapperClass = "row-fluid" if @fluid is true
-      @$wrap( @wrapperClass )
+      @wrapperClass = if @fluid is true then Luca.containers.Viewport.fluidWrapperClass else Luca.containers.Viewport.defaultWrapperClass 
 
     Luca.core.Container::initialize.apply(@, arguments)
 
-    $('html,body').addClass('luca-ui-fullscreen') if @fullscreen
+    @enableFullscreen() if @fullscreen is true
+
+  enableFluid: ()->
+    @$el.parent().addClass( @wrapperClass ) 
+
+  disableFluid: ()->
+    @$el.parent().removeClass( @wrapperClass ) 
+
+  enableFullscreen: ()->
+    $('html,body').addClass('luca-ui-fullscreen')
+    @$el.addClass('fullscreen-enabled')
+
+  disableFullscreen: ()->
+    $('html,body').removeClass('luca-ui-fullscreen')
+    @$el.removeClass('fullscreen-enabled')
 
   beforeRender: ()->
     Luca.containers.CardView::beforeRender?.apply(@, arguments)
@@ -30,12 +42,18 @@ _.def('Luca.containers.Viewport').extend('Luca.containers.CardView').with
     @renderTopNavigation() if @topNav?
     @renderBottomNavigation() if @bottomNav?
 
+  height: ()->
+    @$el.height()
+
+  width: ()->
+    @$el.width()
+
   afterRender: ()->
     Luca.containers.CardView::after?.apply(@, arguments)
 
-    if Luca.enableBootstrap is true
-      @$el.children().wrap('<div class="container" />')
-        
+    if Luca.enableBootstrap is true and @containerClassName
+      @$el.children().wrap('<div class="#{ containerClassName }" />')
+
   renderTopNavigation: ()->
     return unless @topNav?
 
@@ -51,9 +69,9 @@ _.def('Luca.containers.Viewport').extend('Luca.containers.CardView').with
 
     $('body').prepend( @topNav.render().el )
 
-
   renderBottomNavigation: ()->
     # IMPLEMENT
 
 
-
+Luca.containers.Viewport.defaultWrapperClass  = 'row'
+Luca.containers.Viewport.fluidWrapperClass    = 'row-fluid'

data/src/core/collection.coffee

@@ -2,6 +2,7 @@ source = 'Backbone.Collection'
 source = 'Backbone.QueryCollection' if Backbone.QueryCollection?
 
 _.def("Luca.Collection").extends( source ).with
+  include: ['Luca.Events']
   # cachedMethods refers to a list of methods on the collection
   # whose value gets cached once it is ran.  the collection then
   # binds to change, add, remove, and reset events and then expires
@@ -13,7 +14,7 @@ _.def("Luca.Collection").extends( source ).with
   cachedMethods: []
 
   # if filtering a collection should handle via a call to a REST API
-  # and return the filtered results that way, then leave this true
+  # and return the filtered results that way, then set this to true
   remoteFilter: false
 
   initialize: (models=[], @options)->
@@ -90,6 +91,11 @@ _.def("Luca.Collection").extends( source ).with
   # and will automatically do this for you without you having
   # to write a special url handler.  If you want to use a normal
   # url without this feature, just set @useNormalUrl = true
+
+  # TODO
+  #
+  # This has got to go.  It is messing up URL for show actions
+  # for models part of luca collections when there are base query params
   __wrapUrl: ()->
     if _.isFunction(@url)
       @url = _.wrap @url, (fn)=>

data/src/core/container.coffee

@@ -151,10 +151,6 @@ _.def('Luca.core.Container').extends('Luca.components.Panel').with
     @componentContainers = _( @components ).map (component, index)->
       applyDOMConfig.call(container, component, index)
 
-  # prepare components is where each component gets assigned
-  # a container to be rendered into.  if @appendContainers is
-  # set to true, then the view will automatically $append()
-  # elements created via Backbone.View::make() to the body element of the view
   prepareComponents: ()->
     # accept components as an array of strings representing
     # the luca component type
@@ -162,17 +158,17 @@ _.def('Luca.core.Container').extends('Luca.components.Panel').with
       component = (type: component)
 
     _( @components ).each (component, index)=>
-      container = @componentContainers?[index]
+      ce = componentContainerElement = @componentContainers?[index]
 
       # support a variety of the bad naming conventions
-      container.class = container.class || container.className || container.classes
+      ce.class = ce.class || ce.className || ce.classes
 
-      if @appendContainers
-        panel = @make(@componentTag, container, '')
+      if @generateComponentElements
+        panel = @make(@componentTag, componentContainerElement, '')
         @$append( panel )
 
       unless component.container?
-        component.container = "##{ container.id }" if @appendContainers
+        component.container = "##{ componentContainerElement.id }" if @generateComponentElements
         component.container ||= @$bodyEl()
 
   # create components is responsible for turning the JSON syntax of the
@@ -208,6 +204,12 @@ _.def('Luca.core.Container').extends('Luca.components.Panel').with
 
         Luca.util.lazyComponent( object )
 
+      # if you define a @getter property as a string on your component
+      # we will create a function with that name on this container that
+      # allows you to access this component
+      if _.isString( component.getter )
+        @[ component.getter ] = (()-> component) 
+
       # if we're using base backbone views, then they don't extend themselves
       # with their passed options, so this is a workaround to get them to
       # pick up the container config property
@@ -232,12 +234,15 @@ _.def('Luca.core.Container').extends('Luca.components.Panel').with
   # components
   renderComponents: (@debugMode="")->
     @debug "container render components"
-    _(@components).each (component)=>
-      component.getParent = ()=> @
-      $( component.container ).append $(component.el)
+
+    container = @ 
+    _(@components).each (component)->
+      component.getParent = ()-> 
+        container 
 
       try
-        component.render()
+        $( component.container ).append( component.el )
+        component.render() 
       catch e
         console.log "Error Rendering Component #{ component.name || component.cid }", component
 
@@ -265,21 +270,16 @@ _.def('Luca.core.Container').extends('Luca.components.Panel').with
         component?.trigger?.call component, "first:activation", component, activator
         component.previously_activated = true
 
-  #### Component Finder Methods
-  select: (attribute, value, deep=false)->
-    components = _( @components ).map (component)->
-      matches = []
-      test = component[ attribute ]
-
-      matches.push( component ) if test is value
-
-      if deep is true and component.isContainer is true
-        matches.push component.select(attribute, value, true)
+  #### Underscore Methods For Working with Components
+  pluck: (attribute)-> 
+    _( @components ).pluck attribute
 
-      _.compact matches
-
-    _.flatten( components )
+  invoke: (method)->
+    _( @components ).invoke method
 
+  map: (fn)->
+    _( @components ).map(fn)
+    
   # event binding sugar for nested components
   #
   # you can define events like:
@@ -287,7 +287,6 @@ _.def('Luca.core.Container').extends('Luca.components.Panel').with
   # _.def("MyContainer").extends("Luca.View").with
   #   componentEvents:
   #     "component_name before:load" : "mySpecialHandler"
-  #
   componentEvents: {}
 
   registerComponentEvents: ()->
@@ -305,7 +304,6 @@ _.def('Luca.core.Container').extends('Luca.components.Panel').with
   findComponent: (needle, haystack="name", deep=false)->
     @createComponents() unless @componentsCreated is true
 
-
     position = @componentIndex?[ haystack ][ needle ]
     component = @components?[ position ]
 
@@ -335,13 +333,42 @@ _.def('Luca.core.Container').extends('Luca.components.Panel').with
     return @components[ @activeItem ]
 
   componentElements: ()->
-    $(">.#{ @componentClass }", @el)
+    @$(">.#{ @componentClass }", @$bodyEl())
 
   getComponent: (needle)->
     @components[ needle ]
 
   rootComponent: ()->
+    console.log "Calling rootComponent will be deprecated.  use isRootComponent instead"
+    !@getParent?
+
+  isRootComponent:()->
     !@getParent?
 
   getRootComponent: ()->
-    if @rootComponent() then @ else @getParent().getRootComponent()
+    if @rootComponent() then @ else @getParent().getRootComponent()
+    
+  selectByAttribute: (attribute, value, deep=false)->
+    components = _( @components ).map (component)->
+      matches = []
+      test = component[ attribute ]
+
+      matches.push( component ) if test is value
+
+      # recursively traverse our components
+      matches.push component.selectByAttribute?(attribute, value, true) if deep is true
+
+      _.compact matches
+
+    _.flatten( components )
+
+  select: (attribute, value, deep=false)->
+    console.log "Container.select will be replaced by selectByAttribute in 1.0"
+    Luca.core.Container::selectByAttribute.apply(@, arguments)
+
+# This is the method by which a container injects the rendered child views
+# into the DOM.  It will get passed the container object, and the component
+# that is being rendered.  
+Luca.core.Container.componentRenderer = (container, component)->
+  attachMethod = $( component.container )[ component.attachWith || "append" ]
+  attachMethod( component.render().el )

data/src/core/core.coffee

@@ -1,186 +0,0 @@
-# Component Definition Helpers
-#
-#
-# We have customized the core Backbone.extend process to use a slightly
-# different syntax, which allows us to intercept the component definition at
-# various points, and maintain information about classes being defined, and
-# the relationships between inherited classes, etc.
-
-# _.def, or Luca.define returns a chainable object which allows you to define
-# your components with a readable syntax.  For example:
-
-# _.def("Luca.View").extends("Backbone.View").with the_good:"shit"
-# _.def("MyView").extends("Luca.View").with the_custom:"shit"
-
-Luca.define = (componentName)->
-  new DefineProxy(componentName)
-
-Luca.component = Luca.define
-
-# The define proxy chain sets up a call to Luca.extend, which is a wrapper around Luca and Backbone component class' extend function.
-class DefineProxy
-  constructor:(componentName)->
-    @namespace = Luca.util.namespace()
-    @componentId = @componentName = componentName
-
-    if componentName.match(/\./)
-      @namespaced = true
-      parts = componentName.split('.')
-      @componentId = parts.pop()
-      @namespace = parts.join('.')
-
-      # automatically add the namespace to the namespace registry
-      Luca.registry.addNamespace( parts.join('.') )
-
-  # allow for specifying the namespace
-  in: (@namespace)-> @
-
-  # allow for multiple ways of saying the same thing for readability purposes
-  from: (@superClassName)-> @
-  extends: (@superClassName)-> @
-  extend: (@superClassName)-> @
-
-  # an alias for with, or a readability helper in multi-line definitions
-  enhance: (properties)->
-    return @with(properties) if properties?
-    @
-
-  # which properties, methods, etc will you be extending the base class with?
-  with: (properties)->
-    at = if @namespaced
-      Luca.util.resolve(@namespace, (window || global))
-    else
-      (window||global)
-
-    # automatically create the namespace
-    if @namespaced and not at?
-      eval("(window||global).#{ @namespace } = {}")
-      at = Luca.util.resolve(@namespace,(window || global))
-
-    at[@componentId] = Luca.extend(@superClassName,@componentName, properties)
-
-    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]
-
-# The last method of the DefineProxy chain is always going to result in
-# a call to Luca.extend.  Luca.extend wraps the call to Luca.View.extend,
-# or Backbone.Collection.extend, and accepts the names of the extending,
-# and extended classes as strings.  This allows us to maintain information
-# and references to the classes and their prototypes, mainly for the purposes
-# of introspection and development tools
-Luca.extend = (superClassName, childName, properties={})->
-  superClass = Luca.util.resolve( superClassName, (window || global) )
-
-  unless _.isFunction(superClass?.extend)
-    throw "#{ superClassName } is not a valid component to extend from"
-
-  properties.displayName = childName
-
-  properties._superClass = ()->
-    superClass.displayName ||= superClassName
-    superClass
-
-  properties._super = (method, context, args)->
-    @_superClass().prototype[method]?.apply(context, args)
-
-  superClass.extend(properties)
-
-_.mixin
-  def: Luca.define
-
-
-# Luca.Events
-#
-# These helpers will get mixed into Luca.Collection, Luca.View, and Luca.Model.
-#
-# They allow for syntactic sugar like:
-#
-# view.defer("someMethodOnTheView").until("collection","fetch")
-#
-# or
-#
-# view.defer( myCallback ).until("triggered:event")
-class DeferredBindingProxy
-  constructor: (@object, operation, wrapWithUnderscore=true)->
-    if _.isFunction(operation)
-      fn = operation
-
-    else if _.isString(operation) and _.isFunction(@object[operation])
-      fn = @object[operation]
-
-    unless _.isFunction(fn)
-      throw "Must pass a function or a string representing one"
-
-    if wrapWithUnderscore is true
-      @fn = ()=>
-        _.defer(fn)
-    else
-      @fn = fn
-
-    @
-
-  # until accepts an object to bind to, and a trigger to bind with
-  # if you just pass a trigger, the object getting bound to
-  # will implicitly be @object
-  until: (watch, trigger)->
-    if watch? and not trigger?
-      trigger = watch
-      watch = @object
-
-    watch.once(trigger, @fn)
-
-    @object
-
-Luca.Events =
-  defer: (operation, wrapWithUnderscore=true)->
-    new DeferredBindingProxy(@, operation, wrapWithUnderscore)
-
-  once: (trigger, callback, context)->
-    context ||= @
-
-    onceFn = ()->
-      callback.apply(context, arguments)
-      @unbind(trigger, onceFn)
-
-    @bind trigger, onceFn
-
-class Luca.ScriptLoader
-  @loaded: {}
-
-  constructor: (options={})->
-    _.extend(@, Backbone.Events, Luca.Events)
-    @autoStart = options.autoStart is true
-    @scripts = options.scripts
-
-    ready = ()-> @trigger("ready")
-
-    @ready = _.after( @scripts.length, ready)
-
-    _.bindAll @, "load", "ready"
-
-    @defer("load").until(@, "start")
-
-    if @autoStart is true
-      @trigger("start")
-
-    @bind "ready", @onReady
-
-  applyPrefix: (script)->
-    script
-
-  onReady: ()->
-    console.log "All dependencies loaded"
-
-  start: ()->
-    @trigger("start")
-
-  load: ()->
-    Luca.util.loadScript( @applyPrefix(script), @ready ) for script in @scripts
-

data/src/core/field.coffee

@@ -44,7 +44,7 @@ _.def('Luca.core.Field').extends('Luca.View').with
 
     @$el.addClass('required') if @required
 
-    @$el.html Luca.templates[ @template ]( @ )
+    @$el.html Luca.template(@template, @)
     @input = $('input', @el)
 
   change_handler: (e)->
@@ -57,7 +57,15 @@ _.def('Luca.core.Field').extends('Luca.View').with
     $("input", @el).attr('disabled', false)
 
   getValue: ()->
-    @input.attr('value')
+    raw = @input.attr('value')
+
+    return raw if _.str.isBlank( raw )
+
+    switch @valueType
+      when "integer" then parseInt(raw)
+      when "string" then "#{ raw }"
+      when "float" then parseFloat(raw)
+      else raw
 
   render: ()->
     $( @container ).append( @$el )
@@ -68,4 +76,4 @@ _.def('Luca.core.Field').extends('Luca.View').with
   updateState: (state)->
     _( @statuses ).each (cls)=>
       @$el.removeClass(cls)
-      @$el.addClass(state)
+      @$el.addClass(state)