lanes 0.1.9.5 → 0.3.0

data/npm-build/calendar.js

@@ -0,0 +1,6 @@
+var Lanes = ( global.Lanes || (global.Lanes = {}) );
+Lanes.Vendor = ( Lanes.Vendor || {} );
+
+Lanes.Vendor.Dayz = require("dayz");
+
+require("file?name=calendar.scss!dayz/style/dayz.scss");

data/npm-build/development.js

@@ -1,7 +1,6 @@
 var Lanes = ( global.Lanes || (global.Lanes = {}) );
 Lanes.Vendor = ( Lanes.Vendor || {} );
-var React = require('react/addons');
-Lanes.Vendor.ReactTestUtils = React.addons.TestUtils;
-Lanes.Vendor.hotRL = require('react-hot-api')(function () {
-    return require('react/lib/ReactMount')._instancesByReactRootID;
-});
+
+Lanes.Vendor.ReactProxy      = require("react-proxy").default;
+Lanes.Vendor.ReactTestUtils  = require('react-addons-test-utils');
+Lanes.Vendor.deepForceUpdate = require('react-deep-force-update');

data/npm-build/grid.js

@@ -3,9 +3,7 @@ Lanes.Vendor = ( Lanes.Vendor || {} );
 if (! Object.assign){
     Object.assign = require('object-assign');
 }
-Lanes.Vendor.React = require("react");
-var FDT = require('fixed-data-table');
-Lanes.Vendor.Grid  = FDT.Table;
-Lanes.Vendor.Grid.Column  = FDT.Column;
 
-require("fixed-data-table/dist/fixed-data-table.css");
+Lanes.Vendor.Grid  = require("react-datagrid");
+
+require("react-datagrid/index-no-normalize.css");

data/npm-build/package.json

@@ -1,46 +1,57 @@
 {
   "name": "lanes-vendor-modules",
   "author": "Nathan Stitt",
+  "license": "MIT",
   "description": "Build for deploy",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "main": "vendor.js",
   "dependencies": {
-    "ampersand-collection": "~1.4",
+    "ampersand-collection": "~1.5",
     "ampersand-collection-underscore-mixin": "~1.0",
     "ampersand-dom": "~1.4",
-    "ampersand-rest-collection": "~2.0",
-    "ampersand-state": "~4.5",
+    "ampersand-rest-collection": "~5.0",
+    "ampersand-state": "~4.8",
     "ampersand-subcollection": "~2.0",
     "backbone-events-standalone": "~0.2",
-    "big.js": "~2.5",
-    "classnames": "~2.1",
-    "css-loader": "^0.14.2",
-    "extract-text-webpack-plugin": "^0.8.0",
-    "file-loader": "^0.8.4",
-    "fixed-data-table": "^0.3.0",
+    "big.js": "~3.1",
+    "classnames": "~2.2",
+    "dayz": "git://github.com/nathanstitt/dayz.git#master",
     "get-object-path": "~0.0.2",
-    "less": "^2.5.1",
-    "less-loader": "^2.2.0",
-    "lodash": "~3.8.0",
-    "moment": "~2.8",
-    "node-libs-browser": "^0.5.2",
-    "object-assign": "^2.0.0",
-    "react": "~0.13.2",
-    "react-bootstrap": "^0.21.2",
-    "react-hot-api": "^0.4.4",
-    "react-router": "^0.13.3",
-    "react-widgets": "^2.7.2",
-    "rsvp": "~3.0",
+    "history": "^1.13.1",
+    "lodash": "^3.10.1",
+    "loglevel": "1.4.0",
+    "moment": "^2.11.1",
+    "moment-range": "^2.1.0",
+    "object-assign": "^4.0.1",
+    "react": "~0.14.6",
+    "react-addons-test-utils": "^0.14.2",
+    "react-bootstrap": "^0.28.3",
+    "react-component-resizable": "^0.3.0",
+    "react-deep-force-update": "^2.0.1",
+    "react-dom": "^0.14.6",
+    "react-list": "^0.7.11",
+    "react-proxy": "^2.0.1",
+    "react-toggle": "^2.0.1",
+    "react-widgets": "^3.1.7",
+    "rsvp": "~3.1",
     "sorty": "^1.2.0",
-    "style-loader": "^0.12.3",
-    "underscore.inflection": "~1.2",
-    "underscore.string": "^3.0.3",
-    "webpack": "^1.9.9",
-    "xhr": "^1.17.1"
+    "sprintf-js": "^1.0.3",
+    "style-loader": "^0.13.0",
+    "underscore.inflection": "~1.3",
+    "underscore.string": "^3.2.2",
+    "xhr": "^2.2.0"
+  },
+  "peerDependencies": {
+    "react-overlays": "*"
   },
   "devDependencies": {
-    "aliasify": "~1.4.0",
-    "remapify": "~1.3"
+    "css-loader": "^0.23.0",
+    "extract-text-webpack-plugin": "^0.9.1",
+    "file-loader": "^0.8.4",
+    "less": "^2.5.3",
+    "less-loader": "^2.2.1",
+    "url-loader": "^0.5.6",
+    "webpack": "^1.12.6"
   },
   "jshintConfig": {
     "asi": false,

data/npm-build/react-toggle.js

@@ -0,0 +1,5 @@
+var Lanes = ( global.Lanes || (global.Lanes = {}) );
+Lanes.Vendor = ( Lanes.Vendor || {} );
+
+Lanes.Vendor.ReactToggle = require('react-toggle')
+require("react-toggle/style.css");

data/npm-build/react-widgets.js

@@ -3,3 +3,9 @@ Lanes.Vendor = ( Lanes.Vendor || {} );
 
 Lanes.Vendor.ReactWidgets = require('react-widgets')
 require("./react-widgets.less");
+var Moment = require('moment');
+var momentLocalizer = require('react-widgets/lib/localizers/moment');
+momentLocalizer(Moment);
+
+var numberLocalizer = require('react-widgets/lib/localizers/simple-number')
+numberLocalizer();

data/npm-build/update-dayz

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+cd ~/code/dayz
+
+npm run build
+
+cd -
+
+cp -r ~/code/dayz/lib/* ./node_modules/dayz/lib/
+cp -r ~/code/dayz/style/* ./node_modules/dayz/style/
+
+webpack

data/npm-build/webpack.config.js

@@ -10,8 +10,9 @@ module.exports = {
     cache: false,
     entry: {
         base: "./base.js",
-        grid: "./grid.js",
         widgets: "./react-widgets.js",
+        toggle: "./react-toggle.js",
+        calendar: "./calendar.js",
         development: "./development.js"
     },
     'resolve': {
@@ -25,7 +26,8 @@ module.exports = {
     },
     plugins: [
         new CommonsChunkPlugin("commons.js"),
-        new ExtractTextPlugin("[name].scss")
+        new ExtractTextPlugin("[name].scss"),
+        new webpack.optimize.DedupePlugin()
     ],
     module: {
         loaders: [
@@ -33,6 +35,7 @@ module.exports = {
             { test: /\.(png|woff|woff2|eot|ttf|svg)/, loader: "file-loader?name=[name].[ext]"  },
             { test: /\.less$/, loader: ExtractTextPlugin.extract("style-loader",
                                                                  "css-loader!less-loader") },
+
             { test: /\.css$/,  loader: ExtractTextPlugin.extract("style-loader", "css-loader") }
         ]
     }

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

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

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

@@ -1,2 +1,4 @@
 Lanes::API.routes.draw do
+    # Set default view for the site root.  Adjust to fit your needs
+    root_view :lanes_root_view
 end

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

@@ -6,6 +6,10 @@ require_relative "appy-app/extension.rb"
 # The main namespace for AppyApp
 module AppyApp
 
+    def self.system_settings
+        Lanes::SystemSettings.for_ext('appy-app')
+    end
+
 end
 
 require_relative "appy-app/model"

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

@@ -17,6 +17,8 @@ module AppyApp
 
         identifier "appy-app"
 
+        title "AppyApp"
+
         root_path Pathname.new(__FILE__).dirname.join("..","..").expand_path
 
         # If a data structure that can be represented as JSON

data/spec/command-reference-files/model/config/routes.rb

@@ -1,3 +1,5 @@
 Lanes::API.routes.draw do
     resources AppyApp::TestTest
+    # Set default view for the site root.  Adjust to fit your needs
+    root_view :lanes_root_view
 end

data/spec/command-reference-files/model/spec/server/test_test_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'spec_helpers'
+require_relative 'spec_helper'
 
 class TestTestSpec < AppyApp::TestCase
 

data/spec/command-reference-files/screen/client/appy-app/screens/ready-set-go/ReadySetGo.cjsx

@@ -1,7 +1,9 @@
 class AppyApp.Screens.ReadySetGo extends AppyApp.Screens.Base
 
     render: ->
-        <div className="fancy-header">
-            <h1>Hello bright shiny world</h1>
-            <h2>Served by the AppyApp extension&rsquo;s ReadySetGo screen</h2>
-        </div>
+        <LC.ScreenWrapper identifier="ready-set-go">
+            <div className="fancy-header">
+                <h1>Hello bright shiny world</h1>
+                <h2>Served by the AppyApp extension&rsquo;s ReadySetGo screen</h2>
+            </div>
+        </LC.ScreenWrapper>

data/spec/command-reference-files/screen/client/appy-app/screens/ready-set-go/index.scss

@@ -1,8 +1,9 @@
 /*
- If your screen does not use any custom styles
-
- You should remove this file and it's reference from config/screens.rb
+ You should remove this file if your screen does not use any custom styles
 
  Otherwise Lanes will continue to fetch an empty file whenever
  the screen is displayed
 */
+.ready-set-go {
+
+}

data/spec/command-reference-files/screen/config/screens.rb

@@ -13,8 +13,10 @@ Lanes::Screen.for_extension 'AppyApp' do | screens |
         screen.group_id    = ""
         screen.model_class = ""
         screen.view_class  = "ReadySetGo"
-        screen.js          = "ready-set-go.js"
-        screen.css         = "ready-set-go.css"
+        # Can optionally explicity set files to be included
+        # screen.model_access = "write" # defaults to "read"
+        # screen.js          = "ready-set-go.js"
+        # screen.css         = "ready-set-go.css"
     end
 
 end

data/spec/command-reference-files/screen/spec/appy-app/screens/ready-set-go/ReadySetGoSpec.coffee

@@ -2,4 +2,4 @@ describe "AppyApp.Screens.ReadySetGo", ->
 
     it "can be rendered", ->
         screen = LT.renderComponent(AppyApp.Screens.ReadySetGo)
-        expect(screen.getDOMNode().textContent).toMatch("Hello")
+        expect(_.dom(screen).text).toMatch("Hello")

data/spec/fixtures/system_settings.yml

@@ -0,0 +1 @@
+

data/spec/lanes/components/grid/GridSpec.coffee

@@ -1,31 +1,56 @@
-# # require lanes/components/grid
-# # require lanes/access/User
-
-# describe "Lanes.Components.Grid", ->
-
-#     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 "loads", ->
-#         query = new Lanes.Models.Query(
-#             fields: [ 'code', 'name', 'notes' ]
-#             modelClass: Lanes.Models.User
-#         )
-#         grid = new Lanes.Components.Grid(recordQuery:query)
-#         expect( grid.render() ).toBe( grid )
-#         request = jasmine.Ajax.requests.mostRecent()
-#         expect(request.url).toMatch(/^\/users.json/)
-
-#         request.respondWith(RESPONSE)
-#         expect( grid.dt_api.rows().length ).toEqual(1)
+#= require lanes/components/grid
+
+
+DATA = {total:2, success:true, message:"Retrieve succeeded", data:[
+    [1, "TEST1", "Nathan Stitt", "swell guy"]
+    [2, "TEST2", "Nathan Stitt", "Dupe of id #1"]
+]}
+
+Model = Lanes.Test.defineModel(
+    props: {id: 'integer', code: 'string', name: 'string', notes: 'string'}
+)
+
+renderGrid = (q, done) ->
+    loaded = spyOn(q.results, 'ensureLoaded').and.callThrough()
+    grid = LT.renderComponent(LC.Grid, props: query: q)
+    expect(loaded).toHaveBeenCalled()
+    _.defer ->
+        expect(_.dom(grid).qsa('.r').length)
+            .toEqual( q.results.length )
+        done()
+
+describe "Lanes.Components.Grid", ->
+
+    beforeEach (done) ->
+        LT.syncRespondWith(DATA)
+        @query = new Lanes.Models.Query(
+            src: Model, fields: [ 'id', 'code', 'name', 'notes' ]
+        )
+        @collection = new Model.Collection
+        @query.ensureLoaded().then => @collection.ensureLoaded().then -> done()
+
+    describe "loading", ->
+
+        it "from a result set", (d) ->
+            renderGrid(@query, d)
+
+        it "from a collection", (d) ->
+            @query.src = @collection
+            renderGrid(@query, d)
+
+    it 'renders toolbar', ->
+        grid = LT.renderComponent(LC.Grid, props: {
+            query: @query, editor: true, allowCreate: true
+        })
+        tb = _.dom(grid).qs('.toolbar')
+        expect(tb).not.toBeUndefined()
+
+    it 'notifies when selection changes', (done) ->
+        spy = jasmine.createSpy('selection')
+        grid = LT.renderComponent(LC.Grid, props: {
+            query: @query, editor: true, onSelectionChange: spy
+        })
+        _.defer ->
+            _.dom(grid).qs('.grid-body .c').click()
+            expect(spy).toHaveBeenCalled()
+            done()

data/spec/lanes/components/grid/RowEditorSpec.coffee

@@ -0,0 +1,96 @@
+#= require lanes/components/grid
+
+COLLECTION_DATA = [
+    {id:1, code:'TEST1', name: 'Nathan Stitt', notes: 'swell guy'}
+    {id:2, code:'TEST2', name: 'Nathan Stitt', notes: 'Dupe of id #1'}
+]
+
+ROW_DATA = _.map COLLECTION_DATA, (r) -> _.values(r)
+
+Model = Lanes.Test.defineModel(
+    props: {id: 'integer', code: 'string', name: 'string', notes: 'string'}
+)
+
+LAST_ROW_SELECTOR = '.grid-body .r:last-child'
+ADD_ROW_SELECTOR = 'button.add-row'
+
+RenderGrid = (q) ->
+    LT.renderComponent(LC.Grid, props: {
+        query: q, editor: true, allowCreate: true
+    })
+
+RenderEdit = (q, value) ->
+    Lanes.Test.syncSucceedWith(ROW_DATA)
+    grid = RenderGrid(q)
+
+    new _.Promise (res, rej) -> _.defer ->
+        _.dom(grid).qs(LAST_ROW_SELECTOR).click()
+        editor = Lanes.Test.Utils.findRenderedComponentWithType(
+            grid, Lanes.Components.Grid.RowEditor
+        )
+        _.dom(editor).qs('.field:nth-of-type(2) input').setValue(value)
+        res({grid, editor})
+
+
+CommonSpecs = ->
+
+    it 'sets the props', (done) ->
+        grid = LT.renderComponent(LC.Grid, props: {
+            query: @query, editor: true
+        })
+        _.defer ->
+            _.dom(grid).qs(LAST_ROW_SELECTOR).click()
+            editor = Lanes.Test.Utils.findRenderedComponentWithType(grid, LC.Grid.RowEditor)
+            expect(editor.props.rowIndex).toEqual(1)
+            expect(editor.props.model).toEqual(jasmine.any(Model))
+            expect(editor.props.model.id).toEqual(2)
+            done()
+
+    it 'can edit', (done) ->
+        RenderEdit(@query, 'BOB').then ({editor}) =>
+            _.dom(editor).qs('.btn.save').click()
+            expect( @query.results.rowAt(1)[1] ).toEqual('BOB')
+            done()
+
+    it 'does not update when edit is canceled', (done) ->
+        RenderEdit(@query, 'CANCKED').then ({editor}) =>
+            _.dom(editor).qs('.btn.cancel').click()
+            expect( @query.results.rowAt(1)[1] ).toEqual('TEST2')
+            done()
+
+    it 'removes an unsaved row when editing is canceled', (done) ->
+        grid = RenderGrid(@query)
+        _.defer =>
+            addRow = spyOn(@query.results, 'addBlankRow').and.callThrough()
+            removeRow = spyOn(@query.results, 'removeRow').and.callThrough()
+            expect(@query.results.length).toEqual(2)
+            _.dom(grid).qs(ADD_ROW_SELECTOR).click()
+            expect(@query.results.addBlankRow).toHaveBeenCalled()
+            editor = Lanes.Test.Utils.findRenderedComponentWithType(
+                grid, Lanes.Components.Grid.RowEditor
+            )
+            expect(@query.results.length).toEqual(3)
+            _.dom(editor).qs('.btn.cancel').click()
+            expect(@query.results.removeRow).toHaveBeenCalled()
+            expect(@query.results.length).toEqual(2)
+            done()
+
+describe "Lanes.Components.Grid.RowEditor", ->
+
+    describe "using row based result set", ->
+        beforeEach (done) ->
+            @query = new Lanes.Models.Query(
+                fields: [ 'id', 'code', 'name', 'notes' ], src: Model
+            )
+            Lanes.Test.syncSucceedWith(ROW_DATA)
+            @query.ensureLoaded().then(done)
+        CommonSpecs()
+
+
+    describe "using a collection", ->
+        beforeEach ->
+            @query = new Lanes.Models.Query(
+                fields: [ 'id', 'code', 'name', 'notes' ],
+                src: new Model.Collection(COLLECTION_DATA)
+            )
+        CommonSpecs()