lanes 0.1.0 → 0.1.2

data/client/lanes/models/Collection.coffee

@@ -10,6 +10,9 @@ CommonMethods = {
             break if found != -1
         found
 
+    # convenience method to create a new subCollection
+    subcollection: (options)->
+        new Lanes.Models.SubCollection(this, options)
 
     destroyAll: (options={})->
         success = options.success
@@ -21,7 +24,6 @@ CommonMethods = {
                 success.apply(@,arguments) if success
         })
         Lanes.Models.Sync.perform('delete', this, options)
-
 }
 
 class ModelsCollection
@@ -31,56 +33,66 @@ class ModelsCollection
         @errors=[]
         Lanes.Vendor.Ampersand.Collection.apply(this, arguments)
 
+    # convenience method to instantiate a collection
+    # then call fetch on it with the options provided
     @fetch: (options)->
         collection = new this
         collection.fetch(options)
         collection
-        
+
+    # Fetch the a set of models for the collection, replacing all
+    # current models whith them when the call completes
     fetch: (options={})->
-        @_isLoaded = true
-        Lanes.Models.Sync.wrapRequest(this,options)
-        return this.sync('read', this, options)
+        handlers = Lanes.Models.Sync.wrapRequest(this,options)
+        if options.force || !@_isLoaded
+            this.sync('read', this, options)
+        else
+            handlers.resolvePromise( record: this, reply: {} )
+        handlers.promise
+
+    # Call the callback function when the current fetch succeeds
+    # If the collection is not currently being loaded,
+    # the callback is immediatly invoked
+    whenLoaded: (cb)->
+        if this.requestInProgress
+            cb(this)
+        else
+            this._loaded_callbacks ||= []
+            this._loaded_callbacks.push(cb)
+        this
 
     # Sets the attribute data from a server respose
     setFromServer: (data, options)->
+        @_isLoaded = true
         method = if options.reset then 'reset' else 'set'
         this[method](data, options)
-        this.trigger('sync', this, data, options)
-
-    isLoaded:->
-        @_isLoaded
+        if this._loaded_callbacks
+            cb(this) for cb in this._loaded_callbacks
+            delete this._loaded_callbacks
 
-    ensureLoaded: ( callback )->
-        if ! @_isLoaded && ! this.length
-            this.fetch({ success: callback })
-        else if callback
-            callback()
+    isLoaded:-> @_isLoaded
 
+    # true if any models have unsaved data
     isDirty: ->
         for model in @models
             return true if model.isDirty()
         false
 
-    parse:(resp)->
-        resp['data']
-
-    viewJSON: (options)->
-        this.map( (model) ->
-            model.viewJSON(options)
-        )
-
-    url: ->
-        @model::urlRoot()
+    url: -> @model::urlRoot()
 
     sync: Lanes.Models.Sync.perform
 
     save: (options)->
         Lanes.Models.Sync.perform('update', this, options)
 
+    # returns data to save to server.  If options.saveAll is true,
+    # all attributes from all models data is returned.
+    # Otherwise only unsaved attributes are returned.
     dataForSave: (options)->
         unsaved = []
         for model in @models
-            unsaved.push( model.unsavedModels() ) if model.isDirty()
+            if options.saveAll || model.isDirty()
+                unsaved.push( model.dataForSave(options) )
         unsaved
 
     _prepareModel: (attrs, options={})->

data/client/lanes/models/Screens.coffee

@@ -38,9 +38,11 @@ class ScreenDefinition extends Lanes.Models.BasicModel
         view:        'string'
         icon:        'string'
         group_id:    'string'
-        files:       'array'
         loading:     'boolean'
         model:       'string'
+        assets:      'array'
+        js:          'string'
+        css:         'string'
 
     derived:
         model_type:
@@ -54,7 +56,7 @@ class ScreenDefinition extends Lanes.Models.BasicModel
         @views.push( new ScreenView( screen: this, viewport: viewport ) )
 
     getScreen: ->
-        @viewModel ||= Lanes.getPath(this.view,"Lanes.Screens")
+        @viewModel ||= Lanes.getPath(this.view)
         if @viewModel?
             _.Promise.resolve(@viewMOdel)
         else
@@ -62,9 +64,9 @@ class ScreenDefinition extends Lanes.Models.BasicModel
 
     loadScreen: ->
         me=this
-        return new _.Promise(  (resolve,reject)->
+        return new _.Promise( (resolve,reject)->
              me.loading=true
-             Lanes.lib.Request(me.files)
+             Lanes.lib.Request(me.assets)
                  .then ->
                     me.loading=false
                     me.viewModel = Lanes.getPath(me.view)
@@ -80,20 +82,6 @@ class ScreenDefinition extends Lanes.Models.BasicModel
     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.Models.BasicCollection
 

data/client/lanes/models/Sync.coffee

@@ -1,4 +1,3 @@
-
 # a simple reimplentation
 # to use traffic cop
 methodMap = {
@@ -46,13 +45,20 @@ Lanes.Models.Sync = {
             options.resolvePromise = resolve
             options.rejectPromise  = reject
         )
-        options.error = (reply, resp, req)->
-            options.rejectPromise( this.copyServerResp(record,resp.responseJSON || {error: resp.responseText}) )
+        options.error = (reply, status, req)->
+            options.rejectPromise(
+                Lanes.Models.Sync.copyServerReply( record,
+                    resp.responseJSON || {error: resp.responseText}
+                )
+            )
+            delete record.requestInProgress
             error?.apply(options.scope, arguments)
 
-        options.success = (reply,resp,req)->
+        options.success = (reply, status, req)->
             record.setFromServer( reply.data, options ) if reply?.data?
+            record.trigger("sync", record, reply, status)
             options.resolvePromise( Lanes.Models.Sync.copyServerReply(record,reply) )
+            delete record.requestInProgress
             success?.apply(options.scope, arguments)
         options
 
@@ -81,6 +87,7 @@ Lanes.Models.Sync = {
 
         # Make the request, allowing the user to override any Ajax options.
         xhr = options.xhr = Lanes.$.ajax(_.extend(params, options))
-        model.trigger "request", model, xhr, options
+        model.requestInProgress = true
+        model.trigger("request", model, xhr, options)
         xhr
 }

data/client/lanes/screens/Base.coffee

@@ -16,8 +16,7 @@ class ScreenBase
 
     reset: Lanes.emptyFn
 
-    template: ->
-        this.FILE.extension.toLowerCase() + "/screens/" + _.underscore( this.FILE.file ) + "/layout";
+    templatePrefix: -> this.FILE.extensionName.toLowerCase() + "/screens/"
 
     render: ->
         previouslyRendered = this.rendered

data/client/lanes/screens/Instance.coffee

@@ -22,11 +22,11 @@ class Lanes.Screens.Instance
         this.root.tooltip({
             viewport: '.lanes'
             selector: '[data-tooltip-message]'
-            title: => @getAttribute('data-tooltip-message')
+            title: -> this.getAttribute('data-tooltip-message')
         });
         Lanes.Views.Keys.initialize();
         Lanes.Models.PubSub.initialize() if options.pub_sub;
-        
+
         view = Lanes.getPath(options.root_view);
         if view
             this.displayInitialView(view);
@@ -45,8 +45,5 @@ class Lanes.Screens.Instance
     displayInitialView:(view)->
         this.view = new view({parent: this, model: this.viewport}).render();
         this.viewport.el = this.view.$el;
-
         this.root.append( this.view.el );
         Lanes.Extensions.fireOnAvailable(this);
-
-

data/client/lanes/screens/screen-definitions.js.erb

@@ -1,7 +1,15 @@
-<% Lanes::Screens::Group.each(self) do | spec | %>
+<% if !Lanes.config.initial_workspace_screen_id.blank? &&
+      screen = Lanes::Screen[Lanes.config.initial_workspace_screen_id]
+require_asset screen.js
+end %>
+
+<% Lanes::Screen.each_group do | spec | %>
 Lanes.Models.Screens.groups.add( <%= spec.to_json %> );
 <% end %>
 
-<% Lanes::Screens::Definition.each(self) do | spec | %>
+<% Lanes::Screen.each do | spec | %>
 Lanes.Models.Screens.register( <%= spec.to_json %> );
 <% end %>
+
+<% depend_on "/Users/nas/code/lanes-access/config/screens.rb" %>
+

data/client/{styles → lanes/styles}/fonts.scss

@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'skr-icon';
-  src:url(font-path('styles/fonts/icomoon.eot') + '?-7u8s0f');
-  src:url(font-path('styles/fonts/icomoon.eot') + '?#iefix-7u8s0f') format('embedded-opentype'),
-  url(font-path('styles/fonts/icomoon.woff') + '?-7u8s0f') format('woff'),
-  url(font-path('styles/fonts/icomoon.ttf')  + '?-7u8s0f') format('truetype'),
-  url(font-path('styles/fonts/icomoon.svg')  + '?-7u8s0f#icomoon') format('svg');
+  src:url(font-path('lanes/styles/fonts/icomoon.eot') + '?-7u8s0f');
+  src:url(font-path('lanes/styles/fonts/icomoon.eot') + '?#iefix-7u8s0f') format('embedded-opentype'),
+  url(font-path('lanes/styles/fonts/icomoon.woff') + '?-7u8s0f') format('woff'),
+  url(font-path('lanes/styles/fonts/icomoon.ttf')  + '?-7u8s0f') format('truetype'),
+  url(font-path('lanes/styles/fonts/icomoon.svg')  + '?-7u8s0f#icomoon') format('svg');
   font-weight: normal;
   font-style: normal;
 }