lanes 0.5.6 → 0.6.0

data/client/lanes/models/Asset.coffee

@@ -1,37 +1,43 @@
+IMAGES = [
+    "image/png", "image/jpg", "image/gif"
+]
+
+IS_IMAGE = (content_type) ->
+    !!(content_type && IMAGES.indexOf(content_type) isnt -1)
+
 class Lanes.Models.Asset extends Lanes.Models.Base
 
     props:
         id:        'integer'
         order:     'integer'
-        thumbnail: 'object'
-        medium:    'object'
-        original:  'object'
-        metadata:  'object'
+        file_data: 'object'
 
     session:
-        data: 'string'
-        blob: 'object'
-        owner: 'object'
-        parent: 'object'
+        data:     'string'
+        blob:     'object'
+        owner:    'object'
+        parent:   'object'
+        metadata: 'object'
         parent_association: 'string'
 
     derived:
         original_url:
-            deps: ['data', 'original'], fn: ->
-                if @data then @data else @original?.url
+            deps: ['data', 'file_data'], fn: ->
+                if @data then @data else @urlFor('original')
         medium_url:
-            deps: ['data', 'medium'], fn: ->
-                if @data then @data else @medium?.url
+            deps: ['data', 'file_data'], fn: ->
+                if @data then @data else @urlFor('medium')
         thumbnail_url:
-            deps: ['data', 'thumbnail'], fn: ->
-                if @data then @data else @thumbnail?.url
+            deps: ['data', 'file_data'], fn: ->
+                if @data then @data else @urlFor('thumbnail')
 
         hasImage:
-            deps: ['data', 'original', 'metadata'], fn: ->
-                @metadata?.content_type?.includes?('image')
+            deps: ['data', 'file_data'], fn: ->
+                (@data && IS_IMAGE(@metadata.content_type)) ||
+                    (@file_data && IS_IMAGE(@file_data.original
+                        .metadata.mime_type))
     events:
         'change:blob': 'onBlobChange'
-        'parent:save': 'onParentSave'
 
     initialize: ->
         @on('change:parent', =>
@@ -40,11 +46,18 @@ class Lanes.Models.Asset extends Lanes.Models.Base
             @listenTo(@parent, 'save', @save)
         )
 
+    baseUrl: ->
+        Lanes.config.api_path + '/asset'
+
+    urlFor: (type) ->
+        data = @file_data?[type]
+        if data then "#{@baseUrl()}/#{data.id}" else undefined
 
     onBlobChange: ->
         if @blob
-            @metadata ||= {}
-            @metadata.content_type = @blob.type
+            @metadata = {
+                content_type: @blob.type
+            }
             reader = new FileReader()
             reader.onloadend = (ev) =>
                 @data = reader.result if ev.type is 'loadend'
@@ -69,7 +82,6 @@ class Lanes.Models.Asset extends Lanes.Models.Base
         url = Lanes.config.api_path + '/asset'
 
         Lanes.Vendor.xhr.post(url, {body: form}, (err, resp, body) =>
-            @blob = null
             if err
                 @errors = { http: err.message }
             else
@@ -77,5 +89,6 @@ class Lanes.Models.Asset extends Lanes.Models.Base
                 if reply.errors or reply.success is false
                     @errors = reply.errors
                 else
+                    @metadata = @blob = @data = null
                     @set( reply.data )
         )

data/client/lanes/models/AssociationMap.coffee

@@ -46,7 +46,7 @@ class Lanes.Models.AssociationMap
         definition = @definitions[name]
         options = { parent: model }
         if definition.inverse
-            options[ definition.inverse.name ] = model
+            options[ definition.inverse ] = model
         if definition.options
             _.extend(options, Lanes.u.resultsFor(model, definition.options))
         options
@@ -75,14 +75,12 @@ class Lanes.Models.AssociationMap
         options = association.getOptions(name, this)
         options.filter ||= {}
         options.filter[fk] = this.get(pk)
-        options.inverse =
-            name: definition.inverse
-            without: name
 
         if true == target_class::isCollection
             new target_class(options.models || [], options)
         else
             options.model = target_class
+            options.association_name=name
             new Lanes.Models.AssociationCollection(options.models || [], options)
 
     # returns a collection for the given association.
@@ -181,9 +179,10 @@ class Lanes.Models.AssociationMap
             continue if def_options.readOnly or
                 (options.onlyAssociations and not _.includes(options.onlyAssociations, name))
             assoc = model[name]
+            force = _.includes(options.includeAssociations, name)
             ret[name] = assoc.dataForSave(
-                _.extend({}, options, def_options)
-            ) if _.result(assoc, 'isDirty')
+                _.extend({}, options, def_options, saveAll: force)
+            ) if _.result(assoc, 'isDirty') or force
         ret
 
     serialize: (model, options = {depth: 1}) ->

data/client/lanes/models/Base.coffee

@@ -18,7 +18,7 @@ class BaseModel
     derived:
         isSavable:
             deps: ['invalidAttributes'], fn: ->
-                _.isEmpty @invalidAttributes #_calculateInvalidAttributes()
+                _.isEmpty @invalidAttributes
 
         hasErrors:
             deps: ['errors'], fn: -> not _.isEmpty(@errors)
@@ -105,7 +105,7 @@ class BaseModel
 
     clonedAttributes: ->
         attributes = @serialize()
-        _.extend(attributes, @getAttributes(session: true) )
+        _.extend(attributes, @getAttributes(session: true, derived: false) )
 
     attributeType: (name) ->
         @_definition[name].type
@@ -261,6 +261,9 @@ class BaseModel
 
         klass::session['created_at'] ||= 'date'
         klass::session['updated_at'] ||= 'date'
+        # these columns are included when loaded with the 'with_user_logins' scope
+        klass::session['created_by_user.login'] ||= 'string'
+        klass::session['updated_by_user.login'] ||= 'string'
 
         if klass::associations
             klass::associations = new Lanes.Models.AssociationMap(klass)

data/client/lanes/models/Collection.coffee

@@ -54,7 +54,6 @@ class ModelsCollection
 
     constructor: ->
         @_isLoaded = false
-        @errors = []
         Lanes.Vendor.Ampersand.Collection.apply(this, arguments)
         this.on('add remove reset', this._triggerLengthEvent )
 
@@ -103,6 +102,7 @@ class ModelsCollection
 
     # Sets the attribute data from a server respose
     setFromServer: (data, options, method) ->
+        options ||= {}
         @_isLoaded = true
         if 'delete' == method
             models = _.map(_.map(options.originalData, 'id'), (id) =>
@@ -177,7 +177,11 @@ class SubCollection
     setFromServer: (data, options, type) ->
         @collection.setFromServer(data, options, type)
 
-Lanes.Models.SubCollection = Lanes.lib.MakeBaseClass( Lanes.Vendor.Ampersand.SubCollection, SubCollection )
+Lanes.Models.SubCollection = Lanes.lib.MakeBaseClass(
+    Lanes.Vendor.Ampersand.SubCollection.extend(Lanes.Vendor.Ampersand.LDCollection), SubCollection
+)
+
+
 
 Lanes.Models.BasicCollection = Lanes.lib.MakeBaseClass(
     Lanes.Vendor.Ampersand.Collection.extend(Lanes.Vendor.Ampersand.LDCollection), BasicCollection
@@ -196,6 +200,10 @@ class Lanes.Models.AssociationCollection extends Lanes.Models.Collection
         @associationFilter = @options.filter
         super
 
+    mixins: [
+        Lanes.Models.Mixins.TrackRemovals
+    ]
+
     _prepareModel: (attrs, options = {}) ->
         if @associationFilter
             _.extend(attrs, @associationFilter)
@@ -209,3 +217,16 @@ class Lanes.Models.AssociationCollection extends Lanes.Models.Collection
         _.extend(options.query, @associationFilter)
         _.extend(options, @options)
         super(options)
+
+    isDirty: ->
+        super || @hasRemovedModels()
+
+    dataForSave: ->
+        data = super
+        for id in @getRemovedModelIds()
+            data.push({"#{@model.prototype.idAttribute}": id, _delete: true})
+        data
+
+    setFromServer: (data, options, method) ->
+        @clearRemovedModelIds()
+        super

data/client/lanes/models/PubSub.coffee

@@ -8,8 +8,7 @@ class ModelConfig
 
     add: (model) ->
         if @count is 0
-            Lanes.log.info "[pubsub] subscribe to: #{@channel}"
-            Lanes.Models.PubSub.mb?.subscribe(@channel, @mbCallBack(@models))
+            Lanes.Models.PubSub.channel?.subscribe(@channel) #, @mbCallBack(@models))
         @count += 1
         config = @modelConfig(model)
         config.count += 1
@@ -32,14 +31,11 @@ class ModelConfig
             _.remove(@models, {model: model}) if config.count is 0
 
     unsubscribe: ->
-        Lanes.log.info "[pubsub] unsubscribe from: #{@channel}"
-        Lanes.Models.PubSub.mb?.unsubscribe( @channel )
+        Lanes.Models.PubSub.channel?.unsubscribe( @channel )
         delete @type.records[@id]
 
-    mbCallBack: (models) ->
-        (changes) ->
-            config.model.addChangeSet(changes) for config in models
-
+    onChange: (data) ->
+        config.model.addChangeSet(data) for config in @models
 
 class ModelType
 
@@ -54,6 +50,11 @@ class ModelType
     remove: (model) ->
         @records[model.id]?.remove(model)
 
+    onChange: (id, data) ->
+        @records[id].onChange(data)
+
+    unsubscribeAll: ->
+        record.unsubscribe() for id, record of @records
 
 class ModelTypesCollection extends Lanes.Models.BasicCollection
 
@@ -65,6 +66,30 @@ class ModelTypesCollection extends Lanes.Models.BasicCollection
         models = this.get(path) || this.add(id: path)
 
 
+CableChannel = {
+    connected: ->
+        @subscribe 'file-change', ->
+            Lanes.lib.HotReload.initiate(changes)
+
+    subscribe: (channel) ->
+        Lanes.log.info "[pubsub] subscribe to: #{channel}"
+
+        @perform("on", {channel})
+
+    unsubscribe: (channel) ->
+        Lanes.log.info "[pubsub] unsubscribe from: #{channel}"
+        @perform("off", {channel})
+
+    received: (data) ->
+        [channel, model, id] = data.channel.match(/(.*)\/(\d+)/)
+        Lanes.log.info "[pubsub] change recvd for: #{channel}"
+
+        Lanes.Models.PubSub.onChange(
+            model, id, _.omit(data, 'channel')
+        )
+
+}
+
 Lanes.Models.PubSub = {
 
     types: new ModelTypesCollection
@@ -85,9 +110,22 @@ Lanes.Models.PubSub = {
         @types = new ModelTypesCollection
 
     initialize: ->
-        @mb ||= MessageBus.noConflict()
-        @mb.start()
-        @mb.subscribe("/file-change", (changes) ->
-            Lanes.lib.HotReload.initiate(changes)
-        )
+        Lanes.current_user.on 'change:isLoggedIn', _.bind(@onLoginChange, @)
+        @onLoginChange() if Lanes.current_user.isLoggedIn
+
+    onChange: (path, id , data) ->
+        @types.get(path).onChange(id, data)
+
+    onLoginChange: ->
+        if Lanes.current_user.isLoggedIn
+            url = window.location.protocol.replace('http', 'ws') +
+                "//#{Lanes.config.api_host}#{Lanes.config.api_path}/ws"
+            @cable = ActionCable.createConsumer(url)
+            @channel = @cable.subscriptions.create "Lanes::API::PubSub", CableChannel
+        else
+            Lanes.Models.PubSub.types.each (t) -> t.unsubscribeAll()
+            delete @channel
+            @cable.disconnect()
+            delete @cable
+
 }

data/client/lanes/models/Query.coffee

@@ -4,7 +4,8 @@
 ##= require ./query/CollectionResult
 
 class Field extends Lanes.Models.Base
-    pubsub: false
+    registerForPubSub: false
+
     constructor: (attributes) ->
         super( _.defaults( attributes, {
             title: _.titleize(_.humanize(attributes.id))
@@ -25,6 +26,7 @@ class Field extends Lanes.Models.Base
         sortBy:     type: 'any'
         component:  type: 'function'
         onColumnClick: type: 'function'
+        fetchIndex: type: 'integer'
 
     derived:
         default_value: deps: ['id'], fn: ->
@@ -38,12 +40,6 @@ class Field extends Lanes.Models.Base
             deps: ['model_field'], fn: ->
                 type = @model_field?.type || 'string'
                 if type == "code" then "string" else type
-        fetchIndex:
-            fn: ->
-                fetchIndex = 0
-                for field, index in this.collection.models
-                    return fetchIndex if this == field
-                    fetchIndex += 1 if field.query
 
     validValue: (value) ->
         if this.type == 'n'
@@ -58,6 +54,7 @@ class AvailableFields extends Lanes.Models.Collection
 
     constructor: (models, options) ->
         @query = options.query
+        this.on('add remove reset', @calculateFetchIndexes)
         this.on('change', (changing) ->
             return unless changing.selected
             for model in @models
@@ -65,10 +62,15 @@ class AvailableFields extends Lanes.Models.Collection
         )
         super
         @visible = @subcollection(where: {visible: true})
+        @calculateFetchIndexes()
 
+    calculateFetchIndexes: ->
+        index = 0
+        for field in @models
+            field.fetchIndex = if field.query then index++ else undefined
 
 class Operator extends Lanes.Models.Base
-    pubsub: false
+    registerForPubSub: false
 
     session:
         id:       'string'
@@ -77,17 +79,14 @@ class Operator extends Lanes.Models.Base
         field:    'object'
         selected: 'boolean'
 
-    derived:
-        valid:
-            deps: ['types', 'field']
-            fn: ->
-                !this.types || ( this.field && _.includes(this.types, this.field.type) )
+    validForField: (field) ->
+        _.isEmpty(@types) or _.includes(this.types, field.type)
 
 
 class Operators extends Lanes.Models.Collection
     model: Operator
 
-    constructor: ->
+    constructor: (models, attrs) ->
         super
         this.add([
             { id: 'like', name: 'Starts With', types: Lanes.Models.Query.LIKE_QUERY_TYPES }
@@ -100,17 +99,18 @@ class Operators extends Lanes.Models.Collection
             for model in @models
                 model.selected = false unless model == changing
         )
+        @setField(attrs.parent.query.initialField)
+
     setField: (field) ->
-        this.invoke('set', 'field', field)
+        @field = field
+        @valid = @subcollection(filter: (op) => op.validForField(@field) )
         selected = this.findWhere(selected: true)
-        if selected && !selected.valid
-            selected.selected = false
-            this.findWhere(valid:true).selected = true
-
+        unless selected && selected.validForField(field)
+            @valid.at(0)?.selected = true
 
 
 class Clause extends Lanes.Models.Base
-    pubsub: false
+    registerForPubSub: false
 
     session:
         value     : { type: 'string', default: '' }
@@ -119,9 +119,7 @@ class Clause extends Lanes.Models.Base
 
     associations:
         operators : { collection: Operators }
-        fields:
-            collection: AvailableFields, options: ->
-                query: this.collection.query
+        fields:     { collection: AvailableFields }
 
     derived:
         description:
@@ -138,15 +136,12 @@ class Clause extends Lanes.Models.Base
     constructor: (options) ->
         super
         this.fields.reset(options.available_fields.models)
-        @operators.field = @fields.first()
         @fields.on('change:selected',    this.setField,    this)
         @operators.on('change:selected', this.setOperator, this)
-        field = @fields.findWhere(visible: true)
-        if field
+        @operator = @operators.findWhere(selected: true)
+        if (field = @fields.findWhere(visible: true))
             field.selected = true
             @setField(field)
-            operator = @operators.find (o) -> o.valid
-            operator?.selected = true
 
     setFromView: (type, val) ->
         if type == "fields" || type == "operators"
@@ -157,7 +152,7 @@ class Clause extends Lanes.Models.Base
     setField: (field) ->
         return unless field.selected
         @operators.setField( field )
-        this.field = field
+        @field = field
 
     setOperator: (operator) ->
         return unless operator.selected
@@ -172,7 +167,7 @@ class Clause extends Lanes.Models.Base
         value = this.get('value')
         value += '%' if 'like' == op
         value = parseFloat(value) if @field.type == "n"
-        param[ this.field.id ] = if 'eq' == op then value else { op: op, value: value }
+        param[ @field.id ] = if 'eq' == op then value else { op: op, value: value }
         param
 
 
@@ -185,11 +180,14 @@ class Clauses extends Lanes.Models.Collection
         @query = options.query
         @fields = options.query.fields
 
+    session:
+        field: 'state'
+
 # needs to inherit from Base so network events will be listened to
 class Lanes.Models.Query extends Lanes.Models.Base
-    pubsub: false
+    registerForPubSub: false
 
-    @LIKE_QUERY_TYPES: ['string', 'code']
+    @LIKE_QUERY_TYPES: ['string', 'code', 'visible_id']
     @LESS_THAN_QUERY_TYPES: ['integer', 'bigdec', 'number']
     @GREATER_THAN_QUERY_TYPES: ['integer', 'bigdec', 'number']
 
@@ -199,8 +197,6 @@ class Lanes.Models.Query extends Lanes.Models.Base
 
     session:
         src:     'any'
-        fields:  'collection'
-        clauses: 'collection'
         initialField: 'state'
         idIndex: 'number'
         initialFieldIndex: 'number'
@@ -213,6 +209,10 @@ class Lanes.Models.Query extends Lanes.Models.Base
         changeCount: {type: 'integer', default: 0}
         sortAscending: ['boolean', true, true]
 
+    associations:
+        fields:  {collection: AvailableFields, inverse: 'query'}
+        clauses: {collection: Clauses, inverse: 'query'}
+
     derived:
         isCollection:
             deps: ['src'], fn: -> Lanes.u.isCollection(@src)
@@ -238,7 +238,8 @@ class Lanes.Models.Query extends Lanes.Models.Base
 
     constructor: (options = {}) ->
         super
-        @fields = new AvailableFields([], query: this)
+
+        @fields.reset()
         for col, i in options.fields
             rec = if _.isObject(col) then col else { id: col }
             @fields.add rec
@@ -246,7 +247,7 @@ class Lanes.Models.Query extends Lanes.Models.Base
         unless @idIndex?
             @idIndex = @fields.length
             @fields.add(id: @idAttribute)
-        @clauses = new Clauses([], query: this )
+        # @clauses = new Clauses([], query: this )
         this.listenTo(@clauses, 'change remove reset', =>
             @results.reset()
             @results.ensureLoaded() if this.autoRetrieve
@@ -259,14 +260,21 @@ class Lanes.Models.Query extends Lanes.Models.Base
         )
 
         if @initialFieldIndex
-            @initialField = this.fields.at(@initialFieldIndex)
+            @initialField = this.fields.visible.at(@initialFieldIndex)
 
-        @initialField ||= this.fields.findWhere(id: "code") ||
-            this.fields.findWhere(id: "visibleId") ||
-            this.fields.first()
+        @initialField ||= this.fields.visible.findWhere(id: "code") ||
+            this.fields.visible.findWhere(id: "visible_id") ||
+            this.fields.visible.first()
         @reset(true)
         this
 
+    clonedAttributes: ->
+        attrs = @getAttributes(session: true, derived: false)
+        attrs.fields = this.fields.serialize({session: true})
+        attrs
+
+    markModified: -> @changeCount += 1
+
     reset: (silent = false) ->
         unless @defaultSort is false
             sort = @defaultSort or @fields.findWhere(visible: true).id
@@ -289,14 +297,17 @@ class Lanes.Models.Query extends Lanes.Models.Base
         ! @clauses.findWhere( isValid: false )
 
     loadModel: (model, options = {}) ->
-        _.extend(options, _.result(this, 'syncOptions'))
+        _.extend(options, _.result(this, 'syncOptions'), force: true)
         model.withAssociations(options.include || [], options)
 
     loadSingle: (code, options = {}) ->
         options.query = {}
         options.query[ @initialField.id ] = code
         _.extend(options, _.result(this, 'syncOptions'))
-        @src.fetch(options)
+        @trigger('request')
+        @src.fetch(options).then (model) =>
+            @trigger('load')
+            model
 
     defaultField: ->
         @fields.findWhere( field: @initialField )

data/client/lanes/models/State.coffee

@@ -5,10 +5,11 @@ class State
         @
 
     _bindEvent: (eventSpec, fnName) ->
-        [kp, event] = eventSpec.split(' ')
-        unless event
-            event = kp; kp = ''
-        _.get(@, kp, @).on(event, @[fnName], @)
+        [kp, events...] = eventSpec.split(' ')
+        if _.isEmpty(events)
+            @on(kp, @[fnName])
+        else
+            @listenTo(_.get(@, kp), events.join(' '), @[fnName])
 
 
     isState: true

data/client/lanes/models/Sync.coffee

@@ -61,7 +61,7 @@ Lanes.Models.Sync = {
 
 
     perform: (method, options = {}) ->
-        query = {}
+        query = options.queryParams || {}
         for key, value of options
             query[ this.paramsMap[key] ] = value if this.paramsMap[key]
 
@@ -74,12 +74,14 @@ Lanes.Models.Sync = {
 
         # Ensure that we have a URL.
         options.url or Lanes.Models.Sync.urlError()
-        options.url += '.json'
+
+        options.url = '//' + Lanes.config.api_host + options.url + '.json'
+
         unless _.isEmpty(query)
             options.url += '?' + Lanes.lib.objToParam(query)
 
         options.headers ||= {}
-
+        options.withCredentials = true
         if Lanes.config.csrf_token
             options.headers['X_CSRF_TOKEN'] = Lanes.config.csrf_token
         options.contentType = "application/json"

data/client/lanes/models/index.js

@@ -1,4 +1,5 @@
 //= require_self
+//= require_tree ./mixins
 //= require ./Sync
 //= require ./ServerCache
 //= require ./AssociationMap
@@ -6,5 +7,4 @@
 //= require ./State
 //= require ./Base
 //= require ./Collection
-//= require_tree ./mixins
 //= require_tree .

data/client/lanes/models/mixins/TrackCollectionRemovals.coffee

@@ -0,0 +1,17 @@
+Lanes.Models.Mixins.TrackRemovals = {
+
+    initialize: ->
+        @on('remove', (model) ->
+            @_removedModelIds ||= []
+            @_removedModelIds.push model.getId()
+        )
+
+    getRemovedModelIds: ->
+        @_removedModelIds || []
+
+    clearRemovedModelIds: ->
+        delete @_removedModelIds
+
+    hasRemovedModels: ->
+        !!@_removedModelIds
+}