lanes 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc96c5119c604258c8b8f4c2ceb3c8c3028519bc
-  data.tar.gz: 4f4f8fd4254620611174e393070c68c257b13790
+  metadata.gz: dcfa482b3905ad3ec30faf5fe9569f6f6bc8650b
+  data.tar.gz: fd43ec7fc591b2f8310f89bf0c734bdff7be1a9f
 SHA512:
-  metadata.gz: f54221e4207bc547a4aaf6015f28c41991c4347fe2bcf328a8bc5b335c480a2c1b48837a63b55993368ee4529cac2165e966cda612d06a0d52dee1aa28592742
-  data.tar.gz: f7fcb100561a1345cb2280853531b5e12a44ed52a96656e4328581a798bf1b5b54ad4355e54e037f2e26e7d0fa7f90a1c071c990c0f479b34731fb65c4cce43f
+  metadata.gz: 953ecd6093ed5e2cdf9e7b29de6f444a82a5299833c1c3166e930047ab8b80bbbf2c7a166d7a08df882a6d26552cf84ffbb577aac4a7299739144eda0708e591
+  data.tar.gz: 903218ab0ea98c8c1e290ba9c9976ad5585f84080625433e84e6ed22020e036db9d9263a57afc1ec52d039b1c57ad8b43467b9ba9a1021e8f70154d0210d1fe5

data/appy-app/.gitignore

@@ -0,0 +1,3 @@
+public/assets
+tmp/cache
+log/*log

data/appy-app/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem "lanes", '0.1.5'
+
+gem "rake"
+gem 'puma'

data/appy-app/Guardfile

@@ -0,0 +1,13 @@
+require "lanes/guard_tasks"
+
+Lanes::GuardTasks.run(self, name: "appy-app") do | tests |
+
+    tests.client do
+
+    end
+
+    tests.server do
+
+    end
+
+end

data/appy-app/Rakefile

@@ -0,0 +1,2 @@
+require_relative 'lib/appy-app'
+require 'lanes/rake_tasks'

data/appy-app/client/appy-app/Extension.coffee

@@ -0,0 +1,7 @@
+class AppyApp.Extension extends Lanes.Extensions.Base
+
+    FILE: FILE
+
+    identifier: "appy-app"
+
+    setBootstrapData: (data)->

data/appy-app/client/appy-app/Router.coffee

@@ -0,0 +1,4 @@
+class AppyApp.Router extends Lanes.Screens.Router
+
+    routes:
+        {}

data/appy-app/client/appy-app/index.js

@@ -0,0 +1,21 @@
+//=require ./models/Base
+//=require ./views/Base
+//=require_tree ./models
+//=require_tree ./views
+//=require_tree ./components
+//=require ./screens/Base
+//=require ./Router
+//=require ./Extension
+
+/*
+ Files located in the above directories are part of the default
+ Javascript build and are downloaded to the client on the initial
+ request.
+
+ Accordingly, only essential files should be included here. Code that
+ relates to a screen should be placed in the "screens" directory,
+ where it will be loaded dynamically when the screen is displayed.
+
+ Alternatively, feel free to modify the require statements above to
+ only include the paths you need.
+ */

data/appy-app/client/appy-app/models/Base.coffee

@@ -0,0 +1,5 @@
+# All models in AppyApp will inherit from
+# this common base class.
+class AppyApp.Models.Base extends Lanes.Models.Base
+
+    abstractClass: true

data/appy-app/client/appy-app/screens/Base.coffee

@@ -0,0 +1,10 @@
+class AppyApp.Screens.Base extends Lanes.Screens.Base
+
+    FILE: FILE
+    template: '''
+        <div><h1>Base Screen</h1></div>
+    '''
+
+    subviews: {}
+
+    events: {}

data/appy-app/client/appy-app/styles.scss

@@ -0,0 +1 @@
+/* Enter styles for your application in scss format here */

data/appy-app/client/appy-app/views/Base.coffee

@@ -0,0 +1,5 @@
+# All views in AppyApp will inherit from
+# this common base class.
+class AppyApp.Views.Base extends Lanes.Views.Base
+
+    abstractClass: true

data/appy-app/config/database.yml

@@ -0,0 +1,9 @@
+development:
+  adapter: postgresql
+  database: appy-app_dev
+  host: /tmp
+
+test:
+  adapter: postgresql
+  database: appy-app_test
+  host: /tmp

data/appy-app/config/lanes.rb

@@ -0,0 +1,7 @@
+# This file will be loaded if the current extension is the
+# one controlling Lanes.
+#
+# It will not be evaluated if another extension is loading this one
+Lanes.configure do | config |
+    config.root_view = "AppyApp.Screens.Base"
+end

data/appy-app/config/routes.rb

@@ -0,0 +1,2 @@
+Lanes::API.routes.draw do
+end

data/appy-app/config/screens.rb

@@ -0,0 +1,8 @@
+
+Lanes::Screen.define "base" do | screen |
+    screen.description = "Base Screen for Appy App"
+    screen.icon        = ""
+    screen.group_id    = ""
+    screen.model_class = ""
+    screen.view_class  = "AppyApp.Screens.Base"
+end

data/appy-app/config.ru

@@ -0,0 +1,5 @@
+require 'bundler'
+Bundler.require
+require_relative 'lib/appy-app'
+require 'lanes/api'
+run Lanes::API::Root

data/appy-app/lib/appy-app/extension.rb

@@ -0,0 +1,13 @@
+require_relative '../appy-app'
+
+module AppyApp
+
+    class Extension < Lanes::Extensions::Definition
+
+        identifier "appy-app"
+
+        root_path Pathname.new(__FILE__).dirname.join("..","..").expand_path
+
+    end
+
+end

data/appy-app/lib/appy-app/model.rb

@@ -0,0 +1,11 @@
+module AppyApp
+
+    # All models in AppyApp will inherit from
+    # this common base class.
+    class Model < Lanes::Model
+
+        self.abstract_class = true
+
+    end
+
+end

data/appy-app/lib/appy-app/version.rb

@@ -0,0 +1,3 @@
+module AppyApp
+    VERSION=0.1
+end

data/appy-app/lib/appy-app.rb

@@ -0,0 +1,14 @@
+require "lanes"
+require 'require_all'
+require_relative "appy-app/version.rb"
+require_relative "appy-app/extension.rb"
+
+# The main namespace for Appy-app
+module AppyApp
+    def self.table_name_prefix
+        "appy-app_"
+    end
+end
+
+require_relative "appy-app/model"
+require_rel "appy-app/models"

data/appy-app/spec/appy-app/helpers/AppyAppHelpers.coffee

@@ -0,0 +1,5 @@
+##
+# Uncomment the below beforeEach method to execute code or set instance variables
+# that will be available to all Specs
+
+# beforeEach ->

data/appy-app/spec/appy-app/screens/Base.coffee

@@ -0,0 +1,5 @@
+describe "AppyApp.Screens.Base", ->
+
+    it "can be instantiated", ->
+        view = new AppyApp.Screens.Base()
+        expect(view).toEqual(jasmine.any(AppyApp.Screens.Base));

data/appy-app/spec/server/spec_helpers.rb

@@ -0,0 +1,16 @@
+require_relative '../../lib/AppyApp'
+require 'lanes/spec_helper'
+
+module AppyApp
+
+    # Add more helper methods to be used by all tests here...
+
+    class TestCase < Lanes::TestCase
+        include AppyApp
+    end
+
+    class ApiTestCase < Lanes::ApiTestCase
+        include AppyApp
+    end
+
+end

data/client/lanes/Config.coffee

@@ -0,0 +1,19 @@
+class Config extends Lanes.Models.State
+    constructor: -> super
+
+    session:
+        csrf_token:  { type: 'string', setOnce: true }
+        api_path:    { type: 'string', setOnce: true }
+        environment: { type: 'string', setOnce: true }
+
+    derived:
+        env:
+            deps: ['environment'], fn: ->
+                {
+                    test:     this.environment == 'test',
+                    development: this.environment == 'development',
+                    production:  this.environment == 'production'
+                }
+
+
+Lanes.config = new Config

data/client/lanes/components/grid/styles.scss

@@ -27,7 +27,7 @@
     padding-top: 20px;
     text-align: center;
     font-size: 1.2em;
-    background:url(asset_path('images/ajax-loader.gif')) no-repeat scroll 40% 7px $body-bg;
+    background:url(asset_path('images/lanes/ajax-loader.gif')) no-repeat scroll 40% 7px $body-bg;
   }
 
 
@@ -87,12 +87,12 @@
     cursor: pointer;
   }
 
-  thead .sorting { background: url(image-path('images/dataTables/sort_both.png')) no-repeat center right; }
-  thead .sorting_asc { background: url(image-path('images/dataTables/sort_asc.png')) no-repeat center right; }
-  thead .sorting_desc { background: url(image-path('images/dataTables/sort_desc.png')) no-repeat center right; }
+  thead .sorting { background: url(image-path('images/lanes/dataTables/sort_both.png')) no-repeat center right; }
+  thead .sorting_asc { background: url(image-path('images/lanes/dataTables/sort_asc.png')) no-repeat center right; }
+  thead .sorting_desc { background: url(image-path('images/lanes/dataTables/sort_desc.png')) no-repeat center right; }
 
-  thead .sorting_asc_disabled { background: url(image-path('images/dataTables/sort_asc_disabled.png')) no-repeat center right; }
-  thead .sorting_desc_disabled { background: url(image-path('images/dataTables/sort_desc_disabled.png')) no-repeat center right; }
+  thead .sorting_asc_disabled { background: url(image-path('images/lanes/dataTables/sort_asc_disabled.png')) no-repeat center right; }
+  thead .sorting_desc_disabled { background: url(image-path('images/lanes/dataTables/sort_desc_disabled.png')) no-repeat center right; }
 
   thead > tr > th {
     padding-left: 18px;

data/client/lanes/index.js

@@ -3,6 +3,7 @@
 //= require ./lib
 //= require ./extension
 //= require ./models
+//= require ./Config
 //= require ./plugins
 //= require ./views
 //= require ./components/Base

data/client/lanes/index.scss.erb

@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'lanes-icon';
-  src:url(font-path('lanes/styles/fonts/icomoon.eot') + '?-7u8s0f');
-  src:url(font-path('lanes/styles/fonts/icomoon.eot') + '?#iefix-7u8s0f') format('embedded-opentype'),
-  url(font-path('lanes/styles/fonts/icomoon.woff') + '?-7u8s0f') format('woff'),
-  url(font-path('lanes/styles/fonts/icomoon.ttf')  + '?-7u8s0f') format('truetype'),
-  url(font-path('lanes/styles/fonts/icomoon.svg')  + '?-7u8s0f#icomoon') format('svg');
+  src:url(font-path('fonts/lanes/icomoon.eot'));
+  src:url(font-path('fonts/lanes/icomoon.eot')) format('embedded-opentype'),
+  url(font-path('fonts/lanes/icomoon.woff')) format('woff'),
+  url(font-path('fonts/lanes/icomoon.ttf')) format('truetype'),
+  url(font-path('fonts/lanes/icomoon.svg')) format('svg');
   font-weight: normal;
   font-style: normal;
 }

data/client/lanes/models/Base.coffee

@@ -6,9 +6,9 @@ class BaseModel
         changes: { type: 'collection', setOnce: true }
         lastServerMessage: { type: 'string' }
         parent: 'state'
+        isDirty: { type: 'boolean', default: false }
 
     derived:
-
         errorMessage:
             deps:['errors'], fn: ->
                 if !@errors then ''
@@ -50,7 +50,7 @@ class BaseModel
         @changeMonitor = new Lanes.Models.ChangeMonitor(this)
         # The model was created with attributes and it did not originate from a XHR request
         if attrs and !options.xhr
-            @changeMonitor.recordChanged(_.keys(attrs))
+            @changeMonitor.recordChanges(this, _.keys(attrs))
 
     # In some cases a model's security should depend on the parent record, not on itself.
     # For instance, a Customer's Address should have the same permissions as the Customer
@@ -73,7 +73,7 @@ class BaseModel
         _.pluralize(_.dasherize(path))
 
     urlRoot: ->
-        Lanes.Models.Config.api_path + '/' + _.result(this,'api_path')
+        Lanes.config.api_path + '/' + _.result(this,'api_path')
 
     # Default URL for the model's representation on the server
     url: ->
@@ -134,8 +134,9 @@ class BaseModel
 
     # Sets the attribute data from a server respose
     setFromServer: (data,options)->
-        this.set( if _.isArray(data) then data[0] else data )
-        this.changeMonitor.reset()
+        BaseModel.__super__.set.call(this, if _.isArray(data) then data[0] else data )
+        this.associations.setFromServer(this,data) if this.associations
+        this.isDirty = false
 
     # save the model's data to the server
     # Only unsaved attributes will be sent unless
@@ -144,6 +145,7 @@ class BaseModel
         options = _.clone(options)
 
         options.saving=true
+
         handlers = Lanes.Models.Sync.wrapRequest(this,options)
 
         method = if this.isNew()
@@ -187,9 +189,12 @@ class BaseModel
 
     # returns any attributes that have been set and not saved
     unsavedAttributes: ->
-        attrs = if this.isNew() then {} else { id: this.getId() }
+        attrs = {} #if this.isNew() then {} else { id: this.getId() }
         _.extend(attrs, _.pick( this.getAttributes(props:true, true),
             @changeMonitor.changedAttributes() ) )
+        unless _.isEmpty(attrs) or this.isNew()
+            attrs.id = this.getId()
+        attrs
 
     # returns data to save to server.  If options.saveAll is true,
     # all data is returned.  Otherwise only unsaved attributes (and associations)
@@ -204,11 +209,6 @@ class BaseModel
         data
 
 
-    # returns true if any server-side attributes are unsaved
-    # Does not care about session-only properties
-    isDirty: ->
-        @changeMonitor.isDirty()
-
     # True if the model has "name" as eitehr a prop or session attribute
     hasAttribute: (name)->
         !! (this._definition[name] || this._derived[name])

data/client/lanes/models/Bootstrap.coffee

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

data/client/lanes/models/ChangeMonitor.coffee

@@ -2,28 +2,31 @@
 # The ModelChangeMonitor watches for changes on the                  #
 # Model and remembers which attributes have been changed             #
 # ------------------------------------------------------------------ #
+
 class Lanes.Models.ChangeMonitor
-    constructor: (@model)->
-        @model.on('change', this.onChange, this)
+    constructor: (model)->
+        model.on('change', this.onChange, this)
+        model.on('change:isDirty', this.onDirtyChange, this)
 
     onChange: (record,options)->
-        attrs = @model.changedAttributes()
-        this.recordChanged( _.keys(attrs) )
-
-    recordChanged: (names)->
+        attrs = record.changedAttributes()
+        return if _.isEmpty(attrs)
         @_unsaved ||= {}
+        this.recordChanges(record,_.keys(attrs))
+
+
+    recordChanges: (record,names) ->
         for name in names
-            this.recordChangedAttribute(name)
+            if name != record.idAttribute && record._definition[name] && !record._definition[name].session
+                record.isDirty = true
+                @_unsaved[ name ] = true
+
+    onDirtyChange: (record,isDirty)->
+        delete @_unsaved if !isDirty
 
     changedAttributes: ->
         _.keys(@_unsaved)
 
-    recordChangedAttribute:(name)->
-        if @model._definition[name] && !@model._definition[name].session
-            @_unsaved[ name ] = true
-
-    reset: ->
-        delete @_unsaved
 
     isDirty: ->
         !_.isEmpty(@_unsaved)

data/client/lanes/models/Collection.coffee

@@ -83,9 +83,7 @@ class ModelsCollection
 
     # true if any models have unsaved data
     isDirty: ->
-        for model in @models
-            return true if model.isDirty()
-        false
+        !!this.findWhere(isDirty: true)
 
     url: -> @model::urlRoot()
 
@@ -102,7 +100,7 @@ class ModelsCollection
     dataForSave: (options)->
         unsaved = []
         for model in @models
-            if options.saveAll || model.isDirty()
+            if options.saveAll || model.isDirty
                 unsaved.push( model.dataForSave(options) )
         unsaved
 

data/client/lanes/models/ModelAssociations.coffee

@@ -47,44 +47,29 @@ class Lanes.Models.AssocationMap
             new Lanes.Models.AssociationCollection(options.models||[],options)
     # returns the definition for the derived property
     derivedDefinition: (name,definition)->
-#        me = this
-#        target_klass = this.getClassFor(name)
-#        fk = this.fk(name) ; pk = this.pk(name)
-
-        # if definition.defaultValue
-        #     _.defaults(args, _.evaluateFunction(definition.defaultValue))
         createFn = _.partial(
             if definition.model then this.createModel else this.createCollection,
             this, name, definition, this.fk(name), this.pk(name), this.getClassFor(name)
         )
         { deps: [this.pk(name)], fn: createFn }
 
-        # createAssocation = if definition.model then ->
-        #     target_klass ||= me.getClassFor(name)
-        #     _.extend(args, parent: this)
-        #     model_id = this.get(pk)
-        #     if model_id && model_id == this._cache[name]?.id
-        #         this._cache[name]
-        #     else
-        #         target_klass.findOrCreate(args)
-        # else ->
-        #     target_klass ||= me.getClassFor(name)
-        #     filter = {}
-        #     filter[ fk ] = this.get( pk)
-        #     _.extend(args, filter: filter, parent: this)
-        #     if target_klass::isCollection
-        #         new target_klass([],args)
-        #     else
-        #         args.model=target_klass
-        #         new Lanes.Models.AssociationCollection(args)
-        # { deps: [pk], fn: createFn }
 
     # Sets the assocations for "model"
     set: (model, data)->
+        this._set(model, data, 'set')
+
+    setFromServer: (model, data)->
+        this._set(model, data, 'setFromServer')
+
+    _set: (model, data, fn_name)->
         for name, value of data
             if @definitions[name]
                 attributes = if _.isFunction(value.serialize) then value.serialize() else value
-                model[name].set( attributes )
+                association = model[name]
+                association[fn_name]( attributes )
+                # if we're replaceing the model's contents with another, copy the dirty status as well
+                if association.isModel && value.isModel
+                    association.isDirty = value.isDirty
 
     pk: (name)->
         def = @definitions[name]
@@ -101,8 +86,8 @@ class Lanes.Models.AssocationMap
         ret = {}
         options.saveDepth = ( if options.saveDepth then options.saveDepth+1 else 1 )
         return ret if options.saveDepth > 5
-        for name, assoc_options of @definitions
-            unless assoc_options.readOnly
+        for name, options of @definitions
+            unless options.readOnly
                 data = model[name].dataForSave(options)
                 unless _.isEmpty( data )
                     ret[name] = data

data/client/lanes/models/Sync.coffee

@@ -78,7 +78,7 @@ Lanes.Models.Sync = {
         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
+            X_CSRF_TOKEN: Lanes.config.csrf_token
         }
         params.contentType = "application/json"
         if options.data || _.contains(['create','update','patch'], method)

data/client/lanes/screens/Instance.coffee

@@ -6,6 +6,7 @@ class Lanes.Screens.Instance
 
     constructor: (selector, options)->
         this.viewport = new Lanes.Views.Viewport({ selector: selector, instance: this })
+        Lanes.config.set(options)
         Lanes.Models.Bootstrap.initialize(options)
         Lanes.$(document).ready => @boot(options)
 

data/client/lanes/styles/fonts.scss

@@ -20,7 +20,7 @@
   @extend .font-icon-display;
 }
 
-@import "./fonts/style";
+@import "./font-definitions";
 
 .icon-reset:before {
     @extend .icon-refresh:before;

data/client/lanes/styles/plugins/overlay.scss

@@ -29,7 +29,7 @@
       font-size: 3.2rem;
       float: left;
       &.loading-spinner {
-        background:url(image-path('images/ajax-loader.gif')) no-repeat;
+        background:url(image-path('images/lanes/ajax-loader.gif')) no-repeat;
         height: 32px;
         margin-top: 10px;
         width: 32px;