lanes 0.6.1 → 0.7.0

data/client/lanes/vendor/styles/toggle.scss

@@ -29,6 +29,7 @@
 }
 
 .react-toggle--disabled {
+  cursor: not-allowed;
   opacity: 0.5;
   -webkit-transition: opacity 0.25s;
   transition: opacity 0.25s;
@@ -45,7 +46,7 @@
   transition: all 0.2s ease;
 }
 
-.react-toggle:hover .react-toggle-track {
+.react-toggle:hover:not(.react-toggle--disabled) .react-toggle-track {
   background-color: #000000;
 }
 
@@ -53,7 +54,7 @@
   background-color: #19AB27;
 }
 
-.react-toggle.react-toggle--checked:hover .react-toggle-track {
+.react-toggle--checked:hover:not(.react-toggle--disabled) .react-toggle-track {
   background-color: #128D15;
 }
 
@@ -131,7 +132,7 @@
   box-shadow: 0px 0px 2px 3px #0099E0;
 }
 
-.react-toggle:active .react-toggle-thumb {
+.react-toggle:active:not(.react-toggle--disabled) .react-toggle-thumb {
   -webkit-box-shadow: 0px 0px 5px 5px #0099E0;
   -moz-box-shadow: 0px 0px 5px 5px #0099E0;
   box-shadow: 0px 0px 5px 5px #0099E0;

data/client/lanes/workspace/ScreenView.cjsx

@@ -25,7 +25,7 @@ class Lanes.Workspace.ScreenView extends Lanes.React.Component
 
     renderLoading: ->
         screen = Lanes.Screens.Definitions.all.findWhere(loading: true)
-        <LC.NetworkActivityOverlay visible model={screen} message="Loading #{screen.title}…" />
+        <LC.NetworkActivityOverlay visible message="Loading #{screen.title}…" />
 
     BaseView: ->
         Base = Lanes.Extensions.controlling().initialScreen?() or Lanes.Workspace.FirstRun
@@ -36,6 +36,6 @@ class Lanes.Workspace.ScreenView extends Lanes.React.Component
     render: ->
         child = if @displaying.isEmpty() then <@BaseView /> else @displaying.map(@renderScreen)
         <div className={"page-content #{@context.uistate.layout_size}"}>
-            {@renderLoading() if Lanes.Screens.Definitions.all.isLoading()}
+            {@renderLoading() if @allScreens.isLoading()}
             {child}
         </div>

data/client/lanes/workspace/styles/header.scss

@@ -28,10 +28,14 @@
         text-shadow: rgb(143, 112, 112) 2px 2px 4px;
         padding: 0;
         overflow: hidden;
+        display: flex;
+        align-items: center;
+        justify-content: center;
         img {
             width: 100%;
             height: 100%;
         }
+
     }
 
     .navbar-toggle, .screens-menu-toggle {

data/config/routes.rb

@@ -1,7 +1,5 @@
 Lanes::API.routes.for_extension 'lanes' do
 
-    root_view :lanes_root_view
-
     get 'job-statuses/:id.json' do
         wrap_reply do
             status = Lanes::Job.status_for_id(params[:id])

data/db/migrate/01_create_system_settings.rb

@@ -1,4 +1,4 @@
-class CreateSystemSettings < ActiveRecord::Migration
+class CreateSystemSettings < ActiveRecord::Migration[4.2]
     def change
 
         create_table "system_settings" do |t|

data/db/migrate/02_create_assets.rb

@@ -1,4 +1,4 @@
-class CreateAssets < ActiveRecord::Migration
+class CreateAssets < ActiveRecord::Migration[4.2]
     def change
 
         create_table "assets" do |t|

data/lanes.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
     spec.add_dependency "activejob",              "~> 5.0"
     spec.add_dependency "activerecord",           "~> 5.0"
     spec.add_dependency "actioncable",            "~> 5.0"
+    spec.add_dependency "mail",                   "~> 2.6"
 
     spec.add_dependency "sinatra",                "~> 2.0.0.beta2"
     spec.add_dependency "rack",                   "~> 2.0"

data/lib/lanes.rb

@@ -21,3 +21,4 @@ require_relative "lanes/extension"
 require_relative "lanes/screen"
 require_relative "lanes/job"
 require_relative "lanes/job/failure_logger"
+require_relative "lanes/mailer"

data/lib/lanes/access/track_modifications.rb

@@ -5,7 +5,10 @@ module Lanes::Concerns
     # The class_name for the created_by and updated_by is set to {Lanes::Configuration#user_model}
     module TrackModifications
         extend ActiveSupport::Concern
-
+        ApiAttributeAccess::DEFAULT_BLACKLISTED.merge(
+            created_at: nil, updated_at: nil,
+            created_by_id: nil, updated_by_id: nil
+        )
         included do
             class_attribute :record_modifications, :instance_writer=>false
             self.record_modifications = true
@@ -13,7 +16,6 @@ module Lanes::Concerns
             belongs_to :created_by, :class_name=>Lanes::User
             belongs_to :updated_by, :class_name=>Lanes::User
 
-            self.blacklist_attributes :created_at, :updated_at, :created_by_id, :updated_by_id
             before_update :record_update_modifications
             before_create :record_create_modifications
 

data/lib/lanes/api.rb

@@ -1,4 +1,5 @@
 require_relative '../lanes'
+require_relative 'api/to_json'
 require_relative 'api/request_wrapper'
 require_relative 'api/error_formatter'
 require_relative 'api/formatted_reply'

data/lib/lanes/api/cable.rb

@@ -7,6 +7,9 @@ module Lanes
             mattr_reader :server
             mattr_reader :config
 
+            def self.handle_request(request)
+                @@server.call(request.env)
+            end
 
             class Channel < ActionCable::Channel::Base
             end
@@ -15,9 +18,13 @@ module Lanes
                 identified_by :current_user
 
                 def connect
-                    reject_unauthorized_connection unless
-                        cookies['user_id'] &&
-                        self.current_user = Lanes::User.where(id: cookies['user_id']).first
+                    unless cookies['user_id'] &&
+                            self.current_user = Lanes::User
+                                                    .where(id: cookies['user_id']).first
+                        Lanes.logger.warn("Rejecting ws connection due to unauthorized access by user_id #{cookies['user_id']}")
+
+                        reject_unauthorized_connection
+                    end
                 end
 
                 protected
@@ -28,6 +35,7 @@ module Lanes
             end
 
             def self.configure
+
                 require_relative 'updates'
                 @@config = ActionCable::Server::Configuration.new
                 config.logger = Lanes.logger

data/lib/lanes/api/controller_base.rb

@@ -21,18 +21,22 @@ module Lanes
 
         class ControllerBase
 
-            attr_reader :model, :user, :params, :data
+            attr_reader :model, :params, :data
             include FormattedReply
 
             def initialize(model, authentication, params, data={})
-                @user   = authentication.current_user
                 @model  = model
                 @params = params
                 @data   = data
+                @authentication = authentication
             end
 
             protected
 
+            def current_user
+                @current_user ||= @authentication.current_user
+            end
+
             def perform_retrieval
                 query   = build_query
                 query   = add_scopes_to_query(query)
@@ -61,7 +65,7 @@ module Lanes
                 query = add_access_limits_to_query(query)
                 success = true
                 query.each do | record |
-                    if user.can_delete?(record, record.id)
+                    if current_user.can_delete?(record, record.id)
                         success = false unless record.destroy
                     end
                 end
@@ -78,8 +82,8 @@ module Lanes
                 query.each do | record |
                     record_data = data.detect{ |rd| rd['id'] == record.id }
                     next unless record_data
-                    if user.can_write?(record, record.id)
-                        record.set_attribute_data(record_data, user)
+                    if current_user.can_write?(record, record.id)
+                        record.set_attribute_data(record_data, current_user)
                         success = false unless record.save
                     end
                 end
@@ -91,7 +95,7 @@ module Lanes
                 query = build_query
                 query = add_access_limits_to_query(query)
                 record = query.first!
-                record.set_attribute_data(data, user)
+                record.set_attribute_data(data, current_user)
                 options = build_reply_options.merge(success: record.save)
                 std_api_reply(:update, record, options)
             end
@@ -135,25 +139,25 @@ module Lanes
                 options = {}
                 if include_associations.any?
                     options[:include] = include_associations.each_with_object({}) do |association, includes|
-                        includes.merge! build_allowed_associations(association, user)
+                        includes.merge! build_allowed_associations(association)
                     end
                 end
 
                 if requested_fields.any?
-                    options[:methods] = requested_fields.select{|f| model.has_exported_method?(f,user) }
+                    options[:methods] = requested_fields.select{|f| model.has_exported_method?(f, current_user) }
                 end
                 options[:format] = reply_with_array? ? 'array' : 'object'
                 options
             end
 
-            def build_allowed_associations(association, user, model_class=self.model)
+            def build_allowed_associations(association, model_class = self.model)
                 includes = {}
                 if association.is_a?(Hash)
                     association.each do |include_name, sub_associations|
-                        if model_class.has_exported_association?(include_name, user) &&
+                        if model_class.has_exported_association?(include_name, current_user) &&
                            ( reflection = model_class.reflect_on_association( include_name.to_sym ) )
                             sub_includes = includes[include_name.to_sym] = {}
-                            allowed = build_allowed_associations( sub_associations, user, reflection.klass )
+                            allowed = build_allowed_associations( sub_associations, reflection.klass )
                             unless allowed.empty?
                                 sub_includes[:include] ||= []
                                 sub_includes[:include] << allowed
@@ -162,12 +166,12 @@ module Lanes
                     end
                 elsif association.is_a?(Array)
                     association.each do | sub_association |
-                        if model_class.has_exported_association?(sub_association, user)
-                            includes.merge! build_allowed_associations( sub_association, user, model_class )
+                        if model_class.has_exported_association?(sub_association, current_user)
+                            includes.merge! build_allowed_associations( sub_association, model_class )
                         end
                     end
                 else
-                    includes[ association.to_sym ] = {} if  model_class.has_exported_association?(association,user)
+                    includes[ association.to_sym ] = {} if  model_class.has_exported_association?(association, current_user)
                 end
                 includes
             end
@@ -176,7 +180,7 @@ module Lanes
 
             def add_access_limits_to_query(query)
                 if model.respond_to?(:access_limits_for_query)
-                    query = model.access_limits_for_query(query, user, params)
+                    query = model.access_limits_for_query(query, current_user, params)
                 else
                     query
                 end
@@ -216,11 +220,11 @@ module Lanes
                         if desired.is_a?(Hash)
                             nested = {}
                             desired.each do | name, sub_associations |
-                                nested[name.to_sym] = sub_associations if model.has_exported_association?(name,user)
+                                nested[name.to_sym] = sub_associations if model.has_exported_association?(name, current_user)
                             end
                             results.push(nested) unless nested.empty?
                         else
-                            results.push(desired.to_sym) if model.has_exported_association?(desired,user)
+                            results.push(desired.to_sym) if model.has_exported_association?(desired, current_user)
                         end
                     end
                     query = query.includes(allowed_includes) unless allowed_includes.empty?
@@ -242,7 +246,7 @@ module Lanes
 
             def add_scope_to_query(query)
                 query_scopes.each do | name, arg |
-                    if model.has_exported_scope?(name,user)
+                    if model.has_exported_scope?(name, current_user)
                         args = [name]
                         args.push( arg ) unless arg.blank?
                         query = query.send( *args )
@@ -268,7 +272,7 @@ module Lanes
             def convert_field_to_arel(field)
                 if field.include?('.')
                     (table_name, field_name) = field.split('.')
-                    if model.has_exported_join_table?(table_name, user)
+                    if model.has_exported_join_table?(table_name, current_user)
                         Arel::Table.new(table_name)[field_name]
                     else
                         nil

data/lib/lanes/api/default_routes.rb

@@ -1,10 +1,14 @@
 require_relative "handlers/asset.rb"
 
+unless Lanes.env.production?
+    require_relative("test_specs")
+end
+
 module Lanes
     API.routes.draw do
         # WS endpoint must come first
         get Lanes.config.api_path + '/ws' do
-            API::Cable.server.call(env)
+            API::Cable.handle_request(request)
         end
 
         Extensions.each(reversed: true) do | ext |
@@ -24,5 +28,9 @@ module Lanes
             API::PubSub.publish("file-change", data)
             "OK"
         end
+
     end
+
+    API.set_root_view :lanes_root_view
+
 end

data/lib/lanes/api/generic_controller.rb

@@ -9,7 +9,7 @@ module Lanes
             end
 
             def create
-                record  = model.from_attribute_data(data, user)
+                record  = model.from_attribute_data(data, current_user)
                 options = build_reply_options.merge(success: record.save)
                 std_api_reply(:create, record, options)
             end

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

@@ -34,10 +34,9 @@ module Lanes::API::Handlers
         end
 
         def self.getter
-            root = Lanes::Extensions.controlling
-                       .root_path.join('public', 'files')
+            root = Lanes::Extensions.controlling.root_path.join('public', 'files')
             lambda do
--                send_file(root.join( params['splat'].first ).to_s)
+                send_file(root.join( params['splat'].first ).to_s)
             end
         end
     end

data/lib/lanes/api/helper_methods.rb

@@ -1,8 +1,6 @@
 module Lanes
     module API
-
         module HelperMethods
-
             def lanes_application_title
                 Extensions.controlling.title
             end
@@ -16,8 +14,7 @@ module Lanes
             end
 
             def client_bootstrap_data(mergedWith: {})
-                Oj.dump(Extensions.client_bootstrap_data(self)
-                           .merge(mergedWith), mode: :compat)
+                API.to_json(Extensions.client_bootstrap_data(self).merge(mergedWith))
             end
 
             def csrf_token
@@ -30,11 +27,11 @@ module Lanes
 
             def error_as_json
                 Lanes.logger.warn request.env['sinatra.error']
-                Oj.dump({
+                API.to_json(
                     success: false,
                     errors:  { exception: request.env['sinatra.error'].message },
                     message: request.env['sinatra.error'].message
-                }, mode: :compat)
+                )
             end
 
             def data
@@ -45,13 +42,10 @@ module Lanes
                 @request_origin ||= env['HTTP_ORIGIN']
             end
 
-            def json_reply( response )
+            def json_reply(response)
                 content_type 'application/json'
-                Oj.dump(response, mode: :compat)
+                API.to_json(response)
             end
-
-
         end
-
     end
 end

data/lib/lanes/api/pub_sub.rb

@@ -5,23 +5,29 @@ module Lanes
 
         class PubSub < Cable::Channel
             PREFIX = 'ps:'
+
             def on(data)
-                channel = PREFIX + data['channel']
-                stream_from channel
+                stream_from channel_prefix + data['channel']
             end
 
             def off(data)
-                channel = PREFIX + data['channel']
+                channel = channel_prefix + data['channel']
                 cb = pubsub.instance_variable_get('@listener')
                        .instance_variable_get('@subscribers')[channel].first
                 pubsub.unsubscribe(channel, cb)
             end
 
             def self.publish(channel, data)
-                ActionCable.server.broadcast(
-                    PREFIX + channel,
-                    data.merge(channel: channel)
-                )
+                channel = channel_prefix + channel
+                ActionCable.server.broadcast(channel, data.merge(channel: channel))
+            end
+
+            def self.channel_prefix
+                PREFIX
+            end
+
+            def channel_prefix
+                PREFIX
             end
 
         end

data/lib/lanes/api/request_wrapper.rb

@@ -37,7 +37,7 @@ module Lanes
                               params[:nested_attribute] = Hash[ options[:parent_attribute],
                                                                params[parent_attribute] ]
                             end
-                            wrap_reply(options.merge(with_transaction: !request.get?)) do
+                            wrap_reply(options.reverse_merge(with_transaction: !request.get?)) do
                                 yield controller.new(model, authentication, params, data)
                             end
                         end