hippo-fw 0.9.8 → 0.9.9

data/spec/server/api/tenant_isolation_spec.rb

@@ -3,19 +3,22 @@ require_relative '../spec_helper'
 
 describe "Tenant isoloation", api: true, vcr: VCR_OPTS do
 
-    let(:foo) { FactoryGirl.create :tenant, slug: 'foo' }
-    let(:bar) { FactoryGirl.create :tenant, slug: 'bar' }
+    let(:foo) { FactoryBot.create :tenant, slug: 'foo' }
+    let(:bar) { FactoryBot.create :tenant, slug: 'bar' }
 
-    let!(:foo_user) { FactoryGirl.create :user, tenant: foo }
-    let!(:bar_user) { FactoryGirl.create :user, tenant: bar }
+    let!(:foo_user) { FactoryBot.create :user, tenant: foo }
+    let!(:bar_user) { FactoryBot.create :user, tenant: bar }
 
     before(:each) {
         Hippo.logger.level = ::Logger::ERROR
     }
+
+    around(:each){ |spec| with_payment_proccessor { spec.run } }
+
     it 'isolates foo’s tenant data from bar' do
         get '/api/hippo/user.json', {} , {
-            'HTTP_AUTHORIZATION' => foo_user.jwt_token,
-            'SERVER_NAME' => "#{foo.slug}.example.ua" }
+                'HTTP_AUTHORIZATION' => foo_user.jwt_token,
+                'SERVER_NAME' => "#{foo.slug}.example.ua" }
         ids = last_response_json['data'].map { |u| u['id'] }
         expect(ids).to include(foo_user.id)
         expect(ids).not_to include(bar_user.id)
@@ -23,8 +26,8 @@ describe "Tenant isoloation", api: true, vcr: VCR_OPTS do
 
     it 'isolates bar’s tenant data from foo' do
         get '/api/hippo/user.json', {}, {
-             'HTTP_AUTHORIZATION' => bar_user.jwt_token,
-             'SERVER_NAME' => "#{bar.slug}.example.ua" }
+                'HTTP_AUTHORIZATION' => bar_user.jwt_token,
+                'SERVER_NAME' => "#{bar.slug}.example.ua" }
         ids = last_response_json['data'].map { |u| u['id'] }
         expect(ids).to include(bar_user.id)
         expect(ids).not_to include(foo_user.id)

data/spec/server/api/user_sessions_spec.rb

@@ -2,14 +2,17 @@ require_relative '../spec_helper'
 
 describe "User Login", api: true, vcr: VCR_OPTS do
 
-    let!(:user) { FactoryGirl.create :user, login: 'SamTheMan', password: 'password' }
+    let!(:user) { FactoryBot.create :user, login: 'SamTheMan', password: 'password' }
 
     it 'logs in using case insensitive logins' do
-        post '/api/hippo/user-session.json', {
-                 'login' => 'samTheman',
-                 'password' => 'password'
-             }.to_json
-        expect(last_response_json['success']).to eq(true)
-        expect(last_response_json.dig('data', 'user', 'login')).to eq(user.login)
+        with_payment_proccessor do
+            post('/api/hippo/user-session.json', {
+                     'login' => 'samTheman',
+                     'password' => 'password'
+                 }.to_json,
+                 {'CONTENT_TYPE' => 'application/json'})
+            expect(last_response_json['success']).to eq(true)
+            expect(last_response_json.dig('data', 'user', 'login')).to eq(user.login)
+        end
     end
 end

data/spec/server/api/user_spec.rb

@@ -0,0 +1,45 @@
+require_relative '../spec_helper'
+
+describe "User Create/Update", api: true, vcr: VCR_OPTS do
+
+    let(:user) {
+        FactoryBot.create :user, login: 'SamTheMan', password: 'password', role_names: ['employee']
+    }
+
+    let(:new_user_data) {
+        { 'login' => 'bob', 'name' => 'Bob',
+          'email' => 'bob@test.com', 'password' => 'new-password' }
+    }
+
+    it 'can create user when admin' do
+        user.update_attributes(role_names: ['administrator'])
+        post('/api/hippo/user.json', new_user_data.to_json, {
+                 'HTTP_AUTHORIZATION' => user.jwt_token,
+                 'CONTENT_TYPE' => 'application/json'
+             })
+        expect(last_response_json['success']).to eq(true)
+        expect(last_response_json.dig('data', 'login')).to eq('bob')
+    end
+
+    it 'fails when user is not admin' do
+        Hippo.silence_logs do
+            post('/api/hippo/user.json',
+                 new_user_data.to_json,
+                 {'HTTP_AUTHORIZATION' => user.jwt_token,
+                  'CONTENT_TYPE' => 'application/json'})
+        end
+        expect(last_response_json['success']).to eq(false)
+        expect(last_response_json['message']).to eq('Access Denied')
+    end
+
+    it 'allows user to update own account' do
+        put("/api/hippo/user/#{user.id}.json",
+            new_user_data.merge('id' => user.id).to_json,
+            {'HTTP_AUTHORIZATION' => user.jwt_token,
+             'CONTENT_TYPE' => 'application/json'})
+        expect(last_response_json['success']).to eq(true)
+        expect(user.reload.login).to eq('SamTheMan')
+        expect(user.authenticate('new-password')).not_to eq(false)
+    end
+
+end

data/spec/server/models/subscription_spec.rb

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

data/spec/server/payment_helpers.rb

@@ -0,0 +1,13 @@
+module PaymentHelpers
+    def with_payment_proccessor
+        RSpec::Mocks.with_temporary_scope do
+            allow(Hippo::Payments).to receive(:gateway_config).and_return(
+                                          'merchant_id' => 'dshtky2jcjpr96z3',
+                                          'public_key'  => 'hm7n6vc84jbr962w',
+                                          'private_key' => '413cb3c8af29b3c3ba340cfb715f4532',
+                                          'sandbox'     => true
+                                      )
+            yield
+        end
+    end
+end

data/spec/server/print/form_spec.rb

@@ -16,7 +16,7 @@ xdescribe "Printing tempaltes" do
     end
 
     it "can generate a pdf" do
-        user = FactoryGirl.create(:user)
+        user = FactoryBot.create(:user)
         tmpl = TestPrinter.new(user.id)
         tmpl.record
         expect(tmpl.render.length).to be > 1000

data/spec/server/spec_helper.rb

@@ -2,8 +2,8 @@ require "hippo/spec_helper"
 require 'hippo/command'
 require "temping"
 require "shrine/storage/memory"
-
 require 'rspec/expectations'
+require_relative 'payment_helpers'
 
 require "shrine"
 
@@ -12,8 +12,9 @@ RSpec.configure do |config|
   config.after do
     Temping.teardown
   end
-
+  config.include PaymentHelpers
 end
+
 require 'hippo/db/migrations'
 ActiveRecord::ConnectionAdapters::PostgreSQL::Table.class_eval do
     include ::Hippo::DB::Migrations::TableDefinitionHelpers
@@ -63,12 +64,3 @@ module TestingModels
         Temping.teardown
     end
 end
-
-
-# class Hippo::TestCase
-
-#     def fixtures_path
-#         Pathname.new(__FILE__).dirname.join("..","fixtures").expand_path
-#     end
-
-# end

data/templates/js/screen-definitions.js

@@ -11,7 +11,10 @@ const Screens = {};
 Screens['<%= screen.identifier %>'] = <%= screen.to_json %>;
 Definition.register(
     Screens['<%= screen.identifier %>'],
-    asyncComponent({ resolve: () => System.import(<%= "'#{screen.asset_path}'" %>) }),
+    asyncComponent({
+        screen: <%= screen.to_json %>,
+        resolve: () => System.import(<%= "'#{screen.asset_path}'" %>)
+    }),
 );
 <% end -%>
 

data/templates/spec/factories/model.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
     factory :<%= file_name %>, class: <%= namespace %>::<%= class_name %> do
         tenant { Hippo::Tenant.current }
 

data/views/hippo_root_view.erb

@@ -10,7 +10,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui"/>
         <title><%= Hippo::Extensions.controlling.title %></title>
         <style>
-          .loading {
+          .hippo-app-loading {
             position: fixed;
             z-index: 999;
             height: 2em;
@@ -27,7 +27,7 @@
             border: 0;
             transition: opacity .5s ease-in-out;
           }
-          .loading:before {
+          .hippo-app-loading:before {
             content: '';
             display: block;
             position: fixed;
@@ -37,7 +37,7 @@
             height: 100%;
             background-color: rgba(0,0,0,0.3);
           }
-          .loading:after {
+          .hippo-app-loading:after {
             content: '';
             display: block;
             font-size: 10px;
@@ -54,13 +54,13 @@
             0% { transform: rotate(0deg); }
             100% { transform: rotate(360deg); }
           }
-          .loading.complete {
+          .hippo-app-loading.complete {
             opacity: 0;
           }
         </style>
     </head>
     <body>
-      <div class="loading">Loading&#8230;</div>
+      <div class="hippo-app-loading">Loading&#8230;</div>
       <div id="hippo-root">
         <script type="text/json" id="bootstrap-data">
           <%= Hippo::API.to_json(Hippo::Tenant.current.bootstrap_data) %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hippo-fw
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-22 00:00:00.000000000 Z
+date: 2017-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -276,6 +276,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: braintree
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.80'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.80'
 - !ruby/object:Gem::Dependency
   name: rack-cors
   requirement: !ruby/object:Gem::Requirement
@@ -346,6 +360,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: image_optim
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.26'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.26'
+- !ruby/object:Gem::Dependency
+  name: image_optim_pack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
@@ -696,6 +738,10 @@ files:
 - client/hippo/access/index.js
 - client/hippo/access/login-dialog.jsx
 - client/hippo/access/styles.scss
+- client/hippo/access/subscription-choice-layer.jsx
+- client/hippo/access/subscription-choice-layer/cancel-subscription.jsx
+- client/hippo/access/subscription-choice-layer/payment-form.jsx
+- client/hippo/access/subscription-choice-layer/subscription-choice.scss
 - client/hippo/boot.jsx
 - client/hippo/components/asset.jsx
 - client/hippo/components/asset.scss
@@ -714,6 +760,7 @@ files:
 - client/hippo/components/form/fields.jsx
 - client/hippo/components/form/fields/checkbox-wrapper.jsx
 - client/hippo/components/form/fields/date-wrapper.jsx
+- client/hippo/components/form/fields/email-wrapper.jsx
 - client/hippo/components/form/fields/form-field.scss
 - client/hippo/components/form/fields/label.jsx
 - client/hippo/components/form/fields/react-tags.scss
@@ -723,11 +770,7 @@ files:
 - client/hippo/components/form/fields/textarea-wrapper.jsx
 - client/hippo/components/form/validations.js
 - client/hippo/components/form/wrapper.jsx
-- client/hippo/components/grid/config.json
-- client/hippo/components/grid/editors.scss
-- client/hippo/components/grid/index.js
-- client/hippo/components/grid/row-editor.scss
-- client/hippo/components/grid/styles.scss
+- client/hippo/components/grid.js
 - client/hippo/components/help.jsx
 - client/hippo/components/icon.jsx
 - client/hippo/components/index.js
@@ -737,6 +780,8 @@ files:
 - client/hippo/components/modal/styles.scss
 - client/hippo/components/network-activity-overlay.jsx
 - client/hippo/components/network-activity-overlay.scss
+- client/hippo/components/payments/field.jsx
+- client/hippo/components/payments/field.scss
 - client/hippo/components/popout-window.jsx
 - client/hippo/components/query-builder.jsx
 - client/hippo/components/query-builder/boolean-picker.jsx
@@ -754,28 +799,14 @@ files:
 - client/hippo/components/select-field/index.js
 - client/hippo/components/select-field/styles.scss
 - client/hippo/components/text-editor.jsx
-- client/hippo/components/text-editor/display-modes/Button.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/renderer.scss
 - client/hippo/components/text-editor/text-editor.scss
+- client/hippo/components/text-editor/upload-adapter.js
 - client/hippo/components/time-zone-select.jsx
 - client/hippo/components/tool-tip.jsx
-- client/hippo/components/toolbar/changes-notification.scss
-- client/hippo/components/toolbar/index.js
-- client/hippo/components/toolbar/styles.scss
+- client/hippo/components/toolbar.jsx
 - client/hippo/components/warning-notification.jsx
 - client/hippo/config.android.js
 - client/hippo/config.ios.js
@@ -790,11 +821,19 @@ files:
 - client/hippo/index.scss.erb
 - client/hippo/lib/__mocks__/loader.js
 - client/hippo/lib/__mocks__/request-assets.js
+- client/hippo/lib/action_cable.js
+- client/hippo/lib/action_cable/cable.js
+- client/hippo/lib/action_cable/connection.js
+- client/hippo/lib/action_cable/connection_monitor.js
+- client/hippo/lib/action_cable/consumer.js
+- client/hippo/lib/action_cable/subscription.js
+- client/hippo/lib/action_cable/subscriptions.js
 - client/hippo/lib/all.js
 - client/hippo/lib/bootstrap.js
 - client/hippo/lib/computed-properties.js
 - client/hippo/lib/date-range.js
 - client/hippo/lib/index.js.erb
+- client/hippo/lib/lazy-getter.js
 - client/hippo/lib/loader.js
 - client/hippo/lib/request-assets.js
 - client/hippo/lib/smooth-scroll.js
@@ -804,6 +843,7 @@ files:
 - client/hippo/models/base.js
 - client/hippo/models/collection.js
 - client/hippo/models/config.js
+- client/hippo/models/date-type.js
 - client/hippo/models/decorators.js
 - client/hippo/models/index.js
 - client/hippo/models/pub_sub.js
@@ -817,6 +857,7 @@ files:
 - client/hippo/models/query/operator.js
 - client/hippo/models/query/result.js
 - client/hippo/models/query/types.js
+- client/hippo/models/subscription.js
 - client/hippo/models/sync.js
 - client/hippo/models/system-setting.js
 - client/hippo/models/tenant.js
@@ -824,11 +865,13 @@ files:
 - client/hippo/react/component-not-found.jsx
 - client/hippo/react/index.js
 - client/hippo/screens/all.js.erb
+- client/hippo/screens/async-loading.jsx
 - client/hippo/screens/definition.js
 - client/hippo/screens/group.js
 - client/hippo/screens/index.js
 - client/hippo/screens/instance.js
 - client/hippo/screens/mixins/index.js
+- client/hippo/screens/preferences.jsx
 - client/hippo/screens/register.js.erb
 - client/hippo/screens/styles.scss
 - client/hippo/screens/system-settings.jsx
@@ -939,12 +982,17 @@ files:
 - db/migrate/20170530120002_create_system_settings.rb
 - db/migrate/20170530120003_create_assets.rb
 - db/migrate/20170530120004_create_users.rb
+- db/migrate/20171129024737_create_subscriptions.rb
 - db/seed.rb
 - docs/command.md
 - docs/model.md
 - docs/react.md
 - docs/todo-example-part-1.md
 - docs/welcome.md
+- fixtures/vcr_cassettes/Tenant_changes/sends_email_when_tenant_identifier_changes.yml
+- fixtures/vcr_cassettes/Tenant_isoloation/disallows_using_a_user_s_token_on_incorrect_domain.yml
+- fixtures/vcr_cassettes/Tenant_isoloation/isolates_bar_s_tenant_data_from_foo.yml
+- fixtures/vcr_cassettes/Tenant_isoloation/isolates_foo_s_tenant_data_from_bar.yml
 - hippo-fw.gemspec
 - lib/hippo-fw.rb
 - lib/hippo.rb
@@ -975,6 +1023,7 @@ files:
 - lib/hippo/api/generic_controller.rb
 - lib/hippo/api/handlers/asset.rb
 - lib/hippo/api/handlers/print.rb
+- lib/hippo/api/handlers/subscription.rb
 - lib/hippo/api/handlers/tenant.rb
 - lib/hippo/api/handlers/user_session.rb
 - lib/hippo/api/helper_methods.rb
@@ -1045,7 +1094,9 @@ files:
 - lib/hippo/logger.rb
 - lib/hippo/mailer.rb
 - lib/hippo/model.rb
+- lib/hippo/models/subscription.rb
 - lib/hippo/numbers.rb
+- lib/hippo/payments.rb
 - lib/hippo/rake_tasks.rb
 - lib/hippo/redis.rb
 - lib/hippo/reloadable_sinatra.rb
@@ -1059,6 +1110,7 @@ files:
 - lib/hippo/templates/latex.rb
 - lib/hippo/templates/liquid.rb
 - lib/hippo/templates/liquid/pluralize.rb
+- lib/hippo/templates/liquid/precision.rb
 - lib/hippo/templates/mail.rb
 - lib/hippo/templates/tenant_change.rb
 - lib/hippo/tenant.rb
@@ -1098,11 +1150,14 @@ files:
 - spec/client/models/pub_sub.spec.js
 - spec/client/models/pub_sub/channel.spec.js
 - spec/client/models/query.spec.js
+- spec/client/models/subscription.spec.js
 - spec/client/models/sync.spec.js
 - spec/client/models/system-setting.spec.js
+- spec/client/screens/__snapshots__/preferences.spec.jsx.snap
 - spec/client/screens/definition.spec.js
 - spec/client/screens/group.spec.js
 - spec/client/screens/instance.spec.js
+- spec/client/screens/preferences.spec.jsx
 - spec/client/screens/system-settings-tenants.spec.jsx
 - spec/client/screens/system-settings.spec.jsx
 - spec/client/screens/user-management.spec.jsx
@@ -1112,6 +1167,7 @@ files:
 - spec/client/user.spec.js
 - spec/client/workspace/__snapshots__/menu.spec.jsx.snap
 - spec/client/workspace/menu.spec.jsx
+- spec/factories/subscription.rb
 - spec/factories/tenant.rb
 - spec/factories/user.rb
 - spec/fixtures/logo.png
@@ -1145,6 +1201,7 @@ files:
 - spec/server/api/tenant_change_spec.rb
 - spec/server/api/tenant_isolation_spec.rb
 - spec/server/api/user_sessions_spec.rb
+- spec/server/api/user_spec.rb
 - spec/server/assertions.rb
 - spec/server/asset_spec.rb
 - spec/server/command_spec.rb
@@ -1161,7 +1218,9 @@ files:
 - spec/server/configuration_spec.rb
 - spec/server/job_spec.rb
 - spec/server/mailer_spec.rb
+- spec/server/models/subscription_spec.rb
 - spec/server/numbers_spec.rb
+- spec/server/payment_helpers.rb
 - spec/server/print/form_spec.rb
 - spec/server/spec_helper.rb
 - spec/server/strings_spec.rb