lanes 0.1.2 → 0.1.5

data/spec/lanes/models/BaseSpec.coffee

@@ -1,29 +1,9 @@
-
 describe "Lanes.Models.Base", ->
-    # Model = undefined
-    # Collection = undefined
     class Color
         constructor: -> super
         props: { id: 'integer', rgb: 'string' }
     Lanes.Models.Base.extend(Color)
 
-    # 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))
-
-    # beforeEach ->
-    #     class TestModel
-    #         constructor: -> super
-    #     Model = TestModel
-    #     class TestCollection
-    #         constructor: -> super
-    #     Collection = TestCollection
-
-        
     it "tracks unsaved attributes", ->
         model = Lanes.Test.makeModel({
             session:
@@ -32,14 +12,14 @@ describe "Lanes.Models.Base", ->
             props:
                 saved: 'string'
         }, {bar: 'baz'})
-        expect(model.isDirty()).toBeFalse()
+        expect(model.isDirty()).toBe(false)
         model.foo = 'baz' # session prop
-        expect(model.isDirty()).toBeFalse()
+        expect(model.isDirty()).toBe(false)
         expect(model.unsavedAttributes()).toBeEmptyObject()
         model.set( saved: 'true' )
-        expect(model.isDirty()).toBeTrue()
+        expect(model.isDirty()).toBe(true)
+
 
-        
     it "can tell if it has attributes", ->
         model = Lanes.Test.makeModel({
             session:
@@ -47,9 +27,9 @@ describe "Lanes.Models.Base", ->
             props:
                 bar: 'string'
         })
-        expect(model.hasAttribute('missing')).toBeFalse()
-        expect(model.hasAttribute('foo')).toBeTrue()
-        expect(model.hasAttribute('bar')).toBeTrue()
+        expect(model.hasAttribute('missing')).toBe(false)
+        expect(model.hasAttribute('foo')).toBe(true)
+        expect(model.hasAttribute('bar')).toBe(true)
 
     it "provides data for saving", ->
         # model with other types of data, but should only save "props"
@@ -62,14 +42,14 @@ describe "Lanes.Models.Base", ->
                 id: 'integer'
                 foo: 'string'
                 bar: 'string'
+                color_id: 'integer'
             derived:
                 atest:
                     fn: -> 'blarg'
-                
         })
-        model.set( id: 10, unsaved: 'falsify', color: { rgb: '99FFFF' } )
+        model.set( id: 10, foo:'bar', unsaved: 'falsify', color: { rgb: '99FFFF' } )
+        expect(id: 10, foo:'bar', color: { rgb: '99FFFF' }).toEqual( model.dataForSave()  )
 
-        expect( model.dataForSave() ).toEqual( id: 10, color: { rgb: '99FFFF' } )
         model.foo = 'a value'
         a=model.changeMonitor.changedAttributes()
         expect( model.dataForSave() ).toEqual( id: 10, foo: 'a value', color: { rgb: '99FFFF' } )
@@ -80,14 +60,14 @@ describe "Lanes.Models.Base", ->
                 id: 'integer'
                 foo: 'string'
                 bar: 'string'
-                
+
         }, { foo: 'one, two, three'} )
-        expect(model.isDirty()).toBeTrue()
+        expect(model.isDirty()).toBe(true)
         expect(model.unsavedAttributes()).toEqual( foo: 'one, two, three' )
         model.save()
         expect(model.sync).toHaveBeenCalledWith('create', model, jasmine.any(Object))
         model.id=11
-        expect(model.isNew()).toBeFalse()
+        expect(model.isNew()).toBe(false)
         model.sync.calls.reset()
         syncSucceedWith({
             foo: 'a new foo value'
@@ -96,7 +76,7 @@ describe "Lanes.Models.Base", ->
             expect(model.sync).toHaveBeenCalledWith('patch', model, jasmine.any(Object))
             expect(model.foo).toEqual('a new foo value')
             done()
-            
+
     it "can be fetched", (done)->
         model = Lanes.Test.makeModel({
             props:
@@ -113,10 +93,17 @@ describe "Lanes.Models.Base", ->
             expect(options).toHaveNumberWithinRange('limit',1,1)
             done()
 
-    it "creates a Collection property", ->
-        Model = Lanes.Test.DummyModel
+    it "creates a Collection property even when the base is abstract", ->
+        class Base
+            constructor: -> super
+            abstractClass: true
+        Lanes.Models.Base.extend(Base)
+        class Model
+            constructor: -> super
+        Model = Base.extend(Model)
         expect(Model.Collection::model).toEqual(Model)
-    
+
+
     it "loads using where", (done)->
         Model = Lanes.Test.DummyModel
         syncSucceedWith([

data/spec/lanes/models/CollectionSpec.coffee

@@ -1,6 +1,6 @@
 describe "Lanes.Models.Collection", ->
 
-        
+
     it "it triggers promise on loading", (done)->
         Model = Lanes.Test.DummyModel
         syncSucceedWith([
@@ -9,6 +9,19 @@ describe "Lanes.Models.Collection", ->
         ])
         collection = Model.where( name: 'foo' )
         collection.whenLoaded ->
-            expect( collection.isLoaded() ).toBeTrue()
+            expect( collection.isLoaded() ).toEqual( true )
             done()
 
+    it "triggers length when changed", ->
+        collection = new Lanes.Test.DummyModel.Collection
+        spy = jasmine.createSpy('onLengthChange')
+        collection.on("change:length", spy)
+        model = collection.add({ id: 1, title: 'first' })
+        expect(model).toEqual(jasmine.any(Lanes.Test.DummyModel))
+        expect(spy).toHaveBeenCalled()
+        spy.calls.reset()
+        collection.remove(model)
+        expect(spy).toHaveBeenCalled()
+        spy.calls.reset()
+        collection.reset([{ id:11, title: 'last'}])
+        expect(spy).toHaveBeenCalled()

data/spec/lanes/models/ModelAssociationsSpec.coffee

@@ -0,0 +1,51 @@
+describe "Lanes.Models.AssociationMap", ->
+    class Color
+        constructor: -> super
+        api_path: -> 'test'
+        props: { id: 'integer', model_fk_id: 'integer', rgb: 'string' }
+    Lanes.Models.Base.extend(Color)
+
+    DATA = {total:1,success:true,message:"Retrieve succeeded",data:[
+        [1,"TEST","Nathan Stitt",null,"0.0"]
+    ]}
+    RESPONSE = {
+        status:200,
+        contentType: "application/json"
+        responseText: JSON.stringify(DATA)
+    }
+    beforeEach ->
+        jasmine.Ajax.install()
+    afterEach ->
+        jasmine.Ajax.uninstall()
+
+    it "sets up has_many associations", ->
+        model = Lanes.Test.makeModel({
+            associations:
+                color:{ model: Color }
+                colors: { collection: Color, fk: 'model_fk_id' }
+            props: { id: 'integer', foo: 'string' }
+        },{ id: 123 })
+        color = model.colors.add({ rgb:'#ffffff' })
+        expect(color).toEqual(jasmine.any(Color))
+        expect(color.model_fk_id).toEqual(123)
+
+        spy = jasmine.createSpy('sync')
+        model.colors.sync = spy
+
+        model.colors.fetch(force:true)
+
+        expect(spy).toHaveBeenCalledWith('read', model.colors, jasmine.any(Object))
+        call_options = spy.calls.mostRecent().args[2]
+        expect(call_options.query).toEqual( model_fk_id: 123 )
+
+
+    it "sets up belongs_to associations", ->
+        model = Lanes.Test.makeModel({
+            associations:
+                color:{ model: Color }
+            props: { id: 'integer', foo: 'string', color_id: 'integer' }
+        },{ id: 123, color: { rgb: 'red' } })
+        color = model.color
+        expect(model.color).toEqual(jasmine.any(Color))
+
+        expect(model.color.rgb).toEqual('red')

data/spec/lanes/views/BaseSpec.coffee

@@ -12,7 +12,7 @@ describe "Lanes.Views.Base", ->
     it "renders a template file", ->
         spy = jasmine.createSpy('view-test').and.callFake ->
             "<p>a test</p>"
-        Lanes.Templates['view-test'] = spy
+        Lanes.Templates['/view-test'] = spy
 
         view = Lanes.Test.makeView({
             templatePrefix: ''
@@ -31,15 +31,15 @@ describe "Lanes.Views.Base", ->
         expect(view.el.tagName).toEqual("P")
         expect(view.el.innerHTML).toEqual("hello test")
 
-    it "listens to events", ->
+    it "listens to domEvents", ->
         spy = jasmine.createSpy('onClick')
         el = _.el( 'div',{id: 'testdiv'} )
         view = Lanes.Test.makeView({
-            events: { "click #mylink": 'onClick' }
+            domEvents: { "click #mylink": 'onClick' }
             template: "<div>text,text,text<a id='mylink'>click me</a>mor text</div>"
             onClick: spy
         },{el: el})
-        expect(view.events["click #mylink"]).toEqual('onClick')
+        expect(view.domEvents["click #mylink"]).toEqual('onClick')
         view.render()
         view.$('a').trigger('click',22)
         expect(spy).toHaveBeenCalledWith(jasmine.any(Object),22)
@@ -54,11 +54,11 @@ describe "Lanes.Views.Base", ->
             template: "<div>text,text,text<a data-hook='link'>click me</a>mor text</div>"
         }, { model: model })
         view.render()
-        expect( view.el ).toContainText("Bob")
+        expect( view.$('a').text() ).toEqual("Bob")
         model.name="Ralph"
         model.url = 'http://lanesframework.org/'
         expect( view.$('a').text() ).toEqual("Ralph")
-        expect( view.$('a') ).toHaveAttr('href', model.url )
+        expect( view.$('a').attr('href') ).toEqual( model.url )
 
     it "renders subviews", ->
         class LowerView
@@ -77,10 +77,10 @@ describe "Lanes.Views.Base", ->
             subviewOptions: ->{ answer: '42' }
         }, { model: model })
         view.render()
-        expect(view.el).toContainText("unmodified")
-        expect(view.el).not.toContainText("Lower View")
+        expect(view.$('[data-hook]').text()).toEqual("unmodified")
+        expect( view.$el.text() ).not.toMatch(/Hello from Lower View/)
         model.name="Ralph"
-        expect(view.el).toContainText("Lower View")
+        expect( view.$el.text() ).toMatch(/Hello from Lower View/)
         expect(view.lower.answer).toEqual('42')
 
     it "renders collection views", ->
@@ -99,22 +99,22 @@ describe "Lanes.Views.Base", ->
             template: "<div>text,text,text<div data-hook='lower'>unmodified</div>More text</div>"
         }, { collection: collection})
         view.render()
-        expect(view.$('h1')).toHaveLength(0)
+        expect(view.$('h1').length).toEqual(0)
         collection.add([{ name: "One"}, {name: "Two"},{name:"Three"}])
-        expect(view.$('h1')).toHaveLength(3)
-        expect(view.$('h1:first')).toContainText('One')
+        expect(view.$('h1').length).toEqual(3)
+        expect(view.$('h1:first').text()).toMatch('One')
 
     it "caches elements in ui", ->
         spy = jasmine.createSpy('onClick')
         view = Lanes.Test.makeView({
             ui:
                 link: '#linky'
-            events:
+            domEvents:
                 'click @ui.link': spy
             template: "<div>text,text,text<a id='linky'>unmodified</a>More text</div>"
         })
         view.render()
-        expect(view.ui.link).toHaveLength(1)
+        expect(view.ui.link.length).toEqual(1)
         view.$('a').click()
         expect(spy).toHaveBeenCalled()
 

data/spec/server/command_spec.rb

@@ -0,0 +1,39 @@
+require_relative "spec_helper"
+require "lanes/cli"
+
+require "find"
+
+describe Lanes::Command do
+    let(:lanes) { Pathname.new(__FILE__).dirname.join('..','..','bin','lanes') }
+
+    around do |test|
+        Dir.mktmpdir do |dir|
+            @dir = dir
+            Dir.chdir(dir) do
+                `#{lanes} new test`
+                Dir.chdir("test") do
+                    test.call
+                end
+            end
+        end
+    end
+
+    FILES = [".", ".gitignore", "Gemfile", "Guardfile", "Rakefile", "client", "client/test", "client/test/Extension.coffee", "client/test/Router.coffee", "client/test/components", "client/test/components/.gitkeep", "client/test/controllers", "client/test/controllers/.gitkeep", "client/test/index.js", "client/test/models", "client/test/models/.gitkeep", "client/test/models/Base.coffee", "client/test/screens", "client/test/screens/.gitkeep", "client/test/screens/Base.coffee", "client/test/styles.scss", "client/test/views", "client/test/views/.gitkeep", "client/test/views/Base.coffee", "config", "config.ru", "config/database.yml", "config/lanes.rb", "config/routes.rb", "config/screens.rb", "db", "db/.gitkeep", "lib", "lib/test", "lib/test.rb", "lib/test/extension.rb", "lib/test/model.rb", "lib/test/models", "lib/test/models/empty.rb", "lib/test/version.rb", "log", "log/.gitkeep", "spec", "spec/server", "spec/server/spec_helpers.rb", "spec/test", "spec/test/helpers", "spec/test/helpers/TestHelpers.coffee", "spec/test/screens", "spec/test/screens/Base.coffee", "tmp", "tmp/.gitkeep"]
+
+    it "generates an application" do
+        files = Find.find(".").to_a.map{|f| f.gsub(/^\.\//,'') }.sort
+        files.sort.must_equal FILES.sort
+    end
+
+    it "creates a view" do
+       assert_executes "#{lanes} generate view Test"
+       assert_match( /client\/test\/views\/Test.coffee/, last_cmd_execution_output )
+       assert_executes "#{lanes} generate view Testing --screen Base"
+       assert_match( /client\/test\/screens\/base\/Testing.coffee/, last_cmd_execution_output )
+    end
+
+    it "creates a model" do
+       assert_executes "#{lanes} generate model Test"
+       assert_match( /client\/test\/models\/Test.coffee/, last_cmd_execution_output )
+    end
+end

data/spec/{concerns → server/concerns}/api_path_spec.rb

@@ -1,4 +1,4 @@
-require "lanes/spec_helper"
+require_relative "../spec_helper"
 
 class ApiPathTest < Lanes::TestCase
 

data/spec/{concerns → server/concerns}/association_extensions_spec.rb

@@ -1,5 +1,4 @@
-require "lanes/spec_helper"
-
+require_relative "../spec_helper"
 
 class AssociationExtensionsTest < Lanes::TestCase
 

data/spec/{concerns → server/concerns}/export_associations_spec.rb

@@ -1,5 +1,4 @@
-require "lanes/spec_helper"
-
+require_relative "../spec_helper"
 
 class ExportAssociationsTest < Lanes::TestCase
 

data/spec/{concerns → server/concerns}/export_methods_spec.rb

@@ -1,10 +1,8 @@
-require "lanes/spec_helper"
+require_relative "../spec_helper"
 
 class ExportMethodsTest < Lanes::TestCase
     include TestingModels
 
-
-
     def test_simple_delegation
 
         refute TestModel.new.respond_to? :bt_description

data/spec/{concerns → server/concerns}/export_scope_spec.rb

@@ -1,8 +1,8 @@
-require "lanes/spec_helper"
+require_relative "../spec_helper"
 
 class ExportScopeTest < Lanes::TestCase
     include TestingModels
-    
+
     def test_scope_method_creation
         refute TestModel.respond_to?(:big_query)
         TestModel.send( :export_scope, :big_query, ->{} )

data/spec/{concerns → server/concerns}/exported_limits_spec.rb

@@ -1,5 +1,4 @@
-require "lanes/spec_helper"
-
+require_relative "../spec_helper"
 
 class ExportedLimitsTest < Lanes::TestCase
 

data/spec/{concerns → server/concerns}/pub_sub_spec.rb

@@ -1,4 +1,4 @@
-require "lanes/spec_helper"
+require_relative "../spec_helper"
 
 class PubSubTest < Lanes::TestCase
 

data/spec/{concerns → server/concerns}/set_attribute_data_spec.rb

@@ -1,4 +1,4 @@
-require "lanes/spec_helper"
+require_relative "../spec_helper"
 
 class SetAttributeDataTest < Lanes::TestCase
 

data/spec/{configuration_spec.rb → server/configuration_spec.rb}

@@ -1,4 +1,4 @@
-require "lanes/spec_helper"
+require_relative "spec_helper"
 
 describe Lanes::Configuration do
 

data/spec/{helpers → server}/minitest_assertions.rb

@@ -17,7 +17,7 @@ module Minitest::Assertions
 
     def execute_cmd(cmd)
         @cmd_last_output = `#{cmd} 2>&1`
-        $?.exitstatus == 0
+        assert_equal 0, $?.exitstatus, "Command exited with #{$?.exitstatus}.  Output was: #{@cmd_last_output}"
     end
 
 end

data/spec/{numbers_spec.rb → server/numbers_spec.rb}

@@ -1,4 +1,4 @@
-require "lanes/spec_helper"
+require_relative "spec_helper"
 
 describe Lanes::Numbers do
 
@@ -22,5 +22,4 @@ describe Lanes::Numbers do
         assert_equal '68.61551',  Num::PercNum.new( '33.383%' ).debit_from(103).to_s
     end
 
-
 end

data/{lib/lanes/testing_models.rb → spec/server/spec_helper.rb}

@@ -1,10 +1,21 @@
+require "lanes/spec_helper"
+require_relative "minitest_assertions"
 require "active_record_mocks"
 
-module TestingModels
+require 'lanes/command'
+require 'lanes/workspace/extension'
+
+# ext = Extensions.controlling
+# if ext.is_a?(::Lanes::Extensions::Base)
+#     Extensions.lock_controlling!
+#     require_relative '../workspace/extension'
+# end
 
+module TestingModels
+    include ActiveRecordMocks::IncludeMe
 
     def around(&block)
-        with_testing_models(&block)
+        self.with_testing_models(&block)
     end
 
     def with_testing_models
@@ -42,7 +53,6 @@ module TestingModels
             end
             Tmhm.blacklist_attributes :secret_field
 
-#            Lanes::Access.calculate_model_access!
             yield
 
             TestModel.blacklisted_attributes.clear if TestModel.blacklisted_attributes
@@ -52,3 +62,7 @@ module TestingModels
 
 
 end
+
+class TestCase < ActiveSupport::TestCase
+
+end

data/spec/{strings_spec.rb → server/strings_spec.rb}

@@ -1,4 +1,4 @@
-require "lanes/spec_helper"
+require_relative "spec_helper"
 
 describe Lanes::Strings do
 

data/templates/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem "lanes", '<%= Lanes::VERSION %>'
+
+gem "rake"
+gem 'puma'

data/templates/Rakefile

@@ -0,0 +1,2 @@
+require_relative 'lib/<%= identifier %>'
+require 'lanes/rake_tasks'

data/templates/client/Extension.coffee

@@ -0,0 +1,7 @@
+class <%= namespace %>.Extension extends Lanes.Extensions.Base
+
+    FILE: FILE
+
+    identifier: "<%= identifier %>"
+
+    setBootstrapData: (data)->

data/templates/client/Router.coffee

@@ -0,0 +1,4 @@
+class <%= namespace %>.Router extends Lanes.Screens.Router
+
+    routes:
+        {}

data/templates/client/components/Component.coffee

@@ -0,0 +1 @@
+class <%= namespace %>.Component.<%= class_name %> extends Lanes.Component.Base

data/{lib/lanes/command/templates → templates}/client/index.js

@@ -4,6 +4,7 @@
 //=require_tree ./views
 //=require_tree ./components
 //=require ./screens/Base
+//=require ./Router
 //=require ./Extension
 
 /*

data/templates/client/models/BaseModel.coffee

@@ -0,0 +1,5 @@
+# All models in <%= namespace.camelize %> will inherit from
+# this common base class.
+class <%= namespace %>.Models.Base extends Lanes.Models.Base
+
+    abstractClass: true

data/{lib/lanes/command/templates → templates}/client/models/Model.coffee

@@ -1,6 +1,5 @@
-class <%= namespace.camelize %>.Models.<%= class_name %> extends <%= namespace.camelize %>.Models.Base
+class <%= namespace %>.Models.<%= class_name %> extends <%= namespace %>.Models.Base
 
-    api_path: '<%= name.downcase.pluralize.underscore.dasherize %>'
     FILE: FILE
 
     props:
@@ -15,6 +14,6 @@ class <%= namespace.camelize %>.Models.<%= class_name %> extends <%= namespace.c
 
     associations:
 <% reference_fields.each do |field| -%>
-        <%= sprintf("%-#{max_field_length}s ",field.name) %>: { <%= field.belongs_to? ? 'model' : 'collection' -%>: "<%= namespace.camelize %>.<%= field.name.camelize %>" }
+        <%= sprintf("%-#{max_field_length}s ",field.name) %>: { <%= field.belongs_to? ? 'model' : 'collection' -%>: "<%= namespace %>.<%= field.name.camelize %>" }
 <% end -%>
 <% end -%>

data/{lib/lanes/command/templates → templates}/client/screens/Screen.coffee

@@ -1,6 +1,11 @@
 class <%= namespace.camelize %>.Screens.<%= class_name %> extends Lanes.Screens.Base
 
-    source: FILE
+    FILE: FILE
+<% if @template -%>
+    template: '''
+        <%= @template %>
+    '''
+<% end -%>
 
     subviews: {}
 

data/{lib/lanes/command/templates → templates}/client/screens/styles.scss

@@ -1,8 +1,7 @@
 /*
  If your screen does not use any custom styles
 
- You should remove this file and it's reference from:
- lib/<%= namespace %>/<%= name %>_screen.rb
+ You should remove this file and it's reference from config/screens.rb
 
  Otherwise Lanes will continue to fetch an empty file whenever
  the screen is displayed

data/templates/client/views/BaseView.coffee

@@ -0,0 +1,5 @@
+# All views in <%= namespace.camelize %> will inherit from
+# this common base class.
+class <%= namespace %>.Views.Base extends Lanes.Views.Base
+
+    abstractClass: true

data/templates/client/views/View.coffee

@@ -0,0 +1,10 @@
+class <%= namespace %>.Views.<%= class_name %> extends <%= namespace %>.Views.Base
+
+    FILE: FILE
+
+    ## These are listed only as examples.
+    # If unused they can be safely removed.
+    subviews: {}
+    domEvents: {}
+    modelEvents: {}
+    collectionEvents: {}

data/templates/config/screen.rb

@@ -0,0 +1,12 @@
+
+Lanes::Screen.define "<%= screen_id %>" do | screen |
+    screen.description = "<%= options[:description] %>"
+    screen.icon        = "<%= options[:icon] %>"
+    screen.group_id    = "<%= options[:group] %>"
+    screen.model_class = "<%= options[:model_class] %>"
+    screen.view_class  = "<%= namespace %>.Screens.<%= class_name %>"
+<% unless options[:fileless] -%>
+    screen.js          = "<%= identifier %>/screens/<%= screen_id %>.js"
+    screen.css         = "<%= identifier %>/screens/<%= screen_id %>.css"
+<% end -%>
+end

data/{lib/lanes/command/templates → templates}/config.ru

@@ -1,5 +1,5 @@
 require 'bundler'
 Bundler.require
-require_relative 'lib/<%= namespace %>'
+require_relative 'lib/<%= identifier %>'
 require 'lanes/api'
 run Lanes::API::Root

data/{lib/lanes/command/templates → templates}/db/create_table_migration.rb

@@ -1,4 +1,4 @@
-class Create<%= namespace.camelize %><%= class_name.pluralize %> < ActiveRecord::Migration
+class Create<%= namespace %><%= class_name.pluralize %> < ActiveRecord::Migration
     def change
         create_table :<%= table_name %> do |t|
 <% fields.each do |attribute| -%>

data/{lib/lanes/command/templates → templates}/gitignore

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