hippo-fw 0.9.6 → 0.9.7

data/client/hippo/workspace/styles.scss

@@ -1,37 +1,12 @@
 @import '../styles/global';
 @import '~grommet/scss/aruba/index';
 
-html {
-  font-family: $brand-font-family;
-}
-
-a.anchor {
-  display: block;
-}
-
-.request-access fieldset:first-of-type {
-  padding-top: 0;
-}
-
-pre {
-  width: 100%;
-  max-width: 100%;
-}
-
-.generic-branding {
-  display: none;
-}
-
-.content-pane .grommetux-tabs {
-    padding-left: 20px;
-    padding-right: 20px;
-}
-
 .screen {
     flex: 1;
     flex-direction: column;
     padding: 0.5rem;
     display: none;
+    min-height: min-content; min-height: -moz-min-content; min-height: -webkit-min-content;
     &.is-active {
         display: flex;
     }
@@ -53,3 +28,13 @@ pre {
         display:none;
     }
 }
+
+.screen-selection-menu {
+    .grommetux-anchor > .icon {
+        margin-right: 0.5rem;
+    }
+}
+
+.screens-wrapper {
+    overflow: hidden;
+}

data/command-reference-files/initial/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # For development while Hippo is evolving track master branch
 gem "hippo-fw", git: "https://github.com/argosity/hippo", branch: 'master'
 
-# gem "hippo", '0.9.5'
+# gem "hippo", '0.9.6'
 
 gem "rake"
 gem 'puma'

data/command-reference-files/model/client/appy-app/models/test_test.js

@@ -1,5 +1,5 @@
 import {
-    BaseModel, identifiedBy, identifier, belongsTo, hasMany, field, computed
+    BaseModel, identifiedBy, identifier, field, session, belongsTo, hasMany,
 } from './base';
 
 @identifiedBy('appy-app/test_test')

data/command-reference-files/model/spec/server/models/test_test_spec.rb

@@ -0,0 +1,10 @@
+require_relative '../spec_helper'
+
+describe AppyApp::TestTest do
+
+    it "can be instantiated" do
+        model = AppyApp::TestTest.new
+        expect(model).to be_an(AppyApp::TestTest)
+    end
+
+end

data/lib/hippo/api/cable.rb

@@ -15,8 +15,6 @@ module Hippo
 
                 def connect
                     token = request.params['token']
-                    Hippo.logger_debug("NEW WS CONN: #{token}")
-
                     begin
                         self.current_user = User.for_jwt_token(token) if token
                     rescue JWT::DecodeError

data/lib/hippo/command/generate_model.rb

@@ -31,9 +31,8 @@ module Hippo
 
             def create_model
                 template "lib/namespace/model.rb", "lib/#{identifier}/models/#{file_name}.rb"
-                template "spec/server/model_spec.rb", "spec/server/#{file_name}_spec.rb"
-                template "spec/fixtures/namespace/model.yml",
-                         "spec/fixtures/#{identifier}/#{file_name}.yml"
+                template "spec/server/model_spec.rb", "spec/server/models/#{file_name}_spec.rb"
+                template "spec/factories/model.rb", "spec/factories/#{file_name}.rb"
             end
 
             def create_client

data/lib/hippo/spec_helper.rb

@@ -87,8 +87,10 @@ RSpec.configure do |config|
     config.around(:each) do |example|
         Hippo.logger.level = ::Logger::WARN
         TEST_TENANT.perform do
-            DatabaseCleaner.cleaning do
-                example.run
+            Hippo::User.scoped_to(TEST_TENANT.users.first) do
+                DatabaseCleaner.cleaning do
+                    example.run
+                end
             end
         end
     end

data/lib/hippo/tenant.rb

@@ -3,7 +3,7 @@ require 'activerecord-multi-tenant'
 module Hippo
     # Tenant
     class Tenant < Hippo::Model
-        validates :slug, uniqueness: { case_sensitive: false }
+        validates :slug, uniqueness: true
         validates :name, :presence => { message: 'for company' }
         validates :email, :presence => true
 
@@ -12,6 +12,8 @@ module Hippo
 
         before_validation :auto_assign_slug, on: :create
 
+        before_save :downcase_slug
+
         def domain
             self.slug + '.' + Hippo.config.website_domain
         end
@@ -49,5 +51,9 @@ module Hippo
             end
         end
 
+        def downcase_slug
+            self.slug = self.slug.downcase.gsub(/\W/, '')
+        end
+
     end
 end

data/lib/hippo/version.rb

@@ -1,5 +1,5 @@
 module Hippo
 
-    VERSION = "0.9.6"
+    VERSION = "0.9.7"
 
 end

data/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "hippo-fw",
-  "version": "0.9.5",
+  "version": "0.9.6",
   "lockfileVersion": 1,
   "dependencies": {
     "@braintree/browser-detection": {
@@ -2304,6 +2304,11 @@
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz",
       "integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y="
     },
+    "flatpickr": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-3.0.7.tgz",
+      "integrity": "sha512-wcs8au1XU5Sqm3KQLY7SN7W3DDzrUv9Lp364rZyZpXkqMYpE4XezKKMEhwjMUotEMNdfj4/pd2573FLyFZrIjQ=="
+    },
     "flatten": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
@@ -4729,51 +4734,9 @@
       "integrity": "sha1-aureASDMP3i6pXGVAxYwoK6PE88="
     },
     "mobx-decorated-models": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/mobx-decorated-models/-/mobx-decorated-models-0.6.3.tgz",
-      "integrity": "sha512-8tAjfbV/Qqyt/7RanGdTQjIOJj5d5ZLsC8hS6eTKK4xGf4unudT2E0nCocbl09VBT79e9HzwgwI1s9iKlRNyRg==",
-      "dependencies": {
-        "acorn": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz",
-          "integrity": "sha512-vOk6uEMctu0vQrvuSqFdJyqj1Q0S5VTDL79qtjo+DhRr+1mmaD+tluFSCZqhvi/JUhXSzoZN2BhtstaPEeE8cw=="
-        },
-        "ajv": {
-          "version": "5.2.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
-          "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk="
-        },
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk="
-        },
-        "eslint": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.4.0.tgz",
-          "integrity": "sha1-o+FT5wS2T3gpDvA1kklOq6Io07w="
-        },
-        "espree": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.0.tgz",
-          "integrity": "sha1-mDWGJb3QVYYeon4oZ+pyn69GPY0="
-        },
-        "esprima": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-          "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="
-        },
-        "js-yaml": {
-          "version": "3.9.1",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz",
-          "integrity": "sha512-CbcG379L1e+mWBnLvHWWeLs8GyV/EMw862uLI3c+GxVyDHWZcjZinwuBd3iW2pgxgIlksW/1vNJa4to+RvDOww=="
-        },
-        "pluralize": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz",
-          "integrity": "sha1-WbcIwcAZCi9pLxx2GMRGsFL9F2I="
-        }
-      }
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/mobx-decorated-models/-/mobx-decorated-models-0.6.5.tgz",
+      "integrity": "sha512-Vx7QfGYP0uBlkT0Rqn3SewzR/pIZmVrLk9lOO/qwyT5kc4dHrdn+z/F4+CxHxVxYSLQsxOKwFOizKWDZYnUcTQ=="
     },
     "mobx-persist": {
       "version": "0.3.3",
@@ -4795,6 +4758,11 @@
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
       "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
     },
+    "moment-timezone": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz",
+      "integrity": "sha1-mc5cfYJyYusPH3AgRBd/YHRde5A="
+    },
     "mousetrap": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.1.tgz",
@@ -5837,6 +5805,52 @@
       "resolved": "https://registry.npmjs.org/react-sidebar/-/react-sidebar-2.3.2.tgz",
       "integrity": "sha1-7BQL6opvX6PY6npWR5ZltEz0+c8="
     },
+    "react-swipeable-views": {
+      "version": "0.12.8",
+      "resolved": "https://registry.npmjs.org/react-swipeable-views/-/react-swipeable-views-0.12.8.tgz",
+      "integrity": "sha512-VCPjjP9WTQejM6Yy46mzzHu9H6p5g/IuQMm6TUOEjj8d82a9ii+YAgWOR2KCR5ew/4lqD4WKX2hD6Ix+Lq80Eg=="
+    },
+    "react-swipeable-views-core": {
+      "version": "0.12.8",
+      "resolved": "https://registry.npmjs.org/react-swipeable-views-core/-/react-swipeable-views-core-0.12.8.tgz",
+      "integrity": "sha512-VudJhi43DwgLFh25aeNPxSwONzyErPFRg13Hm3YcSwSjwhkvNf3oficuPT7/Kd6qxorDj046D8Nkunl/DG5srA=="
+    },
+    "react-swipeable-views-utils": {
+      "version": "0.12.8",
+      "resolved": "https://registry.npmjs.org/react-swipeable-views-utils/-/react-swipeable-views-utils-0.12.8.tgz",
+      "integrity": "sha512-NHXFbB8Bq1RnuBn5IyZoSTofDHuwXbwbkdFIeTFCozeHvLeIHm6A2rRKy2CTYZggNRUukgHZrsGqRU+H1M2iSQ==",
+      "dependencies": {
+        "react-event-listener": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.5.0.tgz",
+          "integrity": "sha1-2CEFE1Vz4Yfj2QDRgVCliCMEuNE=",
+          "dependencies": {
+            "babel-runtime": {
+              "version": "6.26.0",
+              "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+              "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4="
+            },
+            "fbjs": {
+              "version": "0.8.14",
+              "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.14.tgz",
+              "integrity": "sha1-0dviviVMNakeCfMfnNUKQLKg7Rw=",
+              "dependencies": {
+                "core-js": {
+                  "version": "1.2.7",
+                  "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+                  "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
+                }
+              }
+            }
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
+          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
+        }
+      }
+    },
     "react-tap-event-plugin": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/react-tap-event-plugin/-/react-tap-event-plugin-2.0.1.tgz",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hippo-fw",
-  "version": "0.9.5",
+  "version": "0.9.6",
   "description": "Hippo is a framework for easily writing single page web applications",
   "main": "client/hippo/index.js",
   "repository": "https://github.com/argosity/hippo",
@@ -39,6 +39,7 @@
     "eslint": "^4.2.0",
     "eslint-config-argosity": "^1.1.5",
     "file-loader": "^0.11.2",
+    "flatpickr": "^3.0.7",
     "flexboxgrid": "^6.3.1",
     "grommet": "^1.5.0",
     "history": "^4.6.3",
@@ -53,9 +54,10 @@
     "lodash": "^4.17.4",
     "loglevel": "^1.4.1",
     "mobx": "^3.2.1",
-    "mobx-decorated-models": "^0.6.3",
+    "mobx-decorated-models": "^0.6.5",
     "mobx-persist": "^0.3.3",
     "mobx-react": "^4.2.2",
+    "moment-timezone": "^0.5.13",
     "node-sass": "^4.5.0",
     "ory-editor": "^0.2.12",
     "pluralize": "^6.0.0",
@@ -77,6 +79,7 @@
     "react-router": "^4.1.2",
     "react-router-dom": "^4.1.2",
     "react-sidebar": "^2.3.0",
+    "react-swipeable-views": "^0.12.8",
     "react-tap-event-plugin": "^2.0.1",
     "react-test-renderer": "^15.6.1",
     "react-tippy": "^1.0.2",

data/spec/client/components/__snapshots__/record-finder.spec.jsx.snap

@@ -30,6 +30,7 @@ exports[`RecordFinder Component renders 1`] = `
         onKeyDown={[Function]}
         onKeyPress={[Function]}
         placeholder={undefined}
+        tabIndex={0}
         type="text"
         value=""
       />

data/spec/client/components/__snapshots__/time-zone-select.spec.jsx.snap

@@ -0,0 +1,48 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TimeZone Component matches snapshot 1`] = `
+<div
+  className="grommetux-select"
+  onClick={[Function]}
+>
+  <input
+    className="grommetux-input grommetux-select__input"
+    placeholder="None"
+    readOnly={true}
+    value="America/Chicago"
+  />
+  <button
+    aria-label="Select Icon"
+    className="grommetux-button grommetux-button--plain grommetux-select__control"
+    disabled={false}
+    href={undefined}
+    onBlur={[Function]}
+    onClick={[Function]}
+    onFocus={[Function]}
+    onMouseDown={[Function]}
+    onMouseUp={[Function]}
+    type="button"
+  >
+    <span
+      className="grommetux-button__icon"
+    >
+      <svg
+        aria-label="caret-down"
+        className="grommetux-control-icon grommetux-control-icon-caret-down grommetux-control-icon--responsive"
+        height="24px"
+        role="img"
+        version="1.1"
+        viewBox="0 0 24 24"
+        width="24px"
+      >
+        <polygon
+          fill="none"
+          points="22 8 12 20 2 8"
+          stroke="#000"
+          strokeWidth="2"
+        />
+      </svg>
+    </span>
+  </button>
+</div>
+`;

data/spec/client/components/form.spec.jsx

@@ -28,6 +28,13 @@ describe('Form Validation functions', () => {
         expect(form.isValid).toBe(true);
     });
 
+    it('sets field values when they check in', () => {
+        const form = new FormState();
+        form.set({ foo: 'bar' });
+        form.setField('foo', { label: 'Foo' });
+        expect(form.fields.get('foo').value).toEqual('bar');
+    });
+
     it('builds tests using blank', () => {
         const test = nonBlank();
         expect(test.message).toEqual('is required');

data/spec/client/components/time-zone-select.spec.jsx

@@ -0,0 +1,11 @@
+import React from 'react'; // eslint-disable-line no-unused-vars
+import TZ from 'hippo/components/time-zone-select';
+import { Snapshot } from 'hippo/testing/screens';
+
+
+describe('TimeZone Component', () => {
+    it('matches snapshot', () => {
+        const oc = jest.fn();
+        expect(Snapshot(<TZ onChange={oc} value="America/Chicago" />)).toMatchSnapshot();
+    });
+});

data/spec/client/models/pub_sub.spec.js

@@ -3,10 +3,10 @@ import PubSubChannel from 'hippo/models/pub_sub/channel';
 import Config from 'hippo/config';
 import { Ship, Container } from '../test-models';
 
+jest.mock('hippo/models/pub_sub/channel');
 jest.mock('hippo/user', () => ({
     isLoggedIn: true,
 }));
-jest.mock('hippo/models/pub_sub/channel');
 jest.mock('hippo/config');
 
 describe('PubSub', () => {
@@ -15,8 +15,6 @@ describe('PubSub', () => {
         const ship = new Ship();
         const container = new Container({ id: '2' });
         onBoot();
-        expect(PubSubChannel.prototype.subscribe)
-            .not.toHaveBeenCalledWith('test/boat/test');
         expect(PubSubChannel.prototype.subscribe)
             .not.toHaveBeenCalledWith('test/container/2');
         observePubSub(ship, container);

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

@@ -0,0 +1,45 @@
+import PubSubChannel from 'hippo/models/pub_sub/channel';
+
+describe('PubSub Channel', () => {
+    it('subscribes/unsubscribes', () => {
+        const onModelChange = jest.fn();
+        const perform = jest.fn();
+        const received = jest.fn();
+        const chan = new PubSubChannel({
+            onModelChange,
+            cable: {
+                subscriptions: {
+                    create: jest.fn(() => ({
+                        received,
+                        perform,
+                    })),
+                },
+            },
+        });
+        const spy1 = jest.fn();
+        const channel = 'foo/bar/1';
+        chan.subscribe(channel, spy1);
+        expect(chan.callbacks.get(channel)).toHaveLength(1);
+        const msg = { channel: `ps:${channel}` };
+
+        const spy2 = jest.fn();
+        chan.subscribe(channel, spy2);
+
+        chan.received(msg);
+        expect(spy1).toHaveBeenCalledWith(msg);
+        expect(spy2).toHaveBeenCalledWith(msg);
+
+        chan.unsubscribe(channel, spy1);
+        chan.received(msg);
+        expect(spy1).toHaveBeenCalledTimes(1);
+        expect(spy2).toHaveBeenCalledTimes(2);
+
+        expect(onModelChange).not.toHaveBeenCalled();
+        chan.unsubscribe(channel, spy2);
+
+        chan.received(msg);
+        expect(onModelChange).toHaveBeenCalledWith('foo/bar', '1', {});
+        expect(spy1).toHaveBeenCalledTimes(1);
+        expect(spy2).toHaveBeenCalledTimes(2);
+    });
+});