lanes 0.5.0 → 0.5.5

data/client/lanes/workspace/Modal.cjsx

@@ -35,7 +35,7 @@ class Lanes.Workspace.Dialog extends Lanes.React.Component
 
         classes = _.classnames('layout-dialog', @props.className)
 
-        <BS.Modal.Dialog>
+        <BS.Modal.Dialog className={classes}>
             <BS.Modal.Header>
                 <BS.Modal.Title>{@props.title}</BS.Modal.Title>
             </BS.Modal.Header>

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

@@ -2,6 +2,7 @@
     @extend .navbar;
     @extend .navbar-inverse;
     @extend .navbar-fixed-top;
+    @include hidden-print;
     z-index: 20;
     height: $workspace-header-height;
     border-radius: 0;

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

@@ -7,6 +7,8 @@
 
 .page-container {
     height: calc(100% - #{$workspace-header-height});
+    @media print { height: 100%; }
+
     .screens-menu {
         width: 240px;
         z-index: 20;
@@ -21,10 +23,18 @@
     overflow-x: hidden;
     position: relative;
     top: 50px;
+    @media print { top: 0; }
     transition: all 0.15s ease-in-out 0s;
     margin-left: 240px;
+
     padding: 0 0 20px 0;
     height: 100%;
+
+    @media print {
+        margin-left: 0;
+        height: initial;
+    }
+
     .screen {
         height: 100%;
         display: none;
@@ -37,6 +47,7 @@
 
 .screens-menu {
     background-color: $navbar-inverse-bg;
+    @include hidden-print;
     .navigation {
         border-bottom: 1px solid $navbar-inverse-border;
         list-style: none outside none;
@@ -203,6 +214,7 @@
 
     .page-content {
         margin-left: 60px;
+        @media print { margin-left: 0; }
     }
 }
 

data/lanes.gemspec

@@ -45,6 +45,7 @@ Gem::Specification.new do |spec|
     spec.add_dependency "mocha",                  "~> 1.1"
     spec.add_dependency "oj",                     "~> 2.1"
     spec.add_dependency "pg",                     "~> 0.8"
+    spec.add_dependency "rack-cors",              "~> 0.4"
     spec.add_dependency "rack-protection",        "~> 1.5"
     spec.add_dependency "rack-test",              "~> 0.6"
     spec.add_dependency "rake",                   "~> 10.0"

data/lib/lanes/access/authentication_provider.rb

@@ -32,7 +32,8 @@ module Lanes
                                       end
             end
 
-            def allowed_access_to?(klass)
+            def allowed_access_to?(klass, options = {})
+                return true if options[:public] == true and current_user.nil?
                 return false if current_user.nil?
                 case request.request_method
                 when 'GET'
@@ -56,8 +57,8 @@ module Lanes
                 end
             end
 
-            def wrap_model_access(model, req)
-                if allowed_access_to?(model)
+            def wrap_model_access(model, req, options = {})
+                if allowed_access_to?(model, options)
                     ::Lanes::User.scoped_to(current_user) do | user |
                         yield
                     end

data/lib/lanes/api/coffeescript_processor.rb

@@ -60,14 +60,14 @@ module Lanes
             attr_reader :contents
 
             CONSTRUCTOR = /constructor\s*:/
-
             EXTENDING_CLASS_DEFINITION = /^\s*class\s+([\w|\.]+)\s+extends\s+([\w|\.]+)\s*?(\n|\#)/
+            REACT_CLASS_MATCH = /\.(React|Screens|Components|Views)\./
 
             def cleaned
                 @contents = data.dup
                 data.scan(EXTENDING_CLASS_DEFINITION) do |match|
                     (name, extends) = match
-                    cc = if extends =~ /\.(React|Screens|Components)\./
+                    cc = if extends =~ REACT_CLASS_MATCH
                              ReactCoffeeClass.new(name, extends, contents)
                          else
                              CoffeeClass.new(name, extends, contents)
@@ -80,7 +80,13 @@ module Lanes
 
 
             def evaluate(scope, locals, &block)
-                wrap_js scope, ::CoffeeScript.compile(cleaned, bare: true)
+                begin
+                    wrap_js scope, ::CoffeeScript.compile(cleaned, bare: true)
+                rescue => e
+                    Lanes.logger.warn e
+                    Lanes.logger.warn cleaned
+                    raise e
+                end
             end
         end
 

data/lib/lanes/api/{controller.rb → controller_base.rb}

@@ -19,7 +19,7 @@ module Lanes
         # The parameters are deliberately shortened so they can be used in
         # query parameters without blowing the URL up to an unacceptable length
 
-        class Controller
+        class ControllerBase
 
             attr_reader :model, :user, :params, :data
             include FormattedReply
@@ -31,39 +31,6 @@ module Lanes
                 @data   = data
             end
 
-            def perform_retrieval
-                query   = build_query
-                options = build_reply_options
-                query   = add_modifiers_to_query(query)
-                options[:total_count] = query.dup.unscope(:select).count if should_include_total_count?
-                if params[:id]
-                    query  = query.first!
-                end
-                std_api_reply(:retrieve, query, options)
-            end
-
-            def perform_creation
-                record  = model.from_attribute_data(data, user)
-                options = build_reply_options.merge(success: record.save)
-                std_api_reply(:create, record, options)
-            end
-
-            def perform_update
-                if params[:id]
-                    perform_single_update( build_query.first! )
-                elsif data.is_a?(Array)
-                    perform_multiple_updates
-                end
-            end
-
-            def perform_destroy
-                if params[:id]
-                    perform_single_destroy
-                elsif data.is_a?(Array)
-                    perform_multiple_destroy
-                end
-            end
-
             protected
 
             def perform_single_destroy
@@ -279,13 +246,14 @@ module Lanes
                 when 'like' then field.matches( value )
                 when 'ne'   then field.not_eq(value)
                 when 'lt'   then field.lt(value)
-                when ( op=='in' && value=~/.*:.*/ ) then field.in( Range.new( *value.split(':') ) )
+                when 'in'   then field.in( Range.new( *value ) )
                 when 'gt'   then field.gt(value)
                 else
                     value =~ /%/ ? field.matches( value ) : field.eq( value )
                 end
             end
 
+
         end
     end
 end

data/lib/lanes/api/formatted_reply.rb

@@ -5,7 +5,7 @@ module Lanes
             # constructs a Hash with success, messages, and data keys and
             # populates them appropriately
 
-            def std_api_reply(type, data, options)
+            def std_api_reply(type, data, options = {})
                 json = { success: options[:success].nil? ? true : options[:success] }
                 if data.is_a?(ActiveRecord::Base)
                     record_active_record_errors(data, json)
@@ -15,7 +15,7 @@ module Lanes
                 end
                 json.merge(
                   message: options[:messsage] || json_status_str(data, type.to_s.capitalize, json[:success]),
-                  data:    json[:success] ? records_for_reply(data, type, options) : []
+                  data: json[:success] ? records_for_reply(data, type, options) : []
                 )
             end
 

data/lib/lanes/api/generic_controller.rb

@@ -0,0 +1,42 @@
+module Lanes
+    module API
+
+
+        class GenericController < ControllerBase
+
+            def show
+                query   = build_query
+                options = build_reply_options
+                options[:total_count] = query.dup.unscope(:select).count if should_include_total_count?
+                query   = add_modifiers_to_query(query)
+                if params[:id]
+                    query  = query.first!
+                end
+                std_api_reply(:retrieve, query, options)
+            end
+
+            def create
+                record  = model.from_attribute_data(data, user)
+                options = build_reply_options.merge(success: record.save)
+                std_api_reply(:create, record, options)
+            end
+
+            def update
+                if params[:id]
+                    perform_single_update( build_query.first! )
+                elsif data.is_a?(Array)
+                    perform_multiple_updates
+                end
+            end
+
+            def destroy
+                if params[:id]
+                    perform_single_destroy
+                elsif data.is_a?(Array)
+                    perform_multiple_destroy
+                end
+            end
+
+        end
+    end
+end

data/lib/lanes/api/helper_methods.rb

@@ -33,7 +33,7 @@ module Lanes
                     success: false,
                     errors:  { exception: request.env['sinatra.error'].message },
                     message: request.env['sinatra.error'].message
-                })
+                }, mode: :compat)
             end
 
             def data

data/lib/lanes/api/null_authentication_provider.rb

@@ -27,6 +27,9 @@ module Lanes
             def wrap_reply(model, req)
                 yield
             end
+            def wrap_model_access(model, req, options)
+                yield
+            end
 
         end
     end

data/lib/lanes/api/request_wrapper.rb

@@ -6,49 +6,59 @@ module Lanes
 
                 def get(*args)
                     make_handler(*args) do |controller|
-                        controller.perform_retrieval
+                        controller.show
                     end
                 end
 
                 def post(*args)
                     make_handler(*args) do |controller|
-                        controller.perform_creation
+                        controller.create
                     end
                 end
 
                 def update(*args)
                     make_handler(*args) do |controller|
-                        controller.perform_update
+                        controller.update
                     end
                 end
 
                 def delete(*args)
                     make_handler(*args) do |controller|
-                        controller.perform_destroy
+                        controller.destroy
                     end
                 end
 
-                def make_handler(model, controller, parent_attribute = nil)
+                # @!visibility private
+                def make_handler(model, controller, options = {})
                     lambda do
                         authentication = Lanes::API::AuthenticationProvider.new(request)
-                        authentication.wrap_model_access(model, self) do
-                            if parent_attribute
-                              params[:nested_attribute] = Hash[ parent_attribute,
+                        authentication.wrap_model_access(model, self, options) do
+                            if options[:parent_attribute]
+                              params[:nested_attribute] = Hash[ options[:parent_attribute],
                                                                params[parent_attribute] ]
                             end
-                            wrap_reply(with_transaction: !request.get?) do
+                            wrap_reply(options.merge(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)
+
+                # Ensure request is performed with a logged in user. The provided block will be called
+                # with |user, request|
+                #
+                # @param [options] options for additional checks
+                # @option options [String] :role A role name that the user must have
+                # @option opts [Boolean] :with_transaction rollback DB transaction if exceptions occur
+                #
+                def with_authenticated_user(options = {with_transaction: true})
+                    role = options[:role]
                     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
+                            wrap_reply(options) do
                                 yield authentication.current_user, self
                             end
                         else
@@ -58,15 +68,14 @@ module Lanes
                 end
             end
 
-            def log_request
-                Lanes.logger.info "UserID: #{session['user_id']}, Params: #{request.params}"
-                Lanes.logger.debug JSON.pretty_generate(data) unless Lanes.env.production? or data.nil?
-            end
-
-            def wrap_reply(with_transaction:true)
+            # Wraps a HTTP request in an optional DB transaction and converts yeilded data to JSON
+            #
+            # @param [options] options for additional checks
+            # @option opts [Boolean] :with_transaction rollback DB transaction if exceptions occur
+            def wrap_reply(options = {with_transaction: true})
                 response = { success: false, message: "No response was generated" }
                 log_request
-                if with_transaction
+                if options[:with_transaction]
                     Lanes::Model.transaction do
                         response = yield
                         # This is quite possibly a horrible idea.
@@ -84,6 +93,11 @@ module Lanes
                 json_reply response
             end
 
+            # Logs UserID and params for a request.  In non-production, the JSON payload is also logged
+            def log_request
+                Lanes.logger.info "UserID: #{session['user_id']}, Params: #{request.params}"
+                Lanes.logger.debug JSON.pretty_generate(data) unless Lanes.env.production? or data.nil?
+            end
         end
 
 

data/lib/lanes/api/root.rb

@@ -1,14 +1,15 @@
 require 'sinatra'
 require 'oj'
 require 'rack/protection'
+require 'rack/cors'
 require_relative 'sprockets_extension'
 require_relative 'helper_methods'
 require_relative 'pub_sub'
 
-
 module Lanes
     module API
         class Root < Sinatra::Application
+            CORS_PATHS = {}
 
             Lanes.config.get(:environment) do | env |
                 set :environment, env
@@ -40,11 +41,32 @@ module Lanes
                 unless API.const_defined?(:AuthenticationProvider)
                     require "lanes/api/null_authentication_provider"
                 end
-                use Rack::Protection #, :skip=>['GET:/'], :raise => true
-
                 Lanes::Configuration.apply
             end
 
+            configure do
+                cors_resources = []
+
+                if API::Root::CORS_PATHS.any?
+                    use Rack::Cors, debug: !Lanes.env.production? do
+
+                        API::Root::CORS_PATHS.each do | path, options |
+                            allow do
+                                cors_resources.push  Rack::Cors::Resource.new('', path)
+                                origins options[:origins]
+                                resource path, :methods => options[:methods], :headers => :any
+                            end
+                        end
+
+                    end
+
+                end
+                use Rack::Protection, allow_if: -> (env) {
+                    path = env['PATH_INFO']
+                    cors_resources.any?{|r| r.matches_path?(path) }
+                }
+
+            end
         end
     end
 end

data/lib/lanes/api/routing.rb

@@ -16,47 +16,66 @@ module Lanes
             end
 
             [:get, :post, :put, :patch, :delete].each do | method_name |
-                define_method(method_name) do | path, options = {}, &block |
-                    API::Root.send(method_name, make_path(path), options, &block)
+                define_method(method_name) do | path_suffix, options = {}, &block |
+                    API::Root.send(method_name, make_path(path_suffix), options, &block)
                 end
             end
 
+            def enable_cors(path_suffix, options = {origins: '*', methods: [:get]})
+                puts path_suffix
+                puts options
+                API::Root::CORS_PATHS[make_path(path_suffix)] = options
+            end
+
             def resources(model, options = {})
                 path = options[:path] || model.api_path
-                controller = options[:controller] || Lanes::API::Controller
-                parent_attribute = false
+                controller = options[:controller] || Lanes::API::GenericController
+                format = options[:format] || '.json'
                 if options[:under]
-                    parent_attribute = options[:parent_attribute] || options[:under].underscore.singularize+'_id'
+                    options[:parent_attribute] = options[:under].underscore.singularize+'_id'
                 end
 
-                prefix = parent_attribute ? parent_attribute + '/' : ''
+                prefix = options[:parent_attribute] ? options[:parent_attribute] + '/' : ''
+
+                configured_routes = Hash.new{|hsh, key| hsh[key] = []}
 
-                # index
-                if controller.method_defined?(:perform_retrieval)
-                    get "#{prefix}#{path}/?:id?.json",
-                        &RequestWrapper.get(model, controller, parent_attribute)
+                bind = lambda{ |method, route, wrapper_method = method|
+                    route = route + format
+                    configured_routes[route].push(method)
+                    self.send( method, route,
+                               &RequestWrapper.send(wrapper_method, model, controller, options) )
+                }
+
+                # show
+                if controller.method_defined?(:show)
+                    bind[:get, "#{prefix}#{path}/?:id?"]
                 end
 
                 # create
-                if controller.method_defined?(:perform_creation)
-                    post "#{prefix}#{path}.json",
-                         &RequestWrapper.post(model, controller, parent_attribute)
+                if controller.method_defined?(:create)
+                    bind[:post, "#{prefix}#{path}"]
                 end
 
                 unless options[:immutable]
 
                     # update
-                    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)
+                    if controller.method_defined?(:update)
+                        bind[:patch, "#{prefix}#{path}/?:id?", :update]
+                        bind[:put,   "#{prefix}#{path}/?:id?", :update]
                     end
 
-                    if controller.method_defined?(:perform_destroy) and not options[:indestructible]
-                        # destroy
-                        delete "#{prefix}#{path}/?:id?.json",
-                               &RequestWrapper.delete(model, controller, parent_attribute)
+                    # destroy
+                    if controller.method_defined?(:destroy) and not options[:indestructible]
+                        bind[:delete, "#{prefix}#{path}/?:id?"]
+                    end
+
+                end
+
+                if options[:cors]
+                    cors = options[:cors].is_a?(Hash) ? otions[:cors] : {origins: options[:cors]}
+
+                    configured_routes.each do | route, methods |
+                        enable_cors route, cors.merge(methods: methods)
                     end
 
                 end

data/lib/lanes/api/sprockets_extension.rb

@@ -23,7 +23,7 @@ module Lanes
                     manifest.compile('lanes/vendor.js', 'lanes.js', 'lanes.css')
                     Extensions.each do |ext|
                         ext.each_static_asset do | asset |
-                          manifest.compile( asset.to_s )
+                            manifest.compile( asset.to_s )
                         end
                     end
                     Screen.each do | screen |
@@ -80,6 +80,8 @@ module Lanes
                         end
                     end
 
+                    Root::CORS_PATHS['/assets/*'] = {origins: '*', methods: [:get]}
+
                     app.configure :test, :development do
                         app.get "#{Lanes.config.assets_path_prefix}/*" do |path|
                             env_sprockets = request.env.dup

data/lib/lanes/api.rb

@@ -2,7 +2,8 @@ require_relative '../lanes'
 require_relative 'api/request_wrapper'
 require_relative 'api/error_formatter'
 require_relative 'api/formatted_reply'
-require_relative 'api/controller'
+require_relative 'api/controller_base'
+require_relative 'api/generic_controller'
 require_relative 'api/root'
 
 Lanes.config.get(:environment) do

data/lib/lanes/configuration.rb

@@ -57,7 +57,6 @@ module Lanes
                 config.namespace = "#{identifier}::jobba"
             end
 
-
             Resque.redis.namespace = "#{identifier}::resque"
             Resque.redis = Lanes.config.redis
             MessageBus.redis_config = Lanes.config.redis

data/lib/lanes/extension/definition.rb

@@ -63,6 +63,10 @@ module Lanes
                 [ root_path.join('client') ]
             end
 
+            def standard_client_path
+                root_path.join('client', identifier )
+            end
+
             def static_paths
                 client_paths.each_with_object(Array.new) do |path, result|
                     Lanes.config.static_asset_types.each do | prefix |
@@ -74,7 +78,7 @@ module Lanes
             def each_static_asset
                 static_paths.each do | path |
                     path.find.each do | entry |
-                        yield entry if entry.file?
+                        yield entry.relative_path_from(path) if entry.file?
                     end
                 end
             end

data/lib/lanes/hot_reload_plugin.rb

@@ -36,7 +36,6 @@ module ::Guard
             body = paths.map do | file |
                 asset_to_json(file)
             end
-            p body
             post.body = Oj.dump(body)
             http = Net::HTTP.new(@uri.host, @uri.port)
             http.request(post)

data/lib/lanes/version.rb

@@ -1,5 +1,5 @@
 module Lanes
 
-    VERSION = "0.5.0"
+    VERSION = "0.5.5"
 
 end

data/npm-build/build

@@ -7,3 +7,6 @@ BUILD_ENV=development webpack --progress
 
 echo Building production
 BUILD_ENV=production webpack --progress --optimize-dedupe
+
+echo Building standalone
+BUILD_ENV=production webpack --config webpack-standalone.config.js --progress --optimize-dedupe

data/npm-build/{base.js → data.js}

@@ -1,29 +1,31 @@
+var previousLanes = global.Lanes;
+
 var Lanes = ( global.Lanes || (global.Lanes = {}) );
+
+Lanes.noConflict = function(){
+    global.Lanes = previousLanes;
+    return Lanes;
+};
+
 Lanes.Vendor = ( Lanes.Vendor || {} );
+Lanes.Vendor.xhr = require('xhr');
+Lanes.Vendor.ld = require('lodash');
 
 Lanes.Vendor.Ampersand                = ( Lanes.Ampersand || {} );
 Lanes.Vendor.Ampersand.State          = require("ampersand-state");
-Lanes.Vendor.React                    = require("react");
-Lanes.Vendor.ReactDOM                 = require("react-dom");
 
-Lanes.Vendor.Ampersand.SubCollection  = require("ampersand-subcollection");
+Lanes.Vendor.Ampersand.SubCollection  = require("ampersand-filtered-subcollection");
 Lanes.Vendor.Ampersand.RestCollection = require("ampersand-rest-collection");
 Lanes.Vendor.Ampersand.LDCollection   = require('ampersand-collection-lodash-mixin');
 Lanes.Vendor.Ampersand.Collection     = require("ampersand-collection");
 Lanes.Vendor.Events                   = require('ampersand-events');
-Lanes.Vendor.ReactBootstrap           = require("react-bootstrap");
-Lanes.Vendor.BrowserHistory           = require("history");
-Lanes.Vendor.Moment                   = require("moment");
-Lanes.Vendor.RSVP                     = require('rsvp');
-Lanes.Vendor.xhr                      = require('xhr');
-Lanes.Vendor.ComponentResize          = require('react-component-resizable');
-Lanes.Vendor.List                     = require('react-list')
-Lanes.Vendor.Overlay = require('react-overlays');
-Lanes.log = require('loglevel');
-Lanes.Vendor.ld = require('lodash');
-var spf = require('sprintf-js');
 
+Lanes.log           = require('loglevel');
+Lanes.Vendor.dom    = require('ampersand-dom');
+Lanes.Vendor.Moment = require("moment");
+Lanes.Vendor.RSVP   = require('rsvp');
 
+var spf = require('sprintf-js');
 
 Lanes.Vendor.ld.mixin(require('lodash-inflection'));
 
@@ -42,5 +44,3 @@ Lanes.Vendor.ld.mixin({
     sprintf         : spf.sprintf,
     vsprintf        : spf.vsprintf
 });
-
-Lanes.Vendor.dom = require('ampersand-dom');