lanes 0.8.2 → 0.8.3

data/client/lanes/workspace/screen.jsx

@@ -3,8 +3,8 @@ import classnames from 'classnames';
 import { observer } from 'mobx-react';
 import { Grid } from 'react-flexbox-grid';
 import Box from 'grommet/components/Box';
-
 import Screens from '../screens';
+import ScreenInstances from '../screens/instance';
 
 const ScreenView = observer((props) => {
     const { screen: Screen, ...rest } = props;
@@ -26,7 +26,7 @@ export default class Screen extends React.Component {
     componentDidMount() {
         const { screenId } = this.props.params;
         if (screenId) {
-            const definition = Screens.getDefinition(screenId);
+            const definition = Screens.all.get(screenId);
             if (definition) { definition.display(); }
         }
     }
@@ -40,7 +40,7 @@ export default class Screen extends React.Component {
                 align="stretch"
                 flex="grow"
             >
-                {Screens.displaying.map(s =>
+                {ScreenInstances.displaying.map(s =>
                     <ScreenView key={s.id} {...this.props.params} screen={s} />)}
             </Box>
 

data/config/routes.rb

@@ -8,6 +8,8 @@ Lanes::API.routes.for_extension 'lanes' do
         end
     end
 
+    get 'screens.json', &Lanes::API::Handlers::Screens.get
+
     post "user-sessions.json", &Lanes::API::Handlers::UserSession.create
     get "user-sessions/test.json", &Lanes::API::Handlers::UserSession.check
 

data/config/screens.rb

@@ -20,7 +20,7 @@ Lanes::Screen.for_extension 'lanes' do | screens |
         screen.description = "Add/Remove/Modify User Accounts"
         screen.icon        = "group"
         screen.group_id    = "system-settings"
-        screen.model_class = "User"
+        screen.model_class = "SystemSettings"
         screen.view_class  = "UserManagement"
         screen.asset       = 'lanes/access/screens/user-management'
     end
@@ -30,7 +30,7 @@ Lanes::Screen.for_extension 'lanes' do | screens |
         screen.description = "Update System Settings"
         screen.icon        = "cogs"
         screen.group_id    = "system-settings"
-        screen.model_class = "User"
+        screen.model_class = "SystemSettings"
         screen.asset       = 'lanes/screens/system-settings'
     end
 

data/lanes.gemspec

@@ -24,14 +24,14 @@ Gem::Specification.new do |spec|
 
     spec.required_ruby_version = ">= 2.0"
 
-    spec.add_dependency "activejob",              "~> 5.0"
-    spec.add_dependency "activerecord",           "~> 5.0"
-    spec.add_dependency "actioncable",            "~> 5.0"
+    spec.add_dependency "activejob",              "~> 5.0.2"
+    spec.add_dependency "activerecord",           "~> 5.0.2"
+    spec.add_dependency "actioncable",            "~> 5.0.2"
     spec.add_dependency "mail",                   "~> 2.6"
 
-    spec.add_dependency "sinatra",                "~> 2.0.0.beta2"
+    spec.add_dependency "sinatra",                "~> 2.0.0.rc1"
     spec.add_dependency "rack",                   "~> 2.0"
-    spec.add_dependency "rack-protection",        "~> 2.0.0.beta2"
+    spec.add_dependency "rack-protection",        "~> 2.0.0.rc1"
 
     spec.add_dependency "rack-cors",              "~> 0.4"
     spec.add_dependency "rack-test",              "~> 0.6"
@@ -43,14 +43,17 @@ Gem::Specification.new do |spec|
     spec.add_dependency "execjs",                 "~> 2.6"
     spec.add_dependency "fastimage",              "~> 2.0"
     spec.add_dependency "guard",                  "~> 2.13"
+
+    spec.add_dependency "rspec-rails",            "~> 3.5"
+
     spec.add_dependency "guard-jest",             "~> 0.1"
-    spec.add_dependency "guard-minitest",         "~> 2.3"
+    spec.add_dependency "guard-rspec",            "~> 4.7"
     spec.add_dependency "hashie",                 "~> 3.3"
 
     spec.add_dependency "jobba",                  "~> 1.4"
     spec.add_dependency "jwt",                    "~> 1.5"
     spec.add_dependency "mini_magick",            "~> 4.3.6"
-    spec.add_dependency "minitest-around",        "~> 0.2"
+
     spec.add_dependency "oj",                     "~> 2.1"
     spec.add_dependency "pg",                     "~> 0.8"
     spec.add_dependency "rake",                   "~> 12.0"

data/lib/lanes/access/authentication_provider.rb

@@ -39,11 +39,11 @@ module Lanes
                 return false if current_user.nil?
                 case request.request_method
                 when 'GET'
-                    klass.can_read_attributes?(request.params,current_user)
-                when 'POST','PATCH','PUT'
-                    klass.can_write_attributes?(request.params,current_user)
+                    klass.can_read_attributes?(request.params, current_user)
+                when 'POST', 'PATCH', 'PUT'
+                    klass.can_write_attributes?(request.params, current_user)
                 when 'DELETE'
-                    klass.can_delete_attributes?(request.params,current_user)
+                    klass.can_delete_attributes?(request.params, current_user)
                 else
                     false
                 end

data/lib/lanes/api.rb

@@ -11,6 +11,7 @@ require_relative 'api/helper_methods'
 require_relative 'api/pub_sub'
 require_relative 'api/handlers/user_session';
 require_relative 'api/handlers/asset';
+require_relative 'api/handlers/screens';
 require_relative 'api/root'
 
 module Lanes

data/lib/lanes/api/default_routes.rb

@@ -30,6 +30,6 @@ module Lanes
 
     end
 
-    API.set_root_view :lanes_root_view
+    # API.set_root_view :lanes_root_view
 
 end

data/lib/lanes/api/handlers/screens.rb

@@ -0,0 +1,26 @@
+require_relative '../../access/user'
+
+require 'irb'
+
+module Lanes::API::Handlers
+
+    module Screens
+        def self.get
+            lambda do
+                authentication = Lanes::API::AuthenticationProvider.new(request)
+                if authentication.current_user.nil?
+                    return json_reply std_api_reply :get, {}, success: true
+                end
+                screens = Lanes::Screen.select do | screen |
+                    authentication.current_user.can_read?(screen.model)
+                end
+                # Lanes::Screen.each_group
+                json_reply std_api_reply :get, {
+                                             screens: screens.map{|s| s.identifier }
+                                         }, success: true
+            end
+        end
+
+    end
+
+end

data/lib/lanes/api/helper_methods.rb

@@ -6,10 +6,11 @@ module Lanes
             end
 
             def lanes_javascript_tags
-                assets = API.webpack.assets.map do | k |
-                    "<script src=\"http://localhost:#{API.webpack.port}/#{k}\"></script>"
-                end
-                assets.join("\n")
+                []
+                # assets = API.webpack.assets.map do | k |
+                #     "<script src=\"http://localhost:#{API.webpack.port}/#{k}\"></script>"
+                # end
+                # assets.join("\n")
 
                 # "<script src=\"http://localhost:#{API.webpack.port}/lanes.js\"></script>"
                 # javascript_tag('lanes/vendor') + "\n" + javascript_tag('lanes')

data/lib/lanes/cli.rb

@@ -31,6 +31,13 @@ module Lanes
         long_desc "start the Jest test server"
         register Command::Jest,  'jest', 'jest', 'Start the Jest test server for client code'
 
+        long_desc "start the webpack dev server"
+        register Command::Webpack, 'webpack', 'webpack', 'Start the Webpack Dev Server'
+
+        long_desc "start the Puma server"
+        register Command::Puma, 'puma', 'puma', 'Start the Puma(Sinata) Server'
+
+        long_desc "start the guard test runner"
         register Command::Guard,  'guard', 'guard', 'Start the Guard server'
 
         long_desc Command.usage_from_file("db")

data/lib/lanes/command/app.rb

@@ -36,8 +36,12 @@ module Lanes
                 template "config/screens.rb"
                 template "config/routes.rb"
                 template "config/webpack.config.js"
+                template "config/jest.config.json"
+                template "config/jest/babel-transform.js"
                 template "config/lanes.rb"
                 template "gitignore",".gitignore"
+                template "spec/client/setup.js"
+                template "spec/server/spec_helper.rb"
 
                 create_file "log/.gitkeep",""
                 create_file "tmp/.gitkeep",""
@@ -56,12 +60,6 @@ module Lanes
                 template "client/styles.scss",      "#{client_dir}/styles.scss"
             end
 
-            def create_spec_helpers
-                template "spec/client/setup.js",
-                         "spec/client/setup.js"
-                template "spec/server/spec_helper.rb",
-                         "spec/server/spec_helper.rb"
-            end
 
             def knitterize
                 say 'Installing node modules', :green

data/lib/lanes/command/client_config.rb

@@ -0,0 +1,59 @@
+module Lanes
+    module Command
+
+        class ClientConfig < Thor::Group
+            include Thor::Actions
+
+            attr_reader :directory
+
+            attr_reader :controlling_extension
+            attr_reader :lanes_root_path
+            attr_reader :extension_path
+
+            attr_reader :module_paths
+
+            ROOT = Pathname.new(__FILE__).dirname.join("..", "..", "..")
+            def self.source_root
+                ROOT.join("templates", "js")
+            end
+
+            def apply_lanes_config
+                Lanes::Configuration.apply
+                Lanes::Extensions.load_controlling_config
+            end
+
+            def set_vars
+                @lanes_root_path = ROOT
+                @controlling_extension = Command.load_current_extension(raise_on_fail: true)
+                @extension_path = controlling_extension.root_path
+            end
+
+            def make_temp_dir
+                @directory = Pathname.new(Dir.mktmpdir)
+            end
+
+            def set_module_paths
+                @module_paths = Extensions.map { |e| e.root_path.join('client').to_s }.reverse + [
+                    controlling_extension.root_path.join('node_modules').to_s,
+                    directory.to_s
+                ]
+            end
+
+            def write_asset_files
+                say "Generating config in #{directory}", :green
+
+                template('jest.config.json',
+                         directory.join('jest.config.json'), verbose: false)
+
+                template('root-view.html',
+                         directory.join('root-view.tmpl.html'), verbose: false)
+
+                template('screens.js',
+                         directory.join('lanes/screen-definitions.js'), verbose: false)
+
+                # set the mtime to the past, otherwise Webpack will build repeatedly for a second
+                FileUtils.touch directory.join('index.html').to_s, mtime: Time.now - 1.minute
+            end
+        end
+    end
+end

data/lib/lanes/command/generate_model.rb

@@ -38,10 +38,10 @@ module Lanes
 
             def create_client
                 self.fields.unshift ModelAttribute.parse("id:integer")
-                template "client/models/Model.coffee",
-                         "#{client_dir}/models/#{class_name}.coffee"
-                template "spec/client/models/ModelSpec.coffee",
-                         "#{spec_dir}/models/#{class_name}Spec.coffee"
+                template "client/models/model.js",
+                         "#{client_dir}/models/#{file_name}.js"
+                template "spec/client/models/model.spec.js",
+                         "#{spec_dir}/models/#{file_name}.spec.js"
             end
 
             def add_route

data/lib/lanes/command/jest.rb

@@ -1,49 +1,34 @@
-require 'guard/cli'
-require 'webpack_driver'
-require 'puma/cli'
-require 'guard/jest'
-
+require_relative './client_config'
 require_relative '../extension'
 require_relative '../command'
-require 'irb'
+
 module Lanes
     module Command
 
         class Jest < Thor::Group
             include Thor::Actions
-            ROOT = Pathname.new(__FILE__).dirname.join("..", "..", "..")
-            def self.source_root
-                ROOT.join("templates")
-            end
 
-            class_option :config_dir
-            attr_accessor :lanes_root_path
-            attr_accessor :extension_path
-            attr_accessor :config_file
-            attr_accessor :module_paths
+            attr_reader :config
 
-            def apply_lanes_config
-                Lanes::Configuration.apply
-                Lanes::Extensions.load_controlling_config
-            end
+            class_option :watch, :type => :boolean, default: false,
+                         desc: "Whether to keep running and watch for file changes"
 
             def configure
-                say 'Generating Jest Config', :green
-                ext = Command.load_current_extension(raise_on_fail: true)
-                self.extension_path = ext.root_path
-                self.lanes_root_path = ROOT
-                config_dir = Pathname.new(Dir.mktmpdir)
-                self.config_file = config_dir.join("jest.config.json")
-                self.module_paths = Extensions.asset_paths(ext, config_dir.to_s)
-                template('js/jest.config.json', config_file, verbose: false, force: true)
+                @config = ClientConfig.new
+                @config.invoke_all
                 self
             end
 
+            def config_file
+                config.directory.join('jest.config.json')
+            end
+
             def start
                 say 'Starting Jest', :green
                 say Dir.pwd, :yellow
-                puts "$(npm bin)/jest --watch --config #{config_file};"
-                exec("$(npm bin)/jest --watch --config #{config_file};")
+                cmd = "$(npm bin)/jest --config #{config_file}"
+                cmd << "  --watch" if options[:watch]
+                exec(cmd)
             end
         end
     end

data/lib/lanes/command/model_attribute.rb

@@ -13,7 +13,8 @@ module Lanes
       attr_writer   :index_name
 
       class << self
-        def parse(column_definition)
+          def parse(column_definition)
+
           name, type, has_index = column_definition.split(':')
 
           # if user provided "name:index" instead of "name:string:index"
@@ -65,6 +66,10 @@ module Lanes
         @attr_options   = attr_options
       end
 
+      def decorator
+          name == 'id' ? 'identifier' : 'field'
+      end
+
       def field_type
         @field_type ||= case type
           when :integer              then :number_field

data/lib/lanes/command/named_command.rb

@@ -19,6 +19,7 @@ module Lanes
 
             def set_variables
                 @class_name = name.underscore.camelize
+                @spec_dir   = "spec/#{identifier}"
                 @client_dir = "client/#{identifier}"
             end
 

data/lib/lanes/command/puma.rb

@@ -0,0 +1,56 @@
+require_relative '../extension'
+require_relative '../command'
+
+require 'irb'
+
+module Lanes
+    module Command
+
+        class Puma < Thor::Group
+            include Thor::Actions
+
+            class_option :wait, :type => :boolean, default: true,
+                         desc: "Whether to keep running and wait for exit"
+
+            def start
+                say "Starting Puma", :green
+                @proc = ::ChildProcess.build('puma')
+                @output, w = IO.pipe
+                @proc.io.stdout = @proc.io.stderr = w
+                @proc.start
+                w.close
+                @listener = listen_for_status_updates
+                sleep 1
+                unless @proc.alive?
+                    raise "NOT LIVING"
+                    puts @output.read
+                end
+                self
+            end
+
+            def maybe_wait
+                @proc.wait if options[:wait]
+            end
+
+            def stop
+                say "Stopping Puma", :green
+                @listener.kill
+                @proc.stop
+                @prop = nil
+            end
+
+            private
+
+
+            def listen_for_status_updates
+                Thread.new do
+                    @output.each_line do | l |
+                        Lanes.logger.info(l.chomp)
+                    end
+                end
+            end
+
+
+        end
+    end
+end

data/lib/lanes/command/server.rb

@@ -1,6 +1,5 @@
 require 'guard/cli'
-require_relative '../webpack'
-
+require_relative '../guard_tasks'
 module Lanes
     module Command
 
@@ -11,27 +10,31 @@ module Lanes
                 say "Launching testing server at http://localhost:8888/", :green
                 require 'lanes/api'
                 Lanes::Configuration.apply
-                API.webpack = Lanes::Webpack.new
-                threads = []
-                Thread.abort_on_exception = true
-                threads << Thread.new { API::Root.run! }
-                threads << Thread.new do
-                    sleep 1 until API::Root.running?
-                    trap("INT") do
-                        Lanes.logger.warn("trapped in subthread")
-                        API.webpack.stop!
-                        exit
-                    end
-                    Lanes.logger.info "ok, ctrl-c trap registered"
-                end
-                API.webpack.start
+
+                config = ClientConfig.new
+                config.invoke_all
+
+                API.webpack = Lanes::Command::Webpack.new([], wait: false)
+                API.webpack.config = config
+
+                API.webpack.invoke_all# startup
+
+                ::Lanes::GuardTasks.client_config = config
+
+                # threads = []
+                # Thread.abort_on_exception = true
+                # threads << Thread.new { API::Root.run! }
+                # threads << Thread.new do
+                #     sleep 1 until API::Root.running?
+                #     Lanes.logger.info "ok, ctrl-c trap registered"
+                # end
                 sleep(1) # give webpack a bit of time to fail if it's going to
-                unless API.webpack.alive?
+                unless API.webpack.process.alive?
                     puts API.webpack.messages
                     exit 1
                 end
                 Guard.start # will block until complete
-                API.webpack.stop # stop webpack after guard completes
+                API.webpack.process.stop # stop webpack after guard completes
             end
         end
     end