hippo-fw 0.9.3 → 0.9.4

data/client/hippo/models/pub_sub/channel.js

@@ -0,0 +1,35 @@
+import { omit } from 'lodash';
+
+import { logger } from '../../lib/util';
+import { BaseModel } from '../base';
+
+const CHANNEL_SPLITTER = new RegExp('^(.*):(.*)/([^/]+)$');
+
+export default class PubSubCableChannel {
+
+    constructor(pub_sub) {
+        this.channel = pub_sub.cable.subscriptions.create(
+            'pubsub', this,
+        );
+        this.pub_sub = pub_sub;
+    }
+
+    subscribe(channel) {
+        logger.info(`[pubsub] subscribe to: ${channel}`);
+        this.channel.perform('on', { channel });
+    }
+
+    unsubscribe(channel) {
+        logger.info(`[pubsub] unsubscribe from: ${channel}`);
+        this.channel.perform('off', { channel });
+    }
+
+    received(data) {
+        const [channel, _, modelId, id] = Array.from(
+            data.channel.match(CHANNEL_SPLITTER),
+        );
+        logger.info(`[pubsub] change recvd for: ${channel}`);
+        const model = BaseModel.findDerived(modelId);
+        this.pub_sub.onModelChange(model, id, omit(data, 'channel'));
+    }
+}

data/client/hippo/screens/definition.js

@@ -8,7 +8,7 @@ import Instance, { displaying } from './instance';
 import Registry from './index';
 import Group from './group';
 
-export { createAsyncComponent } from 'react-async-component';
+export { asyncComponent } from 'react-async-component';
 
 @identifiedBy('hippo/screen/definition')
 export default class ScreenDefinition extends BaseModel {

data/client/hippo/screens/index.js

@@ -7,8 +7,6 @@ const Screens = observable({
 
     all: observable.map(),
 
-    active_screen_ids: observable.array(),
-
     get activeGroups() {
         const gids = Group.enabled_group_ids || map(Group.all, 'id');
         const groups = map(gids, gid => Group.forId(gid));
@@ -16,19 +14,13 @@ const Screens = observable({
     },
 
     @computed get active() {
-        return map(this.active_screen_ids, id => this.all.get(id));
-    },
-
-    configure(screen_ids) {
-        this.active_screen_ids.replace(screen_ids);
+        return map(Config.screen_ids, id => this.all.get(id));
     },
 
     reset() {
-        this.active_screen_ids.clear();
+        Config.screen_ids.clear();
     },
 
 });
 
-Config.screens = Screens;
-
 export default Screens;

data/client/hippo/screens/user-management/edit-form.jsx

@@ -1,10 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Row, Col } from 'react-flexbox-grid';
-import { isNil, forIn, get, pick, mapValues, keys, extend } from 'lodash';
 
 import { observer }   from 'mobx-react';
-import { action, observable, computed } from 'mobx';
+import { action } from 'mobx';
 
 import Box    from 'grommet/components/Box';
 import Button from 'grommet/components/Button';
@@ -29,7 +28,6 @@ export default class EditForm extends React.PureComponent {
 
     constructor(props) {
         super(props);
-
         this.user = this.props.query.results.modelForRow(this.props.rowIndex);
     }
 
@@ -39,7 +37,7 @@ export default class EditForm extends React.PureComponent {
 
     @action.bound
     onSave() {
-        this.formState.persistTo(this.user);
+        this.refs.form.persistTo(this.user);
         this.user.save().then(this.onSaved);
     }
 
@@ -59,16 +57,21 @@ export default class EditForm extends React.PureComponent {
 
     render() {
         return (
-            <Form tag="div" className="user-edit-form" state={this.formState}>
+            <Form
+                tag="div"
+                ref="form"
+                model={this.user}
+                className="user-edit-form"
+            >
                 <Warning message={this.errorMessage} />
                 <Row middle='sm'>
                     <Field md={4} xs={6} name="login" validate={nonBlank} />
-                    <Field md={4} xs={6} name="name"  validate={nonBlank} />
+                    <Field md={4} xs={6} name="name" validate={nonBlank} />
                     <Field md={4} xs={6} name="email" validate={validEmail} />
                     <Field md={4} xs={6} type="password" name="password" />
                     <Field md={4} xs={6} type="checkbox" name="is_admin" validate={booleanValue} />
                     <Col md={4} xs={6}>
-                        <Box justify="around" direction="row">
+                        <Box direction="row">
                             <Button label="Cancel" onClick={this.onCancel} accent />
                             <Button
                                 label="Save"

data/client/hippo/user.js

@@ -73,9 +73,7 @@ export class UserModel extends BaseModel {
     setFromSessionRequest(req) {
         merge(this, pick(req, 'errors', 'lastServerMessage'));
         if (req.isValid) {
-            Config.data = req.data;
-            Config.persistToStorage();
-            Config.bootstrapUserData();
+            Config.update(req.data);
             this.errors = {};
         }
         return this;

data/client/hippo/workspace/index.jsx

@@ -3,9 +3,13 @@ import React from 'react';
 import { action, observable } from 'mobx';
 import { observer } from 'mobx-react';
 import { bindAll } from 'lodash';
-import { Router, Route, browserHistory } from 'react-router';
+import {
+    BrowserRouter as Router,
+    Route,
+} from 'react-router-dom';
 
-import App   from 'grommet/components/App';
+
+import App from 'grommet/components/App';
 import Sidebar from 'react-sidebar';
 
 import 'hippo/config-data';
@@ -19,6 +23,12 @@ import './styles.scss';
 
 const DOCKED_WIDTH_BREAKPOINT = 950;
 
+function NoMatch() {
+    return (
+        <h1>Not Found</h1>
+    );
+}
+
 @observer
 class Workspace extends React.Component {
 
@@ -59,27 +69,18 @@ class Workspace extends React.Component {
                     docked={this.sidebarDocked}
                     onSetOpen={this.onSetSidebarOpen}
                 >
-                    {this.props.children || "Welcome"}
+                    <Route name='screen' path="/:screenId/:identifier?" component={Screen} />
+                    <Route path="*" component={NoMatch} />
                 </Sidebar>
             </App>
         );
     }
 }
 
-
-function NoMatch() {
-    return (
-        <h1>Not Found</h1>
-    );
-}
-
 export default function WorkspaceRoot() {
     return (
-        <Router history={browserHistory}>
-            <Route path="/" component={Workspace}>
-                <Route name='screen' path="/:screenId(/:identifier)" component={Screen} />
-                <Route path="*" component={NoMatch} />
-            </Route>
+        <Router>
+            <Route path="/" component={Workspace} />
         </Router>
     );
 }

data/client/hippo/workspace/menu.jsx

@@ -1,21 +1,16 @@
 import React from 'react';
-import classnames from 'classnames';
 import { observer } from 'mobx-react';
 import { action } from 'mobx';
 import PropTypes from 'prop-types';
 import Sidebar from 'grommet/components/Sidebar';
-import Heading from 'grommet/components/Heading';
-import Footer  from 'grommet/components/Footer';
 import Header  from 'grommet/components/Header';
 import Anchor  from 'grommet/components/Anchor';
 import Menu from 'grommet/components/Menu';
 import Group   from './menu-group';
 import Screens from '../screens';
-import Icon from '../components/icon';
 
-import User from '../user';
 
-//const On
+import User from '../user';
 
 @observer
 class Logout extends React.PureComponent {
@@ -30,8 +25,7 @@ class Logout extends React.PureComponent {
         ev.stopPropagation();
         ev.preventDefault();
         User.logout();
-        const { router } = this.context;
-        router.push('/');
+        this.context.router.history.push('/');
     }
 
     render() {

data/client/hippo/workspace/screen.jsx

@@ -1,8 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import classnames from 'classnames';
 import { observer } from 'mobx-react';
-import { Grid } from 'react-flexbox-grid';
 import Box from 'grommet/components/Box';
 import Screens from '../screens';
 import ScreenInstances from '../screens/instance';
@@ -19,13 +17,15 @@ ScreenView.displayName = 'ScreenView';
 export default class Screen extends React.Component {
 
     static propTypes = {
-        params: PropTypes.shape({
-            screenId: PropTypes.string,
+        match: PropTypes.shape({
+            params: PropTypes.shape({
+                screenId: PropTypes.string,
+            }),
         }).isRequired,
     }
 
     componentDidMount() {
-        const { screenId } = this.props.params;
+        const { screenId } = this.props.match.params;
         if (screenId) {
             const definition = Screens.all.get(screenId);
             if (definition) { definition.display(); }
@@ -42,7 +42,7 @@ export default class Screen extends React.Component {
                 flex="grow"
             >
                 {ScreenInstances.displaying.map(s =>
-                    <ScreenView key={s.id} {...this.props.params} screen={s} />)}
+                    <ScreenView key={s.id} {...this.props.match.params} screen={s} />)}
             </Box>
 
         );

data/config/database.yml

@@ -2,6 +2,7 @@ development:
   adapter: postgresql
   database: hippo-dev
   host: /tmp
+  pool: 10
 
 test:
   adapter: postgresql

data/config/routes.rb

@@ -1,7 +1,7 @@
 module Hippo::API
 
     routes.for_extension 'hippo' do
-        get 'job-statuses/:id.json' do
+        get 'job-status/:id.json' do
             wrap_reply do
                 status = Hippo::Job.status_for_id(params[:id])
                 raise ActiveRecord::RecordNotFound unless status
@@ -9,10 +9,10 @@ module Hippo::API
             end
         end
 
-        post "user-sessions.json", &Hippo::API::Handlers::UserSession.create
-        get "user-sessions/test.json", &Hippo::API::Handlers::UserSession.check
+        post "user-session.json", &Hippo::API::Handlers::UserSession.create
+        get "user-session/test.json", &Hippo::API::Handlers::UserSession.check
 
-        delete "user-sessions/:id.json" do
+        delete "user-session/:id.json" do
             wrap_reply do
                 { success: true, message: "Logout succeeded", data: {}, token: '' }
             end

data/config/webpack.config.js

@@ -3,15 +3,15 @@ const path = require('path');
 
 const config = {
     entry: {
-        hippo: [
+        app: [
             'react-hot-loader/patch',
             '<%= "#{Hippo::Extensions.controlling.identifier}/index.js" %>',
         ],
     },
     output: {
         path: '<%= config_directory.join('..','public', 'assets') %>',
-        publicPath: '<%= Hippo.env.production? ? '/assets/' : 'http://test.hippo.dev:8889/assets/' %>',
         filename: '[name]-[hash].js',
+        publicPath: '<%= Hippo.env.production? ? '/assets/' : 'http://test.hippo.dev:8889/assets/' %>',
     },
     resolve: {
         modules: [
@@ -44,16 +44,16 @@ const config = {
                 },
             },
             { test: /\.scss$/,
-                use: [
-                    'style-loader',
-                    'css-loader',
-                    {
-                        loader: 'sass-loader',
-                        options: {
-                            includePaths: [path.resolve('./node_modules')],
-                        },
-                    },
-                ],
+              use: [
+                  'style-loader',
+                  'css-loader',
+                  {
+                      loader: 'sass-loader',
+                      options: {
+                          includePaths: [path.resolve('./node_modules')],
+                      },
+                  },
+              ],
             },
         ],
     },
@@ -71,10 +71,12 @@ const config = {
         inline: true,
         port: 8889,
         historyApiFallback: true,
-        proxy: [{
-            context: '/api',
-            target: 'http://localhost:9292',
-        }],
+        headers: {
+            "Access-Control-Allow-Origin": "*",
+            "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
+            "Access-Control-Allow-Headers": "X-Requested-With, content-type, Authorization"
+        },
+        disableHostCheck: true,
         stats: {
             colors: true,
             profile: true,

data/hippo-fw.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
 
     spec.add_dependency "activejob",                 "~> 5.0.0"
     spec.add_dependency "activerecord",              "~> 5.0.0"
-    spec.add_dependency "actioncable",               "~> 5.0.0"
-#    spec.add_dependency "activerecord-multi-tenant", "~> 0.5"
+    spec.add_dependency "litecable",                 "~> 0.4.1"
+    spec.add_dependency "websocket",                 "~> 1.2.4"
     spec.add_dependency "mail",                      "~> 2.6"
     spec.add_dependency "scenic",                    "~> 1.4"
     spec.add_dependency "liquid",                    "~> 4.0"

data/lib/hippo.rb

@@ -7,13 +7,11 @@ module Hippo
 end
 
 require_relative "hippo/version"
+require_relative "hippo/rails"
 require_relative "hippo/environment"
 require_relative "hippo/configuration"
 require_relative "hippo/redis"
 require_relative "hippo/logger"
-if defined?(::Rails)
-    require_relative "hippo/rails_engine"
-end
 require_relative "hippo/db"
 require_relative "hippo/strings"
 require_relative "hippo/numbers"

data/lib/hippo/api.rb

@@ -8,6 +8,7 @@ require_relative 'api/generic_controller'
 require_relative 'api/cable'
 require_relative 'api/sprockets_extension'
 require_relative 'api/helper_methods'
+require_relative 'api/cable'
 require_relative 'api/pub_sub'
 require_rel      'api/handlers/*.rb'
 require_relative 'api/route_set'

data/lib/hippo/api/cable.rb

@@ -1,5 +1,4 @@
-require 'action_cable'
-# require 'action_cable/subscription_adapter/postgresql'
+require "lite_cable"
 
 module Hippo
     module API
@@ -11,18 +10,20 @@ module Hippo
                 @@server.call(request.env)
             end
 
-            class Channel < ActionCable::Channel::Base
+            class Channel < LiteCable::Channel::Base
             end
 
-            class Connection < ActionCable::Connection::Base
+            class Connection < LiteCable::Connection::Base
                 identified_by :current_user
 
                 def connect
-                    unless cookies['user_id'] &&
-                            self.current_user = Hippo::User
-                                                    .where(id: cookies['user_id']).first
-                        Hippo.logger.warn("Rejecting ws connection due to unauthorized access by user_id #{cookies['user_id']}")
-
+                    token = request.params['token']
+                    begin
+                        self.current_user = User.for_jwt_token(token) if token
+                    rescue JWT::DecodeError
+                    end
+                    unless self.current_user
+                        Hippo.logger.warn("Rejecting ws connection due to unauthorized access")
                         reject_unauthorized_connection
                     end
                 end
@@ -35,18 +36,16 @@ module Hippo
             end
 
             def self.configure
+                require_relative './updates'
 
-                require_relative 'updates'
-                @@config = ActionCable::Server::Configuration.new
-                config.logger = Hippo.logger
-                config.cable = Hippo.config.cable
-                config.connection_class = -> { Connection }
-                config.allowed_request_origins = -> (host) {
-                    host
-                }
-
-                ActionCable::Server::Base.config = config
-                @@server = ActionCable.server
+                if Hippo.config.api_use_any_cable
+
+                else
+                    require "lite_cable/server"
+                    @@server = LiteCable::Server::Middleware.new(
+                        Hippo::API::Root, connection_class: Hippo::API::Cable::Connection
+                    )
+                end
                 Updates.relay!
             end