glimr-api-client 0.1.13 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cbd60fb640a1ffbeae5e9bb2b4e886a9013095a
-  data.tar.gz: 932ef88b4ea067de7969970e9ba2f71142a8c339
+  metadata.gz: 57083af961a58b65ac82caa95841d63b96bb2b49
+  data.tar.gz: cd7283d7a308d26be3cb023a11e40b3ae1992e58
 SHA512:
-  metadata.gz: 22d04e89360d24aa9a537ef7a8bbe26772b31f915fc3b794935932316e14b90fdb77f2ef565571a1a503a1f4b7373485cce689134a81f3936bfae4ad82b7a043
-  data.tar.gz: 033de5166aaf1c4f2bb39ad393a40e9e2799bca4edde1ef1c0f0c08915c7aeaa4c4df3b722017e56b1a4338c8ef2080bb9a71520621c4d0c30d0d2fe62f2eb2e
+  metadata.gz: a043236ebe96657fa5ca5b5b099cabba86bb5283a5a7fb29adc1eb1e0cba3ee36a3251205b94ae0df5993f510c5989c25f1a69692ee3004a17167f9ce846c6a6
+  data.tar.gz: 676991232ce35c066064dc63574995a1085cb8d27f5fe599cfd099945d7f8d8d6717390d90b30758c486ace558cf2fcb27aac81208f046bbc72e3bdd975d580f

data/Gemfile.lock

@@ -1,50 +1,13 @@
 PATH
   remote: .
   specs:
-    glimr-api-client (0.1.13)
+    glimr-api-client (0.1.14)
       excon (~> 0.51)
 
 GEM
   remote: https://rubygems.org/
   specs:
     abstract_type (0.0.7)
-    actioncable (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      nio4r (~> 1.2)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      actionview (= 5.0.0.1)
-      activejob (= 5.0.0.1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.0.0.1)
-      actionview (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0.1)
-      activesupport (= 5.0.0.1)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.0.1)
-      activesupport (= 5.0.0.1)
-      globalid (>= 0.3.6)
-    activemodel (5.0.0.1)
-      activesupport (= 5.0.0.1)
-    activerecord (5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
-      arel (~> 7.0)
-    activesupport (5.0.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
     adamantium (0.2.0)
       ice_nine (~> 0.11.0)
       memoizable (~> 0.4.0)
@@ -53,9 +16,7 @@ GEM
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2)
       equalizer (~> 0.0.11)
-    arel (7.1.4)
     ast (2.3.0)
-    builder (3.2.2)
     byebug (9.0.6)
     capybara (2.10.1)
       addressable
@@ -70,24 +31,15 @@ GEM
     concord (0.1.5)
       adamantium (~> 0.2.0)
       equalizer (~> 0.0.9)
-    concurrent-ruby (1.0.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
     equalizer (0.0.11)
-    erubis (2.7.0)
     excon (0.54.0)
     fuubar (2.2.0)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
     ice_nine (0.11.2)
     json (2.0.2)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.8.2)
@@ -95,7 +47,6 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.1)
     morpher (0.2.6)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
@@ -124,7 +75,6 @@ GEM
     mutant-rspec (0.8.11)
       mutant (~> 0.8.11)
       rspec-core (>= 3.4.0, < 3.6.0)
-    nio4r (1.2.1)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
     parallel (1.9.0)
@@ -142,32 +92,13 @@ GEM
     rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.0.1)
-      actioncable (= 5.0.0.1)
-      actionmailer (= 5.0.0.1)
-      actionpack (= 5.0.0.1)
-      actionview (= 5.0.0.1)
-      activejob (= 5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activerecord (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.0.1)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.1)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6.0)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
     rake (10.5.0)
     regexp_parser (0.3.6)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -176,14 +107,6 @@ GEM
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
     rubocop (0.45.0)
       parser (>= 2.3.1.1, < 3.0)
@@ -198,18 +121,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    sprockets (3.7.0)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.0)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.3.12)
-    thor (0.19.1)
     thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
     unicode-display_width (1.1.1)
     unparser (0.2.5)
       abstract_type (~> 0.0.7)
@@ -219,9 +131,6 @@ GEM
       equalizer (~> 0.0.9)
       parser (~> 2.3.0)
       procto (~> 0.0.2)
-    websocket-driver (0.6.4)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -236,11 +145,9 @@ DEPENDENCIES
   glimr-api-client!
   mutant-rspec (~> 0.8)
   pry-byebug (~> 3.4)
-  rails (~> 5.0)
   rake (~> 10.0)
-  rspec-rails (~> 3.5)
+  rspec (~> 3.5)
   rubocop (~> 0.41)
-  sqlite3 (~> 1.3)
 
 BUNDLED WITH
    1.13.6

data/README.md

@@ -9,10 +9,15 @@ use in various UK tribunals.
 
 ### Configuration
 
-The gem expects a `GLIMR_API_URL` environment variable, providing the endpoint at which the API can be found. This will be something like; `https://glimr-api.taxtribunals.dsd.io`
+The gem expects a `GLIMR_API_URL` environment variable, providing the
+endpoint at which the API can be found. This will be something like;
+`https://glimr-api.taxtribunals.dsd.io`
 
 This URL must be accessible from wherever your code is running.
 
+If you need to set the api time, use the `GLIMR_API_TIMEOUT_SECONDS`
+environment variable.  This defaults to 5 seconds.
+
 ### Check Availablity
 
 ```ruby
@@ -26,23 +31,97 @@ is received; this includes network errors and timeouts.
 ### Find a case
 
 ```ruby
-GlimrApiClient::Case.find(<case reference>)
+  GlimrApiClient::Case.find(<case reference>, <confirmation code>)
 ```
 
 Find a case on GLiMR using the case reference (‘TT/2012/00001’ in Tax
-Tribunals, for example). `#title` returns case title from GLiMR, and `#fees`
-returns an array of anonymous objects (OpenStructs) detailing any
-outstanding fees. Each fee object responds to `#glimr_id`,
-`#description`, and `#amount`.
+Tribunals, for example) and confirmation code. `#title` returns case
+title from GLiMR, and `#fees` returns an array of anonymous objects
+(OpenStructs) detailing any outstanding fees. Each fee object responds
+to `#glimr_id`, `#description`, and `#amount`.
 
 Please note that `#amount` returns the amount in pence.
 
 If a case is not found, the client will raise `GlimrApiClient::CaseNotFound`.
 
+### Pay by Account
+
+```ruby
+  GlimrApiClient::PayByAccount.call(<params>)
+```
+
+Pay tribunal fees with a Pay By Account reference.
+
+Params are as follows:
+
+```ruby
+  feeLiabilityId: 123456789
+  pbaAccountNumber: "PBA1234567"
+  pbaConfirmationCode: "AC-D3-46" or "ACD346" - Glimr accepts hyphens
+  pbaTransactionReference: User's own reference. Max of 240 characters
+  amountToPayInPence: 9999
+```
+
+### Help With Fees Request
+
+```ruby
+  GlimrApiClient::HwfRequested.call(<params>)
+```
+
+Pay tribunal fees with a Help With Fees reference.
+
+Params are as follows:
+
+```ruby
+  feeLiabilityId: 123456789
+  hwfRequestReference: ABCD12345
+  amountToPayInPence: 9999
+```
+
+### Register a New Case
+
+```ruby
+GlimrApiClient::RegisterNewCase.call(<case parameters>)
+```
+
+Accepts the following parameters:
+
+```ruby
+  jurisdictionId: 8,
+  onlineMappingCode: 'something',
+  contactPhone: '1234',
+  contactFax: '5678',
+  contactEmail: 'foo_at_bar.com',
+  contactPreference: 'Email',
+  contactFirstName: 'Alice',
+  contactLastName: 'Caroll',
+  contactStreet1: '5_Wonderstreet',
+  contactStreet2: 'contact_street_2',
+  contactStreet3: 'contact_street_3',
+  contactStreet4: 'contact_street_4',
+  contactCity: 'London',
+  documentsURL: 'http...google.com',
+  repPhone: '7890',
+  repFax: '6789',
+  repEmail: 'bar_at_baz.com',
+  repPreference: 'Fax',
+  repReference: 'MYREF',
+  repIsAuthorised: 'Yes',
+  repOrganisationName: 'Acme._Ltd.',
+  repFAO: 'Bob_Hope',
+  repStreet1: '5_Repstreet',
+  repStreet2: 'Repton',
+  repStreet3: 'Repshire',
+  repStreet4: 'Rep_st._4',
+  repCity: 'City_of_reps'
+```
+
+Currently only `jurisdictionId` and `onlineMappingCode` are mandatory.
+
 ### Update a case, mark as paid
 
 ```ruby
-GlimrApiClient::Update.call(<Fee object>)
+  GlimrApiClient::Update.call(<Fee object>)
 ```
 
 Update a GLiMR case to indicate that payment has been received for a

data/Rakefile

@@ -14,11 +14,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-load 'rails/tasks/statistics.rake'
-
 require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'

data/circle.yml

@@ -1,6 +1,6 @@
 database:
   override:
-    - bundle exec rake db:setup
+   - touch 'not needed'
 
 test:
   override:

data/glimr_api_client.gemspec

@@ -20,11 +20,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'fuubar', '~> 2.0'
   spec.add_development_dependency 'mutant-rspec', '~> 0.8'
   spec.add_development_dependency 'pry-byebug', '~> 3.4'
-  spec.add_development_dependency 'rails', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec-rails', '~> 3.5'
+  spec.add_development_dependency 'rspec', '~> 3.5'
   spec.add_development_dependency 'rubocop', '~> 0.41'
-  spec.add_development_dependency 'sqlite3', '~> 1.3'
 
   spec.add_dependency 'excon', '~> 0.51'
 end

data/lib/glimr_api_client.rb

@@ -6,6 +6,8 @@ require 'glimr_api_client/available'
 require 'glimr_api_client/case'
 require 'glimr_api_client/update'
 require 'glimr_api_client/register_new_case'
+require 'glimr_api_client/pay_by_account'
+require 'glimr_api_client/hwf_requested'
 
 
 module GlimrApiClient

data/lib/glimr_api_client/api.rb

@@ -4,11 +4,11 @@ module GlimrApiClient
   module Api
     def post
       client("#{api_url}#{endpoint}").post(body: request_body.to_json).tap { |resp|
-        handle_response_errors(resp)
+        handle_response_errors(resp) if (400..599).cover?(resp.status)
         @body = resp.body
       }
     rescue Excon::Error => e
-      re_raise_error(endpoint, e)
+      re_raise_error(message: e)
     end
 
     def response_body
@@ -27,22 +27,19 @@ module GlimrApiClient
 
     # Only timeouts and network issues raise errors.
     def handle_response_errors(resp)
-      if resp.status.equal?(404) && endpoint.eql?('/requestpayablecasefees')
-        raise CaseNotFound, resp.status
-      elsif (400..599).cover?(resp.status)
-        re_raise_error(endpoint, resp.status)
-      end
+      # TODO: log error as well.
+      # Deal with cases where we get an otherwise unparseable response body.
+      body = begin
+               JSON.parse(resp.body, symbolize_names: true)
+             rescue JSON::ParserError
+               { message: resp.status }
+             end
+      re_raise_error(body)
     end
 
-    def re_raise_error(docpath, e)
-      case docpath
-      when '/paymenttaken'
-        raise PaymentNotificationFailure, e
-      when '/registernewcase'
-        raise RegisterNewCaseFailure, e
-      else
-        raise Unavailable, e
-      end
+    def re_raise_error(body)
+      error = body.fetch(:message)
+      raise Unavailable, error
     end
 
     def client(uri)
@@ -52,7 +49,8 @@ module GlimrApiClient
           'Content-Type' => 'application/json',
           'Accept' => 'application/json'
         },
-      persistent: true
+        persistent: true,
+        read_timeout: ENV.fetch('GLIMR_API_TIMEOUT_SECONDS', 5)
       )
     end
   end

data/lib/glimr_api_client/case.rb

@@ -1,9 +1,14 @@
 module GlimrApiClient
+  # TODO: rename so it follow api spec
   class Case
+    class NotFound < StandardError; end
+    class InvalidCaseNumber < StandardError; end
+
     include GlimrApiClient::Api
 
     TRIBUNAL_JURISDICTION_ID = 8
 
+    # TODO: Case should use `#call(params)` directly, like everything else.
     def self.find(case_reference, confirmation_code)
       new(case_reference, confirmation_code).call
     end
@@ -18,24 +23,31 @@ module GlimrApiClient
       self
     end
 
+    # Case title is returned with each fee liability, rather than as a top-level
+    # attribute of the case. If there are any unpaid fee liabilities, we want to
+    # take the title from the first of these (because that is the most relevant
+    # title)
     def title
-      # This should be;
-      #
-      #   @title ||= response_body.fetch(:caseTitle)
-      #
-      # But, a change in the Glimr API means that the title is
-      # currently being returned with each fee liability. So,
-      # for the time being, we will fetch it from there.
-      # I'm leaving the "Missing Title" text so that nobody forgets
-      # that this needs to be fixed, preferably by changing the
-      # Glimr RequestPayableCaseFees API call back to returning
-      # caseTitle at the top-level of the response data.
-
-      @title ||= fees.any? ? fees.first.case_title : "Missing Title"
+      @title ||= begin
+                   fee = unpaid_fees.any? ? unpaid_fees.first : all_fees.first
+                   fee.nil? ? 'Missing Title' : fee.case_title
+                 end
     end
 
+    # We only care about outstanding fee liabilities, wrt what we are asking the
+    # taxpayer to pay
     def fees
-      @fees ||= response_body.fetch(:feeLiabilities).map do |fee|
+      unpaid_fees
+    end
+
+    private
+
+    def unpaid_fees
+      @unpaid_fees ||= all_fees.find_all {|fee| fee.amount > 0}
+    end
+
+    def all_fees
+      @all_fees ||= response_body.fetch(:feeLiabilities).map do |fee|
         OpenStruct.new(
           glimr_id: Integer(fee.fetch(:feeLiabilityId)),
           description: fee.fetch(:onlineFeeTypeDescription),
@@ -45,10 +57,19 @@ module GlimrApiClient
       end
     end
 
-    private
-
     def endpoint
-      '/requestpayablecasefees'
+      '/requestcasefees'
+    end
+
+    def re_raise_error(body)
+      error = body.fetch(:message, nil)
+      case body.fetch(:glimrerrorcode, nil)
+      when 212 # TribunalCase for CaseNumber not found
+        raise NotFound, error
+      when 213 # Invalid CaseNumber/CaseConfirmationCode combination
+        raise InvalidCaseNumber, error
+      end
+      super(message: error)
     end
 
     def request_body

data/lib/glimr_api_client/hwf_requested.rb

@@ -0,0 +1,40 @@
+module GlimrApiClient
+  class HwfRequested < Base
+    class FeeLiabilityNotFound < StandardError; end;
+    class InvalidAmount < StandardError; end
+
+    attr_reader :request_body
+
+    def initialize(params)
+      @request_body = params
+    end
+
+    private
+
+    def check_request!
+      errors = []
+      [
+        :feeLiabilityId,
+        :hwfRequestReference
+      ].each do |required|
+        errors << required if request_body.fetch(required, nil).nil?
+      end
+      raise RequestError, errors unless errors.empty?
+    end
+
+    def endpoint
+      '/hwfrequested'
+    end
+
+    def re_raise_error(body)
+      error = body.fetch(:message, nil)
+      case body.fetch(:glimrerrorcode, nil)
+      when 611 # FeeLiability not found for FeeLiabilityID
+        raise FeeLiabilityNotFound, error
+      when 612 # Invalid AmountToPay
+        raise InvalidAmount, error
+      end
+      super(message: error)
+    end
+  end
+end

data/lib/glimr_api_client/pay_by_account.rb

@@ -0,0 +1,61 @@
+module GlimrApiClient
+  class PayByAccount < Base
+    class FeeLiabilityNotFound < StandardError; end;
+    class AccountNotFound < StandardError; end
+    class InvalidAccountAndConfirmation < StandardError; end
+    class InvalidAmount < StandardError; end
+    class GlobalStatusInactive < StandardError; end
+    class JurisdictionStatusInactive < StandardError; end
+    class UnspecifiedError < StandardError; end
+
+    attr_reader :request_body
+
+    def initialize(params)
+      @request_body = params
+    end
+
+    private
+
+    def check_request!
+      errors = []
+      [
+        :feeLiabilityId,
+        :pbaAccountNumber,
+        :pbaConfirmationCode,
+        :pbaTransactionReference
+      ].each do |required|
+        errors << required if request_body.fetch(required, nil).nil?
+      end
+
+      if request_body.fetch(:pbaTransactionReference, '').size > 240
+        errors << :pbaTransactionReferenceTooLong
+      end
+      raise RequestError, errors unless errors.empty?
+    end
+
+    def endpoint
+      '/pbapaymentrequest'
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity
+    def re_raise_error(body)
+      error = body.fetch(:message, nil)
+      case body.fetch(:glimrerrorcode, nil)
+      when 511 # FeeLiability not found for FeeLiabilityID
+        raise FeeLiabilityNotFound, error
+      when 512 # PBA account \w+ not found
+        raise AccountNotFound, error
+      when 513 # Invalid PBAAccountNumber/PBAConfirmationCode combination
+        raise InvalidAccountAndConfirmation, error
+      when 514 # Invalid AmountToPay
+        raise InvalidAmount, error
+      when 521 # PBAGlobalStatus is inactive
+        raise GlobalStatusInactive, error
+      when 522  # PBAJurisdictionStatus is inactive
+        raise JurisdictionStatusInactive, error
+      end
+      super(message: error)
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity
+  end
+end

data/lib/glimr_api_client/register_new_case.rb

@@ -1,7 +1,12 @@
 module GlimrApiClient
   class RegisterNewCase < Base
+    class JurisdictionNotFound < StandardError; end
+    class OnlineMappingNotFoundOrInvalid < StandardError; end
+    class CaseCreationFailed < StandardError; end
+    attr_reader :request_body
+
     def initialize(params)
-      @params = params
+      @request_body = params
     end
 
     private
@@ -21,8 +26,17 @@ module GlimrApiClient
       '/registernewcase'
     end
 
-    def request_body
-      @params
+    def re_raise_error(body)
+      error = body.fetch(:message, nil)
+      case body.fetch(:glimrerrorcode, nil)
+      when 411 # Jusidiction not found
+        raise JurisdictionNotFound, error
+      when 412 # Online Mapping not found or invalid
+        raise OnlineMappingNotFoundOrInvalid, error
+      when 421 # Creation failed (due to a database problem)
+        raise CaseCreationFailed, error
+      end
+      super(message: error)
     end
   end
 end

data/lib/glimr_api_client/update.rb

@@ -1,15 +1,31 @@
 module GlimrApiClient
+  # TODO: rename so it follow api spec
   class Update < Base
-    def initialize(fee)
-      @fee = fee
+    class FeeLiabilityNotFound < StandardError; end
+    class PaymentReferenceInvalidFormat < StandardError; end
+    class GovPayReferenceInvalidFormat < StandardError; end
+    class InvalidAmount < StandardError; end
+    class GovPayReferenceExistsOnSystem < StandardError; end
+
+    # TODO: Move this and initialize into Base. It's the same for all but Case.
+    attr_reader :request_body
+
+    def initialize(params)
+      @request_body = params
     end
 
     private
 
+    # TODO: Set the attributes in a constant and move this to Base.
     def check_request!
       errors = []
-      [:feeLiabilityId, :paymentReference, :govpayReference, :paidAmountInPence].each do |required|
-        errors << required if request_body.fetch(required).nil?
+      [
+        :feeLiabilityId,
+        :paymentReference,
+        :govpayReference,
+        :paidAmountInPence
+      ].each do |required|
+        errors << required if request_body.fetch(required, nil).nil?
       end
       raise RequestError, errors unless errors.empty?
     end
@@ -18,13 +34,21 @@ module GlimrApiClient
       '/paymenttaken'
     end
 
-    def request_body
-      {
-        feeLiabilityId: @fee.glimr_id,
-        paymentReference: @fee.govpay_reference,
-        govpayReference: @fee.govpay_payment_id,
-        paidAmountInPence: @fee.amount
-      }
+    def re_raise_error(body)
+      error = body.fetch(:message, nil)
+      case body.fetch(:glimrerrorcode, nil)
+      when 311 # FeeLiability not found
+        raise FeeLiabilityNotFound, error
+      when 312 # Invalid format for PaymentReference
+        raise PaymentReferenceInvalidFormat, error
+      when 314 # Invalid format for GovPayReference
+        raise GovPayReferenceInvalidFormat, error
+      when 315 # Invalid PaidAmount
+        raise InvalidAmount, error
+      when 321 # GovPay reference already exists on system
+        raise GovPayReferenceExistsOnSystem, error
+      end
+      super(message: error)
     end
   end
 end

data/lib/glimr_api_client/version.rb

@@ -1,3 +1,3 @@
 module GlimrApiClient
-  VERSION = '0.1.13'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimr-api-client
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.2.0
 platform: ruby
 authors:
 - Todd Tyree
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -150,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.41'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +174,8 @@ files:
 - lib/glimr_api_client/available.rb
 - lib/glimr_api_client/base.rb
 - lib/glimr_api_client/case.rb
+- lib/glimr_api_client/hwf_requested.rb
+- lib/glimr_api_client/pay_by_account.rb
 - lib/glimr_api_client/register_new_case.rb
 - lib/glimr_api_client/update.rb
 - lib/glimr_api_client/version.rb