lanes 0.1.5 → 0.1.6

data/spec/server/command-reference-files/initial/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/spec/server/command-reference-files/initial/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/spec/server/command-reference-files/initial/config/routes.rb

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

data/spec/server/command-reference-files/initial/config.ru

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

data/spec/server/command-reference-files/initial/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/spec/server/command-reference-files/initial/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/spec/server/command-reference-files/initial/lib/appy-app/version.rb

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

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

@@ -0,0 +1,12 @@
+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"
+require_rel "appy-app/models"

data/spec/server/command-reference-files/initial/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/spec/server/command-reference-files/initial/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/spec/server/command-reference-files/initial/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/spec/server/command-reference-files/model/client/appy-app/models/TestTest.coffee

@@ -0,0 +1,9 @@
+class AppyApp.Models.TestTest extends AppyApp.Models.Base
+
+    FILE: FILE
+
+    props:
+        id   : "integer"
+        name : "string"
+        email: "string"
+

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

@@ -0,0 +1,3 @@
+Lanes::API.routes.draw do
+    resources AppyApp::TestTest
+end

data/spec/server/command-reference-files/model/db/migrate/20150218032025_create_test_tests.rb

@@ -0,0 +1,10 @@
+class CreateTestTests < ActiveRecord::Migration
+    def change
+        create_table :test_tests do |t|
+            t.string :name
+            t.string :email
+
+            t.timestamps null: false
+        end
+    end
+end

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

@@ -0,0 +1,7 @@
+module AppyApp
+
+    class TestTest < Model
+
+    end
+
+end

data/spec/server/command-reference-files/model/spec/appy-app/models/TestTestSpec.coffee

@@ -0,0 +1,5 @@
+describe "AppyApp.Models.TestTest", ->
+
+    it "can be instantiated", ->
+        model = new AppyApp.Models.TestTest()
+        expect(model).toEqual(jasmine.any(AppyApp.Models.TestTest))

data/spec/server/command-reference-files/model/spec/fixtures/appy-app/test_test.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+first:
+  name: MyString
+  email: MyString
+
+second:
+  name: MyString
+  email: MyString
+
+

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

@@ -0,0 +1,10 @@
+require_relative 'spec_helpers'
+
+class TestTestSpec < AppyApp::TestCase
+
+    it "can be instantiated" do
+        model = TestTest.new
+        model.must_be_instance_of(TestTest)
+    end
+
+end

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

@@ -0,0 +1,7 @@
+class AppyApp.Screens.ReadySetGo extends AppyApp.Screens.Base
+
+    FILE: FILE
+
+    subviews: {}
+
+    events: {}

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

@@ -0,0 +1,5 @@
+//= require_tree .
+
+/*
+ Add additional requirement statements for other files that the screen uses
+*/

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

@@ -0,0 +1,8 @@
+/*
+ If your screen does not use any custom styles
+
+ 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/spec/server/command-reference-files/screen/client/appy-app/screens/ready-set-go/layout.html

@@ -0,0 +1,3 @@
+<div>
+  <h1>Ready Set Go</h1>
+</div>

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

@@ -0,0 +1,9 @@
+Lanes::Screen.define "ready-set-go" do | screen |
+    screen.description = ""
+    screen.icon        = ""
+    screen.group_id    = ""
+    screen.model_class = ""
+    screen.view_class  = "AppyApp.Screens.ReadySetGo"
+    screen.js          = "appy-app/screens/ready-set-go.js"
+    screen.css         = "appy-app/screens/ready-set-go.css"
+end

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

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

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

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

data/spec/server/command-reference-files/view/spec/appy-app/views/BigViewSpec.coffee

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

data/spec/server/command_spec.rb

@@ -1,39 +1,64 @@
 require_relative "spec_helper"
 require "lanes/cli"
-
+require "diffy"
 require "find"
 
 describe Lanes::Command do
-    let(:lanes) { Pathname.new(__FILE__).dirname.join('..','..','bin','lanes') }
+    let(:app_name)  { "appy-app" }
+    let(:lanes)     { Pathname.new(__FILE__).dirname.join('..','..','bin','lanes') }
+    let(:generated_path) { Pathname.pwd }
+    let(:reference_path) { Pathname(__FILE__).dirname.join("command-reference-files") }
 
     around do |test|
         Dir.mktmpdir do |dir|
             @dir = dir
             Dir.chdir(dir) do
-                `#{lanes} new test`
-                Dir.chdir("test") do
+                assert_executes "#{lanes} new #{app_name}"
+                Dir.chdir(app_name) 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"]
+    def compare_generated(reference)
+        reference.find.each do | path |
+            relative = path.relative_path_from(reference)
+            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)
+            assert diff.to_s.empty?, "#{relative}\n #{diff}"
+        end
+    end
 
     it "generates an application" do
-        files = Find.find(".").to_a.map{|f| f.gsub(/^\.\//,'') }.sort
-        files.sort.must_equal FILES.sort
+        reference = reference_path.join('initial')
+        compare_generated(reference)
+        generated_path.find.each do | path |
+            relative = path.relative_path_from(generated_path)
+            reference_copy = reference.join(relative)
+            assert reference_copy.exist?, "Created file that should not exist: #{relative}"
+        end
     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 )
+    it "generates a screen" do
+        assert_executes "#{lanes} g screen ready-set-go"
+        reference = reference_path.join('screen')
+        compare_generated(reference)
     end
 
-    it "creates a model" do
-       assert_executes "#{lanes} generate model Test"
-       assert_match( /client\/test\/models\/Test.coffee/, last_cmd_execution_output )
+    it "generates a model" do
+        ENV['MIGRATION_TIMESTAMP']='20150218032025'
+        assert_executes "#{lanes} g model test-test name:string email:string"
+        reference = reference_path.join('model')
+        compare_generated(reference)
     end
+
+    it "generates a view" do
+        assert_executes "#{lanes} g view big-view"
+        reference = reference_path.join('view')
+        compare_generated(reference)
+    end
+
 end

data/templates/client/screens/Base.coffee

@@ -0,0 +1,3 @@
+class <%= namespace.camelize %>.Screens.Base extends Lanes.Screens.Base
+
+    abstractClass: true

data/templates/client/screens/Screen.coffee

@@ -1,4 +1,4 @@
-class <%= namespace.camelize %>.Screens.<%= class_name %> extends Lanes.Screens.Base
+class <%= namespace.camelize %>.Screens.<%= class_name %> extends <%= namespace.camelize %>.Screens.Base
 
     FILE: FILE
 <% if @template -%>

data/templates/config/screen.rb

@@ -1,4 +1,3 @@
-
 Lanes::Screen.define "<%= screen_id %>" do | screen |
     screen.description = "<%= options[:description] %>"
     screen.icon        = "<%= options[:icon] %>"

data/templates/db/create_table_migration.rb

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

data/templates/lib/namespace.rb

@@ -3,11 +3,9 @@ require 'require_all'
 require_relative "<%= identifier %>/version.rb"
 require_relative "<%= identifier %>/extension.rb"
 
-# The main namespace for <%= name.camelize %>
+# The main namespace for <%= namespace %>
 module <%= namespace %>
-    def self.table_name_prefix
-        "<%= name %>_"
-    end
+
 end
 
 require_relative "<%= identifier %>/model"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lanes
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -430,6 +430,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Lanes is a framework for writing single page web applications.  It's
   a full stack framework that contains  both server and client.
 email:
@@ -447,23 +461,59 @@ files:
 - LICENSE-MIT.txt
 - README.md
 - Rakefile
+- appy-app/.gitignore
+- appy-app/Gemfile
+- appy-app/Guardfile
+- appy-app/Rakefile
+- appy-app/client/appy-app/Extension.coffee
+- appy-app/client/appy-app/Router.coffee
+- appy-app/client/appy-app/components/.gitkeep
+- appy-app/client/appy-app/controllers/.gitkeep
+- appy-app/client/appy-app/index.js
+- appy-app/client/appy-app/models/.gitkeep
+- appy-app/client/appy-app/models/Base.coffee
+- appy-app/client/appy-app/screens/.gitkeep
+- appy-app/client/appy-app/screens/Base.coffee
+- appy-app/client/appy-app/styles.scss
+- appy-app/client/appy-app/views/.gitkeep
+- appy-app/client/appy-app/views/Base.coffee
+- appy-app/config.ru
+- appy-app/config/database.yml
+- appy-app/config/lanes.rb
+- appy-app/config/routes.rb
+- appy-app/config/screens.rb
+- appy-app/db/.gitkeep
+- appy-app/lib/appy-app.rb
+- appy-app/lib/appy-app/extension.rb
+- appy-app/lib/appy-app/model.rb
+- appy-app/lib/appy-app/models/empty.rb
+- appy-app/lib/appy-app/version.rb
+- appy-app/spec/appy-app/helpers/AppyAppHelpers.coffee
+- appy-app/spec/appy-app/screens/Base.coffee
+- appy-app/spec/server/spec_helpers.rb
 - bin/lanes
-- client/images/ajax-loader.gif
-- client/images/dataTables/Sorting icons.psd
-- client/images/dataTables/back_disabled.png
-- client/images/dataTables/back_enabled.png
-- client/images/dataTables/back_enabled_hover.png
-- client/images/dataTables/favicon.ico
-- client/images/dataTables/forward_disabled.png
-- client/images/dataTables/forward_enabled.png
-- client/images/dataTables/forward_enabled_hover.png
-- client/images/dataTables/loading-background.png
-- client/images/dataTables/sort_asc.png
-- client/images/dataTables/sort_asc_disabled.png
-- client/images/dataTables/sort_both.png
-- client/images/dataTables/sort_desc.png
-- client/images/dataTables/sort_desc_disabled.png
-- client/images/logo-sm.png
+- client/fonts/lanes/icomoon.eot
+- client/fonts/lanes/icomoon.svg
+- client/fonts/lanes/icomoon.ttf
+- client/fonts/lanes/icomoon.woff
+- client/fonts/lanes/selection.json
+- client/images/lanes/ajax-loader.gif
+- client/images/lanes/dataTables/Sorting icons.psd
+- client/images/lanes/dataTables/back_disabled.png
+- client/images/lanes/dataTables/back_enabled.png
+- client/images/lanes/dataTables/back_enabled_hover.png
+- client/images/lanes/dataTables/favicon.ico
+- client/images/lanes/dataTables/forward_disabled.png
+- client/images/lanes/dataTables/forward_enabled.png
+- client/images/lanes/dataTables/forward_enabled_hover.png
+- client/images/lanes/dataTables/loading-background.png
+- client/images/lanes/dataTables/sort_asc.png
+- client/images/lanes/dataTables/sort_asc_disabled.png
+- client/images/lanes/dataTables/sort_both.png
+- client/images/lanes/dataTables/sort_desc.png
+- client/images/lanes/dataTables/sort_desc_disabled.png
+- client/images/lanes/logo-sm.png
+- client/lanes/Config.coffee
 - client/lanes/access/Extension.coffee
 - client/lanes/access/LoginDialog.coffee
 - client/lanes/access/Roles.coffee
@@ -547,7 +597,6 @@ files:
 - client/lanes/models/ChangeMonitor.coffee
 - client/lanes/models/ChangeSet.coffee
 - client/lanes/models/Collection.coffee
-- client/lanes/models/Config.coffee
 - client/lanes/models/ModelAssociations.coffee
 - client/lanes/models/PubSub.coffee
 - client/lanes/models/Query.coffee
@@ -709,16 +758,13 @@ files:
 - client/lanes/styles/bootstrap/old/mixins/_text-overflow.scss
 - client/lanes/styles/bootstrap/old/mixins/_vendor-prefixes.scss
 - client/lanes/styles/dataTables.scss
+- client/lanes/styles/font-definitions.scss
 - client/lanes/styles/fonts.scss
-- client/lanes/styles/fonts/icomoon.eot
-- client/lanes/styles/fonts/icomoon.svg
-- client/lanes/styles/fonts/icomoon.ttf
-- client/lanes/styles/fonts/icomoon.woff
-- client/lanes/styles/fonts/selection.json
-- client/lanes/styles/fonts/style.scss
 - client/lanes/styles/plugins/all.scss
 - client/lanes/styles/plugins/overlay.scss
 - client/lanes/styles/plugins/resize-sensor.scss
+- client/lanes/testing/ModelSaver.coffee
+- client/lanes/testing/index.js
 - client/lanes/vendor/bootstrap/affix.js
 - client/lanes/vendor/bootstrap/alert.js
 - client/lanes/vendor/bootstrap/button.js
@@ -821,6 +867,7 @@ files:
 - lib/lanes/api/sprockets_extension.rb
 - lib/lanes/api/test_specs.rb
 - lib/lanes/api/updates.rb
+- lib/lanes/capistrano.rb
 - lib/lanes/cli.rb
 - lib/lanes/command.rb
 - lib/lanes/command/app.rb
@@ -894,6 +941,51 @@ files:
 - spec/lanes/models/PubSubSpec.coffee
 - spec/lanes/views/BaseSpec.coffee
 - spec/lanes/views/FormBindingsSpec.coffee
+- spec/server/command-reference-files/initial/.gitignore
+- spec/server/command-reference-files/initial/Gemfile
+- spec/server/command-reference-files/initial/Guardfile
+- spec/server/command-reference-files/initial/Rakefile
+- spec/server/command-reference-files/initial/client/appy-app/Extension.coffee
+- spec/server/command-reference-files/initial/client/appy-app/Router.coffee
+- spec/server/command-reference-files/initial/client/appy-app/components/.gitkeep
+- spec/server/command-reference-files/initial/client/appy-app/controllers/.gitkeep
+- spec/server/command-reference-files/initial/client/appy-app/index.js
+- spec/server/command-reference-files/initial/client/appy-app/models/.gitkeep
+- spec/server/command-reference-files/initial/client/appy-app/models/Base.coffee
+- spec/server/command-reference-files/initial/client/appy-app/screens/.gitkeep
+- spec/server/command-reference-files/initial/client/appy-app/screens/Base.coffee
+- spec/server/command-reference-files/initial/client/appy-app/styles.scss
+- spec/server/command-reference-files/initial/client/appy-app/views/.gitkeep
+- spec/server/command-reference-files/initial/client/appy-app/views/Base.coffee
+- spec/server/command-reference-files/initial/config.ru
+- spec/server/command-reference-files/initial/config/database.yml
+- spec/server/command-reference-files/initial/config/lanes.rb
+- spec/server/command-reference-files/initial/config/routes.rb
+- spec/server/command-reference-files/initial/config/screens.rb
+- spec/server/command-reference-files/initial/db/.gitkeep
+- spec/server/command-reference-files/initial/lib/appy-app.rb
+- spec/server/command-reference-files/initial/lib/appy-app/extension.rb
+- spec/server/command-reference-files/initial/lib/appy-app/model.rb
+- spec/server/command-reference-files/initial/lib/appy-app/models/empty.rb
+- spec/server/command-reference-files/initial/lib/appy-app/version.rb
+- spec/server/command-reference-files/initial/spec/appy-app/helpers/AppyAppHelpers.coffee
+- spec/server/command-reference-files/initial/spec/appy-app/screens/Base.coffee
+- spec/server/command-reference-files/initial/spec/server/spec_helpers.rb
+- spec/server/command-reference-files/model/client/appy-app/models/TestTest.coffee
+- spec/server/command-reference-files/model/config/routes.rb
+- spec/server/command-reference-files/model/db/migrate/20150218032025_create_test_tests.rb
+- spec/server/command-reference-files/model/lib/appy-app/models/test_test.rb
+- spec/server/command-reference-files/model/spec/appy-app/models/TestTestSpec.coffee
+- spec/server/command-reference-files/model/spec/fixtures/appy-app/test_test.yml
+- spec/server/command-reference-files/model/spec/server/test_test_spec.rb
+- spec/server/command-reference-files/screen/client/appy-app/screens/ready-set-go/ReadySetGo.coffee
+- spec/server/command-reference-files/screen/client/appy-app/screens/ready-set-go/index.js
+- spec/server/command-reference-files/screen/client/appy-app/screens/ready-set-go/index.scss
+- spec/server/command-reference-files/screen/client/appy-app/screens/ready-set-go/layout.html
+- spec/server/command-reference-files/screen/config/screens.rb
+- spec/server/command-reference-files/screen/spec/appy-app/screens/ready-set-go/ReadySetGoSpec.coffee
+- spec/server/command-reference-files/view/client/appy-app/views/BigView.coffee
+- spec/server/command-reference-files/view/spec/appy-app/views/BigViewSpec.coffee
 - spec/server/command_spec.rb
 - spec/server/concerns/api_path_spec.rb
 - spec/server/concerns/association_extensions_spec.rb
@@ -921,6 +1013,7 @@ files:
 - templates/client/index.js
 - templates/client/models/BaseModel.coffee
 - templates/client/models/Model.coffee
+- templates/client/screens/Base.coffee
 - templates/client/screens/Screen.coffee
 - templates/client/screens/index.js
 - templates/client/screens/layout.html

data/client/lanes/models/Config.coffee

@@ -1,10 +0,0 @@
-class Config
-    constructor: -> super
-
-    session:
-        csrf_token: { type: 'string', setOnce: false }
-        api_path:   { type: 'string', setOnce: false }
-
-Lanes.Models.State.extend(Config)
-
-Lanes.Models.Config = new Config