lanes 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e6cb1567e7230eb1c9320af1e79312501b03f6a
-  data.tar.gz: 075ddb6c5d12cb8006bb6b0a0f6b52350f9bd736
+  metadata.gz: 0b20837325a4feed75930d806fcc0ab5a8e914d3
+  data.tar.gz: 42515ab0003321f83e4946766645550b706deea5
 SHA512:
-  metadata.gz: 40c369f55a08e182b116d4a6baf22612a1385104ebb961967811c2639cea03ebb0255e222e7e820a53334f50e42f3271a49147e2866f09f15908adc9d206cf76
-  data.tar.gz: d33486e07c3b727ccf22160d161b87860eb6edccfb39e1b82d4fa23304c3e0c64da50d87995481bf2048c7054a4f1427a1614d82a6bce531e1c23f8a8c11c45b
+  metadata.gz: 70dc86cd4d7e8c44aa1536ad7301672ccb75e0b1b0525bb7f5bfc07fade7de185644190ea99358df5e6d01200e1b7605a5cad2c2b324270a7efc498f2c9f2e43
+  data.tar.gz: 9fd2a37a119aaadfe4dda3f22fa2cd4882d2f79e19eed6e1a96469f8060ea77a579e3c38fd6dcf5dfc86552a34128bbc901f88a7dc94a3c8e15f01968646b69e

data/client/lanes/components/ChoicesInput.coffee

@@ -21,7 +21,7 @@ class Lanes.Component.ChoicesInput extends Lanes.Component.Base
 
     initialize: (options={})->
         if @association
-            collection = Lanes.Data[@association.model].sharedCollection()
+            collection = Lanes.Models[@association.model].sharedCollection()
             collection.fetch().then (m)=>
                 @selections = m
                 this.on('change:model', this.onModelChange )

data/client/lanes/components/grid/Grid.coffee

@@ -1,4 +1,4 @@
-# DataTables class modifications
+# ModelsTables class modifications
 _.extend( Lanes.$.fn.dataTableExt.oStdClasses,{
     sTable: "table table-striped"
 	sWrapper: "dataTables_wrapper form-inline"
@@ -18,7 +18,7 @@ class Lanes.Components.Grid extends Lanes.Components.Base
         'order.dt table': 'onSort'
 
     template: 'grid/template'
-    templateData: ->
+    templateModels: ->
         data = { grid: this, buttons: ['refresh'] }
         data['buttons'].push('create') if @add_records
         data['buttons'].push('delete') if @delete_records
@@ -161,7 +161,7 @@ class Lanes.Components.Grid extends Lanes.Components.Base
 #            columnDefs: @column_definitions
             ajax:
                 url: @record_query.url + ".json"
-                data: (d)=>@buildData(d)
+                data: (d)=>@buildModels(d)
                 dataSrc: (d)->
                     d.recordsFiltered = d.recordsTotal = d.total
                     row.DT_RowId = row.shift() for row in d.data
@@ -176,7 +176,7 @@ class Lanes.Components.Grid extends Lanes.Components.Base
         this.delayedGridConfiguration()
         this
 
-    buildData: (d)->
+    buildModels: (d)->
         params = { o: {}, s: d.start, l: d.length||100, df:'array', f: ['id'].concat(_.pluck(@column_definitions, 'field')) }
         if ! _.isEmpty( query = @record_query.asParams() )
             params['q']=query

data/client/lanes/components/grid/PopOverEditor.coffee

@@ -1,7 +1,7 @@
 class Lanes.Components.Grid.PopOverEditor extends Lanes.Components.Grid.Editor
 
     template: 'grid/popover-editor'
-    templateData: ->
+    templateModels: ->
         { columns: this.grid.column_definitions }
 
     session:

data/client/lanes/components/popover/PopOver.coffee

@@ -8,20 +8,20 @@ class Lanes.Components.PopOver extends Lanes.Components.Base
         title: 'string'
         content: 'any'
         template: 'string'
-        templateData: 'object'
+        templateModels: 'object'
         placement: { type: 'string', default: "right" }
         destroyAfterHide: [ 'boolean', true, false ]
 
     derived:
         options:
-            deps: ['title','content','template','templateData'], fn:->
+            deps: ['title','content','template','templateModels'], fn:->
                 content = if this.template then this.renderTemplate() else this.content
                 { title: @title, content: content, html: true, placement: "auto #{@placement}" }
 
     renderTemplate: ->
         template = Lanes.Templates.find(this.template)
         if template
-            template(this.templateData)
+            template(this.templateModels)
         else
             Lanes.warn "PopOver Template #{this.template} was not found"
 

data/client/lanes/components/record_finder/RecordFinder.coffee

@@ -103,7 +103,7 @@ Lanes.Component.ModalDialog.extend(FinderDialog)
 class RecordFinder
     constructor: -> super
     template: 'record-finder/field'
-    templateData: -> { field_name: @record_query.initial_field }
+    templateModels: -> { field_name: @record_query.initial_field }
 
     events:
         "keyup .record-finder-query-string": "onKey"
@@ -115,7 +115,7 @@ class RecordFinder
         query_field: [ 'string', false, 'code' ]
 
     initialize:(options)->
-        @record_query = new Lanes.Data.Query(fields: options.fields, collection_class: options.query_using)
+        @record_query = new Lanes.Models.Query(fields: options.fields, collection_class: options.query_using)
 
     displayFinder: ->
         finder = new FinderDialog( title: @title, record_query: @record_query )
@@ -132,8 +132,8 @@ class RecordFinder
         qf=this.$('.record-finder-query-string')
         if 13 == ev.keyCode
             this.runQuery(ev)
-        else if qf.val().match( Lanes.Data.mixins.Lanes.sCodeField.INVALID )
-            qf.val( qf.val().replace( Lanes.Data.mixins.Lanes.sCodeField.INVALID, '' ) )
+        else if qf.val().match( Lanes.Models.mixins.Lanes.sCodeField.INVALID )
+            qf.val( qf.val().replace( Lanes.Models.mixins.Lanes.sCodeField.INVALID, '' ) )
 
     runQuery: (ev)->
         code = this.$(ev.target).val()

data/client/lanes/components/select_field/SelectField.coffee

@@ -44,7 +44,7 @@ class Lanes.Components.SelectField extends Lanes.Components.Base
 
     initialize: (options={})->
         if @association
-            collection = Lanes.Data[@association.model].sharedCollection()
+            collection = Lanes.Models[@association.model].sharedCollection()
             collection.fetch().then (m)=>
                 @selections = m
                 this.on('change:model', this.onModelChange )

data/client/lanes/extension/Base.coffee

@@ -1,6 +1,6 @@
 class BaseExtension
 
-    setBootstrapData: (data)->
+    setBootstrapModels: (data)->
 
     @extended:(klass)->
         Lanes.Extensions.register(klass)

data/client/lanes/extension/Extensions.coffee

@@ -10,12 +10,12 @@ Lanes.Extensions = {
     fireOnAvailable: (application)->
         instance.onAvailable?(application) for identifier, instance of @instances
 
-    setBootstrapData: (bootstrap_data)->
+    setBootstrapModels: (bootstrap_data)->
         for identifier,data of bootstrap_data
-            instance?.setBootstrapData?(data)
+            instance?.setBootstrapModels?(data)
 
     makeNamespace: (identifier)->
-        for ns in ['Data','Views','Controllers','Screens']
+        for ns in ['Models','Views','Controllers','Screens']
             Lanes.namespace("#{identifier}.#{ns}")
 
 

data/client/lanes/extension/GlAccounts.coffee

@@ -2,8 +2,8 @@ class GlAccounts
 
     identifier: 'gl_accounts'
 
-    setBootstrapData: (data)->
-        Lanes.Data.GlAccount.sharedCollection().reset(data)
+    setBootstrapModels: (data)->
+        Lanes.Models.GlAccount.sharedCollection().reset(data)
 
 
 Lanes.Extension.Base.extend(GlAccounts)

data/client/lanes/lib/namespace.coffee

@@ -8,5 +8,5 @@ Lanes.namespace = (target, name, block) ->
     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']
+for ns in ['Components', 'Models.Mixins', 'Views.Mixins', 'Screens', 'Vendor', 'Templates', 'Extensions','lib']
     Lanes.namespace(ns)

data/client/lanes/minimal.js

@@ -2,7 +2,7 @@
 //= require ./vendor/modern-stack
 //= require ./lib
 //= require ./extension
-//= require ./data
+//= require ./models
 //= require ./plugins
 //= require ./views
 //= require ./screens

data/client/lanes/{data/Model.coffee → models/Base.coffee}

@@ -38,8 +38,8 @@ class AssocationMap
     constructor: (@klass)->
         @klass::derived ||= {}
         @definitions = @klass::associations
-        @definitions['created_by'] ||= { model: 'Lanes.Data.User', readOnly: true }
-        @definitions['updated_by'] ||= { model: 'Lanes.Data.User', readOnly: true }
+        @definitions['created_by'] ||= { model: 'Lanes.Models.User', readOnly: true }
+        @definitions['updated_by'] ||= { model: 'Lanes.Models.User', readOnly: true }
         for name, options of @definitions
             @klass::derived[name] = this.derivedDefinition(name,options)
 
@@ -47,7 +47,7 @@ class AssocationMap
     derivedDefinition: (name,definition)->
         findAssocationClass = ->
             object = definition.model || definition.collection
-            if _.isObject(object) then object else Lanes.getPath( object, "Lanes.Data")
+            if _.isObject(object) then object else Lanes.getPath( object, "Lanes.Models")
         target_klass = findAssocationClass()
         # will be called in the scope of the model
         createAssocation = ->
@@ -82,36 +82,9 @@ class AssocationMap
                 list.push(name)
         list
 
-urlError = ->
-    throw new Error('A "url" property or function must be specified for Model or Collection')
-
-copyServerResp = (record,resp)->
-    record.errors = resp?.errors
-    record.lastServerMessage = resp?.message
-    { record: record, response: resp }
-
-# 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( copyServerResp(record,resp.responseJSON || {error: resp.responseText}) )
-        error?.apply(options.scope, arguments)
-
-    options.success = (reply,resp,req)->
-        record.setFromResponse( resp.data ) if resp?.data?
-        options.resolvePromise( copyServerResp(record,resp) )
-        success?.apply(options.scope, arguments)
-    options
-
 
 # Da Model. Handles all things dataish
-class DataModel
+class BaseModel
     isModel: true
     session:
         errors: 'object'
@@ -168,17 +141,17 @@ class DataModel
 
     # used by PubSub to record a remote change to the model
     addChangeSet: (change)->
-        this.changes ||= new Lanes.Data.ChangeSetCollection( parent: this )
+        this.changes ||= new Lanes.Models.ChangeSetCollection( parent: this )
         change.record = this
         change = this.changes.add(change)
         this.set( change.value() )
 
     urlRoot: ->
-        Lanes.Data.Config.api_path + '/' + _.result(this,'api_path')
+        Lanes.Models.Config.api_path + '/' + _.result(this,'api_path')
 
     # Default URL for the model's representation on the server
     url: ->
-        base = _.result(this, 'urlRoot') || _.result(this.collection, 'url') || urlError();
+        base = _.result(this, 'urlRoot') || _.result(this.collection, 'url') || Lanes.Models.Sync.urlError();
         if this.isNew() then return base;
         if base.charAt(base.length - 1) != '/'
              base += "/"
@@ -213,7 +186,7 @@ class DataModel
     # When not found, it will create a new record and return it.
     # The newly created record will not be stored, in PubSub map, only records bound to a view are stored
     @findOrCreate: (attrs, options={})->
-        if attrs.id && ( record = Lanes.Data.PubSub.instanceFor(this, attrs.id) )
+        if attrs.id && ( record = Lanes.Models.PubSub.instanceFor(this, attrs.id) )
             record.set(attrs)
         else
             new this(attrs,options)
@@ -231,9 +204,13 @@ class DataModel
         this.associations.set(this,attrs) if this.associations
         this
 
+    where: (query,options)->
+        collection = new @constructor.Collection
+        collection.fetch( _.extend({query: query}, options) )
+        collection
+
     # Sets the attribute data from a server respose
-    setFromResponse: (data)->
-        return unless data
+    setFromServer: (data,options)->
         this.set( if _.isArray(data) then data[0] else data )
         this.changeMonitor.reset()
 
@@ -244,7 +221,7 @@ class DataModel
         options = _.clone(options)
 
         options.saving=true
-        handlers = wrapRequest(this,options)
+        handlers = Lanes.Models.Sync.wrapRequest(this,options)
 
         method = if this.isNew()
             'create'
@@ -260,7 +237,7 @@ class DataModel
     # triggering a `"change"` event.
     fetch:  (options={}) ->
         options = _.clone(options)
-        handlers = wrapRequest(this,options)
+        handlers = Lanes.Models.Sync.wrapRequest(this,options)
         _.extend(options,{limit:1,ignoreUnsaved:true})
 
         this.sync('read', this, options)
@@ -269,7 +246,7 @@ class DataModel
     # Removes the model's record from the server (if it is persistent)
     # and then fires the "destroy" event
     destroy: (options={})->
-        handlers = wrapRequest(this,options)
+        handlers = Lanes.Models.Sync.wrapRequest(this,options)
         model    = this
         success  = options.success
         options.success = (reply, msg, options)->
@@ -283,7 +260,7 @@ class DataModel
         handlers.promise
 
     # returns any attributes that have been set and not saved
-    unsavedData: ->
+    unsavedModels: ->
         attrs = if this.isNew() then {} else { id: this.getId() }
         _.extend(attrs, _.pick( this.getAttributes(props:true, true),
             @changeMonitor.changedAttributes() ) )
@@ -295,7 +272,7 @@ class DataModel
         if options.saveAll
             data = this.getAttributes(props:true, true)
         else
-            data = this.unsavedData()
+            data = this.unsavedModels()
         _.extend(data, this.associations.dataForSave(this, options)) if this.associations
         data
 
@@ -318,7 +295,7 @@ class DataModel
         else
             ''
     # Use Sync directly
-    sync: Lanes.Data.Sync
+    sync: Lanes.Models.Sync.perform
 
     # When the model is extended it auto-creates the created_at and updated_at
     # and sets up the AssociationMap
@@ -332,23 +309,28 @@ class DataModel
         if klass::associations
             klass::associations = new AssocationMap(klass) 
 
+        unless klass.Collection
+            class DefaultCollection
+                constructor: -> super
+                model: klass
+            klass.Collection = Lanes.Models.Collection.extend(DefaultCollection)
 
-Lanes.Data.Model = Lanes.lib.MakeBaseClass( Lanes.Vendor.Ampersand.State, DataModel )
+Lanes.Models.Base = Lanes.lib.MakeBaseClass( Lanes.Vendor.Ampersand.State, BaseModel )
 
 
 
 # ------------------------------------------------------------------ #
 # The BasicModel is just a very thin layer over State                #
 # ------------------------------------------------------------------ #
-class BasicModel                #
+class BasicModel
     constructor: -> super
     isPersistent: -> false
     isModel: true
 
-Lanes.Data.BasicModel = Lanes.lib.MakeBaseClass( Lanes.Vendor.Ampersand.State, BasicModel )
+Lanes.Models.BasicModel = Lanes.lib.MakeBaseClass( Lanes.Vendor.Ampersand.State, BasicModel )
 
 
 class State
     constructor: -> super
 
-Lanes.Data.State = Lanes.lib.MakeBaseClass( Lanes.Vendor.Ampersand.State, State )
+Lanes.Models.State = Lanes.lib.MakeBaseClass( Lanes.Vendor.Ampersand.State, State )

data/client/lanes/models/Bootstrap.coffee

@@ -0,0 +1,8 @@
+Lanes.Models.Bootstrap = {
+
+    initialize: (options)->
+        Lanes.Models.Config.csrf_token = options.csrf
+        Lanes.Models.Config.api_path  = options.api_path
+        Lanes.Extensions.setBootstrapModels(options);
+
+}

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

@@ -1,4 +1,4 @@
-class Lanes.Data.ChangeSet extends Lanes.Data.Model
+class Lanes.Models.ChangeSet extends Lanes.Models.Base
 
     constructor: ->
         super
@@ -32,9 +32,9 @@ class Lanes.Data.ChangeSet extends Lanes.Data.Model
         @time_ago = Lanes.Vendor.Moment( @created_at ).fromNow()
 
 
-class Lanes.Data.ChangeSetCollection extends Lanes.Data.BasicCollection
+class Lanes.Models.ChangeSetCollection extends Lanes.Models.BasicCollection
 
-    model: Lanes.Data.ChangeSet
+    model: Lanes.Models.ChangeSet
 
     constructor: (options)->
         super([],options)

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

@@ -20,14 +20,14 @@ CommonMethods = {
                     model.trigger('destroy', model, model.collection, options)
                 success.apply(@,arguments) if success
         })
-        Lanes.Data.Sync('delete', this, options)
+        Lanes.Models.Sync.perform('delete', this, options)
 
 }
 
-class DataCollection
+class ModelsCollection
 
     constructor: ->
-        @isLoaded=false
+        @_isLoaded=false
         @errors=[]
         Lanes.Vendor.Ampersand.Collection.apply(this, arguments)
 
@@ -37,15 +37,21 @@ class DataCollection
         collection
         
     fetch: (options={})->
-        @isLoaded = true
-        wrapRequest(this,options)
-        super(options).then => @
+        @_isLoaded = true
+        Lanes.Models.Sync.wrapRequest(this,options)
+        return this.sync('read', this, options)
+
+    # Sets the attribute data from a server respose
+    setFromServer: (data, options)->
+        method = if options.reset then 'reset' else 'set'
+        this[method](data, options)
+        this.trigger('sync', this, data, options)
 
     isLoaded:->
-        @isLoaded
+        @_isLoaded
 
     ensureLoaded: ( callback )->
-        if ! @isLoaded && ! this.length
+        if ! @_isLoaded && ! this.length
             this.fetch({ success: callback })
         else if callback
             callback()
@@ -66,15 +72,15 @@ class DataCollection
     url: ->
         @model::urlRoot()
 
-    sync: Lanes.Data.Sync
+    sync: Lanes.Models.Sync.perform
 
     save: (options)->
-        Lanes.Data.Sync('update', this, options)
+        Lanes.Models.Sync.perform('update', this, options)
 
     dataForSave: (options)->
         unsaved = []
         for model in @models
-            unsaved.push( model.unsavedData() ) if model.isDirty()
+            unsaved.push( model.unsavedModels() ) if model.isDirty()
         unsaved
 
     _prepareModel: (attrs, options={})->
@@ -88,32 +94,6 @@ class DataCollection
         CommonMethods
     ]
 
-    @afterExtended: (klass)->
-        if klass::model
-            klass::model::Collection = klass
-
-copyServerMessages=(collection,msg)->
-    return unless msg
-    collection.errors = msg.errors || []
-    collection.lastServerMessage = msg.message
-
-wrapRequest = (collection, options)->
-    error   = options.error
-    success = options.success
-
-    options.error = (collection,resp)->
-        copyServerMessages(collection,resp.responseJSON)
-        error?.apply(options.scope, arguments)
-        Lanes.warn("request fail",resp)
-        options.complete?.apply(options.scope, arguments)
-    options.success = (collection,resp)->
-        copyServerMessages(collection,resp)
-        if resp.success
-            success?.apply(options.scope, arguments)
-        else
-            error?.apply(options.scope, arguments)
-        options.complete?.apply(options.scope, arguments)
-
 class BasicCollection
     constructor: -> super
     isLoaded: -> true
@@ -135,12 +115,12 @@ class SubCollection
     filter: ->
         this._runFilters()
 
-Lanes.Data.SubCollection = Lanes.lib.MakeBaseClass( Lanes.Vendor.Ampersand.SubCollection, SubCollection )
+Lanes.Models.SubCollection = Lanes.lib.MakeBaseClass( Lanes.Vendor.Ampersand.SubCollection, SubCollection )
 
 
-Lanes.Data.BasicCollection = Lanes.lib.MakeBaseClass(
+Lanes.Models.BasicCollection = Lanes.lib.MakeBaseClass(
     Lanes.Vendor.Ampersand.Collection.extend(Lanes.Vendor.Ampersand.USCollection), BasicCollection
 )
 
 
-Lanes.Data.Collection = Lanes.lib.MakeBaseClass( Lanes.Vendor.Ampersand.RestCollection, DataCollection )
+Lanes.Models.Collection = Lanes.lib.MakeBaseClass( Lanes.Vendor.Ampersand.RestCollection, ModelsCollection )

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

@@ -5,6 +5,6 @@ class Config
         csrf_token: { type: 'string', setOnce: false }
         api_path:   { type: 'string', setOnce: false }
 
-Lanes.Data.State.extend(Config)
+Lanes.Models.State.extend(Config)
 
-Lanes.Data.Config = new Config
+Lanes.Models.Config = new Config

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

@@ -1,5 +1,5 @@
-class ModelType extends Lanes.Data.State
 
+class ModelType extends Lanes.Models.State
     constructor: ->
         super
         @records = {}
@@ -27,7 +27,8 @@ class ModelType extends Lanes.Data.State
         delete @records[model.id]
 
 
-class ModelTypesCollection extends Lanes.Data.BasicCollection
+
+class ModelTypesCollection extends Lanes.Models.BasicCollection
     constructor: -> super
     model: ModelType
 
@@ -35,7 +36,7 @@ class ModelTypesCollection extends Lanes.Data.BasicCollection
         models = this.get(model.api_path) || this.add(id: model.api_path)
 
 
-Lanes.Data.PubSub = {
+Lanes.Models.PubSub = {
 
     types: new ModelTypesCollection
 

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

@@ -1,4 +1,4 @@
-class Field extends Lanes.Data.Model
+class Field extends Lanes.Models.Base
 
     constructor: (attributes)->
         super( _.defaults( attributes, {
@@ -25,7 +25,7 @@ class Field extends Lanes.Data.Model
             value
 
 
-class AvailableFields extends Lanes.Data.Collection
+class AvailableFields extends Lanes.Models.Collection
 
     constructor: (models,options)->
         @query = options.query
@@ -34,7 +34,7 @@ class AvailableFields extends Lanes.Data.Collection
 
 
 
-class Operator extends Lanes.Data.Model
+class Operator extends Lanes.Models.Base
 
     addStandardProperties: Lanes.emptyFn
 
@@ -52,7 +52,7 @@ class Operator extends Lanes.Data.Model
                 !this.types || ( this.field && _.contains(this.types, this.field.type) )
 
 
-class Operators extends Lanes.Data.Collection
+class Operators extends Lanes.Models.Collection
     model: Operator
 
     constructor: ->
@@ -72,7 +72,7 @@ class Operators extends Lanes.Data.Collection
             this.findWhere(valid:true).selected = true
 
 
-class Clause extends Lanes.Data.Model
+class Clause extends Lanes.Models.Base
 
     session:
         value     : { type: 'string', default: '' }
@@ -124,7 +124,7 @@ class Clause extends Lanes.Data.Model
         param
 
 
-class Clauses extends Lanes.Data.Collection
+class Clauses extends Lanes.Models.Collection
 
     model: Clause
 
@@ -134,7 +134,7 @@ class Clauses extends Lanes.Data.Collection
         @fields = options.query.fields
 
 
-class Lanes.Data.Query extends Lanes.Data.Model
+class Lanes.Models.Query extends Lanes.Models.Base
 
     session:
         fields:  'collection'