instant_quote 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15c4949632bab15c6468290a1f0d459cf797c2a9dee15c12b02261eff154292d
-  data.tar.gz: '08ac65c4b02edc57c97888299aef2704b88faf2914a4b99ebc6edca078459a40'
+  metadata.gz: ec2e26453b0ed03e414feceb9e8344ff4d502d5f0962f7b509450608278c9b34
+  data.tar.gz: 830639812afaf22a2f67059a6fb757fc6988e99121deca26ede7eba041738a6f
 SHA512:
-  metadata.gz: c11771be9ce275d3e3c6b3900eb444d78313b3764877028855f4bb98ca08d2b4e12dfee9fd2c07c6ed49ce6662cd4c5e749cca7d9e50142283c5808f582757ab
-  data.tar.gz: cab4260996cd01406ea47e0563d24a55cb4cf5736b621e7e2cdc0f9759800c5560af707fbc884b41c55f9da43ecd15fe0d30e3c8d1da08acec6408cb977f8532
+  metadata.gz: '0822f784c417f72c986a44ecaad692be2a53b227cf09c14a4bb7d7afe5b5db7dd3dd3d070952cc809b38f3c7cb0fe2168e0237629d5a7d70c26b24c71cf2d7f7'
+  data.tar.gz: '069cc5595bae6a50601f73d4403be3bcaad28b51033beec08f0488a426a51d3f8911a1828c18b00e69ecfbf3d27f24f2b3e68bd00f05091af9e334f5a6bf9e26'

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+2.6.6

data/Gemfile

@@ -6,6 +6,7 @@ source 'https://rubygems.org'
 #
 # gem 'capital_on_tap', path: '../capital-on-tap'
 # gem 'iwoca', path: '../iwoca'
+# gem 'optimum', path: '../optimum'
 
 # Specify your gem's dependencies in instant-quotes.gemspec
 gemspec

data/Gemfile.lock

@@ -1,22 +1,23 @@
 PATH
   remote: .
   specs:
-    instant_quote (1.1.4)
+    instant_quote (1.2.0)
       activesupport
       capital_on_tap
       iwoca
       money
+      optimum
       phonelib
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.2)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.0)
@@ -28,18 +29,18 @@ GEM
       multi_json
       rainbow
     coderay (1.1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     docile (1.3.2)
     dotenv (2.7.5)
-    faraday (0.17.3)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.14.0)
-      faraday (>= 0.7.4, < 1.0)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
     hashdiff (1.0.1)
-    i18n (1.8.2)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     iwoca (1.0.0)
       addressable
@@ -49,15 +50,21 @@ GEM
       rainbow
     jaro_winkler (1.5.4)
     method_source (1.0.0)
-    minitest (5.14.0)
-    money (6.13.7)
+    minitest (5.14.2)
+    money (6.13.8)
       i18n (>= 0.6.4, <= 2)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multipart-post (2.1.1)
+    optimum (1.0.0)
+      addressable
+      faraday
+      faraday_middleware
+      multi_json
+      rainbow
     parallel (1.19.1)
     parser (2.7.0.5)
       ast (~> 2.4.0)
-    phonelib (0.6.42)
+    phonelib (0.6.45)
     pry (0.13.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -96,14 +103,14 @@ GEM
       simplecov-html (~> 0.11)
     simplecov-html (0.12.2)
     thread_safe (0.3.6)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.1)
     webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
@@ -120,4 +127,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/instant_quote.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport'
   spec.add_dependency 'capital_on_tap'
   spec.add_dependency 'iwoca'
+  spec.add_dependency 'optimum'
   spec.add_dependency 'money'
   spec.add_dependency 'phonelib'
 end

data/lib/instant_quote/adapter_finder.rb

@@ -1,16 +1,19 @@
 # frozen_string_literal: true
 
 # Require all the connection translators
-translators = Dir.children(File.expand_path('connection_translators', __dir__))
-translators.each { |translator| require "instant_quote/connection_translators/#{translator}" }
+Dir.glob('*.rb', base: File.expand_path('connection_translators', __dir__)) do |translator|
+  require "instant_quote/connection_translators/#{translator}"
+end
 
 # Require all the decision parsers
-parsers = Dir.children(File.expand_path('decision_parsers', __dir__))
-parsers.each { |parser| require "instant_quote/decision_parsers/#{parser}" }
+Dir.glob('*.rb', base: File.expand_path('decision_parsers', __dir__)) do |parser|
+  require "instant_quote/decision_parsers/#{parser}"
+end
 
 # Require all the adapters
-adapters = Dir.children(File.expand_path('adapters', __dir__))
-adapters.each { |adapter| require "instant_quote/adapters/#{adapter}" }
+Dir.glob('*.rb', base: File.expand_path('adapters', __dir__)) do |adapter|
+  require "instant_quote/adapters/#{adapter}"
+end
 
 module InstantQuote
   class AdapterFinder
@@ -28,8 +31,8 @@ module InstantQuote
     end
 
     def self.available_adapters
-      adapters = Dir.children(File.expand_path('adapters', __dir__))
-      adapters.map { |adapter| adapter.tr('.rb', '') }
+      Dir.glob('*.rb', base: File.expand_path('adapters', __dir__))
+         .map { |adapter| adapter.sub('.rb', '') }
     end
 
     def get_link

data/lib/instant_quote/adapters/capital_on_tap.rb

@@ -25,7 +25,7 @@ module InstantQuote
         },
         {
           name: 'monthly_income',
-          label: 'Applicat monthly income',
+          label: 'Applicant monthly income',
           type: 'number',
           required: true,
           if: ->(app) { app.borrower_organisation.sole_trader? }
@@ -50,9 +50,7 @@ module InstantQuote
         response = ::CapitalOnTap::Application.create(params)
 
         # CoT responses can be 200 OK but still have an error!
-        unless response.success? && !response.error
-          raise ApiError.new(data: response.body, error: response.error || 'Unknown API error')
-        end
+        raise_error(response) unless response.success? && !response.error
 
         response.body.dig(:result)
       end
@@ -75,7 +73,7 @@ module InstantQuote
       def get_status(application_id)
         response = ::CapitalOnTap::Application.status(application_id)
 
-        raise ApiError.new(data: response.body, error: response.error) unless response.success?
+        raise_error(response) unless response.success?
 
         DecisionParsers::CapitalOnTap.new(response.body[:applicationStatus])
       end
@@ -89,6 +87,16 @@ module InstantQuote
       def get_approval(_application_id)
         true
       end
+
+      private
+
+      def raise_error(response)
+        raise ApiError.new(
+          adapter: 'capital_on_tap',
+          data: response.body,
+          error: response.error || 'Unknown API error'
+        )
+      end
     end
   end
 end

data/lib/instant_quote/adapters/iwoca.rb

@@ -77,7 +77,7 @@ module InstantQuote
 
         raise_error(response) unless response.success?
 
-        DecisionParsers::Iwoca.new(response.body)
+        decision_parser.new(response.body)
       end
 
       # Gets the URL for the given state key.
@@ -96,8 +96,17 @@ module InstantQuote
 
       private
 
+      def decision_parser
+        DecisionParsers::Iwoca
+      end
+
       def raise_error(response)
-        raise ApiError.new(data: response.data, error: response.errors.first[:detail])
+        raise ApiError.new(
+          adapter: 'iwoca',
+          data: response.data,
+          code: response.errors.first[:code],
+          error: response.errors.first[:detail]
+        )
       end
     end
   end

data/lib/instant_quote/adapters/iwoca_cbils.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'iwoca'
+require 'instant_quote/adapters/iwoca'
+require 'instant_quote/decision_parsers/iwoca_cbils'
+
+module InstantQuote
+  module Adapters
+    class IwocaCbils < Iwoca
+      additional_fields Iwoca.additional_fields
+
+      private
+
+      def decision_parser
+        DecisionParsers::IwocaCbils
+      end
+    end
+  end
+end

data/lib/instant_quote/adapters/optimum.rb

@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+require 'optimum'
+require 'instant_quote/decision_parsers/optimum'
+
+module InstantQuote
+  module Adapters
+    class Optimum < Adapter
+      additional_fields [
+        {
+          name: 'applicant_phone_number',
+          label: 'Applicant mobile phone',
+          required: true
+        },
+        {
+          name: 'expected_turnover_next_12_months',
+          label: 'Expected turnover next 12 months',
+          required: true,
+          type: 'money'
+        },
+        {
+          name: 'expected_customers',
+          label: 'Number of expected customers with a balance in 6 months',
+          required: true,
+          type: 'number'
+        },
+        {
+          name: 'industry_sector',
+          label: 'Industry sector',
+          required: true,
+          type: 'select',
+          choices: [
+            "Advertising / Marketing",
+            "Beer / Wine Merchant",
+            "Builders Merchant",
+            "Clothing & Fashion",
+            "Computer Hardware",
+            "Computer Software",
+            "Construction",
+            "Consultancy",
+            "Contract Cleaning",
+            "Courier",
+            "Distribution",
+            "Driving Agency",
+            "Electrical Contracting",
+            "Electrical Wholesaler",
+            "Engineering - Heavy",
+            "Engineering - Light",
+            "Engineering - Precision",
+            "Fabrication",
+            "Flooring Contractor",
+            "Food Manufacture",
+            "Franchise",
+            "Free Newspaper",
+            "Freight Forwarding",
+            "Fruit Importer",
+            "Furniture Manufacture",
+            "Garden Equipment",
+            "Haulage",
+            "IT Contracting",
+            "Jewellery",
+            "Maintenance",
+            "Manufacturing",
+            "Meat Trade",
+            "Other Services",
+            "Permanent Recruitment",
+            "Plant Hire",
+            "Plastic Injection Moulding",
+            "Plumbers Merchant",
+            "Printing",
+            "Publishing",
+            "Recycling",
+            "Security Guards",
+            "Shopfitting",
+            "Stationery",
+            "Steel Stockholding",
+            "Telecoms",
+            "Temporary Recruitment",
+            "Timber Merchant",
+            "Tooling Manufacture",
+            "Toys & Fancy Goods",
+            "Warehousing & Storage",
+            "Wholesale"
+          ]
+        },
+        {
+          name: 'credit_control',
+          label: 'Do you require credit control?',
+          required: false,
+          choices: {
+            '1' => 'Yes',
+            '0' => 'No'
+          },
+          type: 'radio'
+        },
+        {
+          name: 'applicant_consent',
+          label: 'Yes, I give my consent for my data to be shared',
+          required: true,
+          type: 'checkbox'
+        }
+      ]
+
+      def get_quote(params)
+        response = ::Optimum::Decision.create(params)
+
+        return response.data[:opportunityId] if response.success?
+
+        raise_error(response)
+      end
+
+      def get_status(application_id)
+        response = ::Optimum::Decision.update(application_id)
+
+        raise_error(response) unless response.success?
+
+        decision_parser.new(response.body)
+      end
+
+      # Gets the URL for the given state key.
+      def get_link(_)
+        ''
+      end
+
+      def get_approval(_)
+        true
+      end
+
+      private
+
+      def decision_parser
+        DecisionParsers::Optimum
+      end
+
+      def raise_error(response)
+        raise ApiError.new(
+          adapter: 'optimum',
+          data: response.body,
+          error: response.error || 'Unknown API error'
+        )
+      end
+    end
+  end
+end

data/lib/instant_quote/api_error.rb

@@ -2,17 +2,19 @@
 
 module InstantQuote
   class ApiError < StandardError
-    attr_accessor :error, :data
+    attr_accessor :error, :data, :code, :adapter
 
     alias message error
     alias to_s error
 
     def initialize(params = {})
+      @adapter = params[:adapter]
       @error = params[:error]
       @data = params[:data] || {}
+      @code = params[:code]
 
       # Delete the metaData key, because it's irrelevant and has long strings
-      @data.delete(:metaData) if @data.key?(:metaData)
+      @data.delete(:metaData) if @data.respond_to?(:key?) && @data.key?(:metaData)
     end
   end
 end

data/lib/instant_quote/connection_translators/capital_on_tap.rb

@@ -61,7 +61,7 @@ module InstantQuote
 
         return '' unless addr && addr != ''
 
-        street_parts = [addr.line_1, addr.line_2, addr.line_3, addr.line_4]
+        street_parts = [addr.line_1, addr.line_2]
 
         {
           CountryCode: 'UK',

data/lib/instant_quote/connection_translators/iwoca.rb

@@ -10,7 +10,7 @@ module InstantQuote
               company: company_information,
               people: [person_information],
               requested_products: {
-                credit_facility: {
+                product_name => {
                   approval: {
                     amount: (application.amount_pennies / 100),
                     duration: 12,
@@ -25,6 +25,10 @@ module InstantQuote
 
       private
 
+      def product_name
+        :credit_facility
+      end
+
       # rubocop:disable Metrics/AbcSize
       def company_information
         information = {

data/lib/instant_quote/connection_translators/iwoca_cbils.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'instant_quote/connection_translators/iwoca'
+
+module InstantQuote
+  module ConnectionTranslators
+    class IwocaCbils < Iwoca
+      private
+
+      def product_name
+        :cbils
+      end
+    end
+  end
+end

data/lib/instant_quote/connection_translators/optimum.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module InstantQuote
+  module ConnectionTranslators
+    class Optimum < ConnectionTranslator
+      def translate
+        {
+          companyNumber: company&.company_number.to_s,
+          sector: extra_info['industry_sector'],
+          turnover: extra_info['expected_turnover_next_12_months'].to_f,
+          homeowners: homeowners?,
+          yearsTrading: company&.years_in_business,
+          expectedCustomers: extra_info['expected_customers'].to_i,
+          contactName: application&.primary_user&.name,
+          contactNumber: extra_info['applicant_phone_number'],
+          contactEmail: application&.primary_user&.email,
+          creditControl: extra_info['credit_control'] == '1',
+          phoenix: false,
+          quotationOnly: false
+        }
+      end
+
+      private
+
+      def company
+        application.borrower_organisation
+      end
+
+      def homeowners?
+        case company&.directors_home_owning&.name
+        when 'Home owner without mortgage', 'Home owner with mortgage'
+          true
+        else
+          false
+        end
+      end
+    end
+  end
+end

data/lib/instant_quote/decision_parsers/iwoca.rb

@@ -45,7 +45,7 @@ module InstantQuote
       # because  it's silly :)
       def initialize(data = {})
         @data = super
-        @data = @data[:data] || {}
+        @data = @data[:data] if @data.key?(:data)
       end
 
       def pending?

data/lib/instant_quote/decision_parsers/iwoca_cbils.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'instant_quote/decision_parsers/iwoca'
+
+module InstantQuote
+  module DecisionParsers
+    class IwocaCbils < Iwoca
+    end
+  end
+end

data/lib/instant_quote/decision_parsers/optimum.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module InstantQuote
+  module DecisionParsers
+    # Example response:
+    #
+    # {
+    # decision: {
+    #     decision: "approved",
+    #     trialPeriodMonths: 4, # trial period length
+    #     fundingLimit: 745000,
+    #     annualRenewalFee: 0,
+    #     badDebtProtection: 0.85,
+    #     cashAvailableWithinHours: 48,
+    #     discountFee: 3.35,
+    #     facility: "Factoring", # Factoring or Invoice Discounting or Confidential Invoice Discounting
+    #     prepayment: 80,
+    #     serviceFee: 1.14
+    # },
+    # opportunityId: "01234567ABCDEFGH", # the Optimum Finance opportunity ID (only supplied for successful applications that are not 'quotation only')
+    # companyName: "COMPANY NAME LTD" # company name from the given company number - use this to verify correct company
+    # }
+
+    class Optimum < DecisionParser
+      STATUSES = {
+        approved: 'approved',
+        declined: 'declined',
+        referred: 'referred',
+      }.freeze
+
+      LOAN_STATES = {
+        started: 'Closed Won'
+      }.freeze
+
+      def initialize(data = {})
+        super
+      end
+
+      def pending?
+        !STATUSES.value?(status)
+      end
+
+      def approved?
+        status == STATUSES[:approved]
+      end
+
+      def declined?
+        status == STATUSES[:declined]
+      end
+
+      def manual_review?
+        status == STATUSES[:referred]
+      end
+
+      def loan_started?
+        data[:status] == LOAN_STATES[:started]
+      end
+
+      def amount
+        amount_approved = decision[:fundingLimit] || 0
+
+        Money.new(amount_approved * 100).format
+      end
+
+      def credit_duration
+        0
+      end
+
+      def credit_interval
+        decision[:trialPeriodMonths]
+      end
+
+      def monthly_interest_rate
+        0
+      end
+
+      def status
+        decision[:decision]
+      end
+
+      private
+
+      def decision
+        data[:decision] || data[:originalDecision] || {}
+      end
+    end
+  end
+end

data/lib/instant_quote/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module InstantQuote
-  VERSION = '1.1.4'
+  VERSION = '1.2.0'
 end

data/lib/instant_quote/webhooks/iwoca.rb

@@ -16,31 +16,15 @@ module InstantQuote
       class SignatureVerifyError < StandardError
       end
 
-      def iwoca_event
-        # Dynamically calls the following methods:
-        # * handle_approval_status_changed
-        # * handle_instruct_payments
-        # * handle_customer_funded
-        if iwoca_verify_signature
-          return send("handle_#{iwoca_event_type}") if respond_to?("handle_#{iwoca_event_type}")
-
-          render json: iwoca_payload, status: 200
-        else
-          iwoca_verify_signature_error
-        end
-      rescue SignatureVerifyError => e
-        iwoca_verify_signature_error(e.message)
-      end
-
       private
 
       def iwoca_verify_signature
-        unless webhook_signature && iwoca_payload && iwoca_signature
+        unless webhook_signature && payload && iwoca_signature
           raise SignatureVerifyError, "#{SIGNATURE_HEADER} header missing"
         end
 
         digest = OpenSSL::Digest.new('sha1')
-        hmac_digest = OpenSSL::HMAC.digest(digest, webhook_signature, iwoca_payload)
+        hmac_digest = OpenSSL::HMAC.digest(digest, webhook_signature, payload)
         signature = "sha1=#{Base64.strict_encode64(hmac_digest)}"
 
         Rack::Utils.secure_compare(signature, iwoca_signature)
@@ -50,8 +34,8 @@ module InstantQuote
         @webhook_signature ||= ::Iwoca.configuration.webhook_signature
       end
 
-      def iwoca_payload
-        @iwoca_payload ||= request.body.read
+      def payload
+        @payload ||= request.body.read
       end
 
       def iwoca_signature

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instant_quote
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - rikas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: optimum
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
@@ -216,13 +230,19 @@ files:
 - lib/instant_quote/adapter_finder.rb
 - lib/instant_quote/adapters/capital_on_tap.rb
 - lib/instant_quote/adapters/iwoca.rb
+- lib/instant_quote/adapters/iwoca_cbils.rb
+- lib/instant_quote/adapters/optimum.rb
 - lib/instant_quote/api_error.rb
 - lib/instant_quote/connection_translator.rb
 - lib/instant_quote/connection_translators/capital_on_tap.rb
 - lib/instant_quote/connection_translators/iwoca.rb
+- lib/instant_quote/connection_translators/iwoca_cbils.rb
+- lib/instant_quote/connection_translators/optimum.rb
 - lib/instant_quote/decision_parser.rb
 - lib/instant_quote/decision_parsers/capital_on_tap.rb
 - lib/instant_quote/decision_parsers/iwoca.rb
+- lib/instant_quote/decision_parsers/iwoca_cbils.rb
+- lib/instant_quote/decision_parsers/optimum.rb
 - lib/instant_quote/version.rb
 - lib/instant_quote/webhooks/iwoca.rb
 homepage: https://finpoint.co.uk