lanes 0.1.8 → 0.1.9

data/lib/lanes/extension.rb

@@ -94,6 +94,7 @@ module Lanes
                   csrf_token: Rack::Csrf.csrf_token(view.env),
                   controlling_extension: controlling.identifier,
                   root_view:  Lanes.config.root_view,
+                  assets_path_prefix: Lanes.config.assets_path_prefix,
                   api_path: Lanes.config.mounted_at,
                   environment: Lanes.config.environment,
                   initial_workspace_screen_id: Lanes.config.initial_workspace_screen_id,

data/lib/lanes/guard_tasks.rb

@@ -38,7 +38,7 @@ module Lanes
 
             dsl.guard :minitest, minitest_options do
                 dsl.watch(%r{^spec/server/spec_helper\.rb}) { 'test' }
-                dsl.watch(%r{^spec/server/.+_spec\.rb})
+                dsl.watch(%r{^spec/server/.*_spec\.rb})
                 dsl.watch(%r{^spec/fixtures/#{app_name}/(.+)s\.yml})   { |m| "spec/server/#{m[1]}_spec.rb" }
                 dsl.watch(%r{^lib/#{app_name}/(.+)\.rb})               { |m| "spec/server/#{m[1]}_spec.rb" }
                 matchers.server_matches.call if matchers.server_matches

data/lib/lanes/model.rb

@@ -14,6 +14,7 @@ module Lanes
         include Concerns::ExportJoinTables
         include Concerns::AssociationExtensions
         include Concerns::ApiPath
+        include Concerns::CodeIdentifier
         include Concerns::SanitizeFields
 
     end

data/lib/lanes/rake_tasks.rb

@@ -18,7 +18,6 @@ task :console do
     IRB.start
 end
 
-
 # ## quite a bit of this is cribbed from Sinatra ActiveRecord
 load 'active_record/railties/databases.rake'
 
@@ -32,7 +31,6 @@ task :routes do
     end
 end
 
-
 namespace :db do
     task :environment do
         Lanes::DB.configure_rake_environment

data/lib/lanes/screen.rb

@@ -78,10 +78,7 @@ module Lanes
             attr_accessor_with_default :css
 
             def assets
-                paths=[]
-                paths << "#{Lanes.config.assets_path_prefix}/#{js}"  unless js.blank?
-                paths << "#{Lanes.config.assets_path_prefix}/#{css}" unless css.blank?
-                paths
+                [js, css].reject{|asset| asset.blank? }
             end
 
             def to_json

data/lib/lanes/spec_helper.rb

@@ -11,7 +11,7 @@ require 'minitest/spec'
 require 'minitest/autorun'
 require 'mocha/mini_test'
 
-RAILS_ENV = "test"
+LANES_ENV = "test"
 I18n.enforce_available_locales = true
 Lanes::DB.establish_connection('test')
 Lanes.logger=Logger.new( File.open('log/test.log', File::WRONLY | File::APPEND | File::CREAT ))
@@ -36,7 +36,7 @@ module Lanes
         include Lanes
 
         include ActiveRecord::TestFixtures
-        self.fixture_path =  Pathname.new(__FILE__).dirname.join('fixtures')
+         self.fixture_path = Lanes::Extensions.controlling.root_path.join('spec','fixtures')
 
         self.use_transactional_fixtures = true
         fixtures :all
@@ -138,3 +138,6 @@ module MiniTest
         end
     end
 end
+
+
+require_relative 'access/test_fixture_extensions'

data/lib/lanes/version.rb

@@ -1,5 +1,5 @@
 module Lanes
 
-    VERSION = "0.1.8"
+    VERSION = "0.1.9"
 
 end

data/npm-build/package.json

@@ -18,6 +18,7 @@
         "ampersand-dom-bindings": "~3.3",
         "underscore.inflections": "~0.2.1",
         "domify": "~1.3",
+        "interact.js": "~1.2",
         "big.js": "~2.5",
         "rsvp": "~3.0",
         "get-object-path": "~0.0.2",

data/npm-build/template.js

@@ -16,6 +16,7 @@ Lanes.Vendor.KeyMaster                = require("keymaster");
 Lanes.Vendor.Moment                   = require("moment");
 Lanes.Vendor.RSVP                     = require('rsvp');
 Lanes.Vendor.domify                   = require('domify');
+Lanes.Vendor.interact                 = require('interact.js');
 Lanes.Vendor.BBEvents                 = require('backbone-events-standalone');
 Lanes.dom    = require('ampersand-dom');
 var u        = require('underscore');

data/spec/command-reference-files/initial/Gemfile

@@ -1,6 +1,9 @@
 source 'https://rubygems.org'
 
-gem "lanes", '0.1.8'
+# For development while Lanes is evolving track master branch
+gem "lanes",   github: 'argosity/lanes',   branch: 'master'
+
+# gem "lanes", '0.1.9'
 
 gem "rake"
 gem 'puma'

data/spec/command-reference-files/initial/client/appy-app/Extension.coffee

@@ -1,6 +1,16 @@
+# This is the client-side version of AppyApp::Extension
 class AppyApp.Extension extends Lanes.Extensions.Base
 
-
+    # must match the identier in
     identifier: "appy-app"
 
+    # This method is called when the extension is registered
+    # Not all of Lanes will be available yet
+    onRegistered: ->
+
+    # Data that is provided by AppyApp::Extension#client_bootstrap_data
+    # in lib/appy-app/extension.rb is passed to this method
     setBootstrapData: (data)->
+
+    # All of lanes is loaded and it is in the process of booting
+    onAvailable: ->

data/spec/command-reference-files/initial/config/lanes.rb

@@ -3,5 +3,8 @@
 #
 # It will not be evaluated if another extension is loading this one
 Lanes.configure do | config |
-    config.root_view = "AppyApp.Screens.Base"
+    # You can specify a different initial vew by setting it here
+    # It must be set if the "Workspace" extension is disabled in
+    # lib/appy-app/extension.rb
+    # config.root_view = "AppyApp.Screens.<View Name>"
 end

data/spec/command-reference-files/initial/lib/appy-app/extension.rb

@@ -1,4 +1,15 @@
-require_relative '../appy-app'
+require_relative "../appy-app"
+
+# This will load the "Workspace" extension, which provides
+# a menu and tab based switching between screens.
+require "lanes/workspace/extension"
+
+# This will load the "Access" extension, which provides
+# Role based user access controls.  Before enabling it
+# make sure that you have created some users in db/seed.rb
+#
+# require "lanes/workspace/access"
+
 
 module AppyApp
 

data/spec/command-reference-files/initial/lib/appy-app.rb

@@ -9,4 +9,3 @@ module AppyApp
 end
 
 require_relative "appy-app/model"
-require_rel "appy-app/models"

data/spec/command-reference-files/model/lib/appy-app/model.rb

@@ -0,0 +1,12 @@
+module AppyApp
+
+    # All models in AppyApp will inherit from
+    # this common base class.
+    class Model < Lanes::Model
+
+        self.abstract_class = true
+
+    end
+
+    autoload :TestTest, "appy-app/models/test_test"
+end

data/spec/command-reference-files/model/lib/appy-app.rb

@@ -0,0 +1,11 @@
+require "lanes"
+require 'require_all'
+require_relative "appy-app/version.rb"
+require_relative "appy-app/extension.rb"
+
+# The main namespace for AppyApp
+module AppyApp
+
+end
+
+require_relative "appy-app/model"

data/spec/command-reference-files/view/client/appy-app/views/BigView.coffee

@@ -1,5 +1,6 @@
 class AppyApp.Views.BigView extends AppyApp.Views.Base
 
+    template: '<h3>AppyApp.Views.BigView</h3>'
 
     ## These are listed only as examples.
     # If unused they can be safely removed.

data/spec/lanes/helpers/lanes-helpers.coffee

@@ -1,84 +1,5 @@
-Lanes.namespace 'Test'
-
-View       = undefined
-Model      = undefined
-Collection = undefined
-
-class Lanes.Test.DummyView extends Lanes.Views.Base
-    template: "<p>hi</p"
-    events: { "click #mylink": 'onClick' }
-    onClick: Lanes.emptyFn
-
-class Lanes.Test.DummyModel extends Lanes.Models.Base
-    api_path: -> "test"
-    props:
-        id: 'number',
-        name: ['string', true],
-        html: 'string',
-        url: 'string',
-        something: 'string',
-        fireDanger: 'string'
-
-    session:
-        active: 'boolean'
-
-    derived:
-        classes:
-            deps: ['something', 'fireDanger', 'active'],
-            fn: -> this.something + this.active;
-
-Lanes.Test.makeModel = (props={}, args={})->
-    _.extend(Model.prototype, props)
-    Lanes.Models.Base.extend(Model)
-    Collection::model = Model
-    Lanes.Models.Collection.extend(Collection)
-    collection = new Collection
-    return collection.add(new Model(args))
-
-Lanes.Test.makeView = (props={}, args={})->
-    _.extend(View.prototype, props)
-    Lanes.Views.Base.extend(View)
-    return new View(args)
-
-syncResponse = (method, model, options)->
-    _.defer ->
-        if options.success && syncReply.success
-            options.success(syncReply, "success", {})
-        if options.failure && !syncReply.success
-            options.failure(syncReply, "failure", {})
-        _.Promise.resolve(model, options)
-
-syncReply = {}
-
 Lanes.Vendor.MessageBus = {
     subscribe:   jasmine.createSpy('subscribe')
     unsubscribe: jasmine.createSpy('unsubscribe')
     start: Lanes.emptyFn
 }
-
-window.syncSucceedWith = (data)->
-    syncReply.success = true
-    syncReply.data = data
-
-beforeEach ->
-    class TestModel
-        constructor: -> super
-    Model = TestModel
-    class TestCollection
-        constructor: -> super
-    Collection = TestCollection
-    class TestView
-        constructor: -> super
-    View = TestView
-
-    syncReply = {
-        success: true
-        message: ''
-        data: {}
-    }
-
-    Lanes.Test.syncSpy = jasmine.createSpy('sync').and.callFake(syncResponse)
-    Lanes.Test.syncSpy.lastOptions = ->
-        this.calls.mostRecent().args[2]
-    Lanes.Models.Base::sync       = Lanes.Test.syncSpy
-    Lanes.Models.Collection::sync = Lanes.Test.syncSpy

data/spec/lanes/models/BaseSpec.coffee

@@ -65,15 +65,15 @@ describe "Lanes.Models.Base", ->
         expect(model.isDirty).toBe(true)
         expect(model.unsavedAttributes()).toEqual( foo: 'one, two, three' )
         model.save()
-        expect(model.sync).toHaveBeenCalledWith('create', model, jasmine.any(Object))
+        expect(Lanes.Models.Sync.perform).toHaveBeenCalledWith('create', model, jasmine.any(Object))
         model.id=11
         expect(model.isNew()).toBe(false)
-        model.sync.calls.reset()
+        Lanes.Models.Sync.perform.calls.reset()
         syncSucceedWith({
             foo: 'a new foo value'
         })
         model.save().then ->
-            expect(model.sync).toHaveBeenCalledWith('patch', model, jasmine.any(Object))
+            expect(Lanes.Models.Sync.perform).toHaveBeenCalledWith('patch', model, jasmine.any(Object))
             expect(model.foo).toEqual('a new foo value')
             done()
 
@@ -86,9 +86,9 @@ describe "Lanes.Models.Base", ->
             foo: 'foo value'
         })
         model.fetch().then ->
-            expect(model.sync).toHaveBeenCalledWith('read', model, jasmine.any(Object))
+            expect(Lanes.Models.Sync.perform).toHaveBeenCalledWith('read', model, jasmine.any(Object))
             expect(model.foo).toEqual('foo value')
-            options = model.sync.lastOptions()
+            options = Lanes.Models.Sync.perform.lastOptions()
             expect(options).toHaveTrue('ignoreUnsaved')
             expect(options).toHaveNumberWithinRange('limit',1,1)
             done()
@@ -111,7 +111,7 @@ describe "Lanes.Models.Base", ->
             { id: 2, title: 'second value' }
         ])
         Model.where(title: 'first value').whenLoaded (collection)->
-            options = Model::sync.lastOptions()
+            options = Lanes.Models.Sync.perform.lastOptions()
             expect(options.query).toEqual({title:'first value'})
             expect(collection.length).toEqual(2)
             done()
@@ -120,12 +120,10 @@ describe "Lanes.Models.Base", ->
         model = Lanes.Test.makeModel({
             props: { id: 'integer' }
         },{ id: 1 })
-        collection = model.collection
-        expect(collection.length).toEqual(1)
+        collection = model.constructor.Collection
         model.destroy().then ->
-            expect(model.sync)
+            expect(Lanes.Models.Sync.perform)
                 .toHaveBeenCalledWith('delete', model, jasmine.any(Object))
-            expect(collection.length).toEqual(0)
             done()
 
     it "sets associations", ->
@@ -147,6 +145,21 @@ describe "Lanes.Models.Base", ->
             props: { id: 'integer', foo: 'string' }
         },{ id: 1 })
         model.withAssociations('color')
-        expect(model.sync).toHaveBeenCalledWith('read', model, jasmine.any(Object))
-        options = model.sync.lastOptions()
+        expect(Lanes.Models.Sync.perform).toHaveBeenCalledWith('read', model, jasmine.any(Object))
+        options = Lanes.Models.Sync.perform.lastOptions()
         expect(options.include).toEqual(['color'])
+
+    it "reads from caches", (done)->
+        model = Lanes.Test.makeModel({
+            cacheDuration: [1,'day']
+            props: { id: 'integer', title: 'string' }
+        }, {id: 1})
+        syncSucceedWith([
+            { id: 1, title: 'first value'  }
+            { id: 2, title: 'second value' }
+        ])
+        collection = new model.constructor.Collection
+        collection.fetch().then ->
+            model.fetch().then ->
+                expect(model.title).toEqual('first value')
+                done()

data/spec/lanes/models/CollectionSpec.coffee

@@ -25,3 +25,23 @@ describe "Lanes.Models.Collection", ->
         spy.calls.reset()
         collection.reset([{ id:11, title: 'last'}])
         expect(spy).toHaveBeenCalled()
+
+
+    it "caches", (done)->
+        model = Lanes.Test.makeModel({
+            cacheDuration: [1,'day']
+            props: { id: 'integer', title: 'string' }
+        })
+        syncSucceedWith([
+            { id: 1, title: 'first value'  }
+            { id: 2, title: 'second value' }
+        ])
+        collection = new model.constructor.Collection
+        collection.fetch().then ->
+            expect(collection.length).toEqual 2
+            expect(Lanes.Models.Sync.perform).toHaveBeenCalled()
+            Lanes.Models.Sync.perform.calls.reset()
+            collection.fetch().then ->
+                expect(Lanes.Models.Sync.perform).not.toHaveBeenCalled()
+                expect(collection.length).toEqual 2
+                done()

data/spec/lanes/models/EnumMapSpec.coffee

@@ -0,0 +1,26 @@
+describe "Lanes.Models.EnumMap", ->
+    model = null
+
+    beforeEach ->
+        model = Lanes.Test.makeModel({
+            enums:
+                state:
+                    open: 1
+                    complete: 5
+                    canceled: 9
+
+            props:
+                state: {"type":"integer"}
+
+        },{ id: 123 })
+
+    xit "sets up enums", ->
+        expect(model.is_open).toEqual(false)
+        model.state = 1
+        expect(model.is_open).toEqual(true)
+        model.is_open="some crazy value"
+        expect(model.is_open).toEqual(true)
+
+    it "reads the enum's value from the field", ->
+        model.state = 1
+        expect(model.state_value).toEqual("open")

data/spec/server/command_spec.rb

@@ -27,7 +27,7 @@ describe Lanes::Command do
             generated = generated_path.join(relative)
             assert generated.exist?, "File was not created: #{relative}"
             next unless path.file?
-            diff = Diffy::Diff.new(generated.to_s, path.to_s, source: 'files', context: 1)
+            diff = Diffy::Diff.new(path.to_s, generated.to_s, source: 'files', context: 1)
             assert diff.to_s.empty?, "#{relative}\n #{diff}"
         end
     end

data/templates/Gemfile

@@ -1,6 +1,9 @@
 source 'https://rubygems.org'
 
-gem "lanes", '<%= Lanes::VERSION %>'
+# For development while Lanes is evolving track master branch
+gem "lanes",   github: 'argosity/lanes',   branch: 'master'
+
+# gem "lanes", '<%= Lanes::VERSION %>'
 
 gem "rake"
 gem 'puma'

data/templates/client/Extension.coffee

@@ -1,6 +1,16 @@
+# This is the client-side version of <%= namespace %>::Extension
 class <%= namespace %>.Extension extends Lanes.Extensions.Base
 
-
+    # must match the identier in
     identifier: "<%= identifier %>"
 
+    # This method is called when the extension is registered
+    # Not all of Lanes will be available yet
+    onRegistered: ->
+
+    # Data that is provided by <%= namespace %>::Extension#client_bootstrap_data
+    # in lib/<%= identifier %>/extension.rb is passed to this method
     setBootstrapData: (data)->
+
+    # All of lanes is loaded and it is in the process of booting
+    onAvailable: ->

data/templates/client/views/View.coffee

@@ -1,5 +1,6 @@
-class <%= namespace %>.Views.<%= class_name %> extends <%= namespace %>.Views.Base
+class <%= view_class %> extends <%= namespace %>.Views.Base
 
+    template: '<h3><%= view_class %></h3>'
 
     ## These are listed only as examples.
     # If unused they can be safely removed.

data/templates/config/lanes.rb

@@ -3,5 +3,8 @@
 #
 # It will not be evaluated if another extension is loading this one
 Lanes.configure do | config |
-    config.root_view = "<%= class_name %>.Screens.Base"
+    # You can specify a different initial vew by setting it here
+    # It must be set if the "Workspace" extension is disabled in
+    # lib/<%= identifier %>/extension.rb
+    # config.root_view = "<%= class_name %>.Screens.<View Name>"
 end

data/templates/lib/namespace/extension.rb

@@ -1,4 +1,15 @@
-require_relative '../<%= identifier %>'
+require_relative "../<%= identifier %>"
+
+# This will load the "Workspace" extension, which provides
+# a menu and tab based switching between screens.
+require "lanes/workspace/extension"
+
+# This will load the "Access" extension, which provides
+# Role based user access controls.  Before enabling it
+# make sure that you have created some users in db/seed.rb
+#
+# require "lanes/workspace/access"
+
 
 module <%= namespace %>
 

data/templates/lib/namespace.rb

@@ -9,4 +9,3 @@ module <%= namespace %>
 end
 
 require_relative "<%= identifier %>/model"
-require_rel "<%= identifier %>/models"

data/templates/spec/client/views/ViewSpec.coffee

@@ -1,4 +1,4 @@
-describe "<%= namespace %>.Views.<%= class_name %>", ->
+describe "<%= view_class %>", ->
 
     it "can be instantiated", ->
         view = new <%= namespace %>.Views.<%= class_name %>()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lanes
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -470,6 +470,7 @@ files:
 - client/images/lanes/dataTables/sort_desc.png
 - client/images/lanes/dataTables/sort_desc_disabled.png
 - client/images/lanes/logo-sm.png
+- client/lanes/Boot.coffee
 - client/lanes/Config.coffee
 - client/lanes/access/Extension.coffee
 - client/lanes/access/LoginDialog.coffee
@@ -551,14 +552,16 @@ files:
 - client/lanes/lib/promise_helpers.coffee
 - client/lanes/lib/results.coffee
 - client/lanes/lib/utilFunctions.coffee
+- client/lanes/models/AssociationMap.coffee
 - client/lanes/models/Base.coffee
 - client/lanes/models/Bootstrap.coffee
 - client/lanes/models/ChangeMonitor.coffee
 - client/lanes/models/ChangeSet.coffee
 - client/lanes/models/Collection.coffee
-- client/lanes/models/ModelAssociations.coffee
+- client/lanes/models/EnumMap.coffee
 - client/lanes/models/PubSub.coffee
 - client/lanes/models/Query.coffee
+- client/lanes/models/ServerCache.coffee
 - client/lanes/models/Sync.coffee
 - client/lanes/models/User.coffee
 - client/lanes/models/index.js
@@ -569,10 +572,11 @@ files:
 - client/lanes/screens/Base.coffee
 - client/lanes/screens/ChangeListener.coffee
 - client/lanes/screens/Definitions.coffee
-- client/lanes/screens/Instance.coffee
 - client/lanes/screens/Router.coffee
 - client/lanes/screens/all.js.erb
 - client/lanes/screens/index.js
+- client/lanes/screens/mixins/Editing.coffee
+- client/lanes/screens/mixins/index.js
 - client/lanes/screens/register.js.erb
 - client/lanes/styles/bootstrap-custom-grid.scss
 - client/lanes/styles/bootstrap-custom-modals.scss
@@ -722,7 +726,9 @@ files:
 - client/lanes/styles/plugins/all.scss
 - client/lanes/styles/plugins/overlay.scss
 - client/lanes/styles/plugins/resize-sensor.scss
+- client/lanes/testing/BeforeEach.coffee
 - client/lanes/testing/ModelSaver.coffee
+- client/lanes/testing/TestModels.coffee
 - client/lanes/testing/index.js
 - client/lanes/vendor/bootstrap/affix.js
 - client/lanes/vendor/bootstrap/alert.js
@@ -808,6 +814,7 @@ files:
 - lib/lanes/access/role_collection.rb
 - lib/lanes/access/roles/administrator.rb
 - lib/lanes/access/roles/support.rb
+- lib/lanes/access/test_fixture_extensions.rb
 - lib/lanes/access/track_modifications.rb
 - lib/lanes/access/user.rb
 - lib/lanes/access/version.rb
@@ -854,6 +861,7 @@ files:
 - lib/lanes/concerns/api_path.rb
 - lib/lanes/concerns/association_extensions.rb
 - lib/lanes/concerns/attr_accessor_with_default.rb
+- lib/lanes/concerns/code_identifier.rb
 - lib/lanes/concerns/export_associations.rb
 - lib/lanes/concerns/export_join_tables.rb
 - lib/lanes/concerns/export_methods.rb
@@ -914,7 +922,6 @@ files:
 - spec/command-reference-files/initial/lib/appy-app.rb
 - spec/command-reference-files/initial/lib/appy-app/extension.rb
 - spec/command-reference-files/initial/lib/appy-app/model.rb
-- spec/command-reference-files/initial/lib/appy-app/models/empty.rb
 - spec/command-reference-files/initial/lib/appy-app/version.rb
 - spec/command-reference-files/initial/spec/appy-app/helpers/AppyAppHelpers.coffee
 - spec/command-reference-files/initial/spec/appy-app/screens/Base.coffee
@@ -922,6 +929,8 @@ files:
 - spec/command-reference-files/model/client/appy-app/models/TestTest.coffee
 - spec/command-reference-files/model/config/routes.rb
 - spec/command-reference-files/model/db/migrate/20150218032025_create_test_tests.rb
+- spec/command-reference-files/model/lib/appy-app.rb
+- spec/command-reference-files/model/lib/appy-app/model.rb
 - spec/command-reference-files/model/lib/appy-app/models/test_test.rb
 - spec/command-reference-files/model/spec/appy-app/models/TestTestSpec.coffee
 - spec/command-reference-files/model/spec/fixtures/appy-app/test_test.yml
@@ -939,9 +948,10 @@ files:
 - spec/lanes/helpers/jasmine-matchers.js
 - spec/lanes/helpers/lanes-helpers.coffee
 - spec/lanes/helpers/mock-ajax.js
+- spec/lanes/models/AssociationMapSpec.coffee
 - spec/lanes/models/BaseSpec.coffee
 - spec/lanes/models/CollectionSpec.coffee
-- spec/lanes/models/ModelAssociationsSpec.coffee
+- spec/lanes/models/EnumMapSpec.coffee
 - spec/lanes/models/PubSubSpec.coffee
 - spec/lanes/views/BaseSpec.coffee
 - spec/lanes/views/FormBindingsSpec.coffee