lanes 0.6.1 → 0.7.0

data/client/lanes/lib/utilFunctions.coffee

@@ -15,6 +15,16 @@ distillTypes = (type, ns) ->
     _.reduce( type.split( '.' ), ( ( memo, val ) -> return if memo then memo[ val ] else null ),  ns )
 
 Lanes.u = {
+
+    utcToLocalDate: (val) ->
+        new Date(val.getTime() - (val.getTimezoneOffset() * 60000))
+
+    dateToUTC: (val) ->
+        new Date(
+            val.getUTCFullYear(), val.getUTCMonth(),   val.getUTCDate(),
+            val.getUTCHours(),    val.getUTCMinutes(), val.getUTCSeconds()
+        )
+
     cleanBsSizes: (props) ->
         _.omit(props, @getBsSizeProps() )
 
@@ -168,6 +178,8 @@ _.mixin({
                 false
             when _.isNumber(value)
                 !value
+            when _.isObject(value)
+                _.keys(value).length is 0
             else
                 _.isEmpty(value)
 

data/client/lanes/models/Asset.coffee

@@ -1,5 +1,5 @@
 IMAGES = [
-    "image/png", "image/jpg", "image/gif"
+    "image/png", "image/jpeg", "image/gif"
 ]
 
 IS_IMAGE = (content_type) ->
@@ -33,13 +33,12 @@ class Lanes.Models.Asset extends Lanes.Models.Base
 
         isPresent:
             deps: ['data', 'file_data'], fn: ->
-                @data || !_.isEmpty(@file_data)
+                @data || !_.isBlank(@file_data)
 
         hasImage:
             deps: ['data', 'file_data'], fn: ->
                 (@data && IS_IMAGE(@metadata.content_type)) ||
-                    (@file_data && IS_IMAGE(@file_data.original
-                        .metadata.mime_type))
+                    (@file_data && IS_IMAGE(@file_data.original?.metadata.mime_type))
     events:
         'change:blob': 'onBlobChange'
 

data/client/lanes/models/AssociationMap.coffee

@@ -22,8 +22,10 @@ class Lanes.Models.AssociationMap
         Lanes.u.findObject(object, 'Models', @klass::FILE)
 
     getProxyFor: (name) ->
+        klass = @getClassFor(name)
+        return null unless klass
         @proxy[name] ||= (
-            Lanes.Models.AssocationProxy.construct( @getClassFor(name),
+            Lanes.Models.AssocationProxy.construct( klass,
                 association_pk: @pk(name)
                 association_name: name
             )
@@ -35,17 +37,20 @@ class Lanes.Models.AssociationMap
             model._cache[name] = new Proxy( this, this.getOptions(name, model) )
 
     replace: (parent, name, model) ->
+        parent._changing = true
+        parent._previousAttributes[name] = parent[name]
         parent._cache[name] = model
         model.parent = parent if model.hasAttribute?('parent') or model.parent?
         model.parent_association = name if model.hasAttribute?('parent_association') or model.parent_association?
-
         parent.trigger("change", parent, {})
         parent.trigger("change:#{name}", model, {})
+        parent._changing = false
 
     getOptions: (name, model) ->
         definition = @definitions[name]
         options = { parent: model }
         if definition.inverse
+            options.inverse = { name: definition.inverse, value: model }
             options[ definition.inverse ] = model
         if definition.options
             _.extend(options, Lanes.u.resultsFor(model, definition.options))
@@ -53,7 +58,7 @@ class Lanes.Models.AssociationMap
 
     # will be called in the scope of the parent model
     createModel: (association, name, definition, fk, pk, target_class) ->
-        if definition.autoCreate
+        if definition.required
             target_class ||= association.getClassFor(name)
             options = association.getOptions(name, this)
             model_id = this.get(pk)
@@ -67,11 +72,15 @@ class Lanes.Models.AssociationMap
                 existing
             else
                 Proxy = association.getProxyFor(name)
-                new Proxy( association, association.getOptions(name, @)  )
+                if Proxy
+                    new Proxy( association, association.getOptions(name, @)  )
+                else
+                    null
 
     # will be called in the scope of the parent model
     createCollection: (association, name, definition, fk, pk, target_class) ->
         target_class ||= association.getClassFor(name)
+        return null unless target_class
         options = association.getOptions(name, this)
         options.filter ||= {}
         options.filter[fk] = this.get(pk)
@@ -82,6 +91,8 @@ class Lanes.Models.AssociationMap
             options.model = target_class
             options.association_name = name
             klass = options.collectionClass or Lanes.Models.AssociationCollection
+            if _.isString(klass)
+                klass = Lanes.u.findObject(klass, 'Models', association.klass::FILE)
             new klass(options.models || [], options)
 
     # returns a collection for the given association.
@@ -152,12 +163,12 @@ class Lanes.Models.AssociationMap
                 @_setModel(model, name, value, options, fn_name)
 
     _setModel: (model, name, value, options, fn_name) ->
-        model.set(this.pk(name), value.id, options) if value.id
 
         if Lanes.u.isModel(value)
             @replace(model, name, value)
         else
-            model[name][fn_name]( value )
+            model.set(this.pk(name), value.id, options) if value.id
+            model[name]?[fn_name]( value )
         if options?.silent isnt true
             model.trigger("change:#{name}", value, {})
 

data/client/lanes/models/Base.coffee

@@ -25,11 +25,13 @@ class BaseModel
 
         errorMessage:
             deps:['errors'], fn: ->
-                if !@errors then ''
-                else if @errors.exception then @errors.exception
-                else  _.toSentence( _.map(@errors, (value, key) ->
-                    _.titleize(_.humanize(key)) + ' ' + value
-                ))
+                return '' unless @hasErrors
+                @errors.exception or (
+                    _.toSentence( _.map(@errors, (value, key) ->
+                        _.titleize(_.humanize(key.replace('.', ' '))) + ' ' + value
+                    ))
+                )
+
     constructor: (attrs, options = {}) ->
         super
         @on('change', @_calculateInvalidAttributes)
@@ -222,16 +224,18 @@ class BaseModel
     sync: (options...) ->
         Lanes.Models.Sync.state(options...)
 
-    # Check if an attribute named "name" can be set to "value"
-    # Returns an empty string if value, and an appropriate error message if not
+    # Check if an attribute named "name" is invalid
+    # Returns an empty string if valid, and an appropriate error message if not
     invalidMessageFor: (name) ->
-        return '' unless @unmaskedInvalidFields and _.includes(@requiredAttributes, name) and
-            _.includes(@unmaskedInvalidFields, name)
-
-        if @isBlank(name)
+        if @shouldCheckFieldValidity(name) and @isBlank(name)
             "Cannot be empty"
         else
             ''
+    shouldCheckFieldValidity: (name) ->
+        @unmaskedInvalidFields and
+            _.includes(@requiredAttributes, name) and
+                (@unmaskedInvalidFields is 'all' or
+                    _.includes(@unmaskedInvalidFields, name))
 
     maskInvalidFields: ->
         delete @unmaskedInvalidFields
@@ -239,17 +243,20 @@ class BaseModel
     unmaskInvalidField: (attr) ->
         if attr is 'all'
             @unmaskedInvalidFields = 'all'
-            @trigger("invalid-fields", this, @unmaskedInvalidFields)
+            @_calculateInvalidAttributes()
+            unless _.isEmpty(@invalidAttributes)
+                @trigger("invalid-fields", this, @invalidAttributes)
         else if @unmaskedInvalidFields isnt 'all'
             @unmaskedInvalidFields ||= []
             if _.includes(@requiredAttributes, attr) and !_.includes(@unmaskedInvalidFields, attr)
                 @unmaskedInvalidFields.push(attr)
+
                 @trigger("invalid-field:#{attr}", this)
 
     _calculateInvalidAttributes: ->
         invalid = []
         for name in @requiredAttributes
-            invalid.push(name) if @isBlank(name)
+            invalid.push(name) if @invalidMessageFor(name)
         @invalidAttributes = invalid
 
     # When the model is extended it auto-creates the created_at and updated_at

data/client/lanes/models/Collection.coffee

@@ -13,6 +13,9 @@ CommonMethods = {
     pick: (keys...) ->
         _.map(@models, _.partialRight(_.pick, keys...))
 
+    unSaved: ->
+        @filter (pymnt) -> pymnt.isNew()
+
     sum: ->
         args = _.toArray(arguments)
         args.unshift(this.models)
@@ -35,7 +38,7 @@ CommonMethods = {
         )
 
     clone: ->
-        new @constructor( @invoke( 'clone' ), @options )
+        new @constructor( @each( 'clone' ), @options )
 
     serialize: (options = {depth: 1}) ->
         depth = options.depth

data/client/lanes/models/PubSub.coffee

@@ -81,7 +81,7 @@ CableChannel = {
         @perform("off", {channel})
 
     received: (data) ->
-        [channel, model, id] = data.channel.match(/(.*)\/([^\/]+)/)
+        [channel, prefix, model, id] = data.channel.match(/^(.*)\:(.*)\/([^\/]+)$/)
         Lanes.log.info "[pubsub] change recvd for: #{channel}"
         Lanes.Models.PubSub.onChange(
             model, id, _.omit(data, 'channel')
@@ -117,8 +117,7 @@ Lanes.Models.PubSub = {
 
     onLoginChange: ->
         if Lanes.current_user.isLoggedIn
-            url = window.location.protocol.replace('http', 'ws') +
-                "//#{Lanes.config.api_host}#{Lanes.config.api_path}/ws"
+            url = "#{Lanes.config.api_host}#{Lanes.config.api_path}/ws"
             @cable = ActionCable.createConsumer(url)
             @channel = @cable.subscriptions.create "Lanes::API::PubSub", CableChannel
         else

data/client/lanes/models/SmtpSettings.coffee

@@ -0,0 +1,7 @@
+class Lanes.Models.SmtpSettings extends Lanes.Models.Base
+
+    props:
+        server:   'string'
+        login:    'string'
+        password: 'string'
+        from:     'string'

data/client/lanes/models/Sync.coffee

@@ -75,7 +75,7 @@ Lanes.Models.Sync = {
         # Ensure that we have a URL.
         options.url or Lanes.Models.Sync.urlError()
 
-        options.url = '//' + Lanes.config.api_host + options.url + '.json'
+        options.url = Lanes.config.api_host + options.url + '.json'
 
         unless _.isEmpty(query)
             options.url += '?' + Lanes.lib.objToParam(query)
@@ -83,7 +83,7 @@ Lanes.Models.Sync = {
         options.headers ||= {}
         options.withCredentials = true
         if Lanes.config.csrf_token
-            options.headers['X_CSRF_TOKEN'] = Lanes.config.csrf_token
+            options.headers['X-CSRF-TOKEN'] = Lanes.config.csrf_token
         options.contentType = "application/json"
 
         new _.Promise( (resolve, reject) ->

data/client/lanes/react/Viewport.coffee

@@ -13,7 +13,7 @@ class Lanes.React.Viewport extends Lanes.Models.State
         height:         'number'
         el:             'element'
         selector:       'string'
-        domRoot:        'element'
+        container:      'element'
         reactRoot:      'object'
         lanes:          'element'
         modalProps:     'object'
@@ -27,14 +27,17 @@ class Lanes.React.Viewport extends Lanes.Models.State
     constructor: ->
         super
         ALL_INSTANCES.push(this)
-        return unless @selector
-        @domRoot = document.body.querySelector(@selector)
-        _.dom(@domRoot).addClass('lanes-root')
-        Lanes.fatal("Root selector #{@selector} not found") unless @domRoot
-        _.dom(@domRoot).html = "<div class='lanes'/>"
-        this.lanes = @domRoot.querySelector('.lanes')
-
-        Lanes.lib.ResizeSensor(@domRoot, _.debounce( =>
+        unless (@container or (@selector and
+                (@container = document.body.querySelector(@selector))))
+            console.warn("Unable to render without container or valid selector")
+            return
+
+        _.dom(@container).addClass('lanes-root')
+        Lanes.fatal("Root selector #{@selector} not found") unless @container
+        _.dom(@container).html = "<div class='lanes'/>"
+        this.lanes = @container.querySelector('.lanes')
+
+        Lanes.lib.ResizeSensor(@container, _.debounce( =>
             @_updateDimensions()
         , 250))
         this._updateDimensions()
@@ -47,7 +50,7 @@ class Lanes.React.Viewport extends Lanes.Models.State
 
 
     onBoot: ->
-        prev = _.dom(this.domRoot.previousElementSibling)
+        prev = _.dom(this.container.previousElementSibling)
         if @useHistory
             @initializeHistory()
         else
@@ -81,6 +84,7 @@ class Lanes.React.Viewport extends Lanes.Models.State
     close: ->
         @hideModal()
         @_historyStopListening?()
+        @container.remove()
 
     _updateDimensions: ->
         this.set

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

@@ -1,8 +1,5 @@
 Lanes.React.Mixins.FieldErrors = {
 
-    mixins: [
-        Lanes.React.Mixins.ReadEditingState
-    ]
 
     componentWillMount: ->
         @getInvalidModel()?.maskInvalidFields?()
@@ -17,7 +14,9 @@ Lanes.React.Mixins.FieldErrors = {
         !!@fieldInvalidValueMessage()
 
     fieldInvalidValueMessage: ->
-        return '' unless @isEditingRecord()
+        # check needs to stay in sync with Lanes.React.Mixins.ReadEditingState.isEditingRecord
+        return '' unless @props.editOnly or @context.recordDisplay == 'edit'
+
         @getInvalidModel()?.invalidMessageFor?(
             @getInvalidFieldName()
         )

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

@@ -10,5 +10,6 @@ Lanes.React.Mixins.ReadEditingState = {
         editOnly:  React.PropTypes.bool
 
     isEditingRecord: ->
+        # if updated, also change Lanes.React.Mixins.FieldErrors.fieldInvalidValueMessage
         @props.editOnly or @context.recordDisplay == 'edit'
 }

data/client/lanes/remote/Bootstrap.coffee

@@ -0,0 +1,85 @@
+##=require lanes/remote/onDocumentReady
+##=require lanes/lib/loader
+##=require_self
+
+LOADING  =  1
+ERROR    = -1
+COMPLETE = 99
+
+ASSETS_PREFIX = '/assets/'
+
+class Bootstrapper
+
+    constructor:(@options) ->
+        @srcTagSubstrIndx = @options.srcTag.length * -1
+        @callbacks = { onComplete: [] }
+        @onComplete(@options.onComplete) if @options.onComplete
+
+        Lanes.Remote.onDocumentReady =>
+            @readLoadUrl()
+
+    tagMatchesSuffix: (tag) ->
+        tag.src.substr(@srcTagSubstrIndx) == @options.srcTag
+
+    readLoadUrl: ->
+        for tag in document.querySelectorAll('script') when @tagMatchesSuffix(tag)
+            @api_host = tag.src.replace(/\/assets\/.*/, '')
+            break
+        if @api_host
+            @requestFullAssets()
+        else
+            @state = ERROR
+            console.error("Unable to find script tag that Stockor was loaded from")
+
+    srcFor: (type) ->
+        @api_host + ASSETS_PREFIX + @options.scripts[type]
+
+    requestFullAssets: ->
+        @pending = {}
+        if @options.scripts.js
+            @pending.js = Lanes.lib.loader.js(@srcFor('js'), (ev) =>
+                @onLoadComplete(ev)
+            )
+        if @options.scripts.css
+            @pending.css = Lanes.lib.loader.css(@srcFor('css'), (ev) =>
+                @onLoadComplete(ev)
+            )
+        @setLoadingStatus()
+
+    setLoadingStatus: ->
+        if Object.keys(@pending).length
+            @state = LOADING
+        else
+            @state = COMPLETE
+            Lanes.config.api_host = @api_host
+            for cb in @callbacks.onComplete
+                cb(@)
+
+    onComplete: (cb) ->
+        @callbacks.onComplete.push(cb)
+
+    onLoadComplete: (tag) ->
+        switch tag.tagName
+            when 'LINK'   then delete @pending.css
+            when 'SCRIPT' then delete @pending.js
+            else
+                console.warn "Complete called for unknown tag type #{tag.tagName}"
+        @setLoadingStatus()
+
+
+
+Object.defineProperties(Bootstrapper.prototype, {
+
+    isComplete:
+        get: -> @state == COMPLETE
+    isPending:
+        get: -> @state isnt COMPLETE and @state isnt ERROR
+    hasFailed:
+        get: -> @state isnt ERROR
+
+})
+
+Lanes.namespace('Bootstrap')
+
+Lanes.Remote.Bootstrap = (srcTag, options) ->
+    new Bootstrapper(srcTag, options)

data/client/lanes/remote/api.coffee

@@ -1,8 +1,9 @@
 ##=require ../vendor/standalone
 ##=require ../lib/all
 ##=require ../models
+##=require ../Config
 ##=require ../extension
 ##=require ../react
 ##=require_self
 
-Lanes.config = {api_path: null}
+# Lanes.config = {api_path: null}

data/client/lanes/remote/onDocumentReady.coffee

@@ -0,0 +1,12 @@
+##=require lanes/lib/namespace
+
+Lanes.namespace('Remote')
+
+Lanes.Remote.onDocumentReady = (fn) ->
+    if document.readyState isnt 'loading'
+        fn()
+    else if document.addEventListener
+        document.addEventListener 'DOMContentLoaded', fn
+    else
+        document.attachEvent 'onreadystatechange', ->
+            fn() if document.readyState != 'loading'