lanes 0.0.3 → 0.0.5

data/client/{javascripts → lanes}/data/Collection.coffee

@@ -9,6 +9,19 @@ CommonMethods = {
                     break
             break if found != -1
         found
+
+
+    destroyAll: (options={})->
+        success = options.success
+        _.extend( options, {
+            data: this.map( (model)-> { id: model.id } )
+            success: =>
+                for model in @models
+                    model.trigger('destroy', model, model.collection, options)
+                success.apply(@,arguments) if success
+        })
+        Lanes.Data.Sync('delete', this, options)
+
 }
 
 class DataCollection
@@ -18,14 +31,19 @@ class DataCollection
         @errors=[]
         Lanes.Vendor.Ampersand.Collection.apply(this, arguments)
 
-    isLoaded:->
-        @isLoaded
-
+    @fetch: (options)->
+        collection = new this
+        collection.fetch(options)
+        collection
+        
     fetch: (options={})->
         @isLoaded = true
         wrapRequest(this,options)
         super(options).then => @
 
+    isLoaded:->
+        @isLoaded
+
     ensureLoaded: ( callback )->
         if ! @isLoaded && ! this.length
             this.fetch({ success: callback })
@@ -33,6 +51,8 @@ class DataCollection
             callback()
 
     isDirty: ->
+        for model in @models
+            return true if model.isDirty()
         false
 
     parse:(resp)->
@@ -44,10 +64,18 @@ class DataCollection
         )
 
     url: ->
-        @model::urlRoot() + '.json'
+        @model::urlRoot()
+
+    sync: Lanes.Data.Sync
 
-    sync: ->
-        Lanes.Data.Sync.apply(this,arguments)
+    save: (options)->
+        Lanes.Data.Sync('update', this, options)
+
+    dataForSave: (options)->
+        unsaved = []
+        for model in @models
+            unsaved.push( model.unsavedData() ) if model.isDirty()
+        unsaved
 
     _prepareModel: (attrs, options={})->
         options.collection = this;
@@ -97,6 +125,9 @@ class SubCollection
         CommonMethods
     ]
 
+    url: ->
+        this.collection.url()
+
     filter: ->
         this._runFilters()
 

data/client/{javascripts → lanes}/data/Model.coffee

@@ -1,8 +1,8 @@
 class DataModel
     isModel: true
 
-    constructor: (attrs,options)->
-        this._unsaved = if attrs then _.keys(attrs) else []
+    constructor: (attrs,options={})->
+        this._unsaved = if attrs and !options.xhr then _.keys(attrs) else []
         super
         this.on('change', this._recordUnsaved )
 
@@ -82,7 +82,7 @@ class DataModel
         if _.isEmpty( needed )
             options.success.call(scope, this  ) if options.success
             options.complete.call(scope,this  ) if options.complete
-            return Lanes.Promise.resolve(this)
+            return _.Promise.resolve(this)
         else
             options['include']=needed
             this.fetch(options)
@@ -185,8 +185,7 @@ class DataModel
         else
             ''
 
-    sync: ->
-        Lanes.Data.Sync.apply(this,arguments)
+    sync: Lanes.Data.Sync
 
     _recordUnsaved: (record,options)->
         attrs = this.changedAttributes()
@@ -230,19 +229,19 @@ setupStandardProps=(klass)->
     klass.associations['updated_by'] ||= { model: 'Lanes.Data.User' }
 
 copyServerResp = (record,resp)->
-    record.errors = resp.errors
-    record.lastServerMessage = resp.message
+    record.errors = resp?.errors
+    record.lastServerMessage = resp?.message
     { record: record, response: resp }
 
 wrapRequest = (record, options)->
     error   = options.error
     success = options.success
-    options.promise = new Lanes.Promise( (resolve,reject)->
+    options.promise = new _.Promise( (resolve,reject)->
         options.resolvePromise = resolve
         options.rejectPromise  = reject
     )
     options.error = (record, resp, req)->
-        options.rejectPromise( copyServerResp(record,resp.responseJSON) )
+        options.rejectPromise( copyServerResp(record,resp.responseJSON || {error: resp.responseText}) )
         error?.apply(options.scope, arguments)
 
     options.success = (record,resp,req)->

data/client/{javascripts → lanes}/data/Screens.coffee

@@ -5,12 +5,15 @@ class ScreenView extends Lanes.Data.BasicModel
 
     session:
         active: ['boolean', true, false]
-        ui: 'state'
+        viewport: 'state'
 
     derived:
         view:
             deps: ['screen'], fn: ->
-                new @screen.viewModel( screen: this.screen, ui: @ui )
+                if @screen?.viewModel?
+                    new @screen.viewModel( screen: this.screen, viewport: this.viewport )
+                else
+                    Lanes.warn("Undefined screen for #{this}")
 
     initialize: (options)->
         super
@@ -26,7 +29,7 @@ class ScreenView extends Lanes.Data.BasicModel
 
 
 
-class Screen extends Lanes.Data.BasicModel
+class ScreenDefinition extends Lanes.Data.BasicModel
 
     session:
         id:          'string'
@@ -42,28 +45,54 @@ class Screen extends Lanes.Data.BasicModel
     derived:
         model_type:
             deps: ['model'], fn: ->
-                Lanes.Data[this.model]
+                Lanes.getPath(this.model,"Lanes.Data")
 
     initialize: ->
         @views = []
 
-    _setDisplaying: (ui)->
-        @views.push( new ScreenView( screen: this, ui: ui ) )
+    _setDisplaying: (viewport)->
+        @views.push( new ScreenView( screen: this, viewport: viewport ) )
 
-    display: (ui)->
-        @viewModel ||= Lanes.Screens[this.view]
+    getScreen: ->
+        @viewModel ||= Lanes.getPath(this.view,"Lanes.Screens")
         if @viewModel?
-           this._setDisplaying(ui)
+            _.Promise.resolve(@viewMOdel)
         else
-            this.loading=true
-            Lanes.lib.Loader(this.files)
-                .then =>
-                    @viewModel = Lanes.Screens[this.view]
-                    @_setDisplaying(ui)
-                    @loading=false
-                .catch (failures)=>
-                    @loading=false
-                    Lanes.warn(failures)
+            this.loadScreen()
+
+    loadScreen: ->
+        me=this
+        return new _.Promise(  (resolve,reject)->
+             me.loading=true
+             Lanes.lib.Request(me.files)
+                 .then ->
+                    me.loading=false
+                    me.viewModel = Lanes.getPath(me.view)
+                    if me.viewModel then resolve(me.viewModel)
+                    else reject("Screen #{me.view} not definied after file retrieval")
+                 ,(msg)->
+                    Lanes.warn(msg)
+                    me.loading=false
+                    reject(msg)
+        )
+
+
+    display: (ui)->
+        this.getScreen().then => @_setDisplaying(ui)
+
+        # @viewModel ||= Lanes.Screens[this.view]
+        # if @viewModel?
+        #    this._setDisplaying(ui)
+        # else
+        #     this.loading=true
+        #     Lanes.lib.Request(this.files)
+        #         .then =>
+        #             @viewModel = Lanes.Screens[this.view]
+        #             @_setDisplaying(ui)
+        #             @loading=false
+        #         .catch (failures)=>
+        #             @loading=false
+        #             Lanes.warn(failures)
 
 
 class ScreenViewSet extends Lanes.Data.BasicCollection
@@ -106,7 +135,7 @@ class ScreenViewSet extends Lanes.Data.BasicCollection
 
 class ScreenSet extends Lanes.Data.BasicCollection
 
-    model: Screen
+    model: ScreenDefinition
 
     register: (spec)->
 

data/client/{javascripts → lanes}/data/Sync.coffee

@@ -29,7 +29,7 @@ paramsMap = {
     start   : 's'
 }
 
-Lanes.Data.Sync = (method, model, options)->
+Lanes.Data.Sync = (method, model, options={})->
 
     query = {}
     for key, value of options
@@ -48,10 +48,10 @@ Lanes.Data.Sync = (method, model, options)->
     params.headers = {
         X_CSRF_TOKEN: Lanes.Data.Config.csrf_token
     }
-    # Ensure that we have the appropriate request data.
-    if !options.data? && model && _.contains([ "create", "update", "patch" ], method )
-        params.contentType = "application/json"
-        params.data = JSON.stringify( model.dataForSave(options) )
+    params.contentType = "application/json"
+    if options.data || _.contains(['create','update','patch'], method)
+        params.data = JSON.stringify( options.data || model.dataForSave(options) )
+        delete options.data
 
     # Don't process data on a non-GET request.
     #params.processData = false if params.type isnt "GET"

data/client/lanes/data/User.coffee

@@ -0,0 +1,46 @@
+unless Lanes.Data.Roles
+
+    class Lanes.Data.Role extends Lanes.Data.BasicModel
+        props:
+            id:     'string'
+            name:   'string'
+            member: { type: 'boolean', default: false }
+
+    class Lanes.Data.Roles extends Lanes.Data.BasicCollection
+        model: Lanes.Data.Role
+
+
+unless Lanes.Data.User
+    class Lanes.Data.User extends Lanes.Data.Model
+
+        constructor: (attributes,access)->
+            super
+            this.access_data = access
+
+        api_path: 'users'
+        derived:
+            roles:
+                fn: -> []
+            isLoggedIn:
+                fn: -> false
+            allRoles:
+                fn: -> new Lanes.Data.Roles
+
+        session:
+            access_data: 'object'
+
+        session:
+            id:          "integer"
+            login:       'string'
+            name:        'string'
+            email:       'string'
+            role_names:  'array'
+            options:     'object'
+            password:    'string'
+
+        canRead: (model,field)  -> true
+        canWrite: (model,field) -> true
+        canDelete: (model)      -> true
+
+unless Lanes.current_user
+    Lanes.current_user = new Lanes.Data.User

data/client/{javascripts → lanes}/data/index.js

@@ -1,7 +1,6 @@
 //= require_self
+//= require ./Sync
 //= require ./Model
 //= require ./Collection
 //= require_tree ./mixins
 //= require_tree .
-
-Lanes.namespace( 'Data.mixins' );

data/client/{javascripts → lanes}/data/mixins/HasCodeField.coffee

@@ -1,4 +1,4 @@
-Lanes.Data.mixins.HasCodeField = {
+Lanes.Data.Mixins.HasCodeField = {
 
     INVALID: /[^A-Z0-9a-z]/
 

data/client/{javascripts → lanes}/extension/Base.coffee

@@ -6,4 +6,4 @@ class BaseExtension
         Lanes.Extensions.register(klass)
 
 
-Lanes.Extension.Base = Lanes.lib.MakeBaseClass( Lanes.Vendor.Ampersand.State, BaseExtension )
+Lanes.Extensions.Base = Lanes.lib.MakeBaseClass( Lanes.Vendor.Ampersand.State, BaseExtension )

data/client/lanes/extension/EarlyExtensions.js.erb

@@ -0,0 +1,3 @@
+<% Lanes::Extensions.early_loaded do | ext | %>
+<% require_asset ext.javascript_include %>
+<% end %>

data/client/{javascripts → lanes}/extension/Extensions.coffee

@@ -14,4 +14,9 @@ Lanes.Extensions = {
         for identifier,data of bootstrap_data
             instance.setBootstrapData(data) if instance = this.instances[identifier]
 
+    makeNamespace: (identifier)->
+        for ns in ['Data','Views','Controllers','Screens']
+            Lanes.ns("#{identifier}.#{ns}")
+
+
 }

data/client/lanes/extension/LateLoaded.js.erb

@@ -0,0 +1,3 @@
+<% Lanes::Extensions.late_loaded do | ext | %>
+<% require_asset ext.javascript_include %>
+<% end %>

data/client/lanes/extension/index.js

@@ -0,0 +1,5 @@
+//= require_self
+//= require ./Extensions
+//= require ./Base
+//= require ./namespace-available
+//= require ./EarlyExtensions

data/client/lanes/extension/namespace-available.js.erb

@@ -0,0 +1,3 @@
+<% Lanes::Extensions.each do | ext | %>
+Lanes.Extensions.makeNamespace('<%=  ext.client_namespace %>');
+<% end %>

data/client/lanes/index.js

@@ -0,0 +1,11 @@
+//= require ./lib/noConflict
+//= require ./vendor/modern-stack
+//= require ./lib
+//= require ./extension
+//= require ./data
+//= require ./plugins
+//= require ./views
+//= require ./screens
+//= require ./components/Base
+//= require ./components/enabled
+//= require ./extension/LateLoaded

data/client/{javascripts → lanes}/lib/Templates.coffee

@@ -1,6 +1,3 @@
-Lanes.namespace "Templates"
-
-
 ns2path = (ns)->
     ns.replace(".","/").toLowerCase()
 
@@ -13,13 +10,13 @@ Lanes.Templates.find = (name, namespace) ->
 
 # scribbed from eco's compiler.coffee
 # we include the functions here rather than on every single template
-Lanes.TemplateWrapper = {
+Lanes.Templates.Wrapper = {
 
     sanitize: (value) ->
         if value and value.HTMLSafe
             value
         else if typeof value isnt "undefined" and value?
-            Lanes.TemplateWrapper.escape value
+            Lanes.Templates.Wrapper.escape value
         else
             ""
 

data/client/{javascripts → lanes}/lib/index.js

@@ -1,9 +1,5 @@
 //= require ./noConflict
 //= require ./namespace
 //= require ./utilFunctions
-//= require ./underscore.inflection
 //= require ./ModuleSupport
 //= require_tree .
-
-
-Lanes.namespace('lib');

data/client/{javascripts → lanes}/lib/loader.coffee

@@ -1,3 +1,7 @@
+# inspiration from https://github.com/ramitos/lazyload/blob/master/src/lazyload.js
+#
+GECKO = /Gecko\//.test(navigator.userAgent)
+
 class Loader
 
     constructor: (urls,cb)->
@@ -36,10 +40,12 @@ class Loader
         )
         return fn(url, true)  if exists
         called = false
-        node = _.el("link",
-          type: "text/css"
-          href: url
-          rel: "stylesheet"
+        tag = "link" #if GECKO then "style" else "link"
+        node = _.el( tag,
+           type: "text/css"
+           href: url
+           media: "screen"
+           rel: "stylesheet"
         )
 
         onloaded=(success,err)->
@@ -48,15 +54,14 @@ class Loader
             fn(url, success, err)
         node.onload  = ()->    onloaded(true,false)
         node.onerror = (err)-> onloaded(false,err)
-
-
         node.onreadystatechange = ->
             return if not (/loaded|complete/.test(node.readyState)) or called
             called=true
             fn(url, true)
-
         @head.appendChild node
-        poll()
+        # GECKO cannot query the node immediatly after it's created
+        if GECKO then _.delay(poll,250) else poll()
+
 
 
     loadJS: (url, fn) ->
@@ -81,9 +86,9 @@ class Loader
         this.body.appendChild(node)
 
 
-Lanes.lib.Loader = (urls...)->
+Lanes.lib.Request = (urls...)->
     urls = urls[0] if urls.length == 1 && _.isArray(urls[0])
-    new Lanes.Promise(  (resolve,reject)->
+    new _.Promise(  (resolve,reject)->
         new Loader(urls, (completed)->
             failures = _.pick(completed, (status,url)-> !status.success )
             if _.isEmpty(failures)

data/client/{javascripts → lanes}/lib/namespace.coffee

@@ -7,3 +7,6 @@ Lanes.namespace = (target, name, block) ->
     top    = target
     target = target[item] or= {} for item in name.split '.'
     block( target, top ) if typeof block == 'function'
+
+for ns in ['Components', 'Data.Mixins', 'Views.Mixins', 'Screens', 'Vendor', 'Templates', 'Extensions','lib']
+    Lanes.namespace(ns)

data/client/{javascripts → lanes}/lib/noConflict.coffee

@@ -7,6 +7,7 @@ if (!Lanes){
 }
 
 Lanes.noConflict = function(){
+    Lanes.$ = window.jQuery.noConflict(true);
     window.Lanes = previousLanes;
     return Lanes;
 };

data/client/{javascripts → lanes}/lib/utilFunctions.coffee

@@ -5,11 +5,18 @@ Lanes.fatal = (args...)->
     throw new Error(args...)
 
 Lanes.warn = (msg...)->
-    console.warn(msg...) if console
+    return unless console
+    console.warn(msg...)
+    if msg[0] instanceof Error
+        console.warn(msg[0].stack)
+    else console.warn(msg...)
     null
 
 Lanes.log = (msg...)->
-    console.log(msg...) if console
+    return unless console
+    if msg[0] instanceof Error
+        console.warn(msg[0].stack)
+    else console.log(msg...)
     null
 
 distillTypes = (type, ns)->
@@ -20,15 +27,12 @@ distillTypes = (type, ns)->
 # or with ns being an object, which will dref name inside it
 Lanes.getPath = ( name, ns='Lanes' ) ->
     return name unless _.isString(name)
+    ns = "Lanes.#{ns}" if _.isString(ns) && !ns.match("Lanes")
     if _.isObject(ns)
-        distillTypes(name,ns)
+        distillTypes(name,ns) || distillTypes(name, Lanes)
     else
         distillTypes(name,window) || distillTypes(name, distillTypes(ns, window))
 
-Lanes.getModelPath = (scope,name)->
-    [model..., field] = name.split('.')
-    [ Lanes.getPath( model.join('.'), scope), field ]
-
 _.mixin({
 
     toSentence: (words=[], comma=', ', nd=' and ')->
@@ -40,12 +44,6 @@ _.mixin({
                 last
         else
             ''
-
-    sprintfArray: (array, format)->
-        _.map( array, (field)->
-            _.sprintf( format, field )
-        )
-
     evaluateFunction: (fn,args)->
         if this.isFunction(fn) then fn(args) else fn
 })

data/client/lanes/plugins/index.js

@@ -0,0 +1 @@
+//= require_tree .

data/client/lanes/screens/Base.coffee

@@ -0,0 +1,40 @@
+#= require ./ChangeListener
+
+class ScreenBase
+
+    constructor: -> super
+
+    namespace: "Screens"
+
+    mixins:[
+        Lanes.Screens.ChangeListener
+    ]
+
+    initializeChanges:->
+        @_changeListeners = {}
+        for keypath in ( @usingModels || ['model'] )
+            @_changeListeners[keypath] = new Lanes.Views.ScreenChangeListener(this, keypath)
+
+    reset: Lanes.emptyFn
+
+    template: ->
+        this.namespace.name.toLowerCase() + "/screens/" + this.constructor.name.toLowerCase() + "/layout";
+
+    render: ->
+        previouslyRendered = this.rendered
+        Lanes.Views.RenderContext.start(this)
+        # Lanes.re we cheat and skip ViewBase so it doesn't push to context
+        this.reset()
+        this.renderContextFree()
+        #Lanes.Views.Base.__super__.render.apply(this, arguments)
+        this.renderAllSubviews() if previouslyRendered
+        Lanes.Views.RenderContext.reset()
+        this
+
+    addButton: (config, align='left')->
+        this.$(".toolbar ." + align).append( Lanes.Views.Helpers.button(config) )
+
+
+# By doing extending in this fashion, the class will appear as ScreenBase
+# during debugging, allowing it to be easily identified
+Lanes.Screens.Base = Lanes.Views.Base.extend( ScreenBase )

data/client/{javascripts/view/mixins/ScreenChangeListener.coffee → lanes/screens/ChangeListener.coffee}

@@ -1,4 +1,4 @@
-Lanes.View.mixins.ScreenChangeListener = {
+Lanes.Screens.ChangeListener = {
 
     model_events:
         'remote-update': 'onChange'
@@ -32,7 +32,7 @@ Lanes.View.mixins.ScreenChangeListener = {
         @change_count += 1
 
     bindModel: (model)->
-        Lanes.View.Base.prototype.bindModel.call(this, model)
+        Lanes.Views.Base.prototype.bindModel.call(this, model)
         @changes.reset([])
         @change_count = 0
 

data/client/lanes/screens/Router.coffee

@@ -0,0 +1,6 @@
+
+class Router
+    constructor: -> super
+    
+    
+Lanes.Screens.Router = Lanes.lib.MakeBaseClass( Lanes.Vendor.Ampersand.Router, Router )

data/client/lanes/screens/index.js

@@ -0,0 +1 @@
+//= require_tree .