lanes 0.6.1 → 0.7.0

data/lib/lanes/api/routing.rb

@@ -1,6 +1,16 @@
 module Lanes
     module API
 
+        def self.set_root_view(view)
+            API::Root.get Lanes.config.mounted_at + '?*' do
+                if request.accept? 'text/html'
+                    erb :lanes_root_view
+                else
+                    pass
+                end
+            end
+        end
+
         class RoutingBlock
             def initialize(ext_id)
                 Lanes::Extensions.for_identifier(ext_id) ||
@@ -8,13 +18,6 @@ module Lanes
                 @ext_id = ext_id
             end
 
-            def root_view( view )
-                API::Root.get Lanes.config.mounted_at + '?*' do
-                    pass unless request.accept? 'text/html'
-                    erb view
-                end
-            end
-
             [:get, :post, :put, :patch, :delete].each do | method_name |
                 define_method(method_name) do | path_suffix, options = {}, &block |
                     API::Root.send(method_name, make_path(path_suffix), options, &block)

data/lib/lanes/api/to_json.rb

@@ -0,0 +1,7 @@
+require 'oj'
+
+module Lanes::API
+    def self.to_json(data)
+        Oj.dump(data, mode: :compat, time_format: :xmlschema)
+    end
+end

data/lib/lanes/asset.rb

@@ -6,8 +6,11 @@ module Lanes
 
         belongs_to :owner, polymorphic: true
 
-        validates :owner,  set: true
+        validates :owner_id, :owner_type, presence: true
 
+        def present?
+            super && file.present?
+        end
     end
 
 end

data/lib/lanes/concerns/set_attribute_data.rb

@@ -2,6 +2,7 @@ module Lanes::Concerns
 
     module ApiAttributeAccess
 
+        DEFAULT_BLACKLISTED = {}
 
         extend ActiveSupport::Concern
 
@@ -42,7 +43,7 @@ module Lanes::Concerns
             # @param attributes [Array of symbols] attributes that are not safe for the API to set
             def blacklist_attributes( *attributes )
                 options = attributes.extract_options!
-                self.blacklisted_attributes ||= {}
+                self.blacklisted_attributes ||= DEFAULT_BLACKLISTED.clone
                 attributes.each{|attr| self.blacklisted_attributes[ attr.to_sym ] = options }
             end
 

data/lib/lanes/extension.rb

@@ -97,7 +97,9 @@ module Lanes
                   root_view:  Lanes.config.root_view,
                   csrf_token: view.session[:csrf],
                   environment: Lanes.config.environment,
-                  system_settings: Lanes::SystemSettings.config.as_json(include: 'logo'),
+                  system_settings: Lanes::SystemSettings.config.as_json(
+                      include: ['logo', 'print_logo']
+                  ),
                   assets_path_prefix: Lanes.config.assets_path_prefix,
                   controlling_extension: controlling.identifier,
                   initial_workspace_screen_id: Lanes.config.initial_workspace_screen_id

data/lib/lanes/mailer.rb

@@ -0,0 +1,40 @@
+require 'mail'
+module Lanes
+
+    module Mailer
+        @@configured = false
+
+        def self.set_defaults(settings = SystemSettings.for_ext(:lanes))
+            smtp = settings['smtp'] || {}
+            method = Lanes.env.production? ? :smtp : :test
+            Mail.defaults do
+                delivery_method(method, {
+                                    user_name: smtp['login'],
+                                    password:  smtp['password'],
+                                    address:   smtp['server']
+                                })
+
+            end
+            @@configured = true
+        end
+
+        Lanes::SystemSettings.on_change(:lanes, call_now: true) do |settings|
+            self.set_defaults(settings)
+        end
+
+        def self.create(args = {}, &block)
+            args[:from] = SystemSettings.for_ext(:lanes).dig('smtp', 'from')
+            set_defaults unless @@configured
+            Mail::Message.new(args, &block)
+        end
+
+        def self.deliver(args = {}, &block)
+            args[:from] = SystemSettings.for_ext(:lanes).dig('smtp', 'from')
+            set_defaults unless @@configured
+            mail = self.new(args, &block)
+            mail.deliver
+            mail
+        end
+    end
+
+end

data/lib/lanes/rake_tasks.rb

@@ -41,6 +41,10 @@ namespace :db do
     task :environment do
         Lanes::DB.configure_rake_environment
     end
+    task :load_lanes_config do
+        Lanes::DB.configure_rake_environment
+    end
+    task(:load_config).clear.enhance([:load_lanes_config])
 end
 
 namespace :assets do

data/lib/lanes/spec_helper.rb

@@ -74,13 +74,21 @@ module Lanes
             json_body['data']
         end
 
-        [ :get, :put, :post, :delete, :patch].each do |name|
+        [ :delete, :get ].each do |name|
+            define_method(name) do |uri, params = {}, env = {}, &block|
+                session = env['rack.session'] ||= {}
+                session[:user_id] = @current_user.id if @current_user
+                params.stringify_keys!
+                super(uri, params, env, &block)
+            end
+        end
+
+        [ :put, :post, :patch].each do |name|
             define_method(name) do |uri, params = {}, env = {}, &block|
                 session = env['rack.session'] ||= {}
-                env[Rack::Csrf.rackified_header] = Rack::Csrf.token(env)
                 session[:user_id] = @current_user.id if @current_user
                 params = Oj.dump(params, mode: :compat) if params.is_a?(Hash)
-                super(uri,params,env,&block)
+                super(uri, params, env, &block)
             end
         end
 

data/lib/lanes/system_settings.rb

@@ -2,7 +2,13 @@ module Lanes
 
     class SystemSettings < Lanes::Model
 
-        has_one :logo, as: :owner, :class_name=>'Lanes::Asset', :dependent => :destroy
+        has_one :logo, as: :owner, class_name: 'Lanes::Asset',
+                dependent: :destroy
+
+        has_one :print_logo,  -> { where owner_type: "SecondaryPhoto"},
+                class_name: 'Lanes::Asset', foreign_key: :owner_id,
+                foreign_type: :owner_type,
+                dependent: :destroy
 
         class ExtensionSettings < OpenStruct
             def initialize(ext_id, settings)
@@ -35,7 +41,7 @@ module Lanes
             end
 
             def for_ext(extension_id)
-                ExtensionSettings.new(extension_id, config.settings[extension_id])
+                ExtensionSettings.new(extension_id, config.settings[extension_id.to_s])
             end
 
             def persist!(extension_id, update)
@@ -60,17 +66,24 @@ module Lanes
                 Lanes.logger.debug "SystemSettings cache reset"
                 Lanes::SystemSettings.instance_variable_set(:@config, nil)
             end
-        end
 
-        Thread.new do
-            Lanes.redis_connection(cache:false).subscribe(
-                'lanes-system-configuration-update') do |on|
-                on.message do |channel, msg|
-                    ActiveRecord::Base.connection_pool.with_connection do
-                        Lanes::SystemSettings.clear_cache!(msg)
+            def on_change(extension_id, call_now: false, &block)
+                Thread.new do
+                    Lanes.redis_connection(cache:false).subscribe(
+                        'lanes-system-configuration-update') do |on|
+                        on.message do |channel, msg|
+                            ActiveRecord::Base.connection_pool.with_connection do
+                                yield SystemSettings.for_ext(extension_id)
+                            end
+                        end
                     end
                 end
             end
+
+        end
+
+        SystemSettings.on_change(:lanes) do
+            Lanes::SystemSettings.clear_cache!(msg)
         end
 
     end

data/lib/lanes/version.rb

@@ -1,5 +1,5 @@
 module Lanes
 
-    VERSION = "0.6.1"
+    VERSION = "0.7.0"
 
 end

data/lib/lanes/workspace/extension.rb

@@ -23,6 +23,11 @@ module Lanes
                 []
             end
 
+            def each_static_asset
+                super{ | entry | yield entry }
+                [ 'lanes/fonts/fontawesome-webfont.woff',
+                  'lanes/fonts/fontawesome-webfont.woff2' ].each { | asset | yield asset }
+            end
         end
 
     end

data/npm-build/package.json

@@ -32,8 +32,8 @@
     "react-deep-force-update": "^2.0.1",
     "react-dom": "^15.2",
     "react-list": "^0.7.20",
-    "react-lite": "0.15.14",
-    "react-model-binding": "0.4.0",
+    "react-lite": "0.15.29",
+    "react-model-binding": "0.4.1",
     "react-proxy": "^2.0.8",
     "react-toggle": "^2.1.1",
     "react-widgets": "^3.4.3",

data/npm-build/react-toggle.js

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

data/npm-build/standalone.js

@@ -1,4 +1,7 @@
 require("./data");
 
+// Lanes.Vendor.React    = require("react");
+// Lanes.Vendor.ReactDOM = require("react-dom");
+
 Lanes.Vendor.React    = require("react-lite");
 Lanes.Vendor.ReactDOM = require("react-lite");

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.5.6'
+# gem "lanes", '0.6.1'
 
 gem "rake"
 gem 'puma'

data/spec/command-reference-files/initial/client/appy-app/Extension.coffee

@@ -14,7 +14,8 @@ class AppyApp.Extension extends Lanes.Extensions.Base
 
     # Data that is provided by AppyApp::Extension#client_bootstrap_data
     # in lib/appy-app/extension.rb is passed to this method
-    setBootstrapData: Lanes.emptyFn
+    # the Base class will simply store the provided data as @data
+    setBootstrapData: -> super
 
     # All extenensions have been given their data and Lanes has completed startup
     onAvailable: Lanes.emptyFn

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

@@ -1,4 +1,4 @@
-class CreateTestTests < ActiveRecord::Migration
+class CreateTestTests < ActiveRecord::Migration[5.0]
     def change
         create_table :test_tests do |t|
             t.string :name

data/spec/command-reference-files/screen/client/appy-app/Extension.coffee

@@ -16,7 +16,8 @@ class AppyApp.Extension extends Lanes.Extensions.Base
 
     # Data that is provided by AppyApp::Extension#client_bootstrap_data
     # in lib/appy-app/extension.rb is passed to this method
-    setBootstrapData: Lanes.emptyFn
+    # the Base class will simply store the provided data as @data
+    setBootstrapData: -> super
 
     # All extenensions have been given their data and Lanes has completed startup
     onAvailable: Lanes.emptyFn

data/spec/fixtures/system_settings.yml

@@ -1 +1,8 @@
-
+default:
+  id: 1
+  settings:
+    lanes:
+      smtp:
+        server: test.test.test
+        login: 'test'
+        password: 'test'

data/spec/server/mailer_spec.rb

@@ -0,0 +1,33 @@
+require_relative "spec_helper"
+
+describe Lanes::Mailer do
+
+    before do
+        # needed because otherwise the rollback will leave configs without a db record
+        Lanes::SystemSettings.instance_variable_set(:@config, nil)
+        settings = Lanes::SystemSettings.for_ext('lanes')
+        settings.smtp = {
+            'server' => 'foo.test.com'
+        }
+        settings.persist!
+    end
+
+    def test_it_configures_itself
+        # calling new forces a config
+        Lanes::Mailer.new
+        assert_equal 'foo.test.com',
+                     Mail::Configuration.instance.delivery_method.settings[:address]
+
+    end
+
+    def test_sending_an_email
+        Lanes::Mailer.deliver do
+            to 'test@test.com'
+            from 'you@you.com'
+            subject 'testing'
+            body 'hello'
+        end
+        assert_equal(1, Mail::TestMailer.deliveries.length)
+    end
+
+end

data/spec/server/system_settings_spec.rb

@@ -20,4 +20,20 @@ describe Lanes::SystemSettings do
         assert_equal({foo: 'bar'}, Lanes::SystemSettings.for_ext('foo').to_h)
     end
 
+    def test_logos
+        settings = Lanes::SystemSettings.new
+        Tempfile.open do |tf1|
+            tf1.write fixtures_path.join('logo.png').read
+            tf1.rewind
+            Tempfile.open do |tf2|
+                tf2.write fixtures_path.join('logo.png').read
+                tf2.rewind
+
+                settings.build_logo(file: tf1)
+                settings.build_print_logo(file: tf2)
+                assert_saves settings
+            end
+        end
+    end
+
 end

data/templates/client/Extension.coffee

@@ -14,7 +14,8 @@ class <%= namespace %>.Extension extends Lanes.Extensions.Base
 
     # Data that is provided by <%= namespace %>::Extension#client_bootstrap_data
     # in lib/<%= identifier %>/extension.rb is passed to this method
-    setBootstrapData: Lanes.emptyFn
+    # the Base class will simply store the provided data as @data
+    setBootstrapData: -> super
 
     # All extenensions have been given their data and Lanes has completed startup
     onAvailable: Lanes.emptyFn

data/templates/config/database.yml

@@ -2,7 +2,7 @@ development:
   adapter: postgresql
   database: <%= name %>_dev
   host: /tmp
-  pool:  <%= ENV["DB_POOL"] || 12 %>
+  pool:  <%%= ENV["DB_POOL"] || 12 %>
 
 test:
   adapter: postgresql

data/templates/db/create_table_migration.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lanes
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -589,8 +603,6 @@ files:
 - README.md
 - Rakefile
 - bin/lanes
-- client/fonts/fontawesome-webfont.woff
-- client/fonts/fontawesome-webfont.woff2
 - client/images/lanes/ajax-loader.gif
 - client/images/lanes/logo-sm.png
 - client/lanes/Boot.cjsx
@@ -689,11 +701,14 @@ files:
 - client/lanes/extension/LateLoaded.js.erb
 - client/lanes/extension/index.js
 - client/lanes/extension/namespace-available.js.erb
+- client/lanes/fonts/fontawesome-webfont.woff
+- client/lanes/fonts/fontawesome-webfont.woff2
 - client/lanes/index.js
 - client/lanes/index.scss.erb
 - client/lanes/lib/HotReload.coffee
 - client/lanes/lib/MakeBaseClass.coffee
 - client/lanes/lib/ModuleSupport.coffee
+- client/lanes/lib/RequestAssets.coffee
 - client/lanes/lib/ResizeSensor.js
 - client/lanes/lib/all.js
 - client/lanes/lib/development.coffee
@@ -701,7 +716,7 @@ files:
 - client/lanes/lib/el.coffee
 - client/lanes/lib/format.coffee
 - client/lanes/lib/index.js.erb
-- client/lanes/lib/loader.coffee
+- client/lanes/lib/loader.js
 - client/lanes/lib/namespace.coffee
 - client/lanes/lib/objToParam.coffee
 - client/lanes/lib/polyfills.coffee
@@ -721,6 +736,7 @@ files:
 - client/lanes/models/PubSub.coffee
 - client/lanes/models/Query.coffee
 - client/lanes/models/ServerCache.coffee
+- client/lanes/models/SmtpSettings.coffee
 - client/lanes/models/State.coffee
 - client/lanes/models/Sync.coffee
 - client/lanes/models/User.coffee
@@ -754,7 +770,9 @@ files:
 - client/lanes/react/mixins/Screen.coffee
 - client/lanes/react/mixins/Viewport.coffee
 - client/lanes/remote/BaseClasses.coffee
+- client/lanes/remote/Bootstrap.coffee
 - client/lanes/remote/api.coffee
+- client/lanes/remote/onDocumentReady.coffee
 - client/lanes/screens/ChangeListener.coffee
 - client/lanes/screens/Commands.coffee
 - client/lanes/screens/CommonComponents.cjsx
@@ -849,6 +867,7 @@ files:
 - client/lanes/styles/fonts/_mixins.scss
 - client/lanes/styles/fonts/_path.scss
 - client/lanes/styles/fonts/_rotated-flipped.scss
+- client/lanes/styles/fonts/_screen-reader.scss
 - client/lanes/styles/fonts/_stacked.scss
 - client/lanes/styles/fonts/_variables.scss
 - client/lanes/styles/fonts/font-awesome.scss
@@ -896,7 +915,6 @@ files:
 - client/lanes/workspace/Extension.coffee
 - client/lanes/workspace/FirstRun.cjsx
 - client/lanes/workspace/Layout.cjsx
-- client/lanes/workspace/Modal.cjsx
 - client/lanes/workspace/Navbar.cjsx
 - client/lanes/workspace/ScreenView.cjsx
 - client/lanes/workspace/ScreensMenu.cjsx
@@ -961,6 +979,7 @@ files:
 - lib/lanes/api/routing.rb
 - lib/lanes/api/sprockets_extension.rb
 - lib/lanes/api/test_specs.rb
+- lib/lanes/api/to_json.rb
 - lib/lanes/api/updates.rb
 - lib/lanes/asset.rb
 - lib/lanes/capistrano.rb
@@ -1015,6 +1034,7 @@ files:
 - lib/lanes/job.rb
 - lib/lanes/job/failure_logger.rb
 - lib/lanes/logger.rb
+- lib/lanes/mailer.rb
 - lib/lanes/model.rb
 - lib/lanes/numbers.rb
 - lib/lanes/rails_engine.rb
@@ -1133,6 +1153,7 @@ files:
 - spec/server/concerns/sorting_expressions_spec.rb
 - spec/server/configuration_spec.rb
 - spec/server/job_spec.rb
+- spec/server/mailer_spec.rb
 - spec/server/minitest_assertions.rb
 - spec/server/numbers_spec.rb
 - spec/server/spec_helper.rb