lanes 0.0.8 → 0.1.0

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

@@ -1,4 +1,4 @@
-class ScreenView extends Lanes.Data.BasicModel
+class ScreenView extends Lanes.Models.BasicModel
 
     session:
         screen: 'object'
@@ -18,18 +18,18 @@ class ScreenView extends Lanes.Data.BasicModel
     initialize: (options)->
         super
         @screen=options.screen
-        Lanes.Data.Screens.displaying.add( this )
+        Lanes.Models.Screens.displaying.add( this )
         this.active=true
 
     renderScreen: ->
         this.view.render()
 
     remove: ->
-        Lanes.Data.Screens.displaying.remove( this )
+        Lanes.Models.Screens.displaying.remove( this )
 
 
 
-class ScreenDefinition extends Lanes.Data.BasicModel
+class ScreenDefinition extends Lanes.Models.BasicModel
 
     session:
         id:          'string'
@@ -45,7 +45,7 @@ class ScreenDefinition extends Lanes.Data.BasicModel
     derived:
         model_type:
             deps: ['model'], fn: ->
-                Lanes.getPath(this.model,"Lanes.Data")
+                Lanes.getPath(this.model,"Lanes.Models")
 
     initialize: ->
         @views = []
@@ -95,7 +95,7 @@ class ScreenDefinition extends Lanes.Data.BasicModel
         #             Lanes.warn(failures)
 
 
-class ScreenViewSet extends Lanes.Data.BasicCollection
+class ScreenViewSet extends Lanes.Models.BasicCollection
 
     model: ScreenView
 
@@ -133,7 +133,7 @@ class ScreenViewSet extends Lanes.Data.BasicCollection
 
 
 
-class ScreenSet extends Lanes.Data.BasicCollection
+class ScreenSet extends Lanes.Models.BasicCollection
 
     model: ScreenDefinition
 
@@ -145,7 +145,7 @@ class ScreenSet extends Lanes.Data.BasicCollection
 
 
 
-class MenuGroup extends Lanes.Data.BasicModel
+class MenuGroup extends Lanes.Models.BasicModel
 
     session:
         id:          'string'
@@ -155,18 +155,18 @@ class MenuGroup extends Lanes.Data.BasicModel
         active:      ['boolean', true, false]
 
     screens: ->
-        @avail ||= new Lanes.Data.SubCollection( Lanes.Data.Screens.all, {
+        @avail ||= new Lanes.Models.SubCollection( Lanes.Models.Screens.all, {
             filter: (screen)=>
                 screen.group_id == @id && Lanes.current_user.canRead(screen.model_type)
             watched: ['group_id']
         })
 
-class MenuGroupSet extends Lanes.Data.BasicCollection
+class MenuGroupSet extends Lanes.Models.BasicCollection
     constructor: -> super
     model: MenuGroup
 
     available: ->
-        @avail ||= new Lanes.Data.SubCollection(this, {
+        @avail ||= new Lanes.Models.SubCollection(this, {
             filter: (mgs)=>
                 mgs.screens().filter()
                 mgs.screens().length > 0
@@ -174,7 +174,7 @@ class MenuGroupSet extends Lanes.Data.BasicCollection
 
 
 
-Lanes.Data.Screens = {
+Lanes.Models.Screens = {
     all: new ScreenSet
     displaying: new ScreenViewSet([],{ single_active_only: true })
     groups:  new MenuGroupSet

data/client/lanes/models/Sync.coffee

@@ -0,0 +1,86 @@
+
+# a simple reimplentation
+# to use traffic cop
+methodMap = {
+    'create': 'POST',
+    'update': 'PUT',
+    'patch':  'PATCH',
+    'delete': 'DELETE',
+    'read':   'GET'
+}
+
+getValue = (object, prop)->
+    if !(object && object[prop])
+        return null;
+    return if _.isFunction(object[prop]) then object[prop]() else object[prop];
+
+
+
+
+paramsMap = {
+    fields  : 'f'
+    with    : 'w'
+    query   : 'q'
+    include : 'i'
+    order   : 'o'
+    limit   : 'l'
+    start   : 's'
+    format  : 'df'
+}
+
+Lanes.Models.Sync = {
+    urlError: ->
+        throw new Error('A "url" property or function must be specified')
+
+    copyServerReply: (record, reply)->
+        record.errors = reply?.errors
+        record.lastServerMessage = reply?.message
+        { record: record, reply: reply }
+
+    # Wraps a sync request's error and success functions
+    # Copies any errors onto the model and sets it's data on success
+    wrapRequest: (record, options)->
+        error   = options.error
+        success = options.success
+        options.promise = new _.Promise( (resolve,reject)->
+            options.resolvePromise = resolve
+            options.rejectPromise  = reject
+        )
+        options.error = (reply, resp, req)->
+            options.rejectPromise( this.copyServerResp(record,resp.responseJSON || {error: resp.responseText}) )
+            error?.apply(options.scope, arguments)
+
+        options.success = (reply,resp,req)->
+            record.setFromServer( reply.data, options ) if reply?.data?
+            options.resolvePromise( Lanes.Models.Sync.copyServerReply(record,reply) )
+            success?.apply(options.scope, arguments)
+        options
+
+    perform: (method, model, options={})->
+        query = {}
+        for key, value of options
+            query[ paramsMap[key] ] = value if paramsMap[key]
+
+        # Default JSON-request options.
+        params = {
+            type: methodMap[method]
+            dataType: "json"
+            data: query
+        }
+
+        # Ensure that we have a URL.
+        params.url = _.result(model, "url") or Lanes.Models.Sync.urlError() unless options.url
+        params.url += '.json'
+        params.headers = {
+            X_CSRF_TOKEN: Lanes.Models.Config.csrf_token
+        }
+        params.contentType = "application/json"
+        if options.data || _.contains(['create','update','patch'], method)
+            params.data = JSON.stringify( options.data || model.dataForSave(options) )
+            delete options.data
+
+        # 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
+        xhr
+}

data/client/lanes/{data → models}/User.coffee

@@ -1,17 +1,17 @@
-unless Lanes.Data.Roles
+unless Lanes.Models.Roles
 
-    class Lanes.Data.Role extends Lanes.Data.BasicModel
+    class Lanes.Models.Role extends Lanes.Models.BasicModel
         props:
             id:     'string'
             name:   'string'
             member: { type: 'boolean', default: false }
 
-    class Lanes.Data.Roles extends Lanes.Data.BasicCollection
-        model: Lanes.Data.Role
+    class Lanes.Models.Roles extends Lanes.Models.BasicCollection
+        model: Lanes.Models.Role
 
 
-unless Lanes.Data.User
-    class Lanes.Data.User extends Lanes.Data.Model
+unless Lanes.Models.User
+    class Lanes.Models.User extends Lanes.Models.Base
 
         constructor: (attributes,access)->
             super
@@ -24,7 +24,7 @@ unless Lanes.Data.User
             isLoggedIn:
                 fn: -> false
             allRoles:
-                fn: -> new Lanes.Data.Roles
+                fn: -> new Lanes.Models.Roles
 
         session:
             access_data: 'object'
@@ -43,4 +43,4 @@ unless Lanes.Data.User
         canDelete: (model)      -> true
 
 unless Lanes.current_user
-    Lanes.current_user = new Lanes.Data.User
+    Lanes.current_user = new Lanes.Models.User

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

@@ -1,6 +1,6 @@
 //= require_self
 //= require ./Sync
-//= require ./Model
+//= require ./Base
 //= require ./Collection
 //= require_tree ./mixins
 //= require_tree .

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

@@ -1,9 +1,9 @@
-Lanes.Data.Mixins.HasCodeField = {
+Lanes.Models.Mixins.HasCodeField = {
 
     INVALID: /[^A-Z0-9a-z]/
 
     included: ->
-        this.prototype.INVALID_CODE_CLanes.RS ||= Lanes.Data.mixins.Lanes.sCodeField.INVALID
+        this.prototype.INVALID_CODE_CLanes.RS ||= Lanes.Models.mixins.Lanes.sCodeField.INVALID
 
     initialize: ->
         this.on('change:code', this.upcaseCode )

data/client/lanes/screens/Base.coffee

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

data/client/lanes/screens/ChangeListener.coffee

@@ -11,7 +11,7 @@ Lanes.Screens.ChangeListener = {
 
     derived:
         changes: deps:[], fn: ->
-            new Lanes.Data.ChangeSetCollection([],{ parent: this })
+            new Lanes.Models.ChangeSetCollection([],{ parent: this })
         changes_visible: { deps: ['change_count'], fn:-> @change_count > 0 }
 
     bindings:

data/client/lanes/screens/Instance.coffee

@@ -6,7 +6,7 @@ class Lanes.Screens.Instance
 
     constructor: (selector, options)->
         this.viewport = new Lanes.Views.Viewport({ selector: selector, instance: this });
-        Lanes.Data.Bootstrap.initialize(options);
+        Lanes.Models.Bootstrap.initialize(options);
         Lanes.$(document).ready => @boot(options)
 
     boot: (options)->
@@ -25,13 +25,13 @@ class Lanes.Screens.Instance
             title: => @getAttribute('data-tooltip-message')
         });
         Lanes.Views.Keys.initialize();
-        Lanes.Data.PubSub.initialize() if options.pub_sub;
+        Lanes.Models.PubSub.initialize() if options.pub_sub;
         
         view = Lanes.getPath(options.root_view);
         if view
             this.displayInitialView(view);
         else
-            definition=Lanes.Data.Screens.all.findWhere({view: options.root_view});
+            definition=Lanes.Models.Screens.all.findWhere({view: options.root_view});
             if definition
                 definition.getScreen().then( (screen)=>
                     # break out of the promise so an errors during render get thrown properly

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

@@ -1,7 +1,7 @@
 <% Lanes::Screens::Group.each(self) do | spec | %>
-Lanes.Data.Screens.groups.add( <%= spec.to_json %> );
+Lanes.Models.Screens.groups.add( <%= spec.to_json %> );
 <% end %>
 
 <% Lanes::Screens::Definition.each(self) do | spec | %>
-Lanes.Data.Screens.register( <%= spec.to_json %> );
+Lanes.Models.Screens.register( <%= spec.to_json %> );
 <% end %>

data/client/lanes/views/Base.coffee

@@ -42,7 +42,7 @@ class ViewBase
         rendered:
             deps: ["el"], fn: -> !!@el
 
-        hasData:
+        hasModels:
             deps: ["model"], fn: -> !!@model
 
         viewport:
@@ -147,8 +147,8 @@ class ViewBase
     renderWithTemplate: (templateArg)->
         template = templateArg || this.resultsFor('template')
         throw new Error('Template string or function needed.') unless template
-        template_fn = Lanes.Templates.find(template, this.source.extension)
-        newDom = if template_fn then template_fn( _.result(this,'templateData')) else template
+        template_fn = Lanes.Templates.find(template, this.FILE.extension)
+        newDom = if template_fn then template_fn( _.result(this,'templateModels')) else template
         newDom = Lanes.Vendor.domify(newDom) if _.isString(newDom);
         parent = this.el && this.el.parentNode;
         parent.replaceChild(newDom, this.el) if parent
@@ -159,18 +159,18 @@ class ViewBase
         this.el = newDom;
         return this;
 
-    templateName: -> _.underscore( this.source.file )
+    templateName: -> _.underscore( this.FILE.file )
         
     template: ->
-        this.source.extension.toLowerCase() + "/views/" + _.result(this,'templateName')
+        this.FILE.extension.toLowerCase() + "/views/" + _.result(this,'templateName')
 
-    source: FILE
+    FILE: FILE
 
-    templateData: ->
+    templateModels: ->
         { model: this.model, collection: this.collection }
 
     renderTemplate:(name,data={})->
-        template = Lanes.Templates.find(name, this.source.name)
+        template = Lanes.Templates.find(name, this.FILE.name)
         if template
             template(data)
         else
@@ -179,7 +179,7 @@ class ViewBase
 
     renderTemplateMethod: (method)->
         return null unless name = _.result(this, method)
-        this.renderTemplate(name, _.result(this, "#{method}Data") || @model)
+        this.renderTemplate(name, _.result(this, "#{method}Models") || @model)
 
 
     # Remove this view by taking the element out of the DOM, and removing any
@@ -302,7 +302,7 @@ class ViewBase
             Lanes.getPath(subview.component, Lanes.Components)
         else if subview.view
             if _.isString(subview.view)
-                Lanes.getPath(subview.view, this.source.namespace['Views'] )
+                Lanes.getPath(subview.view, this.FILE.namespace['Views'] )
             else
                 subview.view
         Lanes.warn( "Unable to obtain view for %o", subview) if ! klass

data/client/lanes/views/ModelObserver.coffee

@@ -1,4 +1,4 @@
-class Lanes.Views.ModelObserver extends Lanes.Data.State
+class Lanes.Views.ModelObserver extends Lanes.Models.State
 
     model_events: {}
 

data/client/lanes/views/PubSub.coffee

@@ -1,4 +1,4 @@
-# Responsible for adding and removing a view's model(s) from Data.PubSub
+# Responsible for adding and removing a view's model(s) from Models.PubSub
 class Lanes.Views.PubSub extends Lanes.Views.ModelObserver
 
     model_events:
@@ -17,13 +17,13 @@ class Lanes.Views.PubSub extends Lanes.Views.ModelObserver
             this.showUpdate(field) if field = @view.query("[name=#{field}]")
 
     bindModel: (model)->
-        Lanes.Data.PubSub.add(model)
+        Lanes.Models.PubSub.add(model)
         super
 
     unBindModel: (model)->
-        Lanes.Data.PubSub.remove(model)
+        Lanes.Models.PubSub.remove(model)
         super
 
     teardown: ->
         super
-        Lanes.Data.PubSub.remove(model) if model = this.getModel()
+        Lanes.Models.PubSub.remove(model) if model = this.getModel()

data/client/lanes/views/Viewport.coffee

@@ -11,7 +11,7 @@ BREAKPOINTS = {
 
 ALL_INSTANCES = []
 
-class Lanes.Views.Viewport extends Lanes.Data.BasicModel
+class Lanes.Views.Viewport extends Lanes.Models.BasicModel
 
     constructor: ->
         super

data/client/lanes/workspace/ActiveScreensSwitcher.coffee

@@ -51,7 +51,7 @@ class Lanes.Workspace.ActiveScreenSwitcher extends Lanes.Views.Base
     constructor: ->
         super
         _.bindAll(this, 'resetShownControls')
-        @collection = Lanes.Data.Screens.displaying
+        @collection = Lanes.Models.Screens.displaying
         this.listenTo( @collection, "change:active", this.onActiveChange )
         this.listenTo( this.viewport,  "change:width", this.resetShownControls )
         this.listenTo( Lanes.current_user, "change:isLoggedIn", this.closeScreens)

data/client/lanes/workspace/Pages.coffee

@@ -17,8 +17,8 @@ class Lanes.Workspace.Pages extends Lanes.Views.Base
         screens_menu_container: '.screens-menu-container'
 
     initialize: (options)->
-        this.listenTo( Lanes.Data.Screens.displaying, "change:active", this.onActiveChange )
-        this.listenTo( Lanes.Data.Screens.displaying, "remove",        this.onRemove )
+        this.listenTo( Lanes.Models.Screens.displaying, "change:active", this.onActiveChange )
+        this.listenTo( Lanes.Models.Screens.displaying, "remove",        this.onRemove )
         this.listenTo( @model,'change:screen_menu_position', this.moveScreensMenu )
         super
 

data/client/lanes/workspace/ScreensMenu.coffee

@@ -71,7 +71,7 @@ class Lanes.Workspace.ScreensMenu extends Lanes.Views.Base
     initialize: ->
         super
         this.listenTo(Lanes.current_user, "change:isLoggedIn", this.resetGroups)
-        @groups = Lanes.Data.Screens.groups.available()
+        @groups = Lanes.Models.Screens.groups.available()
         this
 
     resetGroups: ->

data/lanes.gemspec

@@ -13,7 +13,8 @@ Gem::Specification.new do |spec|
     spec.summary       = %q{Lanes is a framework for easily writing single page web applications}
     spec.description   = %q{Lanes is a framework for writing single page web applications.  It's a full stack framework that contains  both server and client.}
 
-    spec.homepage      = "http://argosity.com/lanes/"
+    spec.homepage      = "http://lanesframework.org/"
+
     spec.license       = "MIT"
 
     spec.files         = `git ls-files`.split($/)

data/lib/lanes/command/generate_model.rb

@@ -7,8 +7,7 @@ module Lanes
             RESERVED_YAML_KEYWORDS = %w(y yes n no true false on off null)
             OPTIONS ||= {
                 timestamps: true,
-                parent:    "Lanes::Model",
-                client_collection_parent: "Lanes.Data.Collection"
+                parent:    "Lanes::Model"
             }
 
             class_options OPTIONS
@@ -42,10 +41,10 @@ module Lanes
 
             def create_client
                 self.fields.unshift ModelAttribute.parse("id:integer")
-                template "client/data/Model.coffee", \
-                  "#{client_dir}/data/#{class_name}.coffee"
-                template "spec/client/data/ModelSpec.coffee", \
-                  "#{spec_dir}/data/#{class_name}Spec.coffee"
+                template "client/models/Model.coffee", \
+                  "#{client_dir}/models/#{class_name}.coffee"
+                template "spec/client/models/ModelSpec.coffee", \
+                  "#{spec_dir}/models/#{class_name}Spec.coffee"
             end
 
             def add_route
@@ -86,7 +85,7 @@ module Lanes
 
             def client_parent
                 if options[:parent] == 'Lanes::Model'
-                    "Lanes.Data.Model"
+                    "Lanes.Models.Base"
                 else
                     "Lanes.#{namespace.camelize}.#{options[:parent]}"
                 end

data/lib/lanes/command/named_command.rb

@@ -15,7 +15,7 @@ module Lanes
             def load_namespace
                 @namespace  = options[:namespace] ||
                   Command.load_current_extension(raise_on_fail:true).identifier
-              end
+            end
 
             def set_variables
                 @class_name = name.classify

data/lib/lanes/command/templates/client/index.js

@@ -1,4 +1,4 @@
-//=require_tree ./data
+//=require_tree ./models
 //=require_tree ./views
 //=require_tree ./components
 //=require ./Extension

data/lib/lanes/command/templates/client/{data → models}/Model.coffee

@@ -1,7 +1,7 @@
-class <%= namespace.camelize %>.Data.<%= class_name %> extends <%= client_parent %>
+class <%= namespace.camelize %>.Models.<%= class_name %> extends <%= client_parent %>
 
     api_path: '<%= name.downcase.pluralize.underscore.dasherize %>'
-    source: FILE
+    FILE: FILE
 
     props:
 <% fields.each do |field| -%>
@@ -15,10 +15,6 @@ class <%= namespace.camelize %>.Data.<%= class_name %> extends <%= client_parent
 
     associations:
 <% reference_fields.each do |field| -%>
-        <%= sprintf("%-#{max_field_length}s ",field.name) %>: { <%= field.belongs_to? ? 'model' : 'collection' -%>: "Lanes.<%= namespace.camelize %>.<%= field.name.camelize %>" }
+        <%= sprintf("%-#{max_field_length}s ",field.name) %>: { <%= field.belongs_to? ? 'model' : 'collection' -%>: "<%= namespace.camelize %>.<%= field.name.camelize %>" }
 <% end -%>
 <% end -%>
-
-class <%= namespace.camelize %>.Data.<%= class_name %>Collection extends <%= options[:client_collection_parent] %>
-
-    model: <%= namespace.camelize %>.Data.<%= class_name %>

data/lib/lanes/command/templates/client/views/View.coffee

@@ -1,6 +1,6 @@
 class <%= namespace.classify %>.Views.<%= class_name %> extends Lanes.Views.Base
 
-    source: FILE
+    FILE: FILE
 
     subviews: {}
 

data/lib/lanes/command/templates/spec/client/models/ModelSpec.coffee

@@ -0,0 +1,5 @@
+describe "<%= class_name %> Model Suite", ->
+
+    it "can be instantiated", ->
+        model = new <%= namespace.camelize %>.Models.<%= class_name %>()
+        expect(model).toEqual(jasmine.any(<%= namespace.camelize %>.Models.<%= class_name %>))

data/lib/lanes/command/update_model.rb

@@ -3,22 +3,15 @@ require_relative 'model_attribute'
 module Lanes
     module Command
 
-        class UpdateModel < Thor::Group
+        class UpdateModel < NamedCommand
 
-            include Thor::Actions
-
-            argument :name
-            attr_reader :namespace, :class_name, :namespaced_name
-
-            def self.source_root
-                Pathname.new(__FILE__).dirname.join("templates")
-            end
+            attr_reader :namespaced_name
 
             def read_class
                 if name=~/::/
                     (@namespace,@name) = name.split("::")
                 else
-                    ext = Command.load_current_extension
+                    ext = Command.load_current_extension(raise_on_fail:true)
                     @namespace = ext.identifier
                 end
                 class_name = name.camelize
@@ -27,7 +20,7 @@ module Lanes
                 if !@klass
                     raise Thor::Error.new("#{namespaced_name} was not found")
                 end
-                @file = Pathname.new("client/data/#{class_name}.coffee")
+                @file = Pathname.new(client_dir).join("models/#{class_name}.coffee")
                 unless @file.exist?
                     raise Thor::Error.new("Model #{@file} doesn't exist")
                 end

data/lib/lanes/command.rb

@@ -25,8 +25,9 @@ module Lanes
                 if ext
                     begin
                         require(ext)
-                    rescue
-                        return _maybe_fail(raise_on_fail)
+                    rescue =>e
+                        stack = e.backtrace[0..4].join("\n")
+                        raise Thor::Error.new("Loading ./lib/*/extension.rb failed with: #{e}\n#{stack}")
                     end
                     all = Extensions.all
                     if all.any?
@@ -39,7 +40,7 @@ module Lanes
             end
 
             def _maybe_fail(should_raise)
-                raise Thor::Error.new("Unable to locate Lanes environment") if should_raise
+                raise Thor::Error.new("Unable to locate Lanes environment.\nDoes ./lib/*/extension.rb exist?") if should_raise
                 return nil
             end
         end

data/lib/lanes/version.rb

@@ -1,5 +1,5 @@
 module Lanes
 
-    VERSION = "0.0.8"
+    VERSION = "0.1.0"
 
 end

data/spec/helpers/lanes-helpers.coffee

@@ -11,7 +11,7 @@ Lanes.Vendor.MessageBus = {
     start: Lanes.emptyFn
 }
     
-class Lanes.Testing.Model extends Lanes.Data.Model
+class Lanes.Testing.Model extends Lanes.Models.Base
     api_path: "test"
     props:
         id: 'number',
@@ -29,7 +29,7 @@ class Lanes.Testing.Model extends Lanes.Data.Model
             deps: ['something', 'fireDanger', 'active'],
             fn: -> this.something + this.active;
 
-class Lanes.Testing.Collection extends Lanes.Data.Collection
+class Lanes.Testing.Collection extends Lanes.Models.Collection
     model: Lanes.Testing.Model
 
 syncResponse = (method,model,options)->
@@ -37,6 +37,7 @@ syncResponse = (method,model,options)->
         options.success(model, syncReply, {})
     if options.failure && !syncReply.success
         options.failure(model, syncReply, {})
+    _.Promise.resolve(model,options)
 
 syncReply = {}
 
@@ -55,7 +56,7 @@ beforeEach ->
     Lanes.Testing.syncSpy = jasmine.createSpy('sync').and.callFake(syncResponse)
     Lanes.Testing.syncSpy.lastOptions = ->
         this.calls.mostRecent().args[2]
-    Lanes.Data.Model::sync      = Lanes.Testing.syncSpy
-    Lanes.Data.Collection::sync = Lanes.Testing.syncSpy
+    Lanes.Models.Base::sync       = Lanes.Testing.syncSpy
+    Lanes.Models.Collection::sync = Lanes.Testing.syncSpy