lanes 0.5.6 → 0.6.0

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

@@ -1,4 +1,4 @@
-/* Noramlize.css */
+/* Normalize.css */
 .rw-btn,
 .rw-input {
   color: inherit;
@@ -305,7 +305,7 @@ ul.rw-list.rw-list-grouped > li.rw-list-option,
   border-bottom-left-radius: 4px;
   border-top-left-radius: 4px;
 }
-.rw-rtl.rw-widget .rw-input {
+.rw-rtl .rw-widget .rw-input {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
   border-bottom-right-radius: 4px;
@@ -314,7 +314,7 @@ ul.rw-list.rw-list-grouped > li.rw-list-option,
 .rw-widget > .rw-select {
   border-left: #ccc 1px solid;
 }
-.rw-rtl.rw-widget > .rw-select {
+.rw-widget.rw-rtl > .rw-select {
   border-right: #ccc 1px solid;
   border-left: none;
 }
@@ -401,8 +401,8 @@ ul.rw-list.rw-list-grouped > li.rw-list-option,
 .rw-combobox input.rw-input,
 .rw-datetimepicker input.rw-input,
 .rw-numberpicker input.rw-input {
-  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-  box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
 }
 .rw-combobox:active,
 .rw-datetimepicker:active,

data/client/lanes/workspace/Layout.cjsx

@@ -1,6 +1,6 @@
 class Lanes.Workspace.Layout extends Lanes.React.Component
 
-    dataObjects:
+    modelBindings:
         uistate:  -> Lanes.Workspace.Extension.uistate
         viewport: -> @context.viewport
 
@@ -17,15 +17,6 @@ class Lanes.Workspace.Layout extends Lanes.React.Component
 
     componentWillMount: ->
         @uistate.set(@props)
-        useBasename = Lanes.Vendor.BrowserHistory.useBasename
-        history = useBasename(Lanes.Vendor.BrowserHistory.createHistory)({
-            basename: Lanes.config.root_path
-        })
-        @historyStopListening = history.listen (location) ->
-            Lanes.Screens.Definitions.setBrowserLocation(location)
-        @setState({history})
-
-    componentWillUnmount: -> @historyStopListening()
 
     render: ->
         <div className="layout">

data/client/lanes/workspace/Navbar.cjsx

@@ -1,16 +1,12 @@
 class Lanes.Workspace.Navbar extends Lanes.React.Component
-    dataObjects:
+    modelBindings:
         settings: -> Lanes.config.system_settings
 
-    propTypes:
-        history: React.PropTypes.shape(
-            push: React.PropTypes.func
-        ).isRequired
-
     contextTypes:
         uistate: React.PropTypes.object.isRequired
 
-    switchMenu: ->
+    switchMenu: (ev) ->
+        ev.preventDefault()
         @context.uistate.nextSidebarState()
 
     classNames: ->
@@ -18,12 +14,11 @@ class Lanes.Workspace.Navbar extends Lanes.React.Component
             "menu-hidden": !@model.screen_menu_shown
 
     Logo: ->
-        if @settings.logo?.url
-            <img src={@settings.logo.thumbnail_url} />
+        if @settings.logo?.thumbnail_url
+            url = "//#{Lanes.config.api_host}#{@settings.logo.thumbnail_url}"
+            <img src={url} />
         else
-            <span>
-                {Lanes.Extensions.controlling().title()}
-            </span>
+            <span>{Lanes.Extensions.controlling().title()}</span>
 
     render: ->
 
@@ -37,5 +32,5 @@ class Lanes.Workspace.Navbar extends Lanes.React.Component
                     <i className="icon"></i>
                 </button>
             </div>
-            <Lanes.Workspace.Tabs history={@props.history} />
+            <Lanes.Workspace.Tabs />
         </div>

data/client/lanes/workspace/ScreenView.cjsx

@@ -10,12 +10,12 @@ class Lanes.Workspace.ScreenView extends Lanes.React.Component
     contextTypes:
         uistate: React.PropTypes.object.isRequired
 
-    dataObjects:
+    modelBindings:
         displaying: -> Lanes.Screens.Definitions.displaying
         allScreens: -> Lanes.Screens.Definitions.all
 
-    bindDataEvents:
-        displaying: 'change:active remove add'
+    bindEvents:
+        displaying: 'add remove reset change:active'
         allScreens: 'change:loading'
 
     renderScreen: (screen) ->
@@ -34,7 +34,6 @@ class Lanes.Workspace.ScreenView extends Lanes.React.Component
         </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()}

data/client/lanes/workspace/ScreensMenu.cjsx

@@ -1,12 +1,9 @@
 class ScreenList extends Lanes.React.Component
-    propTypes:
-        history: React.PropTypes.shape(
-            push: React.PropTypes.func
-        ).isRequired
 
-    activateScreen: ->
+    activateScreen: (ev) ->
+        ev.preventDefault()
         @model.display().then (screen) =>
-            @props.history.push(screen.historyUrl())
+            @context.viewport.history.push(screen.historyUrl())
 
     render: ->
         <li>
@@ -18,12 +15,8 @@ class ScreenList extends Lanes.React.Component
 
 class ScreenGroup extends Lanes.React.Component
 
-    propTypes:
-        history: React.PropTypes.shape(
-            push: React.PropTypes.func
-        ).isRequired
-
-    toggleActive: ->
+    toggleActive: (ev) ->
+        ev.preventDefault()
         @model.active = !@model.active
         undefined
 
@@ -41,18 +34,14 @@ class ScreenGroup extends Lanes.React.Component
 
 class Lanes.Workspace.ScreensMenu extends Lanes.React.Component
 
-    propTypes:
-        history: React.PropTypes.shape(
-            push: React.PropTypes.func
-        ).isRequired
-
-    dataObjects:
+    modelBindings:
         user: -> Lanes.current_user
 
     renderGroup: (group) ->
         <ScreenGroup {...@props} model=group key=group.id />
 
-    logOut: ->
+    logOut: (ev) ->
+        ev.preventDefault()
         Lanes.current_user.logout()
 
     render: ->

data/client/lanes/workspace/Tabs.cjsx

@@ -1,20 +1,16 @@
 class TabView extends Lanes.React.Component
 
-    setDataState: (nextState) ->
+    setModelState: (nextState) ->
         if @model.active
             _.dom(document.head).qs('title').text = @model.title()
-            @props.history.replace(@model.historyUrl())
+            @context.viewport.history.replace(@model.historyUrl())
         if Lanes.Screens.Definitions.displaying.length is 0
-            @props.history.push('/')
+            @context.viewport.history.push('/')
         @setState(nextState)
 
-    propTypes:
-        history: React.PropTypes.shape(
-            push: React.PropTypes.func
-        ).isRequired
-
     activate: ->
-        @props.history.push(@model.historyUrl())
+        @model.active = true
+        @context.viewport.history.push(@model.historyUrl())
         null
 
     close: -> @model.remove()
@@ -28,12 +24,8 @@ class TabView extends Lanes.React.Component
 
 
 class Lanes.Workspace.Tabs extends Lanes.React.Component
-    propTypes:
-        history: React.PropTypes.shape(
-            push: React.PropTypes.func
-        ).isRequired
 
-    dataObjects:
+    modelBindings:
         collection: -> Lanes.Screens.Definitions.displaying
 
     render: ->

data/db/migrate/02_create_assets.rb

@@ -2,11 +2,9 @@ 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: {}
+            t.jsonb      :file_data, null: false, default: {}
         end
 
         add_index :assets, [:owner_id, :owner_type]

data/lanes.gemspec

@@ -24,37 +24,42 @@ Gem::Specification.new do |spec|
 
     spec.required_ruby_version = ">= 2.0"
 
-    spec.add_dependency "activejob",              "~> 4.2"
-    spec.add_dependency "activerecord",           "~> 4.2"
+    spec.add_dependency "activejob",              "~> 5.0"
+    spec.add_dependency "activerecord",           "~> 5.0"
+    spec.add_dependency "actioncable",            "~> 5.0"
+
+    spec.add_dependency "sinatra",                "~> 2.0.0.beta2"
+    spec.add_dependency "rack",                   "~> 2.0"
+    spec.add_dependency "rack-protection",        "~> 2.0.0.beta2"
+
+    spec.add_dependency "rack-cors",              "~> 0.4"
+    spec.add_dependency "rack-test",              "~> 0.6"
+
     spec.add_dependency "bcrypt",                 "~> 3.1"
-    spec.add_dependency "carrierwave",            "~> 0.10.0"
+    spec.add_dependency "shrine",                 "~> 2.4"
+    spec.add_dependency "image_processing",       "~> 0.4"
     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 "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-jasmine",          "~> 2.1"
     spec.add_dependency "guard-minitest",         "~> 2.3"
     spec.add_dependency "hashie",                 "~> 3.3"
     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 "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"
     spec.add_dependency "require_all",            "~> 1.3"
     spec.add_dependency "resque",                 "~> 1.25"
     spec.add_dependency "sanitize",               "~> 3.0"
     spec.add_dependency "sass",                   "~> 3.4"
-    spec.add_dependency "sinatra",                "~> 1.4"
-    spec.add_dependency "sprockets",              "~> 3.6"
+    spec.add_dependency "sprockets",              "3.6.3"
     spec.add_dependency "sprockets-helpers",      "~> 1.2"
     spec.add_dependency "thor",                   "~> 0.19"
     spec.add_dependency "uglifier",               "~> 2.7"
@@ -62,5 +67,5 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency "bundler",    "~> 1.5"
     spec.add_development_dependency "diffy",      "~> 3.0"
     spec.add_development_dependency "growl",      "~> 1.0"
-
+    spec.add_development_dependency "shrine-memory", ">= 0.2.2"
 end

data/lib/lanes/access/test_fixture_extensions.rb

@@ -1,20 +1,16 @@
 module AccessFixtureTestPatches
-    extend ActiveSupport::Concern
 
-    included do
-        alias_method_chain :table_rows, :custom_autoset_user_fields
-    end
-
-    def table_rows_with_custom_autoset_user_fields
-        results = table_rows_without_custom_autoset_user_fields
+    def table_rows
+        results = super
         if model_class && model_class < ActiveRecord::Base && model_class.record_modifications
             results[ table_name ].each do | row |
-                row['created_by_id'] = 593363170 if model_class.column_names.include?('created_by_id')
-                row['updated_by_id'] = 593363170 if model_class.column_names.include?('updated_by_id')
+                # 135138680 is the 'admin' user
+                row['created_by_id'] ||= 135138680 if model_class.column_names.include?('created_by_id')
+                row['updated_by_id'] ||= 135138680 if model_class.column_names.include?('updated_by_id')
             end
         end
         results
     end
 end
 
-ActiveRecord::FixtureSet.send :include, AccessFixtureTestPatches
+ActiveRecord::FixtureSet.prepend AccessFixtureTestPatches

data/lib/lanes/access/track_modifications.rb

@@ -16,6 +16,30 @@ module Lanes::Concerns
             self.blacklist_attributes :created_at, :updated_at, :created_by_id, :updated_by_id
             before_update :record_update_modifications
             before_create :record_create_modifications
+
+            self.export_scope :with_user_logins
+        end
+
+        module ClassMethods
+
+            def with_user_logins
+                q = self; t = table_name
+                if current_scope.nil? || current_scope.select_values.exclude?("#{t}.*")
+                    q = q.select("#{t}.*")
+                end
+                if self.column_names.include?('created_by_id')
+                    q = q.select("created_by_user.login as created_by_login")
+                          .joins("left join lanes_users as created_by_user on " \
+                                 "created_by_user.id = #{t}.created_by_id")
+                end
+                if self.column_names.include?('updated_by_id')
+                    q = q.select("updated_by_user.login as updated_by_login")
+                          .joins("left join lanes_users as updated_by_user on " \
+                                 "updated_by_user.id = #{t}.updated_by_id")
+                end
+                q
+            end
+
         end
 
         private

data/lib/lanes/api/cable.rb

@@ -0,0 +1,49 @@
+require 'action_cable'
+# require 'action_cable/subscription_adapter/postgresql'
+
+module Lanes
+    module API
+        module Cable
+            mattr_reader :server
+            mattr_reader :config
+
+
+            class Channel < ActionCable::Channel::Base
+            end
+
+            class Connection < ActionCable::Connection::Base
+                identified_by :current_user
+
+                def connect
+                    reject_unauthorized_connection unless
+                        cookies['user_id'] &&
+                        self.current_user = Lanes::User.where(id: cookies['user_id']).first
+                end
+
+                protected
+
+                def cookies
+                    request.session
+                end
+            end
+
+            def self.configure
+                require_relative 'updates'
+                @@config = ActionCable::Server::Configuration.new
+                config.logger = Lanes.logger
+                config.cable = Lanes.config.cable
+                config.connection_class = -> { Connection }
+                config.allowed_request_origins = -> (host) {
+                    host
+                }
+
+                ActionCable::Server::Base.config = config
+                @@server = ActionCable.server
+                Updates.relay!
+            end
+
+        end
+
+
+    end
+end

data/lib/lanes/api/controller_base.rb

@@ -33,39 +33,64 @@ module Lanes
 
             protected
 
+            def perform_retrieval
+                query   = build_query
+                query   = add_scopes_to_query(query)
+                query   = add_access_limits_to_query(query)
+                options = build_reply_options
+                if should_include_total_count?
+                    options[:total_count] = count_query_records(query)
+                end
+                query = add_modifiers_to_query(query)
+                if params[:id]
+                    query  = query.first!
+                end
+                std_api_reply(:retrieve, query, options)
+            end
+
             def perform_single_destroy
-                record = model.find(params[:id])
+                query = model.where(id: params[:id])
+                query = add_access_limits_to_query(query)
+                record = query.first!
                 record.destroy
                 std_api_reply(:destroy, record, {})
             end
 
             def perform_multiple_destroy
-                records = model.find( data.map{|rec|rec['id']} )
+                query = model.where( id: data.map{|rec|rec['id']} )
+                query = add_access_limits_to_query(query)
                 success = true
-                records.each do | record |
+                query.each do | record |
                     if user.can_delete?(record, record.id)
                         success = false unless record.destroy
                     end
                 end
                 options = build_reply_options.merge(success: success)
-                std_api_reply(:destroy, records, options)
+                std_api_reply(:destroy, query, options)
             end
 
             def perform_multiple_updates
-                records = model.find( data.map{|rec|rec['id']} )
+
+                query = model.where( id: data.map{|rec|rec['id']} )
+                query = add_access_limits_to_query(query)
+
                 success = true
-                records.each do | record |
+                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)
                         success = false unless record.save
                     end
                 end
                 options = build_reply_options.merge(success: success)
-                std_api_reply(:update, records, options)
+                std_api_reply(:update, query, options)
             end
 
-            def perform_single_update(record)
+            def perform_single_update
+                query = build_query
+                query = add_access_limits_to_query(query)
+                record = query.first!
                 record.set_attribute_data(data, user)
                 options = build_reply_options.merge(success: record.save)
                 std_api_reply(:update, record, options)
@@ -149,6 +174,14 @@ module Lanes
 
             # query options
 
+            def add_access_limits_to_query(query)
+                if model.respond_to?(:access_limits_for_query)
+                    query = model.access_limits_for_query(query, user, params)
+                else
+                    query
+                end
+            end
+
             def build_query(query = model.all)
                 if params[:id]
                     query = query.where(id: params[:id])
@@ -156,16 +189,26 @@ module Lanes
                 if params[:nested_attribute]
                     query = query.where(params[:nested_attribute])
                 end
+                query = add_access_limits_to_query(query)
+
                 if query_params.present?
                     query = add_params_to_query(query)
                 end
                 query
             end
 
-            def add_modifiers_to_query(query)
+            def count_query_records(query)
+                model.from('('+query.to_sql+') q').count
+            end
+
+            def add_scopes_to_query(query)
                 if query_scopes.present?
                     query = add_scope_to_query(query)
                 end
+                query
+            end
+
+            def add_modifiers_to_query(query)
                 query = query.limit(query_limit_size)
                 query = query.offset(query_offset.to_i) if query_offset.present?
                 if include_associations.any?

data/lib/lanes/api/default_routes.rb

@@ -10,6 +10,15 @@ module Lanes
         get Lanes.config.api_path + '/asset/*',
             &API::Handlers::Asset.getter
 
+        get Lanes.config.api_path + '/ws' do
+            API::Cable.server.call(env)
+        end
+
+        post Lanes.config.api_path + '/dev-file-change.json' do
+            API::PubSub.publish("file-change", data)
+            "OK"
+        end
+
         Extensions.each(reversed: true) do | ext |
             ext.route(self)
         end

data/lib/lanes/api/generic_controller.rb

@@ -5,14 +5,7 @@ module Lanes
         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)
+                perform_retrieval
             end
 
             def create
@@ -23,7 +16,7 @@ module Lanes
 
             def update
                 if params[:id]
-                    perform_single_update( build_query.first! )
+                    perform_single_update
                 elsif data.is_a?(Array)
                     perform_multiple_updates
                 end

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

@@ -4,8 +4,6 @@ module Lanes::API::Handlers
 
         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
 
@@ -17,7 +15,8 @@ module Lanes::API::Handlers
                             else
                                 owner.send("build_#{params['owner_association']}")
                             end
-                    asset.store_uploaded_file(params['file'])
+
+                    asset.update(file: params['file'])
 
                     json_reply std_api_reply asset.new_record? ? :update : :create,
                                              asset,
@@ -27,10 +26,10 @@ module Lanes::API::Handlers
         end
 
         def self.getter
+            root = Lanes::Extensions.controlling
+                       .root_path.join('public', 'files')
             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
+-                send_file(root.join( params['splat'].first ).to_s)
             end
         end
     end

data/lib/lanes/api/helper_methods.rb

@@ -15,8 +15,9 @@ module Lanes
                 stylesheet_tag('lanes')
             end
 
-            def client_bootstrap_data
-                Oj.dump(Extensions.client_bootstrap_data(self), mode: :compat)
+            def client_bootstrap_data(mergedWith: {})
+                Oj.dump(Extensions.client_bootstrap_data(self)
+                           .merge(mergedWith), mode: :compat)
             end
 
             def csrf_token

data/lib/lanes/api/javascript_processor.rb

@@ -21,7 +21,7 @@ module Lanes
 
             def get_js_aliases(ns)
                 ext = Extensions.for_identifier(ns)
-                aliases = ext ? ext.client_js_aliases : {}
+                aliases = ext ? ext.client_js_aliases || {} : {}
                 aliases.merge!({
                     'LC'    => 'window.Lanes.Components',
                     'React' => 'window.Lanes.Vendor.React',
@@ -58,10 +58,11 @@ module Lanes
                 (aliases, definitions) = get_js_aliases(identifier)
                 ns, ns_file_ref, ns_ref, ns_name = get_wrapping_vars(identifier)
                 file="{namespace:#{ns_file_ref},extension:{name:'#{ns}',identifier:'#{identifier}'},path:#{path}}"
-                "(function(Lanes,#{ns_name}_,#{aliases},FILE,window,undefined)"\
-                    "{\n#{js}\n})"\
-                    "(window.Lanes,#{ns_ref}window.Lanes.Vendor.ld,"\
-                    "#{definitions},#{file},window);"
+                "(function(Lanes,#{ns_name}_,#{aliases},FILE,window,undefined)" \
+                "{\n#{js}\n})" \
+                "((window.Lanes = (window.Lanes || {})),#{ns_ref}" \
+                "(window.Lanes.Vendor = (window.Lanes.Vendor || {})).ld," \
+                "#{definitions},#{file},window);"
             end
 
         end