lanes 0.4.0 → 0.5.0

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

@@ -561,6 +561,7 @@ ul.rw-list.rw-list-grouped > li.rw-list-option,
   cursor: not-allowed;
 }
 .rw-calendar-grid {
+  outline: none;
   height: 14.28571429em;
   table-layout: fixed;
   width: 100%;
@@ -602,6 +603,7 @@ ul.rw-list.rw-list-grouped > li.rw-list-option,
   position: relative;
   min-height: 27px;
   cursor: auto;
+  outline: none;
   padding-left: 5px;
 }
 .rw-selectlist > ul > li.rw-list-option > label > input {

data/client/lanes/workspace/FirstRun.cjsx

@@ -0,0 +1,69 @@
+class Lanes.Workspace.FirstRun extends Lanes.React.Screen
+
+    openSS: ->
+        Lanes.Screens.Definitions.all.get('system-settings').display()
+
+    openUP: ->
+        Lanes.Screens.Definitions.all.get('user-preferences').display()
+
+    openUser: ->
+        Lanes.Screens.Definitions.all.get('user-management').display()
+
+    render: ->
+        title = Lanes.Extensions.controlling().title()
+
+        <LC.ScreenWrapper identifier="first-run">
+
+            <BS.Row>
+                <BS.Col xs=10 xsOffset=1>
+                    <BS.PageHeader>
+                        Welcome to {title}
+                    </BS.PageHeader>
+                </BS.Col>
+            </BS.Row>
+            <BS.Row>
+                <BS.Col xs=8 xsOffset=1>
+                    <p className="lead">
+                        A few tips & tricks:
+                    </p>
+                </BS.Col>
+            </BS.Row>
+            <BS.Row>
+                <BS.Col xs=8 xsOffset=2>
+                    <ul>
+                        <li>
+                            {title} is composed of individual screens.  Each screen can be opened from the menu at the left.
+                            When opened, each screen opens into a new tab in this window.
+                        </li>
+                        <li>
+                            Many screens are dual-purpose and support both edit and display modes.
+                            They can be switched between the modes by clicking
+                            the <Lanes.Vendor.ReactToggle defaultChecked={true} /> control
+                            at the top right of the screen.
+                        </li>
+                        <li>
+                            You can setup the system by
+                            selecting <LC.Icon type="cogs" /> <a onClick={@openSS}>System Settings</a>
+                            from the menu option with
+                            the <LC.Icon type="wrench" lg /> icon.
+                        </li>
+                        <li>
+                            There’s also <LC.Icon type="user-secret" /> <a onClick={@openUP}>User Preferences</a> where
+                            you can set which screens are displayed when {title} loads.
+                        </li>
+                        <li>
+                            User accounts can be setup from
+                            the <LC.Icon type='group' /> <a onClick={@openUser}>User Management</a> screen.
+                        </li>
+                    </ul>
+                </BS.Col>
+            </BS.Row>
+            <BS.Row className="help">
+                <BS.Col xs=7 xsOffset=4>
+                    <p>Have a suggestion on improving {title}?</p>
+                    <p><a href="https://argosity.com/" target="_blank">Argosity</a> would
+                    love to hear it and help you.</p>
+                </BS.Col>
+            </BS.Row>
+
+        </LC.ScreenWrapper>

data/client/lanes/workspace/Navbar.cjsx

@@ -19,9 +19,11 @@ class Lanes.Workspace.Navbar extends Lanes.React.Component
 
     Logo: ->
         if @settings.logo?.url
-            <img src={@settings.logo.thumb.url} />
+            <img src={@settings.logo.thumbnail_url} />
         else
-            <span>Lanes</span>
+            <span>
+                {Lanes.Extensions.controlling().title()}
+            </span>
 
     render: ->
 

data/client/lanes/workspace/ScreenView.cjsx

@@ -27,8 +27,16 @@ class Lanes.Workspace.ScreenView extends Lanes.React.Component
         screen = Lanes.Screens.Definitions.all.findWhere(loading: true)
         <LC.NetworkActivityOverlay visible model={screen} message="Loading #{screen.title}…" />
 
+    BaseView: ->
+        Base = Lanes.Extensions.controlling().initialScreen?() or Lanes.Workspace.FirstRun
+        <div className="screen active base">
+            <Base />
+        </div>
+
     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()}
-            {@displaying.map @renderScreen}
+            {child}
         </div>

data/client/lanes/workspace/index.js

@@ -6,3 +6,4 @@
 //=require ./ScreenView
 //=require ./Navbar
 //=require ./Layout
+//=require ./FirstRun

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

@@ -1,4 +1,15 @@
 .screen {
     padding: 5px;
     width: 100%;
+
+    > .first-run {
+        font-size: 1.3rem;
+        li + li {
+            margin-top: 1rem;
+        }
+        .help {
+            margin-top: 2rem;
+            p { text-align: right; }
+        }
+    }
 }

data/config/database.yml

@@ -1,9 +1,9 @@
 development:
   adapter: postgresql
-  database: skr_dev
+  database: lanes_dev
   host: /tmp
 
 test:
   adapter: postgresql
-  database: skr_dev
+  database: lanes_dev
   host: /tmp

data/db/migrate/01_create_system_settings.rb

@@ -2,7 +2,6 @@ class CreateSystemSettings < ActiveRecord::Migration
     def change
 
         create_table "system_settings" do |t|
-            t.string "logo"
             t.jsonb  "settings", null: false, default: {}
         end
 

data/db/migrate/02_create_assets.rb

@@ -0,0 +1,15 @@
+class CreateAssets < ActiveRecord::Migration
+    def change
+
+        create_table "assets" do |t|
+            t.string     :file, null: false
+
+            t.references :owner, polymorphic: true, null: false
+            t.integer    :order
+            t.jsonb      :metadata, null: false, default: {}
+        end
+
+        add_index :assets, [:owner_id, :owner_type]
+
+    end
+end

data/lanes.gemspec

@@ -24,45 +24,42 @@ Gem::Specification.new do |spec|
 
     spec.required_ruby_version = ">= 2.0"
 
-    spec.add_dependency "activerecord",           "~> 4.2"
     spec.add_dependency "activejob",              "~> 4.2"
-    spec.add_dependency "jobba",                  "~> 1.4"
-
-    spec.add_dependency "resque",                 "~> 1.25"
-    spec.add_dependency "pg",                     "~> 0.17"
-    spec.add_dependency "sinatra",                "~> 1.4"
+    spec.add_dependency "activerecord",           "~> 4.2"
     spec.add_dependency "bcrypt",                 "~> 3.1"
-    spec.add_dependency "oj",                     "~> 2.1"
-    spec.add_dependency "message_bus",            "2.0.0.beta.6"
-    spec.add_dependency "rack-protection",        "~> 1.5"
-    spec.add_dependency "sprockets",              "~> 3.0"
-    spec.add_dependency "coffee-script",          "~> 2.3"
-    spec.add_dependency "coffee-react",           "~> 3.0"
-    spec.add_dependency "execjs",                 "~> 2.2"
-    spec.add_dependency "thor",                   "~> 0.19"
-    spec.add_dependency "sass",                   "~> 3.4"
-    spec.add_dependency "sprockets-helpers",      "~> 1.2"
+    spec.add_dependency "carrierwave",            "~> 0.10.0"
+    spec.add_dependency "coffee-react",           "~> 4.0"
+    spec.add_dependency "coffee-script",          "~> 2.4"
     spec.add_dependency "compass-import-once",    "~> 1.0"
-    spec.add_dependency "guard",                  "~> 2.0"
+    spec.add_dependency "execjs",                 "~> 2.6"
+    spec.add_dependency "fastimage",              "~> 1.8.1"
+    spec.add_dependency "guard",                  "~> 2.13"
+    spec.add_dependency "guard-jasmine",          "~> 2.0"
+    spec.add_dependency "guard-minitest",         "~> 2.3"
     spec.add_dependency "hashie",                 "~> 3.3"
-    spec.add_dependency "rack-test",              "~> 0.6"
+    spec.add_dependency "jasmine-core",           "~> 2.0"
+    spec.add_dependency "jobba",                  "~> 1.4"
+    spec.add_dependency "message_bus",            "2.0.0.beta.6"
+    spec.add_dependency "mini_magick",            "~> 4.3.6"
     spec.add_dependency "minitest-around",        "~> 0.2"
     spec.add_dependency "mocha",                  "~> 1.1"
-    spec.add_dependency "guard-minitest",         "~> 2.3"
-
-    spec.add_dependency "uglifier",               "~> 2.7"
-    spec.add_dependency "guard-jasmine",          "~> 2.0"
+    spec.add_dependency "oj",                     "~> 2.1"
+    spec.add_dependency "pg",                     "~> 0.8"
+    spec.add_dependency "rack-protection",        "~> 1.5"
+    spec.add_dependency "rack-test",              "~> 0.6"
     spec.add_dependency "rake",                   "~> 10.0"
-    spec.add_dependency "jasmine-core",           "~> 2.0"
     spec.add_dependency "require_all",            "~> 1.3"
+    spec.add_dependency "resque",                 "~> 1.25"
     spec.add_dependency "sanitize",               "~> 3.0"
-    spec.add_dependency "carrierwave",            "~> 0.10.0"
-    spec.add_dependency "fog",                    "~> 1.37.0"
-    spec.add_dependency "mini_magick",            "~> 4.3.6"
-    spec.add_dependency "fastimage",              "~> 1.8.1"
+    spec.add_dependency "sass",                   "~> 3.4"
+    spec.add_dependency "sinatra",                "~> 1.4"
+    spec.add_dependency "sprockets",              "~> 3.6"
+    spec.add_dependency "sprockets-helpers",      "~> 1.2"
+    spec.add_dependency "thor",                   "~> 0.19"
+    spec.add_dependency "uglifier",               "~> 2.7"
 
     spec.add_development_dependency "bundler",    "~> 1.5"
-    spec.add_development_dependency "growl",      "~> 1.0"
     spec.add_development_dependency "diffy",      "~> 3.0"
+    spec.add_development_dependency "growl",      "~> 1.0"
 
 end

data/lib/lanes/access/authentication_provider.rb

@@ -13,7 +13,6 @@ module Lanes
                     if Lanes.env.test? && request.env['HTTP_X_TESTING_USER'].present?
                         Lanes::User.where(login: request.env['HTTP_X_TESTING_USER']).first
                     else
-                        return Lanes::User.first
                         Lanes::User.where(id: request.session['user_id']).first
                     end
                 )
@@ -47,19 +46,33 @@ module Lanes
                 end
             end
 
-            def wrap_reply(model, req)
+            def wrap_request(req)
+                if current_user
+                    ::Lanes::User.scoped_to(current_user) do | user |
+                        yield
+                    end
+                else
+                    fail_request(req)
+                end
+            end
+
+            def wrap_model_access(model, req)
                 if allowed_access_to?(model)
                     ::Lanes::User.scoped_to(current_user) do | user |
                         yield
                     end
                 else
-                    Lanes.logger.warn request.env['HTTP_X_TESTING_USER']
-                    Lanes.logger.warn "Unauthorized access attempted to #{req.url}"
-                    req.halt( 401, Oj.dump({
-                      success:false, errors: {user: "Access Denied"}, message: "Access Denied"
-                    }))
+                    fail_request(req)
                 end
             end
+
+            def fail_request(req)
+                Lanes.logger.warn request.env['HTTP_X_TESTING_USER']
+                Lanes.logger.warn "Unauthorized access attempted to #{req.url}"
+                req.halt( 401, Oj.dump({
+                    success:false, errors: {user: "Access Denied"}, message: "Access Denied"
+                }))
+            end
         end
 
     end

data/lib/lanes/access/role_collection.rb

@@ -5,13 +5,20 @@ module Lanes
             include Enumerable
 
             def initialize(user)
-                @roles ||= user.role_names.map{ |name|
+                @role_names = user.role_names
+                @roles = user.role_names.map{ |name|
                     "Lanes::Access::Roles::#{name.classify}".safe_constantize
                 }.compact.map{ |klass| klass.new(user) }
             end
 
             def exposed_data
-                @roles.map{ |role| role.class.to_s.demodulize.downcase }
+                @role_names
+            end
+
+            # @param role [String]
+            # @return [Boolean] Does a role with the given id exist?
+            def include?(role)
+                @role_names.include?(role)
             end
 
             # @param model [Lanes::Model]

data/lib/lanes/api/default_routes.rb

@@ -4,11 +4,11 @@ module Lanes
         put Lanes.config.api_path + '/system-settings.json',
             &SystemSettings.update_handler
 
-        post Lanes.config.api_path + '/save-file-attribute',
-             &API::Handlers::File.saver
+        post Lanes.config.api_path + '/asset',
+             &API::Handlers::Asset.saver
 
-        get Lanes.config.api_path + '/file/*',
-            &API::Handlers::File.getter
+        get Lanes.config.api_path + '/asset/*',
+            &API::Handlers::Asset.getter
 
         Extensions.each(reversed: true) do | ext |
             ext.route(self)

data/lib/lanes/api/formatted_reply.rb

@@ -6,25 +6,29 @@ module Lanes
             # populates them appropriately
 
             def std_api_reply(type, data, options)
-                success = options[:success].nil? ? true : options[:success]
-                json = {}
-                if data.is_a?(ActiveRecord::Base) && data.errors.any?
-                    json[:errors] = {}
-                    success = false
-                    data.errors.each{ | attr, message |
-                        json[:errors][attr] = message
-                    }
+                json = { success: options[:success].nil? ? true : options[:success] }
+                if data.is_a?(ActiveRecord::Base)
+                    record_active_record_errors(data, json)
                 end
                 if options[:total_count]
                     json[:total] = options.delete(:total_count)
                 end
                 json.merge(
-                  success: success,
-                  message: options[:messsage] || json_status_str(data, type.to_s.capitalize, success),
-                  data:    success ? records_for_reply(data, type, options) : []
+                  message: options[:messsage] || json_status_str(data, type.to_s.capitalize, json[:success]),
+                  data:    json[:success] ? records_for_reply(data, type, options) : []
                 )
             end
 
+            def record_active_record_errors(model, json = {})
+                return if model.errors.none?
+                json[:success] = false
+                json[:errors] = {}
+                model.errors.each{ | attr, message |
+                    json[:errors][attr] = message
+                }
+                json
+            end
+
             # @return Array<Array> returns either an array of fields
             def records_for_reply(data, type, options)
                 return [] if :destroy == type

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

@@ -0,0 +1,37 @@
+module Lanes::API::Handlers
+
+    class Asset
+
+        def self.saver
+            lambda do
+                Lanes.logger.debug "Saving File. Root=#{CarrierWave.root}"
+
+                path = "#{params['extension_id']}/#{params['owner_type']}"
+                model = path.underscore.camelize.constantize
+
+                authentication = Lanes::API::AuthenticationProvider.new(request)
+                authentication.wrap_model_access(model, self) do
+                    owner = model.find(params['owner_id'])
+                    asset = if params['id']
+                                ::Lanes::Asset.find(params['id'])
+                            else
+                                owner.send("build_#{params['owner_association']}")
+                            end
+                    asset.store_uploaded_file(params['file'])
+
+                    json_reply std_api_reply asset.new_record? ? :update : :create,
+                                             asset,
+                                             success: asset.save
+                end
+            end
+        end
+
+        def self.getter
+            lambda do
+                # files are stored using a random string, therefore we assume that anyone who
+                # knows the filename has access and don't empose any further restrictions
+                send_file CarrierWave::Uploader::Base.root.call + '/' + params['splat'].first
+            end
+        end
+    end
+end

data/lib/lanes/api/request_wrapper.rb

@@ -28,20 +28,34 @@ module Lanes
                     end
                 end
 
-                def make_handler(model, controller, parent_attribute)
+                def make_handler(model, controller, parent_attribute = nil)
                     lambda do
                         authentication = Lanes::API::AuthenticationProvider.new(request)
-                        authentication.wrap_reply(model, self) do
+                        authentication.wrap_model_access(model, self) do
                             if parent_attribute
                               params[:nested_attribute] = Hash[ parent_attribute,
                                                                params[parent_attribute] ]
                             end
-                            wrap_reply(!request.get?) do
+                            wrap_reply(with_transaction: !request.get?) do
                                 yield controller.new(model, authentication, params, data)
                             end
                         end
                     end
                 end
+
+                def with_authenticated_user(role:nil, with_transaction:true)
+                    lambda do
+                        authentication = Lanes::API::AuthenticationProvider.new(request)
+                        user = authentication.current_user
+                        if user and ( role.nil? or user.roles.include?(role) )
+                            wrap_reply(with_transaction: with_transaction) do
+                                yield authentication.current_user, self
+                            end
+                        else
+                            authentication.fail_request(self)
+                        end
+                    end
+                end
             end
 
             def log_request
@@ -49,7 +63,7 @@ module Lanes
                 Lanes.logger.debug JSON.pretty_generate(data) unless Lanes.env.production? or data.nil?
             end
 
-            def wrap_reply(with_transaction=true)
+            def wrap_reply(with_transaction:true)
                 response = { success: false, message: "No response was generated" }
                 log_request
                 if with_transaction

data/lib/lanes/api/routing.rb

@@ -32,20 +32,31 @@ module Lanes
                 prefix = parent_attribute ? parent_attribute + '/' : ''
 
                 # index
-                get "#{prefix}#{path}/?:id?.json", &RequestWrapper.get(model, controller, parent_attribute)
+                if controller.method_defined?(:perform_retrieval)
+                    get "#{prefix}#{path}/?:id?.json",
+                        &RequestWrapper.get(model, controller, parent_attribute)
+                end
 
                 # create
-                post "#{prefix}#{path}.json", &RequestWrapper.post(model, controller, parent_attribute)
+                if controller.method_defined?(:perform_creation)
+                    post "#{prefix}#{path}.json",
+                         &RequestWrapper.post(model, controller, parent_attribute)
+                end
 
                 unless options[:immutable]
 
                     # update
-                    patch "#{prefix}#{path}/?:id?.json", &RequestWrapper.update(model, controller, parent_attribute)
-                    put   "#{prefix}#{path}/?:id?.json", &RequestWrapper.update(model, controller, parent_attribute)
+                    if controller.method_defined?(:perform_update)
+                        patch "#{prefix}#{path}/?:id?.json",
+                              &RequestWrapper.update(model, controller, parent_attribute)
+                        put   "#{prefix}#{path}/?:id?.json",
+                              &RequestWrapper.update(model, controller, parent_attribute)
+                    end
 
-                    unless options[:indestructible]
+                    if controller.method_defined?(:perform_destroy) and not options[:indestructible]
                         # destroy
-                        delete "#{prefix}#{path}/?:id?.json", &RequestWrapper.delete(model, controller, parent_attribute)
+                        delete "#{prefix}#{path}/?:id?.json",
+                               &RequestWrapper.delete(model, controller, parent_attribute)
                     end
 
                 end

data/lib/lanes/api/updates.rb

@@ -24,7 +24,7 @@ module Lanes
                         Lanes::API::PubSub.publish(path, {
                             by: self.user_info_for_change(model),
                             update: model.changes
-                          })
+                        })
                     end
                 end
 

data/lib/lanes/api.rb

@@ -9,5 +9,5 @@ Lanes.config.get(:environment) do
     require_relative("api/test_specs") unless Lanes.env.production?
 end
 
-require_relative "api/handlers/file.rb"
+require_relative "api/handlers/asset.rb"
 require_relative 'api/default_routes'

data/lib/lanes/asset.rb

@@ -0,0 +1,38 @@
+module Lanes
+
+    class Asset < Lanes::Model
+
+        mount_uploader :file, Lanes::Concerns::AssetUploader
+
+        belongs_to :owner, polymorphic: true
+
+        validates :owner,  set: true
+
+        after_update :remove_changed_file, if: lambda{ file_changed? }
+
+        def serializable_hash(options = nil)
+            values = super
+            values.delete('file')
+            values.merge!(file.as_json[:file].stringify_keys)
+            values['original'] = { 'url' => values.delete('url') }
+            values
+        end
+
+        def store_uploaded_file(f)
+            ext = File.extname(f[:filename])
+            if ext.blank?
+                ext = '.' + FastImage.type(f[:tempfile]).to_s
+            end
+            self[:file] = ::Lanes::Strings.random + ext
+            file.store!(f)
+        end
+
+        protected
+
+        def remove_changed_file
+            self.file_was.remove!
+        end
+
+    end
+
+end

data/lib/lanes/concerns/all.rb

@@ -10,5 +10,5 @@ require_relative "pub_sub"
 require_relative "code_identifier"
 require_relative "queries"
 require_relative "sanitize_fields"
-require_relative "image_uploader.rb"
 require_relative "sorting_expressions"
+require_relative "asset_uploader"

data/lib/lanes/concerns/asset_uploader.rb

@@ -0,0 +1,60 @@
+require 'mini_magick'
+require 'carrierwave'
+require 'fastimage'
+
+module Lanes::Concerns
+
+    class AssetUploader < CarrierWave::Uploader::Base
+
+        include CarrierWave::MiniMagick
+
+        process :store_attributes
+
+        version :medium,  :if => :image? do
+            process :resize_to_fit => [800, 800]
+        end
+
+        version :thumbnail,  :if => :image? do
+            process :resize_to_fit => [200,200]
+        end
+
+        def cache_dir
+            '/tmp'
+        end
+
+        def filename
+            if original_filename && model && model.read_attribute(mounted_as).present?
+                model.read_attribute(mounted_as)
+            end
+        end
+
+        def store_dir
+            token = secure_token
+            "#{token[0, 2]}/#{token[2, 2]}"
+        end
+
+        protected
+
+        def store_attributes
+            if file && model
+                model.metadata['size'] = file.size
+                model.metadata['content_type'] = file.content_type
+                if image?(file)
+                    img = ::MiniMagick::Image.open(file.file)
+                    model.metadata['width'] = img.width
+                    model.metadata['height'] = img.height
+                end
+            end
+        end
+
+        def image?(new_file)
+            new_file.content_type.include? 'image'
+        end
+
+        def secure_token
+            model[mounted_as] ||= ::Lanes::Strings.random
+        end
+
+    end
+
+end

data/lib/lanes/configuration.rb

@@ -4,7 +4,6 @@ require 'pathname'
 require 'carrierwave'
 require 'active_job'
 require 'jobba'
-require 'fog'
 require 'message_bus'
 
 module Lanes
@@ -106,7 +105,7 @@ module Lanes
 
         # Storage engine to use, default to file, may also be set to
         # 'fog' or any other value that CarrierWave accepts
-        config_option :storage_type, 'file'
+        config_option :storage_type, :file
 
         def api_path
             mounted_at + 'api'