lanes 0.1.0 → 0.1.2

data/lib/lanes/command/generate_screen.rb

@@ -19,14 +19,21 @@ module Lanes
             end
 
             def create_screen
-                template "lib/namespace/screen.rb",      "lib/#{namespace}/#{name}_screen.rb"
                 template "client/screens/index.js",      "#{client_dir}/screens/#{name}/index.js"
                 template "client/screens/styles.scss",   "#{client_dir}/screens/#{name}/index.scss"
-                template "client/screens/Screen.coffee", "#{client_dir}/screens/#{name}/#{class_name}.coffee"
+                template "client/screens/Screen.coffee",
+                         "#{client_dir}/screens/#{name}/#{class_name}.coffee"
                 template "client/screens/layout.html",   "#{client_dir}/screens/#{name}/layout.html"
                 template "spec/client/Screen.coffee",    "#{spec_dir}/screens/#{class_name}.coffee"
             end
 
+            def add_definition
+                insert_into_file "config/screens.rb", after: "" do
+                    source = File.expand_path(find_in_source_paths("config/screen.rb"))
+                    ERB.new(::File.binread(source), nil, "-","@output_buffer").result(binding)
+                end
+
+            end
         end
     end
 end

data/lib/lanes/command/generate_view.rb

@@ -5,17 +5,29 @@ module Lanes
 
         class GenerateView < NamedCommand
             OPTIONS ||= {
-                namespace: nil
+              namespace: nil,
+              screen: 'global'
             }
             class_options( OPTIONS )
 
+            # desc "foo bar"
+            # option :from, :required => true
+
             def create_screen
-                template "client/views/View.coffee",   "#{client_dir}/views/#{name.classify}.coffee"
-                template "client/views/template.html", "#{client_dir}/views/#{name.dasherize}.html"
+                template "client/views/View.coffee",   "#{client_dir}/#{name.classify}.coffee"
                 template "spec/client/views/ViewSpec.coffee", \
                   "#{spec_dir}/views/#{class_name}Spec.coffee"
             end
 
+          private
+
+            def client_dir
+                if options[:screen] == 'global'
+                    "client/#{namespace}/views"
+                else
+                    "client/#{namespace}/screens/#{options[:screen].dasherize}"
+                end
+            end
         end
 
     end

data/lib/lanes/command/generate_view.usage

@@ -1,13 +1,13 @@
 Stubs out a new View. Pass the view name, either CamelCased or
 under_scored
 
- When executed inside a project called "Blog":
+When executed inside a project called "Blog":
 
- `lanes generate view comment`
+`lanes generate view comment`
 
- Lanes will create:
-
-         Client View: client/view/Comment.coffee
-         Template:    client/view/comment.html
-         Spec:        spec/client/view/CommentSpec.coffee
+Lanes will create:
+····················
 
+  * View: client/views/Comment.coffee
+  * Template: client/views/comment.html
+  * Spec: spec/<app>/views/CommentSpec.coffee

data/lib/lanes/command/named_command.rb

@@ -18,8 +18,8 @@ module Lanes
             end
 
             def set_variables
-                @class_name = name.classify
-                @spec_dir =   "spec/#{namespace}"
+                @class_name = name.underscore.classify
+                @spec_dir   = "spec/#{namespace}"
                 @client_dir = "client/#{namespace}"
             end
 

data/lib/lanes/command/templates/client/index.js

@@ -1,6 +1,9 @@
+//=require ./models/Base
+//=require ./views/Base
 //=require_tree ./models
 //=require_tree ./views
 //=require_tree ./components
+//=require ./screens/Base
 //=require ./Extension
 
 /*

data/lib/lanes/command/templates/client/models/BaseModel.coffee

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

data/lib/lanes/command/templates/client/models/Model.coffee

@@ -1,4 +1,4 @@
-class <%= namespace.camelize %>.Models.<%= class_name %> extends <%= client_parent %>
+class <%= namespace.camelize %>.Models.<%= class_name %> extends <%= namespace.camelize %>.Models.Base
 
     api_path: '<%= name.downcase.pluralize.underscore.dasherize %>'
     FILE: FILE

data/lib/lanes/command/templates/client/views/BaseView.coffee

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

data/lib/lanes/command/templates/client/views/View.coffee

@@ -1,4 +1,4 @@
-class <%= namespace.classify %>.Views.<%= class_name %> extends Lanes.Views.Base
+class <%= namespace.classify %>.Views.<%= class_name %> extends <%= namespace.classify %>.Views.Base
 
     FILE: FILE
 

data/lib/lanes/command/templates/config/screen.rb

@@ -0,0 +1,8 @@
+Lanes::Screen.define "<%= name.dasherize %>" 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.camelize %>.Screens.<%= class_name %>"
+    screen.files       = ["<%= namespace %>/screens/<%= name.dasherize %>.js","<%= namespace %>/screens/<%= name.dasherize %>.css"]
+end

data/lib/lanes/command/templates/lib/namespace/base_model.rb

@@ -0,0 +1,9 @@
+module <%= namespace.camelize %>
+
+    # All models in <%= namespace.camelize %> will inherit from
+    # this common base class.
+    class Model < Lanes::Model
+
+    end
+
+end

data/lib/lanes/command/templates/lib/namespace/model.rb

@@ -1,6 +1,6 @@
 module <%= namespace.camelize %>
 
-    class <%= class_name %> < <%= options[:parent] %>
+    class <%= class_name %> < Model
 
     end
 

data/lib/lanes/command/templates/spec/client/models/ModelSpec.coffee

@@ -1,4 +1,4 @@
-describe "<%= class_name %> Model Suite", ->
+describe "<%= namespace.camelize %>.Models.<%= class_name %>", ->
 
     it "can be instantiated", ->
         model = new <%= namespace.camelize %>.Models.<%= class_name %>()

data/lib/lanes/command/templates/spec/client/views/ViewSpec.coffee

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

data/lib/lanes/command.rb

@@ -8,7 +8,7 @@ module Lanes
             # internally by commands to populate their long_desc
             # @param [String] basename of file to read usage from
             def usage_from_file(file)
-                Pathname.new(__FILE__).dirname.join("command","#{file}.usage").read
+                Pathname.new(__FILE__).dirname.join("command","#{file}.usage").read.gsub(/\n/,"\n\x5")
             end
 
             # Loads the code for the extension that the user is currently
@@ -19,7 +19,6 @@ module Lanes
             #
             # @return [Extension] extension that was loaded, nil if none was found
             def load_current_extension(raise_on_fail:false)
-                
                 previous = Extensions.all
                 ext = Dir.glob("./lib/*/extension.rb").first
                 if ext

data/lib/lanes/components.rb

@@ -1,4 +1,3 @@
-require 'pry'
 module Lanes
 
     module Components
@@ -20,8 +19,10 @@ module Lanes
             # Requires the enabled components and all of their dependencies
             def enabled_with_dependencies(env, &block)
                 enabled do | component |
-                    depends = component_configuration(component, env.environment)['depends']
-                    depends.each{ |d| yield d } if depends
+                    config = component_configuration(component, env.environment)
+                    if config['depends']
+                        config['depends'].each{ |d| yield d }
+                    end
                     yield component
                 end
             end
@@ -30,7 +31,7 @@ module Lanes
             # @return Hash configuration for component, read from a config.json file in the components directory,
             # or an empty hash if no configuration is present
             def component_configuration(component, env)
-                if asset = env.find_asset("components/#{component}")
+                if asset = env.find_asset("lanes/components/#{component}")
                     config_file = asset.pathname.dirname.join("config.json")
                     if config_file.exist?
                         return Oj.load(config_file.read)

data/lib/lanes/concerns/all.rb

@@ -1,16 +1,11 @@
 require_relative "api_path"
 require_relative "association_extensions"
 require_relative "attr_accessor_with_default"
-require_relative "code_identifier"
 require_relative "export_associations"
 require_relative "export_join_tables"
 require_relative "export_methods"
 require_relative "export_scope"
-require_relative "immutable_model"
 require_relative "set_attribute_data"
-require_relative "locked_fields"
 require_relative "pub_sub"
 require_relative "queries"
-require_relative "random_hash_code"
-require_relative "visible_id_identifier"
 require_relative "sanitize_fields"

data/lib/lanes/concerns/attr_accessor_with_default.rb

@@ -41,16 +41,18 @@ module Lanes::Concerns
                     end
                 end
             end
+
             def attr_reader_with_default( name, default )
                 module_eval do
                     define_method( name ) do
                         class << self; self; end.class_eval do
                             attr_reader( name )
                         end
-                        if instance_variables.include? "@#{name}"
-                            instance_variable_get( "@#{name}" )
+                        instance_var = "@#{name.to_s}".to_sym
+                        if instance_variable_defined?(instance_var)
+                            instance_variable_get(instance_var)
                         else
-                            instance_variable_set( "@#{name}", default.is_a?(Proc) ? default.call : default )
+                            instance_variable_set(instance_var, default.is_a?(Proc) ? default.call : default )
                         end
                     end
                 end

data/lib/lanes/concerns/set_attribute_data.rb

@@ -101,13 +101,12 @@ module Lanes::Concerns
                     next unless self.class.has_exported_nested_attribute?(name, user)
 
                     association = self.association(name)
-
-                    result[name] = if value.is_a?(Hash) && [:belongs_to,:has_one].include?(association.reflection.macro)
-                                       target = association.target || association.build
-                                       target.set_attribute_data(value, user)
-                                   elsif value.is_a?(Array) && :has_many == association.reflection.macro
-                                       _set_attribute_data_from_collection(association, value, user)
-                                   end
+                    if value.is_a?(Hash) && [:belongs_to,:has_one].include?(association.reflection.macro)
+                        target = association.target || association.build
+                        result[name] = target.set_attribute_data(value, user)
+                    elsif value.is_a?(Array) && :has_many == association.reflection.macro
+                        result[name] = _set_attribute_data_from_collection(association, value, user)
+                    end
                 end
             end
         end
@@ -133,22 +132,6 @@ module Lanes::Concerns
             end
         end
 
-
-        # association = self.send(name)
-
-        # klass_name = self.class.reflections[ name.to_sym ].class_name
-        # klass = klass_name.safe_constantize || "Lanes::#{klass_name}".constantize
-
-        # # only Hash, Array & nil is valid for nesting attributes
-        # cleaned = case value
-        #           when Hash  then klass.sanitize_api_data( value, user, klass )
-        #           when Array then value.map{ | nested |
-        #                   klass.sanitize_api_data( nested, user, klass )
-        #               }
-        #           else
-        #               nil
-        #           end
-#        result[ name.to_sym ] = cleaned unless cleaned.blank?
     end
 
 end

data/lib/lanes/configuration.rb

@@ -68,6 +68,7 @@ module Lanes
         config_option :assets_path_prefix, "/assets"
         config_option :mounted_at, ''
         config_option :root_view, 'Lanes.Workspace.Layout'
+        config_option :initial_workspace_screen_id, ''
         config_option :specs_root, Pathname.getwd
     end
 

data/lib/lanes/extension.rb

@@ -45,7 +45,7 @@ module Lanes
             def client_paths
                 [ root_path.join('client') ]
             end
-            
+
             def client_images
                 images = []
                 root_path.join('client','images').find{|path| images << path if path.file? }
@@ -58,10 +58,20 @@ module Lanes
                     require routes_config
                 end
             end
+
         end
 
         class << self
 
+            def load_screens
+                each do | ext |
+                    screens_config = ext.root_path.join('config','screens.rb')
+                    if screens_config.exist?
+                        require screens_config
+                    end
+                end
+            end
+
             def load_after(extension)
                 self.after = extension
             end
@@ -77,7 +87,7 @@ module Lanes
             def require_workspace?
                 all.detect{|ext| ext.uses_workspace }
             end
-            
+
             def require_pub_sub?
                 all.detect{|ext| ext.uses_pub_sub }
             end
@@ -120,11 +130,12 @@ module Lanes
 
             def client_bootstrap_data(view)
                 data = {
-                        csrf_token: Rack::Csrf.csrf_token(view.env),
-                        root_view:  Lanes.config.root_view,
-                        api_path: Lanes.config.mounted_at,
-                        pub_sub: require_pub_sub?
-                       }
+                  csrf_token: Rack::Csrf.csrf_token(view.env),
+                  root_view:  Lanes.config.root_view,
+                  api_path: Lanes.config.mounted_at,
+                  initial_workspace_screen_id: Lanes.config.initial_workspace_screen_id,
+                  pub_sub: require_pub_sub?
+                }
                 each do | ext |
                     data[ext.identifier] = ext.client_bootstrap_data(view)
                 end
@@ -134,7 +145,7 @@ module Lanes
             def client_images
                 each{|ext| }
             end
-            
+
             def load_current_config
                 config_file = Pathname.getwd.join('config','lanes.rb')
                 if config_file.exist?
@@ -146,6 +157,4 @@ module Lanes
 
     end
 
-
-
 end

data/lib/lanes/guard_tasks.rb

@@ -23,7 +23,7 @@ module Lanes
 
             jasmine_options = options.merge({
                 port: 8888, server_mount: '/spec', server_env: 'test', server: :puma,
-                spec_dir: 'spec/client', console: :always, debug: false
+                spec_dir: "spec/#{app_name}", console: :always, debug: false
             })
 
             dsl.guard :jasmine, jasmine_options do

data/lib/lanes/model.rb

@@ -8,11 +8,6 @@ module Lanes
 
         include Concerns::PubSub
         include Concerns::ApiAttributeAccess
-        include Concerns::LockedFields
-        include Concerns::CodeIdentifier
-        include Concerns::RandomHashCode
-        include Concerns::VisibleIdIdentifier
-        include Concerns::ImmutableModel
         include Concerns::ExportMethods
         include Concerns::ExportScope
         include Concerns::ExportAssociations
@@ -20,7 +15,7 @@ module Lanes
         include Concerns::AssociationExtensions
         include Concerns::ApiPath
         include Concerns::SanitizeFields
-        
+
     end
 
 end

data/lib/lanes/{screens.rb → screen.rb}

@@ -1,18 +1,41 @@
 require 'yaml'
 require 'oj'
+require 'pry'
 
 module Lanes
 
-    module Screens
-        class << self
+    module Screen
+        GROUPS=Hash.new{|h,k| g=Group.new; g.identifier=k; h[k]=g }
+        DEFINITIONS=Hash.new{|h,k| d=Definition.new; d.identifier=k; h[k]=d }
 
-            def each_directory
-                root = Pathname.new(__FILE__).dirname.join('../../assets/screens')
-                root.each_child do | path  |
-                    yield path if path.directory?
+        class << self
+            def [](config)
+                if DEFINITIONS.has_key?(config)
+                    DEFINITIONS[config]
+                else
+                    nil
                 end
             end
 
+            def define(id)
+                definition = DEFINITIONS[id]
+                yield definition
+            end
+
+            def define_group(id)
+                group = GROUPS[id]
+                yield group
+            end
+
+            def each
+                Extensions.load_screens
+                DEFINITIONS.values.each{ | definition | yield definition }
+            end
+
+            def each_group
+                Extensions.load_screens
+                GROUPS.values.each{ | group | yield group }
+            end
         end
 
         class Group
@@ -23,14 +46,6 @@ module Lanes
             attr_accessor_with_default :description
             attr_accessor_with_default :icon
 
-            def self.each(config)
-                self.descendants.each{ |klass| yield klass.new(config) }
-            end
-
-            def initialize(sprockets)
-                @sprockets=sprockets
-            end
-
             def to_json
                 Oj.dump({
                     id: identifier,
@@ -51,14 +66,14 @@ module Lanes
             attr_accessor_with_default :group_id
             attr_accessor_with_default :view_class
             attr_accessor_with_default :model_class
-            attr_accessor_with_default :files
-
-            def self.each(config)
-                self.descendants.each{ |klass| yield klass.new(config) }
-            end
-
-            def initialize(sprockets)
-                @sprockets=sprockets
+            attr_accessor_with_default :js
+            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
             end
 
             def to_json
@@ -68,7 +83,9 @@ module Lanes
                     icon:  icon,
                     model: model_class,
                     view:  view_class,
-                    files: files.map{ |f| "#{Lanes.config.assets_path_prefix}/#{f}"},
+                    js:    js,
+                    css:   css,
+                    assets: assets,
                     group_id: group_id,
                     description: description
                 }, mode: :compat)

data/lib/lanes/spec_helper.rb

@@ -6,19 +6,21 @@ require 'hashie/mash'
 require 'active_record'
 require 'active_record/fixtures'
 require 'minitest/around/unit'
+require 'minitest/around/spec'
 require 'minitest/spec'
 require 'minitest/autorun'
 require 'mocha/mini_test'
 
 require_relative 'testing_models'
 
+
 RAILS_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 ))
 ActiveRecord::Base.logger = Lanes.logger
 ActiveSupport::Dependencies.mechanism = :require
-
+ActiveSupport.test_order = :random
 module Lanes
 
     class DummyUser
@@ -32,7 +34,7 @@ module Lanes
             true
         end
     end
-    
+
     class TestCase < ActiveSupport::TestCase
         include Lanes
         include ActiveRecordMocks::IncludeMe

data/lib/lanes/version.rb

@@ -1,5 +1,5 @@
 module Lanes
 
-    VERSION = "0.1.0"
+    VERSION = "0.1.2"
 
 end

data/lib/lanes.rb

@@ -17,4 +17,4 @@ require_relative "lanes/model"
 
 require_relative "lanes/components"
 require_relative "lanes/extension"
-require_relative "lanes/screens"
+require_relative "lanes/screen"

data/spec/api/javascript_processor_spec.rb

@@ -95,7 +95,7 @@ Foo = (function() {
 
 Bar.extend(Foo);
 
-})(window.Lanes,(window.Lanes ? window.Lanes['Foo'] : null),window._, window,{namespace:(window.Lanes ? window.Lanes['Foo'] : null),extension:'Foo',file:'baz'});
+})(window.Lanes,(window.Lanes ? window.Lanes['Foo'] : null),window._, window,{namespace:(window.Lanes ? window.Lanes['Foo'] : null),extensionName:'Foo',path:'baz'});
 EOS
 
 Scope = Struct.new(:logical_path)
@@ -103,8 +103,8 @@ Scope = Struct.new(:logical_path)
     def test_coffeescript_generation
         template = API::CoffeeScriptWrapper.new{ |t| SCRIPT }
         assert_equal CLEANED, template.cleaned
-        
-        
+
+
         assert_equal JS.chomp, template.render(Scope.new("foo/bar/baz"))
     end
 end

data/spec/command_spec.rb

@@ -0,0 +1,49 @@
+require "lanes/spec_helper"
+require "lanes/cli"
+require "find"
+require_relative "helpers/minitest_assertions"
+
+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/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/database.yml", "config/lanes.rb", "config/routes.rb", "config/screens.rb",
+      "config.ru", "db", "db/.gitkeep", "lib", "lib/test", "lib/test/extension.rb",
+      "lib/test/model.rb", "lib/test/version.rb", "lib/test.rb", "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/attr_accessor_with_default_spec.rb

@@ -10,6 +10,7 @@ class AttrAccessorWithDefaultTest < Lanes::TestCase
         attr_accessor_with_default :non_copying, ->{ "default string" }
         attr_accessor_with_default :shared, Shared.new('default')
         attr_accessor_with_default :non_shared, ->{ Shared.new('default') }
+        attr_accessor_with_default :startingnil
     end
 
     class Inherited<AttrTestClass
@@ -53,5 +54,11 @@ class AttrAccessorWithDefaultTest < Lanes::TestCase
         assert_equal "default", b.non_shared.value
     end
 
+    def test_nils
+        a = AttrTestClass.new
+        assert_nil a.startingnil
+        a.startingnil = 22
+        assert_equal 22, a.startingnil
+    end
 
 end