hippo-fw 0.9.4 → 0.9.5

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hippo-fw",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "Hippo is a framework for easily writing single page web applications",
   "main": "client/hippo/index.js",
   "repository": "https://github.com/argosity/hippo",
@@ -10,11 +10,11 @@
     "client"
   ],
   "dependencies": {
-    "actioncable": "^5.0.4",
+    "actioncable": "^5.1.1",
     "babel-core": "^6.25.0",
     "babel-eslint": "^7.2.3",
     "babel-jest": "^20.0.3",
-    "babel-loader": "^7.0.0",
+    "babel-loader": "^7.1.0",
     "babel-plugin-lodash": "^3.2.11",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0",
@@ -34,30 +34,30 @@
     "core-decorators": "^0.19.0",
     "create-react-class": "^15.6.0",
     "css-loader": "^0.28.4",
-    "date-fns": "^1.28.2",
     "domtastic": "^0.15.0",
-    "enzyme": "^2.8.2",
+    "enzyme": "^2.9.0",
     "eslint": "^4.0.0",
     "eslint-config-argosity": "^1.1.3",
     "file-loader": "^0.11.2",
     "flexboxgrid": "^6.3.1",
     "grommet": "^1.4.0",
-    "history": "^4.6.2",
+    "history": "^4.6.3",
     "identity-obj-proxy": "^3.0.0",
     "invariant": "^2.2.2",
     "jest": "^20.0.4",
     "jest-cli": "^20.0.4",
-    "jest-enzyme": "^3.1.0",
+    "jest-enzyme": "^3.3.0",
     "jest-fetch-mock": "^1.0.7",
     "js-yaml": "^3.8.2",
     "jsdom": "^11.0.0",
     "lodash": "^4.17.4",
     "loglevel": "^1.4.1",
-    "mobx": "^3.1.15",
+    "mobx": "^3.1.16",
     "mobx-decorated-models": "^0.5.2",
     "mobx-persist": "^0.3.3",
     "mobx-react": "^4.1.0",
     "node-sass": "^4.5.0",
+    "ory-editor": "^0.2.12",
     "pluralize": "^5.0.0",
     "prop-types": "^15.5.8",
     "qs": "^6.3.0",
@@ -66,9 +66,10 @@
     "react-addons-test-utils": "^15.6.0",
     "react-async-component": "^1.0.0-beta.3",
     "react-dom": "^15.6.1",
-    "react-dropzone": "^3.10.0",
+    "react-dropzone": "^3.13.3",
     "react-flexbox-grid": "git+https://github.com/nathanstitt/react-flexbox-grid.git#devel",
     "react-hot-loader": "3.0.0-beta.6",
+    "react-input-slider": "^1.6.0",
     "react-motion": "^0.5.0",
     "react-native-storage": "^0.2.2",
     "react-router": "^4.1.1",
@@ -77,16 +78,16 @@
     "react-test-renderer": "^15.6.1",
     "react-tippy": "^0.14.0",
     "react-virtualized": "^9.8.0",
-    "resolve-url-loader": "^2.0.2",
+    "resolve-url-loader": "^2.0.3",
     "rsvp": "^3.3.3",
     "sass-loader": "^6.0.6",
     "sockjs-client": "^1.1.4",
     "sprintf-js": "^1.0.3",
     "style-loader": "^0.18.2",
     "url-loader": "^0.5.9",
-    "validator": "^7.0.0",
-    "webpack": "^2.6.1",
-    "webpack-dev-server": "^2.4.5",
+    "validator": "^7.1.0",
+    "webpack": "^3.0.0",
+    "webpack-dev-server": "^2.5.0",
     "whatwg-fetch": "^2.0.2",
     "when-dom-ready": "^1.2.4"
   }

data/spec/client/access/login-dialog.spec.jsx

@@ -23,6 +23,7 @@ describe('Login Dialog', () => {
         expect(dialog).not.toHaveRendered('LoginForm');
         return User.logout().then(() => {
             expect(dialog).not.toHaveRendered('LoginForm');
+            expect(Config.reset).toHaveBeenCalled();
         });
     });
 });

data/spec/client/components/asset.spec.jsx

@@ -7,10 +7,9 @@ import { TestImage } from '../test-models';
 import { Snapshot } from 'hippo/testing/screens';
 
 describe("Asset Component", () => {
-    it('renders and matches snapshot', () => {
+    it('renders', () => {
         const image = new TestImage();
         const asset = mount(<Asset model={image} name="asset" />);
         expect(asset).toHaveRendered('Dropzone');
-        expect(Snapshot(<Asset model={image} name="asset" />)).toMatchSnapshot();
     });
 });

data/spec/client/components/date-time.spec.jsx

@@ -0,0 +1,20 @@
+import React from 'react';
+import DateTime from 'hippo/components/date-time/date-time-drop';
+import moment from 'moment';
+
+describe('DateTime Component', () => {
+    let props;
+    beforeEach(() => {
+        props = {
+            value: moment('2017-06-26T21:33:13Z'),
+            onChange: jest.fn(),
+        };
+    });
+
+    it('sets time', () => {
+        const dt = mount(<DateTime {...props} />);
+        dt.find('.minutes').simulate('change', { target: { value: '42' } });
+        expect(props.onChange).toHaveBeenCalledWith(props.value);
+        expect(props.value.minute()).toEqual(42);
+    });
+});

data/spec/client/extension/base.spec.js

@@ -2,9 +2,7 @@ import { BaseExtension } from 'hippo/extensions/base';
 import { observable } from 'mobx';
 
 class TestExtension extends BaseExtension {
-
     @observable identifier = 'foo-bar-baz';
-
 }
 
 describe('Base Extension', () => {

data/spec/client/models/base.spec.js

@@ -27,15 +27,15 @@ describe('BaseModel Test', () => {
         const box = new Box({ id: 11, width: 5 });
         const spy = jest.fn();
         autorun(() => spy(box.syncUrl));
-        expect(spy).toHaveBeenCalledWith('/api/test/boxes/11');
+        expect(spy).toHaveBeenCalledWith('/api/test/box/11');
         expect(box.id).toEqual(11);
         expect(box.identifierFieldValue).toEqual(11);
         expect(box.isNew).toEqual(false);
-        expect(box.syncUrl).toEqual('/api/test/boxes/11');
+        expect(box.syncUrl).toEqual('/api/test/box/11');
         box.id = 42;
         expect(spy).toHaveBeenCalledTimes(2);
-        expect(spy).toHaveBeenCalledWith('/api/test/boxes/42');
-        expect(box.syncUrl).toEqual('/api/test/boxes/42');
+        expect(spy).toHaveBeenCalledWith('/api/test/box/42');
+        expect(box.syncUrl).toEqual('/api/test/box/42');
     });
 
     it('is set from sync', () => {

data/spec/client/models/query.spec.js

@@ -138,7 +138,7 @@ describe('Model Queries', () => {
             query.clauses[0].value = 'test value';
             query.results.fetch();
             expect(Sync.perform).toHaveBeenLastCalledWith(
-                '/api/test/boxes', {
+                '/api/test/box', {
                     total_count: 't',
                     fields: ['id', 'label', 'width', 'height', 'depth'],
                     query:  { computed: { op: 'like', value: 'test value%' } },
@@ -227,7 +227,7 @@ describe('Model Queries', () => {
             expect(query.results.fullyLoaded).toEqual(false);
             query.setSort({ field: query.fields[2], ascending: true });
             expect(Sync.perform).toHaveBeenLastCalledWith(
-                '/api/test/boxes', {
+                '/api/test/box', {
                     total_count: 't',
                     fields: ['id', 'label', 'width', 'height', 'depth'],
                     order:  { label: 'asc' },

data/spec/client/models/sync.spec.js

@@ -43,7 +43,7 @@ describe('Network sync', () => {
         const body = JSON.stringify(box.syncData);
         Sync.forModel(box).then(() => expect(box.width).toEqual(12));
         expect(fetch).lastCalledWith(
-            '/api/test/boxes/11.json',
+            '/api/test/box/11.json',
             { body, headers: { 'Content-Type': 'application/json' }, method: 'PUT' });
     });
 });

data/spec/client/screens/system-settings.spec.jsx

@@ -17,6 +17,7 @@ describe('SystemSettings Screen', () => {
     });
 
     it('renders', () => {
-        expect(Snapshot(<Settings screen={instance} />)).toMatchSnapshot();
+        const settings = mount(<Settings screen={instance} />);
+        expect(settings).toHaveRendered('Screen');
     });
 });

data/spec/client/setup.js

@@ -3,6 +3,9 @@
 require('hippo/testing');
 const matchers = require('hippo/testing/matchers');
 const { shallow, mount } = require('enzyme');
+const log = require('loglevel');
+
+log.setLevel(log.levels.WARN);
 
 global.expect.extend(matchers);
 

data/spec/client/test-models.js

@@ -30,7 +30,6 @@ export class TestImage extends BaseModel {
 
 @identifiedBy('test/box')
 export class Box extends BaseModel {
-
     @session visibleIdentifier;
 
     @session({ type: 'string' }) label;
@@ -50,7 +49,6 @@ export class Box extends BaseModel {
 
 @identifiedBy('test/container')
 export class Container extends BaseModel {
-
     @identifier({ type: 'string' }) id;
 
     @field name;

data/spec/server/api/tenant_change_spec.rb

@@ -8,7 +8,7 @@ describe "Tenant changes", api: true, vcr: VCR_OPTS do
     let!(:user) { FactoryGirl.create :user, tenant: tenant, role_names: ['administrator'] }
 
     it 'sends email when tenant identifier changes' do
-        post '/api/hippo/tenants.json', {
+        post '/api/hippo/tenant.json', {
                  'slug' => 'RED'
              }.to_json, {
                  'HTTP_AUTHORIZATION' => user.jwt_token,

data/spec/server/api/tenant_isolation_spec.rb

@@ -9,8 +9,11 @@ describe "Tenant isoloation", api: true, vcr: VCR_OPTS do
     let!(:foo_user) { FactoryGirl.create :user, tenant: foo }
     let!(:bar_user) { FactoryGirl.create :user, tenant: bar }
 
+    before(:each) {
+        Hippo.logger.level = ::Logger::ERROR
+    }
     it 'isolates foo’s tenant data from bar' do
-        get '/api/hippo/users.json', {} , {
+        get '/api/hippo/user.json', {} , {
             'HTTP_AUTHORIZATION' => foo_user.jwt_token,
             'SERVER_NAME' => "#{foo.slug}.example.ua" }
         ids = last_response_json['data'].map { |u| u['id'] }
@@ -19,7 +22,7 @@ describe "Tenant isoloation", api: true, vcr: VCR_OPTS do
     end
 
     it 'isolates bar’s tenant data from foo' do
-        get '/api/hippo/users.json', {}, {
+        get '/api/hippo/user.json', {}, {
              'HTTP_AUTHORIZATION' => bar_user.jwt_token,
              'SERVER_NAME' => "#{bar.slug}.example.ua" }
         ids = last_response_json['data'].map { |u| u['id'] }
@@ -28,7 +31,7 @@ describe "Tenant isoloation", api: true, vcr: VCR_OPTS do
     end
 
     it 'disallows using a user’s token on incorrect domain' do
-        get '/api/hippo/users.json', {}, {
+        get '/api/hippo/user.json', {}, {
                 'HTTP_AUTHORIZATION' => foo_user.jwt_token,
                 'SERVER_NAME' => "#{bar.slug}.example.ua" }
         expect(last_response).to_not be_ok

data/spec/server/concerns/api_path_spec.rb

@@ -11,10 +11,10 @@ describe "ApiPath" do
     end
 
     it "generates path" do
-        expect('test-models').to eq(TestModel.api_path)
+        expect('test-model').to eq(TestModel.api_path)
     end
 
     it "converts path to model" do
-        expect(TestModel).to eq(Hippo::Model.from_api_path('test-models'))
+        expect(TestModel).to eq(Hippo::Model.from_api_path('test-model'))
     end
 end

data/templates/.gitignore

@@ -2,3 +2,4 @@ node_modules
 public/assets
 tmp/cache
 log/*log
+config/secrets.yml

data/templates/client/extension.js

@@ -25,6 +25,10 @@ export default class Extension extends BaseExtension {
     // the Base class will simply store the provided data as @data
     setBootstrapData() { return super.setBootstrapData(...arguments); }
 
+    // The root view that will be rendered when a screen is not being shown
+    // Return a different component here to customize
+    rootView() { return super.rootView(); }
+
     // A React component that should be rendered as part of the settings screen
     get systemSettingsComponent() {
         return null;

data/templates/config/webpack.config.js

@@ -9,9 +9,9 @@ const entries = {
 };
 
 <%% unless Hippo.env.production? -%>
-    for (var key in entries) {
-        entries[key].unshift('react-hot-loader/patch');
-    }
+for (var key in entries) {
+    entries[key].unshift('react-hot-loader/patch');
+}
 <%% end -%>
 
 const config = {
@@ -19,7 +19,7 @@ const config = {
     output: {
         path: '<%%= config_directory.join('..','public', 'assets') %>',
         publicPath: '<%%= Hippo.env.production? ? "https://assets.#{Hippo.config.website_domain}/assets/" : 'http://test.hippo.dev:8889/assets/' %>',
-        filename: '[name]-[hash].js',
+                    filename: '[name]-[hash].js',
     },
     resolve: {
         modules: [
@@ -63,17 +63,19 @@ const config = {
                 },
             },
             { test: /\.scss$/,
-                use: [
-                    'style-loader',
-                    'css-loader',
-                    'resolve-url-loader',
-                    {
-                        loader: 'sass-loader',
-                        options: {
-                            includePaths: [path.resolve('./node_modules')],
-                        },
-                    },
-                ],
+              use: [
+                  'style-loader',
+                  'css-loader',
+                  'resolve-url-loader',
+                  {
+                      loader: 'sass-loader',
+                      options: {
+                          includePaths: [
+                              "<%%= Hippo::Extensions.client_module_paths.join('","') %>",
+                          ],
+                      },
+                  },
+              ],
             },
         ],
     },
@@ -82,20 +84,20 @@ const config = {
         new webpack.DefinePlugin({
             'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'development'),
         }),
-<%% if Hippo.env.production? %>
+        <%% if Hippo.env.production? %>
         new webpack.optimize.UglifyJsPlugin(), //minify everything
         new webpack.optimize.AggressiveMergingPlugin(), //Merge chunks
         new webpack.optimize.OccurrenceOrderPlugin(), // use smallest id for most used chuncks
         new CompressionPlugin({
-          asset: "[path].gz[query]",
-          algorithm: "gzip",
-          test: /\.(js|html)$/,
-          threshold: 10240,
-          minRatio: 0.8
+            asset: "[path].gz[query]",
+            algorithm: "gzip",
+            test: /\.(js|html)$/,
+            threshold: 10240,
+            minRatio: 0.8
         }),
-<%% else %>
+        <%% else %>
         new webpack.NamedModulesPlugin(),
-<%% end %>
+        <%% end %>
     ],
     node: {
         fs: 'empty',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hippo-fw
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
+- !ruby/object:Gem::Dependency
+  name: activerecord-multi-tenant
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: litecable
   requirement: !ruby/object:Gem::Requirement
@@ -677,6 +691,12 @@ files:
 - client/hippo/components/data-table.jsx
 - client/hippo/components/data-table/header-cell.jsx
 - client/hippo/components/data-table/table-styles.scss
+- client/hippo/components/date-time.jsx
+- client/hippo/components/date-time.scss
+- client/hippo/components/date-time/calendar.jsx
+- client/hippo/components/date-time/date-time-drop.jsx
+- client/hippo/components/date-time/date-time.scss
+- client/hippo/components/date-time/time.jsx
 - client/hippo/components/enabled.js.erb
 - client/hippo/components/field-validation.js
 - client/hippo/components/form.jsx
@@ -745,6 +765,25 @@ files:
 - client/hippo/components/shared/resize-sensor.scss
 - client/hippo/components/shared/styles.scss
 - client/hippo/components/shared/throbber.scss
+- client/hippo/components/text-editor.jsx
+- client/hippo/components/text-editor/display-modes/Button.jsx
+- client/hippo/components/text-editor/display-modes/SaveState.jsx
+- client/hippo/components/text-editor/display-modes/ToggleEdit.jsx
+- client/hippo/components/text-editor/display-modes/ToggleInsert.jsx
+- client/hippo/components/text-editor/display-modes/ToggleLayout.jsx
+- client/hippo/components/text-editor/display-modes/TogglePreview.jsx
+- client/hippo/components/text-editor/display-modes/ToggleResize.jsx
+- client/hippo/components/text-editor/display-modes/index.css
+- client/hippo/components/text-editor/display-modes/index.js
+- client/hippo/components/text-editor/image-plugin/Component/Display/index.js
+- client/hippo/components/text-editor/image-plugin/Component/Form/index.js
+- client/hippo/components/text-editor/image-plugin/Component/index.js
+- client/hippo/components/text-editor/image-plugin/Component/index.scss
+- client/hippo/components/text-editor/image-plugin/index.js
+- client/hippo/components/text-editor/image-plugin/index.scss
+- client/hippo/components/text-editor/plugins.js
+- client/hippo/components/text-editor/renderer.jsx
+- client/hippo/components/text-editor/text-editor.scss
 - client/hippo/components/tool-tip.jsx
 - client/hippo/components/toolbar/changes-notification.scss
 - client/hippo/components/toolbar/index.js
@@ -769,7 +808,6 @@ files:
 - client/hippo/lib/bootstrap.js
 - client/hippo/lib/index.js.erb
 - client/hippo/lib/loader.js
-- client/hippo/lib/pub_sub.js
 - client/hippo/lib/request-assets.js
 - client/hippo/lib/smooth-scroll.js
 - client/hippo/lib/util.js
@@ -796,7 +834,6 @@ files:
 - client/hippo/react/DefaultComponentNotFound.jsx
 - client/hippo/react/Root.jsx
 - client/hippo/react/index.js
-- client/hippo/react/viewport-root.jsx
 - client/hippo/screens/all.js.erb
 - client/hippo/screens/definition.js
 - client/hippo/screens/group.js
@@ -846,6 +883,7 @@ files:
 - client/hippo/workspace/menu-option.jsx
 - client/hippo/workspace/menu.jsx
 - client/hippo/workspace/navbar.jsx
+- client/hippo/workspace/root-view.jsx
 - client/hippo/workspace/screen.jsx
 - client/hippo/workspace/styles.scss
 - client/hippo/workspace/styles/forms.scss
@@ -1011,6 +1049,7 @@ files:
 - lib/hippo/concerns/sorting_expressions.rb
 - lib/hippo/configuration.rb
 - lib/hippo/db.rb
+- lib/hippo/db/fake_rails.rb
 - lib/hippo/db/migrations.rb
 - lib/hippo/environment.rb
 - lib/hippo/extension.rb
@@ -1023,7 +1062,6 @@ files:
 - lib/hippo/mailer.rb
 - lib/hippo/model.rb
 - lib/hippo/numbers.rb
-- lib/hippo/rails.rb
 - lib/hippo/rake_tasks.rb
 - lib/hippo/redis.rb
 - lib/hippo/reloadable_sinatra.rb
@@ -1051,13 +1089,13 @@ files:
 - package.json
 - spec/client/.eslintrc.js
 - spec/client/access/login-dialog.spec.jsx
-- spec/client/components/__snapshots__/asset.spec.jsx.snap
 - spec/client/components/__snapshots__/master-detail.spec.jsx.snap
 - spec/client/components/__snapshots__/network-activity-overlay.spec.jsx.snap
 - spec/client/components/__snapshots__/query-builder.spec.jsx.snap
 - spec/client/components/asset.spec.jsx
 - spec/client/components/data-list.spec.jsx
 - spec/client/components/data-table.spec.jsx
+- spec/client/components/date-time.spec.jsx
 - spec/client/components/form.spec.jsx
 - spec/client/components/master-detail.spec.jsx
 - spec/client/components/network-activity-overlay.spec.jsx
@@ -1072,7 +1110,6 @@ files:
 - spec/client/models/query.spec.js
 - spec/client/models/sync.spec.js
 - spec/client/models/system-setting.spec.js
-- spec/client/screens/__snapshots__/system-settings.spec.jsx.snap
 - spec/client/screens/__snapshots__/tabs.spec.jsx.snap
 - spec/client/screens/definition.spec.js
 - spec/client/screens/group.spec.js
@@ -1163,7 +1200,6 @@ files:
 - templates/config/screens.rb
 - templates/config/webpack.config.js
 - templates/db/create_table_migration.rb
-- templates/gitignore
 - templates/js/config-data.js
 - templates/js/jest.config.json
 - templates/js/root-view.html