lanes 0.0.3 → 0.0.5

data/lib/lanes/screens.rb

@@ -12,35 +12,6 @@ module Lanes
                 end
             end
 
-            def assets_for_directory(directory)
-                path = "skr/screens/#{directory.basename}"
-                assets = []
-                unless Pathname.glob([ directory.join('*.js'), directory.join('*.coffee')] ).empty?
-                    assets << "#{path}.js"
-                end
-                unless Pathname.glob([ directory.join('*.css'), directory.join('*.scss')] ).empty?
-                    assets << "#{path}.css"
-                end
-                assets
-            end
-
-            # def groups(sprockets)
-            #     groups = []
-            #     each_definition(sprockets) do | spec |
-            #         unless groups.detect{ |group| group['id'] == spec.group_id }
-            #             groups << spec.group_definition
-            #         end
-            #         groups
-            #     end
-            # end
-
-            # def each_definition(sprockets)
-            #     ScreenDefinition.each(sprockets) do | definition |
-            #         spec = definition.specification
-            #         spec['files'] = definition.asset_file_names.map{ |file| "/assets/#{file}" }
-            #         yield spec
-            #     end
-            # end
         end
 
         class Group
@@ -96,31 +67,13 @@ module Lanes
                     icon:  icon,
                     model: model_class,
                     view:  view_class,
-                    files: files,
+                    files: files.map{ |f| "#{Lanes.config.assets_path_prefix}/#{f}"},
                     group_id: group_id,
                     description: description
                 }, mode: :compat)
             end
         end
 
-        class SystemGroup < Group
-            identifier  "system-settings"
-            title       "System Settings"
-            description "Modify system settings"
-            icon        "icon-wrench"
-        end
-
-        class UserMaintScreen < Definition
-            identifier  "user-maintenance"
-            title       "User Maintenance"
-            description "Add/Remove/Modify User Accounts"
-            icon        "icon-group"
-            group_id    "system-settings"
-            model_class "User"
-            view_class  "UserManagement"
-            files       ['/assets/user-management.js','/assets/user-management.css']
-        end
-
     end
 
 end

data/lib/lanes/version.rb

@@ -1,5 +1,5 @@
 module Lanes
 
-    VERSION = "0.0.3"
+    VERSION = "0.0.5"
 
 end

data/lib/lanes.rb

@@ -14,9 +14,7 @@ require_relative "lanes/numbers"
 require_relative "lanes/concerns/all"
 require_relative "lanes/validators/all"
 require_relative "lanes/model"
-require_relative "lanes/user"
-
-require_relative "lanes/access"
 
+require_relative "lanes/components"
 require_relative "lanes/extension"
 require_relative "lanes/screens"

data/npm-build/compile.coffee

@@ -12,4 +12,4 @@ browserify({ debug: true })
 #    .transform(exposify)
     .require(require.resolve('./template.js'), { entry: true })
     .bundle()
-    .pipe(fs.createWriteStream(path.join(__dirname, '../assets/javascripts/vendor/packaged.js'), 'utf8'))
+    .pipe(fs.createWriteStream(path.join(__dirname, '../client/lanes/vendor/packaged.js'), 'utf8'))

data/npm-build/package.json

@@ -6,18 +6,18 @@
     "main": "vendor.js",
     "dependencies": {
         "events-mixin":"git://github.com/nathanstitt/events.git#cb-as-func",
-        "ampersand-view": "~7.1",
-        "ampersand-state":"~4.3",
+        "ampersand-state": "~4.4.2",
         "ampersand-dom": "~1.2",
         "ampersand-model": "~4.0",
         "ampersand-collection-view": "~1.1",
         "ampersand-rest-collection": "~2.0",
         "ampersand-collection-underscore-mixin": "~1.0",
         "ampersand-collection": "~1.3",
-        "ampersand-subcollection": "~1.4",
+        "ampersand-subcollection": "~1.5",
         "ampersand-router": "~1.0",
-        "ampersand-form-view": "~2.0",
-        "ampersand-input-view": "~3.1",
+        "ampersand-dom-bindings": "~3.3",
+        "underscore.inflections": "~0.2.1",
+        "domify": "~1.3",
         "big.js": "~2.5",
         "rsvp": "~3.0",
         "get-object-path": "~0.0.2",

data/npm-build/template.js

@@ -3,7 +3,7 @@ var Lanes = ( global.Lanes || (global.Lanes = {}) );
 Lanes.Vendor = ( Lanes.Vendor || {} );
 
 Lanes.Vendor.Ampersand                = ( Lanes.Ampersand || {} );
-Lanes.Vendor.Ampersand.View           = require("ampersand-view");
+Lanes.Vendor.Ampersand.Bindings       = require("ampersand-dom-bindings");
 Lanes.Vendor.Ampersand.State          = require("ampersand-state");
 Lanes.Vendor.Ampersand.CollectionView = require("ampersand-collection-view");
 Lanes.Vendor.Ampersand.SubCollection  = require("ampersand-subcollection");
@@ -12,22 +12,22 @@ Lanes.Vendor.Ampersand.USCollection   = require('ampersand-collection-underscore
 Lanes.Vendor.Ampersand.Collection     = require("ampersand-collection");
 Lanes.Vendor.Ampersand.Model          = require("ampersand-model");
 Lanes.Vendor.Ampersand.Router         = require("ampersand-router");
-Lanes.Vendor.AmpersandFormView        = require("ampersand-form-view");
-Lanes.Vendor.AmpersandInputView       = require("ampersand-input-view");
 Lanes.Vendor.KeyMaster                = require("keymaster");
 Lanes.Vendor.Moment                   = require("moment");
 Lanes.Vendor.RSVP                     = require('rsvp');
-Lanes.Promise                         = Lanes.Vendor.RSVP.Promise;
-Lanes.Deferred                        = Lanes.Vendor.RSVP.defer;
-
-
+Lanes.Vendor.domify                   = require('domify');
+Lanes.Vendor.BBEvents                 = require('backbone-events-standalone');
+Lanes.dom    = require('ampersand-dom');
 var u        = require('underscore');
 var spf      = require('sprintf-js');
 
-u.getPath    = require('get-object-path');
-u.bigDecimal = require('big.js');
-u.dom        = require('ampersand-dom');
-u.sprintf    = spf.sprintf;
-u.vsprintf   = spf.vsprintf;
-
+u.mixin(require('underscore.inflections'));
+u.mixin({
+    Promise         : Lanes.Vendor.RSVP.Promise,
+    DeferredPromise : Lanes.Vendor.RSVP.defer,
+    getPath         : require('get-object-path'),
+    bigDecimal      : require('big.js'),
+    sprintf         : spf.sprintf,
+    vsprintf        : spf.vsprintf
+});
 global._ = u;

data/spec/api/javascript_processor_spec.rb

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

data/spec/client/view/BaseSpec.coffee

@@ -0,0 +1,166 @@
+
+class Model extends Lanes.Data.Model
+    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;
+
+class Collection extends Lanes.Data.Collection
+    model: Model
+
+describe "BaseView Suite", ->
+    View = undefined
+    makeView = (props,args={})->
+        _.extend(View.prototype, props)
+        Lanes.Views.Base.extend(View)
+        return new View(args)
+
+    beforeEach ->
+        class TestView
+            constructor: -> super
+        View = TestView
+
+    it "fires el change on render", ->
+        spy = jasmine.createSpy()
+        view = makeView({
+            template: "<p>hi</p"
+        })
+        view.on("change:el", spy)
+        view.render()
+        expect(spy).toHaveBeenCalled()
+
+
+    it "renders a template string", ->
+        view = makeView({
+            template: "<p>hi</p"
+        })
+        expect(view.template).toEqual "<p>hi</p"
+        view.render()
+        expect(view.el.tagName).toEqual("P")
+        expect(view.el.innerHTML).toEqual("hi")
+
+    it "listens to events", ->
+        spy = jasmine.createSpy('onClick')
+        el = _.el( 'div',{id: 'testdiv'} )
+        view = makeView({
+            events: { "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')
+        view.render()
+        view.$('a').trigger('click',22)
+        expect(spy).toHaveBeenCalledWith(jasmine.any(Object),22)
+
+    it "updates from bindings", ->
+        model = new Model({ name: "Bob" })
+        view = makeView({
+            bindings: {
+                "model.name": { hook: 'link' }
+                "model.url":  { type:'attribute', name: 'href', hook: 'link' }
+            }
+            template: "<div>text,text,text<a data-hook='link'>click me</a>mor text</div>"
+        }, { model: model })
+        view.render()
+        expect( view.el ).toContainText("Bob")
+        model.name="Ralph"
+        model.url = 'http://lanesframework.org/'
+        expect( view.$('a').text() ).toEqual("Ralph")
+        expect( view.$('a') ).toHaveAttr('href', model.url )
+
+    it "renders subviews", ->
+        class LowerView
+            template: "<h1>Hello from Lower View</h1>"
+            constructor: -> super
+            session: { answer: 'string' }
+        Lanes.Views.Base.extend(LowerView)
+        model = new Model
+        view = makeView({
+            subviews:
+                lower:
+                    hook: 'lower'
+                    waitFor: 'model.name'
+                    view: LowerView
+            template: "<div>text,text,text<div data-hook='lower'>unmodified</div>More text</div>"
+            subviewOptions: ->{ answer: '42' }
+        }, { model: model })
+        view.render()
+        expect(view.el).toContainText("unmodified")
+        expect(view.el).not.toContainText("Lower View")
+        model.name="Ralph"
+        expect(view.el).toContainText("Lower View")
+        expect(view.lower.answer).toEqual('42')
+
+    it "renders collection views", ->
+        class LowerView
+            template: "<h1>Hello from Lower View</h1>"
+            constructor: -> super
+            bindings: { "model.name": { type: "text" } }
+        Lanes.Views.Base.extend(LowerView)
+        collection = new Collection
+        view = makeView({
+            subviews:
+                lower:
+                    hook: 'lower'
+                    collection: 'collection'
+                    view: LowerView
+            template: "<div>text,text,text<div data-hook='lower'>unmodified</div>More text</div>"
+        }, { collection: collection})
+        view.render()
+        expect(view.$('h1')).toHaveLength(0)
+        collection.add([{ name: "One"}, {name: "Two"},{name:"Three"}])
+        expect(view.$('h1')).toHaveLength(3)
+        expect(view.$('h1:first')).toContainText('One')
+
+    it "caches elements in ui", ->
+        spy = jasmine.createSpy('onClick')
+        view = makeView({
+            ui:
+                link: '#linky'
+            events:
+                '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)
+        view.$('a').click()
+        expect(spy).toHaveBeenCalled()
+
+
+    it "invokes model events", ->
+        nameSpy = jasmine.createSpy()
+        urlSpy  = jasmine.createSpy()
+        model   = new Model
+        view = makeView({
+            modelEvents:
+                'change:name': nameSpy
+                'change:url' : 'onURLChange'
+            onURLChange: urlSpy
+        },{ model: model })
+
+        model.name="Ralph"
+        expect(nameSpy).toHaveBeenCalled()
+
+
+    it "invokes collection events", ->
+        eventSpy = jasmine.createSpy('event')
+        view = makeView({
+            collectionEvents:
+                all: 'onEvent'
+            onEvent: eventSpy
+            initialize: -> this.collection = new Collection
+        })
+        expect(eventSpy).not.toHaveBeenCalled()
+        view.collection.add(new Model)
+        expect(eventSpy).toHaveBeenCalled()