hippo-fw 0.9.1 → 0.9.2

data/lib/hippo/api/tenant_domain_router.rb

@@ -0,0 +1,21 @@
+module Hippo
+    module API
+        class TenantDomainRouter
+            def initialize(app)
+                @app = app
+            end
+
+            def call(env)
+                domain_parts = env['SERVER_NAME'].split('.')
+                if domain_parts.length == 3
+                    tenant = Hippo::Tenant.where(slug: domain_parts.first).first
+                    MultiTenant.with(tenant) do
+                        @app.call(env)
+                    end
+                else
+                    @app.call(env)
+                end
+            end
+        end
+    end
+end

data/lib/hippo/asset.rb

@@ -1,6 +1,7 @@
 module Hippo
 
     class Asset < Hippo::Model
+        belongs_to_tenant
 
         include Hippo::Concerns::AssetUploader[:file]
 

data/lib/hippo/command.rb

@@ -11,31 +11,8 @@ module Hippo
                 Pathname.new(__FILE__).dirname.join("command","#{file}.usage").read.gsub(/\n/,"\n\x5")
             end
 
-            # Loads the code for the extension that the user is currently
-            # working inside.  The `hippo` command uses this to detect
-            # what actions should be taken.
-            #
-            # Will silently swallow any exceptions that are raised when the file is required and return nil
-            #
-            # @return [Extension] extension that was loaded, nil if none was found
             def load_current_extension(raise_on_fail:false)
-                ext = Dir.glob("./lib/*/extension.rb").first
-                if ext
-                    begin
-                        require(ext)
-                    rescue =>e
-                        stack = e.backtrace[0..4].join("\n")
-                        raise Thor::Error.new("Loading ./lib/*/extension.rb failed with: #{e}\n#{stack}")
-                    end
-                    Extensions.controlling
-                else
-                    return _maybe_fail(raise_on_fail)
-                end
-            end
-
-            def _maybe_fail(should_raise)
-                raise Thor::Error.new("Unable to locate Hippo environment.\nDoes ./lib/*/extension.rb exist?") if should_raise
-                return nil
+                Hippo::Extensions.bootstrap(raise_on_fail: raise_on_fail)
             end
 
         end

data/lib/hippo/command/app.rb

@@ -30,7 +30,7 @@ module Hippo
                     ".babelrc", "config/database.yml"
                 ].each{ |f| template(f) }
                 [
-                    ".eslintrc.js", ".rubocop.yml", "spec/client/.eslintrc.js", "views/index.html"
+                    ".eslintrc.js", ".rubocop.yml", "spec/client/.eslintrc.js"
                 ].each{ |f| template("../#{f}", f) }
                 template "lib/namespace.rb", "lib/#{identifier}.rb"
                 template "lib/namespace/version.rb", "lib/#{identifier}/version.rb"
@@ -44,10 +44,10 @@ module Hippo
                 template "config/jest/babel-transform.js"
                 template "config/initialize.rb"
                 template ".gitignore"
-
                 template "spec/client/setup.js"
                 template "spec/server/spec_helper.rb"
 
+                copy_file "../views/index.erb", "views/index.erb"
                 create_file "log/.gitkeep",""
                 create_file "tmp/.gitkeep",""
                 create_file "db/.gitkeep", ""
@@ -59,6 +59,7 @@ module Hippo
                     empty_directory "#{client_dir}/#{path.basename}"
                     create_file "#{client_dir}/#{path.basename}/.gitkeep"
                 end
+                create_file "#{client_dir}/components/.gitkeep", ""
                 template "client/models/base.js",   "#{client_dir}/models/base.js"
                 template "client/index.js",         "#{client_dir}/index.js"
                 template "client/extension.js",     "#{client_dir}/extension.js"
@@ -73,7 +74,7 @@ module Hippo
                 say 'Installing node modules', :green
                 [
                     'jest',
-                    'hippo-framework',
+                    'hippo-fw',
                     'react-router',
                     'webpack',
                     'webpack-dev-server'

data/lib/hippo/command/console.rb

@@ -9,10 +9,17 @@ module Hippo
                 require 'irb'
                 require 'irb/completion'
                 require 'pp'
+                require 'faker'
+                require 'factory_girl'
                 DB.establish_connection
                 ActiveRecord::Base.logger = Logger.new STDOUT
                 Configuration.apply
                 Hippo::Extensions.load_controlling_config
+                FactoryGirl.definition_file_paths = Hippo::Extensions.map do |ext|
+                    ext.root_path.join('spec/factories')
+                end
+                FactoryGirl.find_definitions
+                MultiTenant.current_tenant = Hippo::Tenant.system
                 ext.on_dev_console
                 ARGV.clear
                 IRB.start

data/lib/hippo/command/generate.rb

@@ -13,11 +13,6 @@ module Hippo
             long_desc Command.usage_from_file("generate_screen")
             method_options( GenerateScreen::OPTIONS )
             register Command::GenerateScreen, 'screen', 'screen [NAME]', 'Creates a new Screen'
-
-            long_desc Command.usage_from_file("generate_component")
-            method_options( GenerateComponent::OPTIONS )
-            register Command::GenerateComponent, 'component', 'component [NAME]', 'Creates a new Component to be shared between screens'
-
         end
 
     end

data/lib/hippo/command/guard.rb

@@ -11,6 +11,7 @@ module Hippo
 
             def start
                 say 'Starting Guard', :green
+                Command.load_current_extension
                 ::Guard.start
             end
         end

data/lib/hippo/command/jest.rb

@@ -1,6 +1,6 @@
-require_relative './client_config'
 require_relative '../extension'
 require_relative '../command'
+require_relative '../webpack/client_config'
 
 module Hippo
     module Command
@@ -17,7 +17,7 @@ module Hippo
 
 
             def configure
-                @config = ClientConfig.new
+                @config = Hippo::Webpack::ClientConfig.new
                 @config.invoke_all
                 self
             end

data/lib/hippo/command/server.rb

@@ -1,6 +1,5 @@
 require 'guard/cli'
 require_relative '../guard_tasks'
-require_relative '../multi_server_boot'
 
 module Hippo
     module Command
@@ -11,8 +10,7 @@ module Hippo
 
             def launch
                 say "Launching testing server at http://localhost:8888/", :green
-                Command.load_current_extension
-                ::Hippo::MultiServiceBoot.perform
+                Guard.start # will block until complete
             end
         end
     end

data/lib/hippo/command/webpack.rb

@@ -9,49 +9,29 @@ module Hippo
         class Webpack < Thor::Group
             include Thor::Actions
 
-            attr_reader :process
+            attr_reader :webpack
 
             attr_accessor :config
 
             attr_reader :wpd_config
 
-            class_option :wait, :type => :boolean, default: true,
-                         desc: "Whether to keep running and wait for exit"
-
             class_option :compile, :type => :boolean, default: false
 
             def set_production_env
+                ext = Command.load_current_extension
                 Hippo.config.environment = :production if options[:compile]
             end
 
-            def make_config
-                return if @config
-                @config = ClientConfig.new
-                config.invoke_all
-            end
-
-            def configure
-                @wpd_config = WebpackDriver::Configuration.new(
-                    config.directory.join('webpack.config.js'),
-                    logger: Hippo.logger,
-                    directory: config.controlling_extension.root_path,
-                    cmd_line_flags: (options[:compile] ? [] : ['--hot', '--inline']),
-                    environment: { NODE_ENV: options[:compile] ? 'production' : 'development' }
-                )
-                self
-            end
-
-            def create_process
-                @process = options[:compile] ? ::WebpackDriver::Compile.new(wpd_config) :
-                               ::WebpackDriver::DevServer.new(wpd_config)
+            def launch
+                @webpack = Hippo::Webpack.new
             end
 
             def startup
+                process = webpack.process
                 process.start
-                process.wait if options[:wait]
+                process.wait
             end
 
         end
     end
-
 end

data/lib/hippo/configuration.rb

@@ -50,7 +50,7 @@ module Hippo
         end
 
         def self.apply
-            controlling_ext = Hippo::Extensions.controlling
+            controlling_ext = Hippo::Extensions.bootstrap
             secrets = controlling_ext.root_path.join('config', 'secrets.yml')
             @@secrets = Hashie::Mash.new(
                 secrets.exist? ? YAML.load(ERB.new(secrets.read).result) : {}
@@ -68,20 +68,24 @@ module Hippo
 
             Resque.redis.namespace = "#{controlling_ext.identifier}::resque"
             Resque.redis = Hippo.config.redis
+            Hippo::Concerns::AssetUploader.storages = {
+                cache: Shrine::Storage::FileSystem.new(
+                    controlling_ext.root_path,
+                    prefix: "tmp/cache"
+                ),
+                store: Shrine::Storage::FileSystem.new(
+                    controlling_ext.root_path,
+                    prefix: "public/files"
+                )
+            }
+            Hippo::Tenant.system.perform do
+                Hippo::SystemSettings.for_ext('hippo').apply!
+                Extensions.each{|ext| ext.apply_configuration }
 
-            Hippo::SystemSettings.for_ext('hippo').apply!
-            Extensions.each{|ext| ext.apply_configuration }
-
-            if Kernel.const_defined?(:Guard) && ::Guard.const_defined?(:Jest)
-                ::Guard::Jest.logger = Hippo.logger
+                if Kernel.const_defined?(:Guard) && ::Guard.const_defined?(:Jest)
+                    ::Guard::Jest.logger = Hippo.logger
+                end
             end
-
-            ::Hippo::Concerns::AssetUploader.storages = {
-                cache: Shrine::Storage::FileSystem.new(controlling_ext.root_path,
-                                                       prefix: "tmp/cache"),
-                store: Shrine::Storage::FileSystem.new(controlling_ext.root_path,
-                                                       prefix: "public/files")
-            }
         end
 
     end
@@ -123,6 +127,10 @@ module Hippo
         # Configuration for action cable
         config_option :cable, { 'adapter' => 'redis' }
 
+        config_option :website_domain, 'test.com'
+
+        config_option :product_name, 'Hippo Funtime'
+
         def api_path
             mounted_at + 'api'
         end

data/lib/hippo/db.rb

@@ -55,3 +55,5 @@ module Hippo
     ActiveRecord::Base.logger = Hippo.logger
 
 end
+
+require_relative './db/migrations'

data/lib/hippo/db/migrations.rb

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'scenic'
 
 module Hippo
     module DB
@@ -25,8 +26,14 @@ module Hippo
     end
 end
 
+ActiveRecord::ConnectionAdapters::AbstractAdapter.include ::Hippo::DB::Migrations::TableDefinitionHelpers
 
+module ::Scenic
+    class Definition
+        def full_path
+            Pathname.pwd.join(path)
+        end
+    end
 
-ActiveRecord::ConnectionAdapters::PostgreSQL::ColumnMethods.class_eval do
-    include ::Hippo::DB::Migrations::TableDefinitionHelpers
 end
+::Scenic.load

data/lib/hippo/extension.rb

@@ -17,11 +17,11 @@ module Hippo
                 end
             end
 
-            # lock the current controlling extension so that it can't
-            # be changed by other extensions that are loaded later
-            def lock_controlling!
-                self.controlling_locked=true
-            end
+            # # lock the current controlling extension so that it can't
+            # # be changed by other extensions that are loaded later
+            # def lock_controlling!
+            #     self.controlling_locked=true
+            # end
 
             def add(klass)
                 @cached_instances = nil
@@ -78,16 +78,45 @@ module Hippo
                 Hippo.logger.error "Unable to find controlling extension. #{sorted} are loaded"
             end
 
+            # Loads the code for the extension that the user is currently
+            # working inside.  The `hippo` command uses this to detect
+            # what actions should be taken.
+            #
+            # Will silently swallow any exceptions that are raised when the file is required and return nil
+            #
+            # @return [Extension] extension that was loaded, nil if none was found
+            def bootstrap(raise_on_fail:false)
+                ext = Dir.glob("./lib/*/extension.rb").first
+                if ext
+                    begin
+                        require(ext)
+                    rescue =>e
+                        stack = e.backtrace[0..4].join("\n")
+                        raise Thor::Error.new("Loading ./lib/*/extension.rb failed with: #{e}\n#{stack}")
+                    end
+                    Extensions.controlling
+                else
+                    return _maybe_fail(raise_on_fail)
+                end
+            end
+
+            def _maybe_fail(should_raise)
+                raise Thor::Error.new("Unable to locate Hippo environment.\nDoes ./lib/*/extension.rb exist?") if should_raise
+                return nil
+            end
+
+
             def client_bootstrap_data
-                data = {
-                  api_path: Hippo.config.api_path,
-                  root_path: Hippo.config.mounted_at,
-                  root_view: Hippo.config.root_view,
-                  environment: Hippo.config.environment,
-                  assets_path_prefix: Hippo.config.assets_path_prefix,
-                  controlling_extension: controlling.identifier,
-                  initial_workspace_screen_id: Hippo.config.initial_workspace_screen_id
-                }
+                data = {}
+                %w{
+                  api_path environment website_domain product_name assets_path_prefix
+                }.each do |config|
+                    data[config.to_sym] = Hippo.config.send(config)
+                end
+                data.merge(
+                    controlling_extension: controlling.identifier,
+                    initial_workspace_screen_id: Hippo.config.initial_workspace_screen_id
+                )
                 each do | ext |
                     ext_data  = ext.client_bootstrap_data
                     data[ext.identifier] = ext_data unless ext_data.nil?
@@ -102,6 +131,12 @@ module Hippo
                 end
             end
 
+            def client_module_paths
+                map { |e| e.root_path.join('client').to_s }.reverse + [
+                    controlling.root_path.join('node_modules').to_s
+                ]
+            end
+
         end
 
     end

data/lib/hippo/extension/definition.rb

@@ -43,10 +43,6 @@ module Hippo
                 {}
             end
 
-            def view_templates
-                ['index.html']
-            end
-
             def on_dev_console
             end
 

data/lib/hippo/guard_tasks.rb

@@ -1,7 +1,6 @@
 require_relative '../hippo'
 require_relative 'command/jest'
 require_relative 'reloadable_sinatra.rb'
-require_relative 'reloadable_view.rb'
 require 'guard/jest'
 require 'guard/rspec'
 
@@ -20,7 +19,6 @@ module Hippo
             end
         end
 
-
         def self.run(dsl, options, &block)
             matchers = CustomMatchers.new
             yield matchers
@@ -42,21 +40,15 @@ module Hippo
             dsl.guard :rspec, rspec_options do
                 dsl.watch(%r{^spec/server/spec_helper\.rb}) { 'spec' }
                 dsl.watch(%r{^spec/server/.*_spec\.rb})
-                dsl.watch(%r{^spec/fixtures/#{identifier}(.+)s\.yml})   { |m| "spec/server/#{m[1]}_spec.rb" }
-                dsl.watch(%r{^lib/#{identifier}/(.+)\.rb})              { |m| "spec/server/#{m[1]}_spec.rb" }
+                dsl.watch(%r{^lib/#{identifier}/(.+)\.rb}) { |m| "spec/server/#{m[1]}_spec.rb" }
+                dsl.watch(%r{^spec/fixtures/#{identifier}(.+)s\.yml}) { |m| "spec/server/#{m[1]}_spec.rb" }
                 matchers.server_matches.call if matchers.server_matches
             end
 
             dsl.guard :reloadable_sinatra do
                 dsl.watch(%r{^lib/.*\.rb})
-                dsl.watch(%r{^config/.*\.rb})
-            end
-
-            dsl.guard :reloadable_view do
-                dsl.watch(%r{^views/(.*\.html)}) { |m| m[1] }
+                dsl.watch(%r{^config/.*})
             end
-
         end
-
     end
 end