hippo-fw 0.9.8 → 0.9.9

data/hippo-fw.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
     spec.add_dependency "liquid",                    "~> 4.0"
     spec.add_dependency 'erb_latex',                 "~> 1.0"
     spec.add_dependency 'shrine-memory',             "~> 0.2"
-    spec.add_dependency 'factory_girl',              "~> 4.8"
+    spec.add_dependency 'factory_bot',               "~> 4.8"
     spec.add_dependency 'faker',                     "~> 1.7"
     spec.add_dependency 'webmock',                   "~> 3.0"
     spec.add_dependency "database_cleaner",          "~> 1.3"
@@ -44,14 +44,15 @@ Gem::Specification.new do |spec|
     spec.add_dependency "sinatra",                   "~> 2.0.0"
     spec.add_dependency "rack-protection",           "~> 2.0.0"
     spec.add_dependency "rack",                      "~> 2.0"
-
+    spec.add_dependency "braintree",                 "~> 2.80"
     spec.add_dependency "rack-cors",                 "~> 0.4"
     spec.add_dependency "rack-test",                 "~> 0.6"
 
     spec.add_dependency "bcrypt",                    "~> 3.1"
     spec.add_dependency "shrine",                    "~> 2.4"
     spec.add_dependency "image_processing",          "~> 0.4"
-
+    spec.add_dependency 'image_optim',               "~> 0.26"
+    spec.add_dependency 'image_optim_pack'
     spec.add_dependency "execjs",                    "~> 2.6"
     spec.add_dependency "fastimage",                 "~> 2.0"
     spec.add_dependency "guard",                     "~> 2.13"

data/lib/hippo.rb

@@ -35,3 +35,4 @@ require_relative 'hippo/user'
 require_relative "hippo/access"
 require_relative "hippo/workspace"
 require_relative "hippo/webpack"
+require_relative "hippo/payments"

data/lib/hippo/access/roles/basic_user.rb

@@ -6,6 +6,7 @@ module Hippo
             class BasicUser < Role
 
                 self.read << Hippo::Tenant
+                self.read << Hippo::Subscription
 
             end
 

data/lib/hippo/api/authentication_provider.rb

@@ -31,15 +31,14 @@ module Hippo
                                       end
             end
 
-            def allowed_access_to?(klass, options = {})
-
+            def allowed_access_to?(klass, handler, options = {})
                 return true if options[:public] == true and current_user.nil?
                 return false if current_user.nil?
                 case request.request_method
                 when 'GET'
                     klass.can_read_attributes?(request.params, current_user)
                 when 'POST', 'PATCH', 'PUT'
-                    klass.can_write_attributes?(request.params, current_user)
+                    klass.can_write_attributes?(handler.data, current_user)
                 when 'DELETE'
                     klass.can_delete_attributes?(request.params, current_user)
                 else
@@ -59,8 +58,8 @@ module Hippo
 
             def wrap_model_access(model, req, options = {})
                 fail_request(req) and return unless Tenant.current
-                if allowed_access_to?(model, options)
-                    ::Hippo::User.scoped_to(current_user) do | user |
+                if allowed_access_to?(model, req, options)
+                    ::Hippo::User.scoped_to(current_user) do |user|
                         yield
                     end
                 else

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

@@ -48,10 +48,15 @@ module Hippo::API::Handlers
             webpack = Hippo::API::Root.webpack
             if Hippo.env.production?
                 lambda do
-                    file = webpack.file(params['asset'].to_sym, raise_on_not_found: false)
-                    if file
-                        redirect "/assets/#{file}"
-                    else
+                    begin
+                        file = webpack.file(params['asset'].to_sym, raise_on_not_found: false)
+                        if file
+                            response['Cache-Control'] = "public, max-age=0, must-revalidate"
+                            redirect "/assets/#{file}"
+                        else
+                            halt 404
+                        end
+                    rescue Hippo::Webpack::NotFound
                         halt 404
                     end
                 end

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

@@ -0,0 +1,39 @@
+module Hippo::API::Handlers
+
+    class Subscription < Hippo::API::ControllerBase
+
+        def show
+            plan = Hippo::Subscription
+                       .find(params['id'])
+                       .as_json.merge(
+                           authorization: Hippo::Payments.payment_authorization
+                       )
+            std_api_reply(:retrieve, plan, success: true)
+        end
+
+        def update
+            tenant = Hippo::Tenant.current
+            subscription = Hippo::Subscription.find(data['id'])
+            Hippo::Payments.set_tenant_payment_method(
+                tenant, subscription, data['nonce']
+            )
+            success = subscription.errors.none?
+            if success
+                tenant.subscription = subscription
+                tenant.save!
+            end
+            std_api_reply(:retrieve, subscription, success: success)
+        end
+
+        def destroy
+            tenant = Hippo::Tenant.current
+            if tenant.subscription_id != params['id'].to_i
+                return std_api_reply(:destroy, {}, success: false)
+            end
+            success = Hippo::Payments.cancel_subscription(tenant)
+            tenant.save! if success
+            std_api_reply(:retrieve, tenant.subscription, success: success)
+        end
+    end
+
+end

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

@@ -9,7 +9,6 @@ module Hippo::API::Handlers
             lambda do
                 wrap_reply(with_transaction: false) do
                     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

@@ -32,10 +32,14 @@ module Hippo
             end
 
             def data
-                @json_data ||= (
-                    body = request.body.read
-                    body.present? ? Oj.load(body) : {}
-                )
+                if request.content_type == 'application/json'
+                    @json_data ||= (
+                        body = request.body.read
+                        body.present? ? Oj.load(body) : {}
+                    )
+                else
+                    request.params
+                end
             end
 
             def request_origin

data/lib/hippo/api/request_wrapper.rb

@@ -2,6 +2,10 @@ module Hippo
     module API
 
         module RequestWrapper
+            DEFAULT_OPTIONS = {
+                with_transaction: true, require_tenant: true
+            }
+
             class << self
 
                 def get(*args)
@@ -68,12 +72,19 @@ module Hippo
                 end
             end
 
+            def with_user(options = DEFAULT_OPTIONS)
+                authentication = Hippo::API::AuthenticationProvider.new(request)
+                wrap_reply(options) do
+                    yield authentication.current_user
+                end
+            end
+
             # Wraps a HTTP request in an optional DB transaction and converts yeilded data to JSON
             #
             # @param [options] options for additional checks
             # @option opts [Boolean] :with_transaction rollback DB transaction if exceptions occur
             # @option opts [Boolean] :require_tenant return error if tenant is not found
-            def wrap_reply(options = { with_transaction: true, require_tenant: true })
+            def wrap_reply(options = DEFAULT_OPTIONS)
                 if options[:require_tenant] && Hippo::Tenant.current.nil?
                     return json_reply(
                                { success: false, message: "invalid address",

data/lib/hippo/command/console.rb

@@ -12,15 +12,15 @@ module Hippo
                 require 'irb/completion'
                 require 'pp'
                 require 'faker'
-                require 'factory_girl'
+                require 'factory_bot'
                 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|
+                FactoryBot.definition_file_paths = Hippo::Extensions.map do |ext|
                     ext.root_path.join('spec/factories')
                 end
-                FactoryGirl.find_definitions
+                FactoryBot.find_definitions
                 Hippo::API::Cable.configure
                 MultiTenant.current_tenant = Hippo::Tenant.find_by_slug(
                     Hippo.env.development? ? 'dev' : 'system'

data/lib/hippo/concerns/asset_uploader.rb

@@ -1,5 +1,6 @@
 require 'shrine'
 require 'image_processing/mini_magick'
+require 'image_optim'
 
 module Hippo::Concerns
 
@@ -28,11 +29,16 @@ module Hippo::Concerns
 
 
         process(:store) do |io, context|
+
             if io.metadata['mime_type'] && io.metadata['mime_type'].starts_with?('image')
-                size_1000 = resize_to_limit(io.download, 1000, 1000)
+                file = io.download
+                optimizer = ImageOptim.new
+                optimizer.optimize_image!(file)
+
+                size_1000 = resize_to_limit(file, 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}
+                {original: file, large: size_1000, medium: size_600, thumbnail: size_300}
             else
                 {original: io}
             end

data/lib/hippo/concerns/pub_sub.rb

@@ -50,10 +50,10 @@ module Hippo::Concerns
             class_attribute :_event_listeners
             base.valid_event_names = [ :save, :create, :update, :destroy ]
 
-            base.after_save    :fire_after_save_pubsub_events
-            base.after_create  :fire_after_create_pubsub_events
-            base.after_update  :fire_after_update_pubsub_events
-            base.after_destroy :fire_after_destroy_pubsub_events
+            base.before_save    :fire_save_pubsub_events
+            base.before_create  :fire_create_pubsub_events
+            base.before_update  :fire_update_pubsub_events
+            base.before_destroy :fire_destroy_pubsub_events
         end
 
         module ClassMethods
@@ -94,19 +94,19 @@ module Hippo::Concerns
 
         protected
 
-        def fire_after_destroy_pubsub_events
+        def fire_destroy_pubsub_events
             fire_pubsub_event(:update, self)
         end
 
-        def fire_after_update_pubsub_events
+        def fire_update_pubsub_events
             fire_pubsub_event(:update, self)
         end
 
-        def fire_after_create_pubsub_events
+        def fire_create_pubsub_events
             fire_pubsub_event(:create, self)
         end
 
-        def fire_after_save_pubsub_events
+        def fire_save_pubsub_events
             fire_pubsub_event(:save, self)
         end
 

data/lib/hippo/configuration.rb

@@ -13,7 +13,7 @@ module Hippo
 
     class Configuration
         include Concerns::AttrAccessorWithDefault
-        cattr_reader :secrets
+        attr_reader :secrets
 
         # Since changing a config value inadvertently
         # can have pretty drastic consequences that might not be
@@ -34,6 +34,7 @@ module Hippo
 
         def initialize
             @observers=Hash.new{ |hash,key| hash[key] = Array.new }
+            @secrets = Hashie::Mash.new
         end
 
         def on_change(config, &block)
@@ -54,6 +55,7 @@ module Hippo
 
             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) : {}
             )
@@ -122,9 +124,9 @@ module Hippo
         # types of assets to include into compiled package
         config_option :static_asset_types, ['images','fonts']
 
-        config_option :website_domain, 'test.com'
-
-        config_option :product_name, 'Hippo Funtime'
+        config_option :website_domain, ''
+        config_option :support_email, ''
+        config_option :product_name, ''
 
         def api_path
             mounted_at + 'api'

data/lib/hippo/extension.rb

@@ -99,7 +99,8 @@ module Hippo
             def static_bootstrap_data
                 data = {}
                 %w{
-                  api_path environment website_domain product_name assets_path_prefix
+                  api_path print_path_prefix environment assets_path_prefix
+                  website_domain  product_name support_email
                 }.each do |config|
                     data[config.to_sym] = Hippo.config.send(config)
                 end
@@ -110,7 +111,7 @@ module Hippo
                     ext_data  = ext.static_bootstrap_data
                     data[ext.identifier] = ext_data unless ext_data.nil?
                 end
-                data[:screen_ids] = Hippo::Screen.active_ids
+                data[:subscription_plans] = Subscription.all.as_json
                 return data
             end
 

data/lib/hippo/model.rb

@@ -31,4 +31,5 @@ module Hippo
         end
     end
 
+    autoload :Subscription, "hippo/models/subscription"
 end

data/lib/hippo/models/subscription.rb

@@ -0,0 +1,7 @@
+module Hippo
+
+    class Subscription < Model
+
+    end
+
+end

data/lib/hippo/payments.rb

@@ -0,0 +1,129 @@
+require 'braintree'
+
+module Hippo
+
+    module Payments
+        extend self
+
+        def gateway_config
+            Hippo.config.secrets.dig(:payments, :braintree) || {}
+        end
+
+        def gateway
+            cc = gateway_config
+            return nil unless cc.present?
+            ::Braintree::Gateway.new(
+                ::Braintree::Configuration.new(
+                    environment: cc['sandbox'] ? :sandbox : :production,
+                    merchant_id: cc['merchant_id'],
+                    public_key:  cc['public_key'],
+                    private_key: cc['private_key'],
+                    logger:      Hippo.logger
+                )
+            )
+        end
+
+        def payment_authorization
+            gw = ::Braintree::ClientTokenGateway.new(gateway)
+            gw.generate
+        end
+
+        def sync_plans
+            ::Braintree::PlanGateway.new(gateway).all.each do |bt|
+                subscription = Hippo::Subscription.find_or_initialize_by(subscription_id: bt.id)
+                subscription.update_attributes(
+                    name: bt.name, description: bt.description,
+                    price: bt.price, trial_duration: bt.trial_duration
+                )
+                subscription.save!
+            end
+            true
+        end
+
+        def update_customer_for_tenant(tenant)
+            return unless gateway.present?
+            gateway.customer.update(
+                tenant.metadata['bt_customer_id'],
+                company: tenant.name,
+                email: tenant.email,
+                phone: tenant.phone_number
+            )
+        end
+
+        def create_customer_for_tenant(tenant)
+            return unless gateway.present?
+            result = gateway.customer.create(
+                company: tenant.name,
+                email: tenant.email,
+                phone: tenant.phone_number
+            )
+            if result.success?
+                tenant.metadata['bt_customer_id'] = result.customer.id
+            end
+        end
+
+        def set_tenant_payment_method(tenant, subscription, nonce)
+            result = if tenant.metadata['payment_method_id']
+                         gateway.payment_method.update(
+                             tenant.metadata['payment_method_id'],
+                             payment_method_nonce: nonce)
+                     else
+                         gateway.payment_method.create(
+                             customer_id: tenant.metadata['bt_customer_id'],
+                             payment_method_nonce: nonce,
+                             options: { make_default: true })
+                     end
+
+            if result.success?
+                tenant.metadata['payment_method_id'] = result.payment_method.token
+            else
+                subscription.errors.add(:base, result.errors.map(&:message).first)
+                return false
+            end
+
+            attrs = { plan_id: subscription.subscription_id,
+                      payment_method_token: tenant.metadata['payment_method_id'] }
+
+            result = if tenant.metadata['bt_plan_id']
+                         gateway.subscription.update(
+                             tenant.metadata['bt_plan_id'],
+                             attrs
+                         )
+                     else
+                         gateway.subscription.create(attrs)
+                     end
+
+            if result.success?
+                tenant.metadata['bt_plan_id'] = result.subscription.id
+                return true
+            else
+                subscription.errors.add(:base, result.errors.map(&:message).first)
+                return false
+            end
+        end
+
+        def cancel_subscription(tenant)
+            result = gateway.subscription.cancel(
+                tenant.metadata['bt_plan_id']
+            )
+            if result.success?
+                tenant.metadata.delete('bt_plan_id')
+                tenant.subscription = nil
+                return true
+            else
+                tenant.subscription.errors.add(:base, result.errors.map(&:message).first)
+                return false
+            end
+        end
+
+    end
+
+    Tenant.observe(:create) do |tenant|
+        Payments.create_customer_for_tenant(tenant)
+    end
+
+    # Tenant.observe(:update) do |tenant|
+    #     Payments.update_customer_for_tenant(tenant)
+    # end
+
+end