lanes 0.3.0 → 0.4.0

data/client/lanes/models/Collection.coffee

@@ -71,10 +71,7 @@ class ModelsCollection
     # Fetch the a set of models for the collection, replacing all
     # current models whith them when the call completes
     fetch: (options = {}) ->
-        if this.cacheDuration
-            Lanes.Models.ServerCache.fetchCollection(this, options)
-        else
-            this.sync('read', this, options)
+        this.sync('read', this, options)
 
     getOrFetch: (id, options) ->
         @get(id) || @fetchId(id, options)
@@ -108,7 +105,7 @@ class ModelsCollection
     setFromServer: (data, options, method) ->
         @_isLoaded = true
         if 'delete' == method
-            models = _.map(_.pluck(options.originalData, 'id'), (id) =>
+            models = _.map(_.map(options.originalData, 'id'), (id) =>
                 @get(id)
             )
             this.remove(models)
@@ -181,7 +178,7 @@ class SubCollection
 Lanes.Models.SubCollection = Lanes.lib.MakeBaseClass( Lanes.Vendor.Ampersand.SubCollection, SubCollection )
 
 Lanes.Models.BasicCollection = Lanes.lib.MakeBaseClass(
-    Lanes.Vendor.Ampersand.Collection.extend(Lanes.Vendor.Ampersand.USCollection), BasicCollection
+    Lanes.Vendor.Ampersand.Collection.extend(Lanes.Vendor.Ampersand.LDCollection), BasicCollection
 
 )
 

data/client/lanes/models/JobStatus.coffee

@@ -19,7 +19,7 @@ class Lanes.Models.JobStatus extends Lanes.Models.Base
             deps: ['id'], fn: -> !@isNew()
         isExecuting:
             deps: ['state'], fn: ->
-                _.contains(['unqueued', 'queued', 'started'], @state)
+                _.includes(['unqueued', 'queued', 'started'], @state)
         isActive:
             deps: ['isSubmitted', 'isExecuting'], fn: ->
                 !(@isSubmitted or @isExecuting)

data/client/lanes/models/PubSub.coffee

@@ -1,38 +1,58 @@
-class ModelType extends Lanes.Models.State
+class ModelConfig
 
-    constructor: ->
-        super
-        @records = {}
-
-    session:
-        id: 'string'
-        records: 'object'
-
-    subscribe: (config) ->
-        model = config.models[0]
-        channel = "/#{_.result(model, 'api_path')}/#{model.id}"
-        Lanes.log.info "Subscribe to: #{channel}"
-        Lanes.Models.PubSub.mb.subscribe(channel, (changes) ->
-            for model in config.models
-                model.addChangeSet(changes)
-        )
-        channel
+    constructor: (@type, model) ->
+        @id = model.getId()
+        @channel = "#{_.result(model, 'api_path')}/#{@id}"
+        @count = 0
+        @models = []
 
     add: (model) ->
-        if (config = @records[model.id])
-            config.models.push(model) unless _.include(config.models, model)
+        if @count is 0
+            Lanes.log.info "[pubsub] subscribe to: #{@channel}"
+            Lanes.Models.PubSub.mb.subscribe(@channel, @mbCallBack(@models))
+        @count += 1
+        config = @modelConfig(model)
+        config.count += 1
+
+    modelConfig: (model) ->
+        config = _.find(@models, {model: model})
+        unless config
+            config = {model: model, count: 0}
+            @models.push(config)
+        config
+
+    remove: (model) ->
+        config = _.find(@models, {model: model})
+        return unless config
+        @count -= 1
+        if @count is 0 # all removed, just unsubscribe
+            @unsubscribe()
         else
-            config = { models: [model] }
-            config.channel = this.subscribe(config)
-            @records[model.id] = config
+            config.count -= 1
+            _.remove(@models, {model: model}) if config.count is 0
+
+    unsubscribe: ->
+        Lanes.log.info "[pubsub] unsubscribe from: #{@channel}"
+        Lanes.Models.PubSub.mb?.unsubscribe( @channel )
+        delete @type.records[@id]
+
+    mbCallBack: (models) ->
+        (changes) ->
+            config.model.addChangeSet(changes) for config in models
+
+
+class ModelType
+
+    constructor: (attr) ->
+        _.extend(@, attr)
+        @records = {}
+
+    add: (model) ->
+        config = @records[model.id] ||= new ModelConfig(this, model)
+        config.add(model)
 
     remove: (model) ->
-        if ( config = @records[model.id] )
-            _.remove(config.models, (m) -> m == model)
-            if _.isEmpty(config.models)
-                Lanes.log.info "Unsubscribe from: #{config.channel}"
-                Lanes.Models.PubSub.mb.unsubscribe( config.channel )
-                delete @records[model.id]
+        @records[model.id]?.remove(model)
 
 
 class ModelTypesCollection extends Lanes.Models.BasicCollection
@@ -49,8 +69,6 @@ Lanes.Models.PubSub = {
 
     types: new ModelTypesCollection
 
-    # forModel: (model) ->
-
     add: (model) ->
         return unless model.isPersistent?()
         @types.forModel(model).add(model)
@@ -61,13 +79,13 @@ Lanes.Models.PubSub = {
 
     instanceFor: ( model_klass, id ) ->
         path = _.result(model_klass.prototype, 'api_path')
-        @types.get(path)?.records[id]?.models[0]
+        @types.get(path)?.records[id]?.models[0]?.model
 
     clear: ->
         @types = new ModelTypesCollection
 
     initialize: ->
-        @mb = MessageBus.noConflict()
+        @mb ||= MessageBus.noConflict()
         @mb.start()
         @mb.subscribe("/file-change", (changes) ->
             Lanes.lib.HotReload.initiate(changes)

data/client/lanes/models/Query.coffee

@@ -81,7 +81,7 @@ class Operator extends Lanes.Models.Base
         valid:
             deps: ['types', 'field']
             fn: ->
-                !this.types || ( this.field && _.contains(this.types, this.field.type) )
+                !this.types || ( this.field && _.includes(this.types, this.field.type) )
 
 
 class Operators extends Lanes.Models.Collection

data/client/lanes/models/Sync.coffee

@@ -29,7 +29,7 @@ Lanes.Models.Sync = {
 
     state: (method, model, options = {}) ->
         options.url ||= _.result(model, "url")
-        if _.contains(['create', 'update', 'patch'], method)
+        if _.includes(['create', 'update', 'patch'], method)
             isSave = true
             options.json ||= model.dataForSave(options)
         model.requestInProgress = options

data/client/lanes/models/User.coffee

@@ -13,7 +13,7 @@ unless Lanes.Models.User
             super
             this.access_data = access
 
-        api_path: -> 'users'
+        api_path: -> '/users'
 
         derived:
             roles:
@@ -32,7 +32,7 @@ unless Lanes.Models.User
             role_names:  'array'
             options:     'object'
             password:    'string'
-
+        hasAccess: -> true
         canRead:   (model, field) -> true
         canWrite:  (model, field) -> true
         canDelete: (model)        -> true
@@ -45,7 +45,7 @@ Object.defineProperty(Lanes, 'current_user', {
         events = null
         if CURRENT_USER
             events = CURRENT_USER._events
-        if _.any(events)
+        if _.some(events)
             for key, callbacks of events
                 if user._events[key]
                     user._events[key] = user._events[key].concat(callbacks)

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

@@ -4,7 +4,7 @@ isFileDefinition = (def) ->
 Lanes.Models.Mixins.FileSupport = {
 
     included: (klass) ->
-        files = _.pick klass::props, (def, name) -> isFileDefinition(def)
+        files = _.pickBy klass::props, (def, name) -> isFileDefinition(def)
         return if _.isEmpty(files)
         session = {}
         for name, def of files
@@ -37,7 +37,7 @@ Lanes.Models.Mixins.FileSupport = {
 
 
     _uploadFileAfterSave: ->
-        files = _.pick @_definition, (def, name) =>
+        files = _.pickBy @_definition, (def, name) =>
             isFileDefinition(def) and @["#{name}_file"]
         return if _.isEmpty(files)
 
@@ -47,7 +47,7 @@ Lanes.Models.Mixins.FileSupport = {
         form.append("type", @modelTypeIdentifier())
         form.append("id", @getId())
         form.append("extension_id", @FILE.extension.identifier)
-        url = Lanes.config.api_path + 'save-file-attribute'
+        url = Lanes.config.api_path + '/save-file-attribute'
 
         Lanes.Vendor.xhr.post(url, {body: form}, (err, resp, body) =>
             if err

data/client/lanes/models/query/ArrayResult.coffee

@@ -12,8 +12,9 @@ class Page
             format: 'array', total_count: 't'
             start: @pageNum * @result.pageSize, limit: @result.pageSize,
             query: query, url: @result.query.src::urlRoot(),
-            fields: _.pluck( @result.query.fields.where(query: true), 'id')
+            fields: _.map( @result.query.fields.where(query: true), 'id')
         }
+
         if @result.query.sortField
             options.order = {}
             {sortBy} = @result.query.sortField
@@ -48,12 +49,8 @@ class Page
 
     rowAt: (index) ->
         @_rowAt(index)
-        # row = @_rowAt(index)
-        # @result.query.fields.map (field) =>
-        #     value = row[field.fetchIndex]
-        #     field.format?(value, row, @result.query) or value
 
-    modelAt: (index) ->
+    modelAt: (index, options) ->
         row = @_rowAt(index)
         @modelCache ||= {}
         id = @idForRow(row)

data/client/lanes/models/query/CollectionResult.coffee

@@ -19,11 +19,13 @@ class Lanes.Models.Query.CollectionResult extends Lanes.Models.Query.Result
         rows = (@rowAt(i, options) for i in [0...@length])
         _.Promise.resolve(rows)
 
-    modelAt: (index) ->
-        @collection.at(index)
+    modelAt: (index, options = {}) ->
+        model = @collection.at(index)
+        if options.clone then model.clone() else model
 
     saveModelChanges: (model, index) ->
         old = @collection.at(index)
+
         @collection.remove(old)
         @collection.add(model, at:index)
         @query.changeCount++
@@ -48,7 +50,7 @@ class Lanes.Models.Query.CollectionResult extends Lanes.Models.Query.Result
         @modelAt(rowNum)
 
     valueForField: (rowNum, field) ->
-        @modelAt(rowNum)[field.id]
+        @collection.at(rowNum)[field.id]
 
     fieldToSortValue:
         any:    (v) -> v

data/client/lanes/react/Component.coffee

@@ -9,7 +9,7 @@ createHelper = (component, name) ->
 
 extendComponent = (component) ->
     names = _.keys(component.prototype.dataObjects).concat(['collection', 'model'])
-    for name in _.unique(names)
+    for name in _.uniq(names)
         createHelper(component, name)
 
 Lanes.React.Component = {
@@ -22,7 +22,7 @@ Lanes.React.Component = {
 
     extend: (klass, mixins = @defaultMixins) ->
         klass::mixins ||= []
-        klass::mixins = _.unique(klass::mixins.concat(mixins))
+        klass::mixins = _.uniq(klass::mixins.concat(mixins))
         comp = React.createClass(klass.prototype)
         extendComponent(comp)
         return Lanes.lib.HotReload.remember(comp)

data/client/lanes/react/DefaultComponentNotFound.cjsx

@@ -1,9 +1,9 @@
-class Lanes.React.Root.DefaultComponentNotFOund extends Lanes.React.Component
+class Lanes.React.Root.DefaultComponentNotFound extends Lanes.React.Component
     propTypes:
         extension: React.PropTypes.object
 
     render: ->
         identifier = @props.extension?.identifier || "UnknownExtension"
         <div className="fancy-header">
-            <h1>{_.classify(identifier)}.rootElement() did not return an element!</h1>
+            <h1>{_.classify(identifier)}.rootElement() did not return an element to render!</h1>
         </div>

data/client/lanes/react/Screen.coffee

@@ -10,7 +10,7 @@ Lanes.React.Screen = {
 
     extend: (klass) ->
         comp = Lanes.React.Component.extend(klass, @defaultMixins)
-        klass::mixins.push _.unique(klass::mixins.concat(this.defaultMixins))
+        klass::mixins.push _.uniq(klass::mixins.concat(this.defaultMixins))
         comp
 
 }

data/client/lanes/react/Viewport.coffee

@@ -59,6 +59,6 @@ class Lanes.React.Viewport extends Lanes.Models.State
         component = cntrl?.rootComponent?(this) ||
             Lanes.React.Root.DefaultComponentNotFound
         root = React.createElement(Lanes.React.Root, {viewport: @},
-            React.createElement(component)
+            React.createElement(component, extension: cntrl)
         )
         @reactRoot = Lanes.Vendor.ReactDOM.render(root, @lanes)

data/client/lanes/react/mixins/Access.coffee

@@ -24,7 +24,7 @@ Lanes.React.Mixins.Access = {
         !!@state.accessRight
 
     hasWriteAccess: ->
-        _.include(['w', 'd'], @state.accessRight)
+        _.includes(['w', 'd'], @state.accessRight)
 
 
 }

data/client/lanes/react/mixins/Data.coffee

@@ -30,7 +30,7 @@ class DataWrapper
 
             if Lanes.u.isModel(state)
                 @listenToNetworkEvents(state) if @component.listenNetworkEvents
-                unless false == @component.pubsub or false == @component?.pubsub?[name]
+                if @isStateUsingPubsub(name)
                     if !prevState? or prevState.getId() != state.getId()
                         Lanes.Models.PubSub.remove(prevState) if prevState
                         unless false == state.pubsub
@@ -102,14 +102,18 @@ class DataWrapper
             @component.setState(state)
         true
 
+    isStateUsingPubsub: (name) ->
+        not (false == @component.pubsub or false == @component.pubsub?[name])
+
     destroy: (state, events, fn) ->
-        for name, state of @states
+        for name, state of @states when @isStateUsingPubsub(name)
             Lanes.Models.PubSub.remove(state) if Lanes.u.isModel(state)
         this.stopListening()
         delete @component.data
 
 
-_.extend(DataWrapper.prototype, Lanes.Vendor.BBEvents)
+Lanes.Vendor.Events.createEmitter(DataWrapper.prototype)
+#_.extend(DataWrapper.prototype, Lanes.Vendor.BBEvents)
 
 readDataObjects = (comp, newProps) ->
     bound = _.clone _.result(comp, 'dataObjects') || {}
@@ -118,9 +122,9 @@ readDataObjects = (comp, newProps) ->
     _.mapValues(bound, (value, name) ->
         if _.isFunction(value)
             if _.isEmpty(comp.data?.states[name]) then value.call(comp) else false
-        else if 'props' == value then newProps?[name] or @props[name]
+        else if 'props' == value then newProps?[name] or comp.props[name]
         else value
-    , comp)
+    )
 
 Lanes.React.Mixins.Data = {
     # When the component gets the initial state, instance a `DataWrapper` to take

data/client/lanes/screens/Commands.coffee

@@ -2,7 +2,7 @@ class Lanes.Screens.Commands extends Lanes.Models.State
 
     constructor: (@screen, @options = {}) ->
         _.defaults(@options, modelName: 'model')
-        _.bindAll(this, _.functions(this))
+        _.bindAll(this, _.functionsIn(this))
 
     resetModel: ->
         model = @getModel()

data/client/lanes/screens/UserPreferences.cjsx

@@ -8,7 +8,7 @@ class Lanes.Screens.UserPreferences extends Lanes.React.Screen
         commands: new Lanes.Screens.Commands(this, modelName: 'user')
 
     setScreens: (screens) ->
-        @user.options = _.extend({}, @user.options, {initial_screens: _.pluck(screens, 'id')})
+        @user.options = _.extend({}, @user.options, {initial_screens: _.map(screens, 'id')})
 
     getScreens: ->
         _.map(@user.options?.initial_screens || [], (id) ->

data/client/lanes/testing/BeforeEach.coffee

@@ -10,6 +10,8 @@ Lanes.Test.syncRespondWith = (obj) ->
 
 afterEach ->
     Lanes.current_user._events = @__user_events
+    Lanes.Models.PubSub.types.reset()
+    Lanes.Models.PubSub.mb = @prevMB
 
 beforeEach ->
     @__user_events = Lanes.current_user._events
@@ -23,6 +25,11 @@ beforeEach ->
         data: []
     }
 
+    @prevMB = Lanes.Models.PubSub.mb
+    Lanes.Models.PubSub.mb = jasmine.createSpyObj('MessageBus', [
+        'subscribe', 'unsubscribe'
+    ])
+
     originalFn = Lanes.Models.Sync.perform
     spyOn(Lanes.Models.Sync, 'perform').and.callFake( (method, options) ->
         _.Promise.resolve(SYNC_RESPONSE)

data/client/lanes/vendor/base.js.erb

@@ -0,0 +1,5 @@
+<% if Lanes.env.production?
+    require_asset "./production/base"
+else
+    require_asset "./development/base"
+end %>

data/client/lanes/vendor/calendar.js.erb

@@ -0,0 +1,5 @@
+<% if Lanes.env.production?
+    require_asset "./production/calendar"
+else
+    require_asset "./development/calendar"
+end %>

data/client/lanes/vendor/commons.js.erb

@@ -0,0 +1,5 @@
+<% if Lanes.env.production?
+    require_asset "./production/commons"
+else
+    require_asset "./development/commons"
+end %>