hippo-fw 0.9.1 → 0.9.2

data/lib/hippo/mailer.rb

@@ -3,26 +3,38 @@ require 'mail'
 module Hippo
 
     module Mailer
+        class << self
 
-        def self.create(args = {})
-            config = SystemSettings.for_ext(:hippo)['smtp'] || {}
-            delivery = delivery_method_config(config)
-            Mail::Message.new(args) do
-                from "\"#{config['from_name']}\" <#{config['from_email']}>"
-                delivery_method delivery
+            def create
+                config = SystemSettings.for_ext(:smtp)
+                delivery = delivery_method_config(config)
+                Mail::Message.new do
+                    from "\"#{config['from_name']}\" <#{config['from_email']}>"
+                    delivery_method delivery[:via], delivery[:config]
+                end
             end
-        end
 
-        def self.delivery_method_config(config)
-            return :test unless Hippo.env.production?
-            {
-                smtp: {
-                    address: config['server'],
-                    user_name: config['login'],
-                    password: config['password']
+            def delivery_method_config(config)
+                {
+                    via: Hippo.env.production? ? :smtp : :test,
+                    config: {
+                        address: config['address'],
+                        user_name: config['user_name'],
+                        password: config['password'],
+                        enable_starttls_auto: true,
+                        port: 587
+                    }
                 }
-            }
-        end
+            end
 
+            def from_template(template)
+                mail = create
+                mail.content_type = 'text/html; charset=UTF-8'
+                mail.body = template.render
+                mail.to = template.to
+                mail.subject = template.subject
+                mail
+            end
+        end
     end
 end

data/lib/hippo/model.rb

@@ -1,4 +1,5 @@
 require_relative 'concerns/all'
+require 'activerecord-multi-tenant'
 
 module Hippo
 
@@ -19,6 +20,15 @@ module Hippo
         include Concerns::SortingExpressions
         include Concerns::RandomIdentifer
 
+        def self.belongs_to_tenant
+            belongs_to :tenant, class_name: 'Hippo::Tenant'
+            multi_tenant :tenant
+        end
+
+        # will be overridden if models call belongs_to_tenant
+        def self.scoped_by_tenant?
+            false
+        end
     end
 
 end

data/lib/hippo/numbers.rb

@@ -31,7 +31,7 @@ module Hippo
             # @param perc_or_num [BigDecimal,String, Integer] any value that BigDecimal will accept
             def initialize( perc_or_num )
                 @is_perc    = !! perc_or_num.to_s.match( /\%\s*$/ )
-                @right_side = BigDecimal.new( perc_or_num, 5 )
+                @right_side = BigDecimal.new( perc_or_num.gsub(/[^0-9\.\-]/, ''), 5 )
                 if is_percentage?
                     @right_side *= 0.01
                 end

data/lib/hippo/rake_tasks.rb

@@ -62,8 +62,14 @@ task :test => [:spec] do
     ::Hippo::Command::Jest.new.configure.single_run
 end
 
-task :ci => ['db:migrate', 'db:seed'] do
+task :lint do
     sh %{node node_modules/eslint/bin/eslint.js client spec/client/}
+end
+
+task :ci do
+    sh %{bundle exec hippo db migrate}
+    sh %{bundle exec hippo db seed}
     sh %{bundle exec hippo jest}
     sh %{bundle exec rspec}
+    Rake::Task["lint"].invoke
 end

data/lib/hippo/spec_helper.rb

@@ -1,16 +1,22 @@
+require 'hippo/webpack'
+Hippo::Webpack.stub = true
+
 require 'rack/test'
 require 'hippo'
 require 'hippo/api'
 require 'hashie/mash'
 require 'active_record'
 require 'active_record/fixtures'
-require 'rack/test'
 require 'mail'
 require 'factory_girl'
 require 'faker'
 require 'database_cleaner'
 require "shrine/storage/memory"
 require 'vcr'
+require 'hippo/tenant'
+
+
+TEST_TENANT = Hippo::Tenant.find_by_slug('test') || Hippo::Tenant.create!(slug: 'test', name: 'testing tenant', email: 'test@test.com')
 
 VCR.configure do |config|
     config.cassette_library_dir = "spec/fixtures/vcr_cassettes"
@@ -30,13 +36,13 @@ VCR_OPTS = {
 
 
 module RackSpecMixin
-  include Rack::Test::Methods
-  def app
-      Hippo::API::Root
-  end
-  def last_response_json
-      Oj.load(last_response.body)
-  end
+    include Rack::Test::Methods
+    def app
+        Hippo::API::Root
+    end
+    def last_response_json
+        Oj.load(last_response.body)
+    end
 end
 
 HIPPO_ENV = "test"
@@ -46,9 +52,23 @@ module Fixtures
     end
 end
 
+FactoryGirl.definition_file_paths = Hippo::Extensions.map do |ext|
+    ext.root_path.join('spec/factories')
+end
+
+module ApiHelper
+    def ApiHelper.included(mod)
+        mod.around(:each) do |example|
+            begin
+                example.run
+            end
+        end
+    end
+end
+
 RSpec.configure do |config|
     config.include FactoryGirl::Syntax::Methods
-
+    config.include ApiHelper, api: true
     config.include Fixtures
 
     config.include RackSpecMixin, :api => true
@@ -62,8 +82,10 @@ RSpec.configure do |config|
     end
 
     config.around(:each) do |example|
-        DatabaseCleaner.cleaning do
-            example.run
+        TEST_TENANT.perform do
+            DatabaseCleaner.cleaning do
+                example.run
+            end
         end
     end
 

data/lib/hippo/system_settings.rb

@@ -1,6 +1,7 @@
 module Hippo
 
     class SystemSettings < Hippo::Model
+        belongs_to_tenant
 
         has_one :logo, as: :owner, class_name: 'Hippo::Asset',
                 dependent: :destroy

data/lib/hippo/templates/base.rb

@@ -14,7 +14,7 @@ module Hippo
             end
 
             def root_path
-                Hippo::Extensions.for_identifier(extension_id.to_s).root_path.join('templates')
+                Hippo::ROOT_PATH.join('templates')
             end
 
             def pathname

data/lib/hippo/templates/mail.rb

@@ -0,0 +1,26 @@
+module Hippo
+    module Templates
+        class Mail < Liquid
+
+            def to
+                raise 'virtual method to called, this should be implemented by child class'
+            end
+
+            def subject
+                raise 'virtual method subject called, this should be implemented by child class'
+            end
+
+            def pathname
+                root_path.join('mail', filename)
+            end
+
+            def variables
+                { 'product_name' => Hippo.config.product_name }
+            end
+
+            def self.create(*arg)
+                Hippo::Mailer.from_template(self.new(*arg))
+            end
+        end
+    end
+end

data/lib/hippo/templates/tenant_change.rb

@@ -0,0 +1,23 @@
+module Hippo::Templates
+    class TenantChange < Mail
+
+        def initialize(tenant)
+            @tenant = tenant
+        end
+
+        def to
+            @tenant.email
+        end
+
+        def subject
+            "The login address for #{Hippo.config.product_name} has changed"
+        end
+
+        def variables
+            super.merge(
+                'slug' => @tenant.slug,
+                'domain' => @tenant.domain
+            )
+        end
+    end
+end

data/lib/hippo/tenant.rb

@@ -0,0 +1,53 @@
+require 'activerecord-multi-tenant'
+
+module Hippo
+    # Tenant
+    class Tenant < Hippo::Model
+        validates :slug, uniqueness: { case_sensitive: false }
+        validates :name, :presence => { message: 'for company' }
+        validates :email, :presence => true
+
+        has_random_identifier
+        has_many :users, class_name: 'Hippo::User', autosave: true
+
+        before_validation :auto_assign_slug, on: :create
+
+        def domain
+            self.slug + '.' + Hippo.config.website_domain
+        end
+
+        def perform
+            MultiTenant.with(self) do
+                yield
+            end
+        end
+
+        def self.current
+            MultiTenant.current_tenant
+        end
+
+        def self.system
+            find_by(slug: 'system') || create!(
+                slug: 'system', name: 'system',
+                email: 'contact@argosity.com', subscription: :admin
+            )
+        end
+
+        def self.switch(condition)
+            MultiTenant.current_tenant = self.find_by(condition)
+        end
+
+      protected
+
+        def auto_assign_slug
+            5.times do |i|
+                if slug.blank?
+                    newslug = Hippo::Strings.code_identifier(self.name, length: i + 5).downcase
+                    self.slug = newslug if Tenant.where(slug: newslug).none?
+                end
+                break if slug.present?
+            end
+        end
+
+    end
+end

data/lib/hippo/user.rb

@@ -3,10 +3,13 @@ require 'jwt'
 module Hippo
 
     class User < Hippo::Model
-
+        belongs_to_tenant
         has_secure_password
-        validates :login, :name, :email, presence: true, uniqueness: { case_sensitive: false }
-        validates :email, email: true, uniqueness: { case_sensitive: false }
+        validates :login, :name, presence: true,
+                  uniqueness: { scope: :tenant, case_sensitive: false }
+        validates :email, presence: true, email: true,
+                  uniqueness: { scope: :tenant, case_sensitive: false }
+
         validates :password, length: { minimum: 6 }, allow_nil: true
 
         whitelist_attributes :password
@@ -137,9 +140,12 @@ module Hippo
         end
 
         def self.seed_admin_account
-            where(login: 'admin').first || create!(name: "Admin", email: "admin@test.com",
-                                                   password: 'password',
-                                                   login: 'admin', role_names: ['administrator'])
+            where(login: 'admin').first ||
+                create!(
+                    name: "Admin", email: "admin@test.com",
+                    password: 'password',
+                    login: 'admin', role_names: ['administrator']
+                )
         end
     end
 

data/lib/hippo/version.rb

@@ -1,5 +1,5 @@
 module Hippo
 
-    VERSION = "0.9.1"
+    VERSION = "0.9.2"
 
 end

data/lib/hippo/webpack.rb

@@ -0,0 +1,57 @@
+require_relative './webpack/client_config'
+
+module Hippo
+    class Webpack
+        mattr_accessor :stub
+        attr_reader :driver, :assets, :process
+
+        def initialize
+            @assets = {}
+            root = Hippo::Extensions.controlling.root_path
+
+            @config = ClientConfig.new
+            @config.invoke_all
+
+            @driver = WebpackDriver::Configuration.new(
+                directory: root,
+                logger: Hippo.logger,
+                file: root.join('config', 'webpack.config.js'),
+                cmd_line_flags: Hippo.env.production? ? [] : ['--hot', '--inline'],
+                environment: { NODE_ENV: Hippo.env.production? ? 'production' : 'development' }
+            )
+            @process = @driver.launch(development: !Hippo.env.production?)
+        end
+
+        def start
+            process.start if Hippo.env.development? && !Hippo::Webpack.stub
+        end
+
+        def wait_until_available
+            return if Hippo.env.production?
+            Hippo.logger.warn("waiting while compilation in progress") if busy?
+            sleep 0.5 while busy?
+        end
+
+        def busy?
+            driver.process.in_progress?
+        end
+
+        def file(entry, raise_on_not_found: true)
+            if Webpack.stub
+                "#{entry}.js"
+            else
+                asset = @driver.process.assets[entry]
+                if asset
+                    asset.file
+                elsif !raise_on_not_found
+                    raise ArgumentError, "asset '#{entry}' was not found"
+                end
+            end
+        end
+
+        def host
+            Hippo.env.production? ? "" :
+                "//#{@driver.process.host}:#{@driver.process.port}"
+        end
+    end
+end

data/lib/hippo/{command → webpack}/client_config.rb

@@ -1,8 +1,8 @@
-require_relative './webpack_view';
+require 'thor'
+require 'active_support'
 
 module Hippo
-    module Command
-
+    class Webpack
         class ClientConfig < Thor::Group
             include Thor::Actions
 
@@ -14,21 +14,17 @@ module Hippo
 
             attr_reader :module_paths
 
-            ROOT = Pathname.new(__FILE__).dirname.join("..", "..", "..")
-            def self.source_root
-                ext = Hippo::Extensions.controlling
-                ext.root_path
-            end
+            ROOT = Pathname.new(__FILE__).dirname.join('..', '..', '..')
 
-            def apply_hippo_config
-                Command.load_current_extension
+            def self.source_root
                 Hippo::Configuration.apply
                 Hippo::Extensions.load_controlling_config
+                Hippo::Extensions.controlling.root_path
             end
 
             def set_vars
+                @controlling_extension = Hippo::Extensions.controlling
                 @hippo_root_path = ROOT
-                @controlling_extension = Command.load_current_extension(raise_on_fail: true)
                 @extension_path = controlling_extension.root_path
             end
 
@@ -47,16 +43,6 @@ module Hippo
             def write_asset_files
                 say "Generating config in #{directory}", :green
                 opts = { verbose: false, force: true }
-
-                Hippo::Extensions.controlling.view_templates.each do |tmpl|
-                    tmpl = WebpackView.new(tmpl)
-                    tmpl.write
-                    # set the mtime to the past, otherwise Webpack will build repeatedly as it starts up
-                    FileUtils.touch tmpl.destination.to_s, mtime: Time.now - 10.minute
-                end
-
-                template('config/webpack.config.js',
-                         directory.join('webpack.config.js'), opts)
                 template('config/jest.config.json',
                          directory.join('jest.config.json'), opts)
                 template(ROOT.join('templates','js', 'config-data.js'),