hippo-fw 0.9.7 → 0.9.8

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

@@ -45,7 +45,6 @@ module Hippo::API::Handlers
         end
 
         def self.asset_getter
-            root = Hippo::Extensions.controlling.root_path.join('public', 'assets')
             webpack = Hippo::API::Root.webpack
             if Hippo.env.production?
                 lambda do
@@ -61,7 +60,9 @@ module Hippo::API::Handlers
                     webpack.wait_until_available
                     file = webpack.file(params['asset'].to_sym, raise_on_not_found: false)
                     if file
-                        redirect "http://#{env['SERVER_NAME']}:#{webpack.process.port}/assets/#{file}"
+                        protocol = 'http'
+                        protocol += 's' if Hippo::Webpack.using_ssl?
+                        redirect "#{protocol}://#{env['SERVER_NAME']}:#{webpack.process.port}/assets/#{file}"
                     else
                         halt 404
                     end

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

@@ -1,16 +1,14 @@
 module Hippo::API::Handlers
 
     class Tenant < Hippo::API::ControllerBase
-        PUBLIC_ATTRS = %w{slug name}
 
         def show
-            std_api_reply(:retrieve, Hippo::Tenant.current, only: PUBLIC_ATTRS)
+            std_api_reply(:retrieve, Hippo::Tenant.current.bootstrap_data, success: true)
         end
 
-        # isn't really a create, but FE will think it's creating because we don't expose the id
-        def create
+        def update
             tenant = Hippo::Tenant.current
-            tenant.assign_attributes(data.slice(*PUBLIC_ATTRS))
+            tenant.assign_attributes(data.slice(*Hippo::Tenant::PUBLIC_ATTRS))
             success = tenant.save
             if success && tenant.slug_previously_changed?
                 Hippo::Tenant.system.perform do
@@ -18,7 +16,7 @@ module Hippo::API::Handlers
                 end
             end
             std_api_reply(:update, tenant,
-                          only: PUBLIC_ATTRS,
+                          only: Hippo::Tenant::PUBLIC_ATTRS,
                           success: success)
         end
     end

data/lib/hippo/api/helper_methods.rb

@@ -12,10 +12,6 @@ module Hippo
                 }.join("\n")
             end
 
-            def client_bootstrap_data(mergedWith: {})
-                API.to_json(Extensions.client_bootstrap_data.merge(mergedWith))
-            end
-
             def csrf_token
                 Rack::Csrf.csrf_token(env)
             end
@@ -25,11 +21,13 @@ module Hippo
             end
 
             def error_as_json
-                Hippo.logger.warn request.env['sinatra.error']
+                error = request.env['sinatra.error']
+                Hippo.logger.warn error.message
+                Hippo.logger.warn error.backtrace.join("\n    ")
                 API.to_json(
                     success: false,
-                    errors:  { exception: request.env['sinatra.error'].message },
-                    message: request.env['sinatra.error'].message
+                    errors:  { exception: error.message },
+                    message: error.message
                 )
             end
 

data/lib/hippo/api/route_set.rb

@@ -63,8 +63,9 @@ module Hippo
 
                 if options[:cors] && valid_methods.any?
                     cors = options[:cors].is_a?(Hash) ? otions[:cors] : {origins: options[:cors]}
-                    enable_cors "#{prefix}#{path}/?:id?#{format}",
-                                cors.merge(methods: valid_methods)
+                    cors_path = "#{prefix}#{path}/?:id?#{format}"
+                    Hippo.logger.debug("CORS: #{cors_path} #{valid_methods}")
+                    enable_cors cors_path, cors.merge(methods: valid_methods)
                 end
 
             end

data/lib/hippo/asset.rb

@@ -14,6 +14,10 @@ module Hippo
         def path(size)
             Hippo.config.api_path + Hippo.config.assets_path_prefix + '/' + file_data[size]['id']
         end
+
+        def url(size = 'original')
+           "https://#{Hippo::Tenant.current.slug}.#{Hippo.config.website_domain}#{path(size)}"
+        end
     end
 
 end

data/lib/hippo/command/console.rb

@@ -23,7 +23,7 @@ module Hippo
                 FactoryGirl.find_definitions
                 Hippo::API::Cable.configure
                 MultiTenant.current_tenant = Hippo::Tenant.find_by_slug(
-                    Hippo.env.development? ? 'test' : 'system'
+                    Hippo.env.development? ? 'dev' : 'system'
                 )
                 ext.on_dev_console
                 Pry::Commands.block_command "tenant", "set current tenant to <slug>" do |slug|

data/lib/hippo/concerns/asset_uploader.rb

@@ -26,11 +26,16 @@ module Hippo::Concerns
         plugin :versions
         plugin :location_hash
 
+
         process(:store) do |io, context|
-            size_800 = resize_to_limit(io.download, 800, 800)
-            size_500 = resize_to_limit(size_800,    500, 500)
-            size_300 = resize_to_limit(size_500,    300, 300)
-            {original: size_800, medium: size_500, thumbnail: size_300}
+            if io.metadata['mime_type'] && io.metadata['mime_type'].starts_with?('image')
+                size_1000 = resize_to_limit(io.download, 1000, 1000)
+                size_600 = resize_to_limit(size_1000,     600, 600)
+                size_300 = resize_to_limit(size_600,      300, 300)
+                {original: io, large: size_1000, medium: size_600, thumbnail: size_300}
+            else
+                {original: io}
+            end
         end
 
     end

data/lib/hippo/concerns/queries.rb

@@ -8,10 +8,10 @@ module Hippo
 
             module ClassMethods
 
-                def compose_query_using_detail_view( view: nil, join_to: nil )
+                def compose_query_using_detail_view( view: nil, join_to: nil, join_name: 'details' )
                     join_to ||= self.name.demodulize.tableize.singularize + '_' + primary_key
-                    q = joins("join #{view} as details on details.#{join_to} = #{table_name}.#{primary_key}")
-                          .select("details.*")
+                    q = joins("join #{view} as #{join_name} on #{join_name}.#{join_to} = #{table_name}.#{primary_key}")
+                          .select("#{join_name}.*")
                     if current_scope.nil? || current_scope.select_values.exclude?("#{table_name}.*")
                         q = q.select("#{table_name}.*")
                     end

data/lib/hippo/extension.rb

@@ -94,8 +94,9 @@ module Hippo
                 return nil
             end
 
-
-            def client_bootstrap_data
+            ## Data returned will be included in the JS build;
+            ## it should not be Tenant specific
+            def static_bootstrap_data
                 data = {}
                 %w{
                   api_path environment website_domain product_name assets_path_prefix
@@ -106,12 +107,22 @@ module Hippo
                     controlling_extension: controlling.identifier,
                 )
                 each do | ext |
-                    ext_data  = ext.client_bootstrap_data
+                    ext_data  = ext.static_bootstrap_data
                     data[ext.identifier] = ext_data unless ext_data.nil?
                 end
+                data[:screen_ids] = Hippo::Screen.active_ids
                 return data
             end
 
+            def tenant_bootstrap_data(tenant)
+                data = {}
+                each do | ext |
+                    tenant_data  = ext.tenant_bootstrap_data(tenant)
+                    data[ext.identifier] = tenant_data unless tenant_data.nil?
+                end
+                data
+            end
+
             def load_controlling_config
                 config_file = self.controlling.root_path.join('config','initialize.rb')
                 if config_file.exist?
@@ -129,7 +140,6 @@ module Hippo
 
     end
 
-
 end
 
 require_relative 'extension/definition'

data/lib/hippo/extension/definition.rb

@@ -39,7 +39,11 @@ module Hippo
                 self.before = extension
             end
 
-            def client_bootstrap_data
+            def static_bootstrap_data
+                {}
+            end
+
+            def tenant_bootstrap_data(tenant)
                 {}
             end
 

data/lib/hippo/logger.rb

@@ -3,27 +3,40 @@ require 'logger'
 
 module Hippo
 
-    class MultiDestinationLogger
-        def initialize
-            @targets = [STDOUT]
-            @targets.push(
-                File.open("log/#{Hippo.config.environment}.log", "a")
-            ) if File.writable?("log")
-        end
+    class MultiDestinationLogger < ::Logger
+        class Output
+            def initialize
+                @targets = [STDOUT]
+                @targets.push(
+                    File.open("log/#{Hippo.config.environment}.log", "a")
+                ) if File.writable?("log")
+            end
 
-        def write(*args)
-            @targets.each {|t| t.write(*args)}
-        end
+            def write(*args)
+                @targets.each {|t| t.write(*args)}
+            end
 
-        def close
-            @targets.each(&:close)
+            def close
+                @targets.each(&:close)
+            end
         end
 
+        def initialize
+            super Output.new
+            self.formatter = proc do |severity, datetime, progname, msg|
+                sprintf "%5.5s %s\n", severity, msg
+            end
+            if ENV['LOG']
+                self.level = ::Logger.const_get(ENV['LOG'].upcase)
+            else
+                self.level = ::Logger::INFO
+            end
+        end
     end
 
     class << self
         def logger
-            @logger ||= _create_logger
+            @logger ||= MultiDestinationLogger.new
         end
 
         def logger=( logger )
@@ -46,19 +59,5 @@ module Hippo
             logger.debug '⚡ '*40
         end
 
-        private
-
-        def _create_logger
-            logger = ::Logger.new MultiDestinationLogger.new
-            logger.formatter = proc do |severity, datetime, progname, msg|
-                sprintf "%5.5s %s\n", severity, msg
-            end
-            if ENV['LOG']
-                logger.level = ::Logger.const_get(ENV['LOG'].upcase)
-            else
-                logger.level = ::Logger::INFO
-            end
-            logger
-        end
     end
 end

data/lib/hippo/mailer.rb

@@ -3,29 +3,41 @@ require 'mail'
 module Hippo
 
     module Mailer
+
+        class TestMailer < Mail::TestMailer
+            def deliver!(mail)
+                retval = super
+                Hippo.logger.info { mail.encoded }
+                retval
+            end
+        end
+
         class << self
 
             def create
                 config = SystemSettings.for_ext(:smtp)
-                delivery = delivery_method_config(config)
+                delivery_config = delivery_method_config(config)
                 Mail::Message.new do
                     from "\"#{config['from_name']}\" <#{config['from_email']}>"
-                    delivery_method delivery[:via], delivery[:config]
+                    if Hippo.env.production?
+                        delivery_method :smtp, delivery_config
+                    else
+                        delivery_method TestMailer, delivery_config
+                    end
                 end
             end
 
             def delivery_method_config(config)
-                config = Hippo.config.secrets.smtp || {}
-                {
-                    via: Hippo.env.production? ? :smtp : :test,
-                    config: {
+                Hippo::Tenant.system.perform do
+                    config = Hippo.config.secrets.smtp || {}
+                    {
                         address: config['address'],
                         user_name: config['user_name'],
                         password: config['password'],
                         enable_starttls_auto: true,
                         port: 587
                     }
-                }
+                end
             end
 
             def from_template(template)

data/lib/hippo/system_settings.rb

@@ -30,15 +30,21 @@ module Hippo
             ExtensionSettings.new(extension_id, settings[extension_id.to_s])
         end
 
+        def public_json
+            {
+                'logo' => Hippo::SystemSettings.config
+                              .as_json(include: ['logo'])
+                              .dig('logo', 'file_data')
+            }
+        end
+
         class << self
             def config
-                SystemSettings.first_or_create
+                Tenant.current.system_settings || Tenant.current.create_system_settings
             end
 
             def public_json
-                {
-                    'logo' => Hippo::SystemSettings.config.as_json(include: ['logo']).dig('logo', 'file_data')
-                }
+                config.public_json
             end
 
             def for_ext(extension_id)

data/lib/hippo/templates/liquid.rb

@@ -1,4 +1,5 @@
 require 'liquid'
+require_rel 'liquid/*.rb'
 
 module Hippo
 

data/lib/hippo/templates/liquid/pluralize.rb

@@ -0,0 +1,16 @@
+module Pluralize
+
+    def pluralize(number, singular, plural = nil)
+        number = number.to_i
+        if number == 1
+            "#{number} #{singular}"
+        elsif plural.nil?
+            "#{number} #{singular}s"
+        else
+            "#{number} #{plural}"
+        end
+    end
+
+end
+
+Liquid::Template.register_filter(Pluralize)

data/lib/hippo/tenant.rb

@@ -3,6 +3,9 @@ require 'activerecord-multi-tenant'
 module Hippo
     # Tenant
     class Tenant < Hippo::Model
+
+        PUBLIC_ATTRS = %w{slug name identifier}
+
         validates :slug, uniqueness: true
         validates :name, :presence => { message: 'for company' }
         validates :email, :presence => true
@@ -10,6 +13,9 @@ module Hippo
         has_random_identifier
         has_many :users, class_name: 'Hippo::User', autosave: true
 
+        belongs_to :system_settings, class_name: 'Hippo::SystemSettings',
+                   foreign_key: :id, primary_key: :tenant_id
+
         before_validation :auto_assign_slug, on: :create
 
         before_save :downcase_slug
@@ -24,8 +30,18 @@ module Hippo
             end
         end
 
+        def bootstrap_data
+            as_json(
+                only: PUBLIC_ATTRS,
+            ).merge(
+                bootstrap: system_settings.public_json.merge(
+                    Hippo::Extensions.tenant_bootstrap_data(self)
+                )
+            )
+        end
+
         def self.current
-            MultiTenant.current_tenant
+            MultiTenant.current_tenant || system
         end
 
         def self.system

data/lib/hippo/user.rb

@@ -23,15 +23,16 @@ module Hippo
         end
 
         def workspace_data
-            my_data = attributes.slice('id','login','name','email','created_at',
-                                       'created_by','updated_at','updated_by','role_names', 'options')
-
-            Hippo::SystemSettings
-                .public_json
-                .merge(
-                    user: my_data, access: Access.for_user(self), access_token: jwt_token,
-                    screen_ids: Hippo::Screen.active_ids,
-                )
+            user_data = attributes.slice(
+                'id','login','name','email', 'role_names', 'options',
+                'created_at','created_by','updated_at', 'updated_by'
+            )
+            {
+                user: user_data,
+                access: Access.for_user(self),
+                access_token: jwt_token,
+                screen_ids: Hippo::Screen.active_ids,
+            }
         end
 
         # @param model [Hippo::Model]

data/lib/hippo/version.rb

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