hippo-fw 0.9.5 → 0.9.6

data/client/hippo/workspace/styles.scss

@@ -36,3 +36,20 @@ pre {
         display: flex;
     }
 }
+
+.sidebar-toggle {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 1;
+    border-top-left-radius: 0;
+    border-bottom-right-radius: 0;
+    opacity: 0.2;
+    transistion: all 0.4s;
+    &:hover {
+        opacity: 1.0;
+    }
+    &.is-open {
+        display:none;
+    }
+}

data/command-reference-files/screen/client/appy-app/screens/ready-set-go.jsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import Screen from 'hippo/components/screen';
 
@@ -6,7 +7,7 @@ import Screen from 'hippo/components/screen';
 export default class ReadySetGo extends React.PureComponent {
 
     static propTypes = {
-        screen: React.PropTypes.instanceOf(Screen.Instance).isRequired,
+        screen: PropTypes.instanceOf(Screen.Instance).isRequired,
     }
 
     render() {

data/db/migrate/20170530120004_create_users.rb

@@ -9,6 +9,6 @@ class CreateUsers < ActiveRecord::Migration[5.0]
             t.timestamps null:false
         end
 
-        add_index :users, [:login, :tenant_id], unique: true
+        add_index :users, 'lower(login), tenant_id', name: 'index_users_on_login_and_tenant_id', unique: true
     end
 end

data/hippo-fw.gemspec

@@ -26,9 +26,10 @@ Gem::Specification.new do |spec|
 
     spec.add_dependency "activejob",                 "~> 5.1.0"
     spec.add_dependency "activerecord",              "~> 5.1.0"
-    spec.add_dependency "activerecord-multi-tenant", "~> 0.6"
+    spec.add_dependency "activerecord-multi-tenant", "~> 0.7"
 
     spec.add_dependency "litecable",                 "~> 0.4.1"
+    spec.add_dependency "anycable",                  "~> 0.4.6"
     spec.add_dependency "websocket",                 "~> 1.2.4"
     spec.add_dependency "mail",                      "~> 2.6"
     spec.add_dependency "scenic",                    "~> 1.4"
@@ -65,7 +66,7 @@ Gem::Specification.new do |spec|
     spec.add_dependency "jwt",                       "~> 1.5"
     spec.add_dependency "mini_magick",               "~> 4.3"
 
-    spec.add_dependency "oj",                        "~> 2.1"
+    spec.add_dependency "oj",                        "~> 3.3"
     spec.add_dependency "pg",                        "~> 0.8"
     spec.add_dependency "rake",                      "~> 12.0"
     spec.add_dependency "require_all",               "~> 1.3"

data/lib/hippo/api/cable.rb

@@ -1,4 +1,4 @@
-require "lite_cable"
+require "action_cable"
 
 module Hippo
     module API
@@ -10,14 +10,13 @@ module Hippo
                 @@server.call(request.env)
             end
 
-            class Channel < LiteCable::Channel::Base
-            end
-
-            class Connection < LiteCable::Connection::Base
+            class Connection < ActionCable::Connection::Base
                 identified_by :current_user
 
                 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
@@ -37,15 +36,16 @@ module Hippo
 
             def self.configure
                 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
 

data/lib/hippo/api/controller_base.rb

@@ -212,6 +212,7 @@ module Hippo
             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?
                     allowed_includes = include_associations.each_with_object([]) do |desired, results|
                         if desired.is_a?(Hash)

data/lib/hippo/api/handlers/tenant.rb

@@ -12,7 +12,7 @@ module Hippo::API::Handlers
             tenant = Hippo::Tenant.current
             tenant.assign_attributes(data.slice(*PUBLIC_ATTRS))
             success = tenant.save
-            if success
+            if success && tenant.slug_previously_changed?
                 Hippo::Tenant.system.perform do
                     Hippo::Templates::TenantChange.create(tenant).deliver
                 end

data/lib/hippo/api/handlers/user_session.rb

@@ -8,7 +8,8 @@ module Hippo::API::Handlers
         def self.create
             lambda do
                 wrap_reply(with_transaction: false) do
-                    user = Hippo::User.where(login: data['login']).first
+                    user = Hippo::User.with_login(data['login']).first
+
                     if user && user.authenticate(data['password'])
                         { success: true, message: "Login succeeded",
                           data: user.workspace_data }

data/lib/hippo/api/helper_methods.rb

@@ -34,7 +34,10 @@ module Hippo
             end
 
             def data
-                @json_data ||= Oj.load( request.body.read ) || {}
+                @json_data ||= (
+                    body = request.body.read
+                    body.present? ? Oj.load(body) : {}
+                )
             end
 
             def request_origin

data/lib/hippo/api/pub_sub.rb

@@ -3,8 +3,7 @@ require_relative 'cable'
 module Hippo
     module API
 
-        class PubSub < Cable::Channel
-            identifier :pubsub
+        class PubSub < ActionCable::Channel::Base
 
             PREFIX = 'ps:'
 
@@ -14,14 +13,16 @@ module Hippo
             end
 
             def off(data)
-                Hippo.logger.info "pubsub off: #{data['channel']}"
-                stop_stream channel_prefix + data['channel']
+                channel = channel_prefix + data['channel']
+                subscribers = pubsub
+                                  .instance_variable_get('@listener')
+                                  .instance_variable_get('@subscribers')[channel]
+                pubsub.unsubscribe(channel, subscribers.first) if subscribers.any?
             end
 
             def self.publish(channel, data)
-                Hippo.logger.info "pubsub pub: #{channel}"
                 channel = channel_prefix + channel
-                LiteCable.broadcast(channel, data.merge(channel: channel))
+                ActionCable.server.broadcast(channel, data.merge(channel: channel))
             end
 
             def self.channel_prefix

data/lib/hippo/api/to_json.rb

@@ -2,6 +2,6 @@ require 'oj'
 
 module Hippo::API
     def self.to_json(data)
-        Oj.dump(data, mode: :compat, time_format: :xmlschema)
+        Oj.dump(data)
     end
 end

data/lib/hippo/api/updates.rb

@@ -1,3 +1,5 @@
+require_relative './pub_sub'
+
 module Hippo
 
     module API

data/lib/hippo/command/console.rb

@@ -1,3 +1,5 @@
+require_relative '../api/updates'
+
 module Hippo
     module Command
 
@@ -19,10 +21,16 @@ module Hippo
                     ext.root_path.join('spec/factories')
                 end
                 FactoryGirl.find_definitions
-                MultiTenant.current_tenant = Hippo::Tenant.system
+                Hippo::API::Cable.configure
+                MultiTenant.current_tenant = Hippo::Tenant.find_by_slug(
+                    Hippo.env.development? ? 'test' : 'system'
+                )
                 ext.on_dev_console
-                ARGV.clear
-                IRB.start
+                Pry::Commands.block_command "tenant", "set current tenant to <slug>" do |slug|
+                    MultiTenant.current_tenant=Hippo::Tenant.find_by_slug!(slug)
+                    puts "Current tenant id = #{MultiTenant.current_tenant.id}"
+                end
+                Pry.start
             end
 
         end

data/lib/hippo/command/jest.rb

@@ -17,6 +17,7 @@ module Hippo
 
 
             def configure
+                @extension ||= Command.load_current_extension(raise_on_fail:true)
                 @config = Hippo::Webpack::ClientConfig.new
                 @config.invoke_all
                 self
@@ -33,6 +34,7 @@ module Hippo
                 options.each do |key, value|
                     cmd << " --#{key}" if value
                 end
+                say cmd, :green
                 exec(cmd)
             end
         end

data/lib/hippo/configuration.rb

@@ -50,6 +50,8 @@ module Hippo
         end
 
         def self.apply
+            Oj.default_options = { mode: :rails, time_format: :xmlschema }
+
             controlling_ext = Hippo::Extensions.bootstrap
             secrets = controlling_ext.root_path.join('config', 'secrets.yml')
             @@secrets = Hashie::Mash.new(
@@ -114,11 +116,8 @@ module Hippo
         # prefix to use for all urls
         config_option :mounted_at, '/'
 
-        # The initial id of the screen that should be displayed
-        config_option :root_view, 'workspace-layout'
-
-        # Screen to display on load (if workspace extension is used)
-        config_option :initial_workspace_screen_id, ''
+        # Configuration for action cable
+        config_option :cable, { 'adapter' => 'redis' }
 
         # types of assets to include into compiled package
         config_option :static_asset_types, ['images','fonts']
@@ -127,8 +126,6 @@ module Hippo
 
         config_option :product_name, 'Hippo Funtime'
 
-        config_option :api_use_any_cable, false
-
         def api_path
             mounted_at + 'api'
         end

data/lib/hippo/rake_tasks.rb

@@ -63,7 +63,7 @@ task :test => [:spec] do
 end
 
 task :lint do
-    sh %{node node_modules/eslint/bin/eslint.js client spec/client/}
+    sh %{node node_modules/eslint/bin/eslint.js --ext .js --ext .jsx client spec/client/}
 end
 
 task :ci do

data/lib/hippo/screen.rb

@@ -1,29 +1,49 @@
 require 'yaml'
 require 'oj'
 require 'pry'
+require_relative 'screen/group'
+require_relative 'screen/definition'
 
 module Hippo
 
     module Screen
 
         GROUPS=Hash.new{|h,k| g=Group.new; g.identifier=k; h[k]=g }
-        DEFINITIONS=Hash.new
+        DEFINITIONS = Hash.new
+        EXTENSIONS  = Hash.new
 
         mattr_accessor :enabled_group_ids
 
         class DefinitionList
+            attr_reader :ids
+
+            include Enumerable
+
             def initialize(extension_id)
+                @ids = []
                 @extension_id = extension_id
             end
 
             def define(id)
+                ids.push(id)
                 definition = (DEFINITIONS[id] ||= Definition.new(id, @extension_id))
                 yield definition
             end
+
+            def extend(id)
+                ids.push(id)
+                definition = DEFINITIONS[id]
+                definition.extension_id = @extension_id
+                yield definition if block_given?
+            end
+
+            def each
+                ids.each { |id| yield DEFINITIONS[id] }
+            end
+
         end
 
         class << self
-
             include Enumerable
 
             def [](config)
@@ -34,8 +54,14 @@ module Hippo
                 end
             end
 
+            def each
+                DEFINITIONS.values.each { |s| yield s }
+            end
+
             def for_extension(id)
-                yield DefinitionList.new(id)
+                definition = EXTENSIONS[id] ||= DefinitionList.new(id)
+                yield definition if block_given?
+                definition
             end
 
             def define_group(id)
@@ -43,9 +69,9 @@ module Hippo
                 yield group
             end
 
-            def each
+            def active_ids
                 Extensions.load_screens
-                DEFINITIONS.values.each{ | definition | yield definition }
+                for_extension(Hippo::Extensions.controlling.identifier).map(&:identifier)
             end
 
             def each_group
@@ -59,94 +85,6 @@ module Hippo
 
         end
 
-
-        class Group
-            include Concerns::AttrAccessorWithDefault
-
-            attr_accessor_with_default :identifier
-            attr_accessor_with_default :title
-            attr_accessor_with_default :description
-            attr_accessor_with_default :icon
-            attr_accessor_with_default :order
-
-            def to_json
-                Oj.dump({
-                    id: identifier,
-                    title: title,
-                    description: description,
-                    icon: icon
-                }, mode: :compat)
-            end
-        end
-
-        class Definition
-            include Concerns::AttrAccessorWithDefault
-
-            attr_accessor_with_default :identifier
-            attr_accessor_with_default :title
-            attr_accessor_with_default :description
-            attr_accessor_with_default :icon
-            attr_accessor_with_default :group_id
-            attr_accessor_with_default :extension
-            attr_accessor_with_default :view_class
-            attr_accessor_with_default :model_class
-            attr_accessor_with_default :model_access, 'read'
-            attr_accessor_with_default :asset
-
-            def initialize(id, extension_id)
-                self.identifier = id
-                @extension_id = extension_id
-                @extension    = extension_id.underscore.camelize
-            end
-
-            def group
-                GROUPS[@group_id]
-            end
-
-            def has_file_matching?(pattern)
-                Pathname.glob(root_path.join(pattern)).any?
-            end
-
-            def root_path
-                ext = Hippo::Extensions.for_identifier(@extension_id)
-                raise "Unable to find extension '#{@extension_id}' for screen group" unless ext
-                ext.root_path.join('client', url_prefix, identifier)
-            end
-
-            def model
-                return nil if @model_class.blank?
-                ext = Hippo::Extensions.for_identifier(@extension_id)
-                (@extension_id.camelize + '::' + @model_class).constantize
-            end
-
-            def viewable_by?(user)
-                model.nil? || user.can_read?(self)
-            end
-
-            def asset_path
-                (asset && asset =~ /\//) ? asset : "#{@extension_id}/screens/#{asset || identifier}"
-            end
-
-            def as_json
-                {
-                    id:    identifier,
-                    title: title,
-                    icon:  icon,
-                    model: model_class,
-                    view:  view_class,
-                    access: model_access,
-                    group_id: group_id,
-                    extension: extension,
-                    description: description,
-                    asset: asset_path
-                }
-            end
-
-            def to_json
-                Oj.dump(as_json, mode: :compat)
-            end
-        end
-
     end
 
 end