callcredit 0.3.8 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1213865aa7687c9adfd222ffeed8c2e1e6a76ccd
-  data.tar.gz: 2e1265299afc2b3198eb4c1c0c07da6e809dd6fe
+  metadata.gz: a36f71d745577cbb7014548b3bfb274aaf08daec
+  data.tar.gz: 54086f749c30f37c3055298450d4ec4988f5f1e2
 SHA512:
-  metadata.gz: 88f56e2dce84202fdaed7891de549f8e6c4d89400c6c6b1718efe717fc50368f7ef990ccd9a066ff5568f69388db2a6e9020e38b0e06f732bc1d4cb0581f4259
-  data.tar.gz: 321382da4b9e994eeb5c702c166ff78a8372e5bfb3d640b17a6d8dc596339427c1d507354f87e437bf0945b6021ea5f9cd53887762a2faf4e0bbd8f90e2ba80f
+  metadata.gz: adf512665d1906b25a37cb658b39875d680360a6465f9e7f256e4a7e6f6ec568ed2d7841734c0874db2ba355f3330f866aa7facdcb856382e08f6d291c9e535b
+  data.tar.gz: 8a597828c0501da6782c48813f59abaddf82f66da96d2897059fef7a640ebf01cb7354389f43feb1a1b5784d512e92466a50861ac2cd07ddde199a00f938f9f3

data/.rubocop.yml

@@ -0,0 +1,41 @@
+# For all options see https://github.com/bbatsov/rubocop/tree/master/config
+
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  Exclude:
+    - bin/*
+
+LineLength:
+  Max: 80
+
+ClassLength:
+  Enabled: false
+
+# Avoid methods longer than 30 lines of code
+MethodLength:
+  CountComments: false  # count full line comments?
+  Max: 87
+
+# Avoid single-line methods.
+SingleLineMethods:
+  AllowIfMethodIsEmpty: true
+
+StringLiterals:
+  Enabled: false
+
+GlobalVars:
+  Enabled: false
+
+# Wants underscores in all large numbers. Pain in the ass for things like
+# unix timestamps.
+NumericLiterals:
+  Enabled: false
+
+# Wants you to use the same argument names for every reduce. This seems kinda
+# naff compared to naming them semantically
+SingleLineBlockParams:
+  Enabled: false
+
+Style/SignalException:
+  EnforcedStyle: 'only_raise'

data/.rubocop_todo.yml

@@ -0,0 +1,154 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2014-10-30 22:45:17 +0000 using RuboCop version 0.27.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 27
+# Cop supports --auto-correct.
+Lint/UnusedBlockArgument:
+  Enabled: false
+
+# Offense count: 128
+Metrics/AbcSize:
+  Max: 64
+
+# Offense count: 9
+Metrics/CyclomaticComplexity:
+  Max: 10
+
+# Offense count: 5
+Metrics/PerceivedComplexity:
+  Max: 10
+
+# Offense count: 17
+Style/AccessorMethodName:
+  Enabled: false
+
+# Offense count: 64
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles.
+Style/AlignHash:
+  Enabled: false
+
+# Offense count: 72
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# Offense count: 16
+# Configuration parameters: Keywords.
+Style/CommentAnnotation:
+  Enabled: false
+
+# Offense count: 336
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 1285
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/DotPosition:
+  Enabled: false
+
+# Offense count: 6
+Style/DoubleNegation:
+  Enabled: false
+
+# Offense count: 11
+Style/EachWithObject:
+  Enabled: false
+
+# Offense count: 92
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Enabled: false
+
+# Offense count: 24
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/IndentHash:
+  Enabled: false
+
+# Offense count: 60
+Style/Lambda:
+  Enabled: false
+
+# Offense count: 141
+# Cop supports --auto-correct.
+Style/LineEndConcatenation:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/MethodCallParentheses:
+  Enabled: false
+
+Style/ModuleFunction:
+  Enabled: false
+
+# Offense count: 449
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/MultilineOperationIndentation:
+  Enabled: false
+
+# Offense count: 4
+# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
+Style/Next:
+  Enabled: false
+
+# Offense count: 11
+# Configuration parameters: NamePrefix, NamePrefixBlacklist.
+Style/PredicateName:
+  Enabled: false
+
+# Offense count: 5
+# Cop supports --auto-correct.
+Style/Proc:
+  Enabled: false
+
+# Offense count: 9
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/RaiseArgs:
+  Enabled: false
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
+  Enabled: false
+
+# Offense count: 177
+# Cop supports --auto-correct.
+Style/RedundantSelf:
+  Enabled: false
+
+# Offense count: 17
+# Cop supports --auto-correct.
+Style/SingleSpaceBeforeFirstArg:
+  Enabled: false
+
+# Offense count: 87
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/StringLiteralsInInterpolation:
+  Enabled: false
+
+# Offense count: 53
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
+Style/TrailingComma:
+  Enabled: false
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, Whitelist.
+Style/TrivialAccessors:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/WhileUntilDo:
+  Enabled: false

data/CHANGELOG.md

@@ -1,6 +1,13 @@
+## 0.4.0 - December 31, 2014
+
+- Add support for BankStandard and BankEnhanced checks
+- Tweak `Callcredit::Response#result` to support multiple kinds of check (i.e. not just
+identity checks)
+- Enforce code style with Rubocop
+
 ## 0.3.8 - July 16, 2014
 
-- Include requiest ID (RID) on all requests
+- Include request ID (RID) on all requests
 
 ## 0.3.7 - June 3, 2014
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Grey Baker
+Copyright (c) 2014 GoCardless
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/README.md

@@ -45,7 +45,30 @@ The library will raise an error if you're missing any of the required
 parameters (first_name, last_name, date_of_birth, building_number and
 postcode).
 
+#### BankStandard check
+
+To perform a BankStandard check use:
+
+```ruby
+Callcredit.bank_standard_check(account_number: "44779911", sort_code: "200000")
+```
+
+The library will raise an error unless you provide both account_number and sort_code.
+
+#### BankEnhanced check
+
+To perform a BankEnhanced check use:
+
+```ruby
+Callcredit.bank_enhanced_check(first_name: "Tim", last_name: "Rogers", postcode: "EC1V 7LQ", account_number: "44779911", sort_code: "200000", building_number: "338-346")
+```
+
+The library will raise an error if you're missing any of the required
+parameters (first_name, last_name, building_number, postcode, account_number
+and sort_code).
+
 #### Other checks
+
 For any other check, simply pass the name of the check you'd like to perform
 into the `perform_check` method, along with details of the individual you're
 checking.
@@ -63,11 +86,6 @@ data_hash = { personal_data: { first_name: "Grey", last_name: "Baker" } }
 Callcredit.perform_check([:id_enhanced, :credit_score], data_hash)
 ```
 
-NOTE: Currently, this gem only supports checks on the payer's personal
-information (other information won't be passed through to Callcredit).
-Extending the gem should be trivial if Callcredit have given you access to
-other checks.
-
 ### Parsing responses
 
 Unless you've set the "raw" argument to true in your config, checks called by
@@ -80,7 +98,8 @@ Callcredit.id_enhanced_check(...)              # => Callcredit::Response
 Callcredit.id_enhanced_check(...).input        # => Hash of input params, as
                                                #    returned by Callcredit
 
-Callcredit.id_enhanced_check(...).result       # => Hash of results
+Callcredit.id_enhanced_check(...).result       # => Hash of results, mapping
+											                         #    a check type to its results
 
 Callcredit.id_enhanced_check(...).full_result  # => Hash of the full XML body
                                                #    returned by Callcredit

data/callcredit.gemspec

@@ -10,13 +10,13 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'webmock',         '~> 1.18.0'
 
   gem.authors = ['Grey Baker']
-  gem.description = %q{Ruby wrapper for Callcredit's CallValidate API}
+  gem.description = "Ruby wrapper for Callcredit's CallValidate API"
   gem.email = ['grey@gocardless.com']
   gem.files = `git ls-files`.split("\n")
   gem.homepage = 'https://github.com/gocardless/callcredit-ruby'
   gem.name = 'callcredit'
   gem.require_paths = ['lib']
-  gem.summary = %q{Ruby wrapper for Callcredit's CallValidate API}
+  gem.summary = "Ruby wrapper for Callcredit's CallValidate API"
   gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.version = Callcredit::VERSION.dup
 end

data/lib/callcredit.rb

@@ -11,6 +11,8 @@ require 'callcredit/validations'
 require 'callcredit/client'
 require 'callcredit/response'
 require 'callcredit/checks/id_enhanced'
+require 'callcredit/checks/bank_standard'
+require 'callcredit/checks/bank_enhanced'
 require 'callcredit/middleware/check_response'
 
 # Errors
@@ -28,6 +30,14 @@ module Callcredit
     client.id_enhanced_check(*args)
   end
 
+  def self.bank_standard_check(*args)
+    client.bank_standard_check(*args)
+  end
+
+  def self.bank_enhanced_check(*args)
+    client.bank_enhanced_check(*args)
+  end
+
   def self.perform_check(*args)
     client.perform_check(*args)
   end
@@ -49,4 +59,3 @@ module Callcredit
   end
   private_class_method :client
 end
-

data/lib/callcredit/checks/bank_enhanced.rb

@@ -0,0 +1,49 @@
+module Callcredit
+  module Checks
+    class BankEnhanced
+      REQUIRED_INPUTS =    [:first_name, :last_name, :postcode, :account_number,
+                            :sort_code, :account_number, :sort_code]
+
+      PERSONAL_DATA_KEYS = [:first_name, :last_name, :postcode,
+                            :building_name, :building_number]
+
+      BANK_DATA_KEYS =     [:account_number, :sort_code]
+
+      def initialize(client)
+        @client = client
+      end
+
+      def perform(data = {})
+        check_params(data)
+        response = @client.perform_check([:bank_standard, :bank_enhanced],
+                                         build_params(data))
+
+        @client.config[:raw] ? response : Response.new(response)
+      end
+
+      private
+
+      def build_params(data)
+        {
+          personal_data: data.select { |k, v| PERSONAL_DATA_KEYS.include?(k) },
+          bank_data: data.select { |k, v| BANK_DATA_KEYS.include?(k) }
+        }
+      end
+
+      def check_params(data)
+        REQUIRED_INPUTS.each do |param|
+          if data[param].nil?
+            msg = "An BankEnhanced check requires a #{param}"
+            raise InvalidRequestError.new(msg, param)
+          end
+        end
+
+        # For a BankEnhanced check, we also need a building name or number
+        unless data[:building_number] || data[:building_name]
+          msg = "A BankEnhanced check requires a building number or name"
+          raise InvalidRequestError.new(msg, :building_number)
+        end
+      end
+    end
+  end
+end

data/lib/callcredit/checks/bank_standard.rb

@@ -0,0 +1,28 @@
+module Callcredit
+  module Checks
+    class BankStandard
+      REQUIRED_INPUTS = [:account_number, :sort_code]
+
+      def initialize(client)
+        @client = client
+      end
+
+      def perform(data = {})
+        check_params(data)
+        response = @client.perform_check(:bank_standard, bank_data: data)
+        @client.config[:raw] ? response : Response.new(response)
+      end
+
+      private
+
+      def check_params(data)
+        REQUIRED_INPUTS.each do |param|
+          if data[param].nil?
+            msg = "An BankStandard check requires a #{param}"
+            raise InvalidRequestError.new(msg, param)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/callcredit/checks/id_enhanced.rb

@@ -23,7 +23,7 @@ module Callcredit
           end
         end
 
-        # For and ID Enhanced check, we also need a building name or number
+        # For an ID Enhanced check, we also need a building name or number
         unless data[:building_number] || data[:building_name]
           msg = "An IDEnhanced check requires a building number or name"
           raise InvalidRequestError.new(msg, :building_number)

data/lib/callcredit/client.rb

@@ -1,9 +1,19 @@
 module Callcredit
   class Client
-    def initialize(config=nil)
+    def initialize(config = nil)
       @config = (config || Callcredit.config).clone
     end
 
+    def bank_standard_check(check_data)
+      check = Checks::BankStandard.new(self)
+      check.perform(check_data)
+    end
+
+    def bank_enhanced_check(check_data)
+      check = Checks::BankEnhanced.new(self)
+      check.perform(check_data)
+    end
+
     def id_enhanced_check(check_data)
       check = Checks::IDEnhanced.new(self)
       check.perform(check_data)

data/lib/callcredit/config.rb

@@ -7,7 +7,8 @@ module Callcredit
       password:         nil,
       application_name: nil,
       raw:              false,
-      api_endpoint:     "https://ct.callcreditsecure.co.uk/callvalidateapi/incomingserver.php",
+      api_endpoint:     "https://ct.callcreditsecure.co.uk/callvalidateapi/" \
+                        "incomingserver.php",
       user_agent:       "Callcredit Ruby Gem #{Callcredit::VERSION}".freeze
     }.freeze
 
@@ -25,8 +26,7 @@ module Callcredit
     end
 
     def clone
-      Config.new { |config| @config.each { |k,v| config[k] = v } }
+      Config.new { |config| @config.each { |k, v| config[k] = v } }
     end
   end
 end
-

data/lib/callcredit/constants.rb

@@ -47,5 +47,10 @@ module Callcredit
       delivery_town:            "Deliverytown",
       delivery_postcode:        "Deliverypostcode"
     }
+
+    BANK_DETAILS = {
+      account_number:           "Bankaccountnumber",
+      sort_code:                "Banksortcode"
+    }
   end
-end
+end

data/lib/callcredit/errors/callcredit_error.rb

@@ -2,12 +2,16 @@ module Callcredit
   class CallcreditError < StandardError
     attr_reader :message
     attr_reader :status
-    attr_reader :response_body
+    attr_reader :response
 
-    def initialize(message=nil, status=nil, response=nil)
+    def initialize(message = nil, status = nil, response = nil)
       @message = message
       @status = status
-      @response_body = response_body
+      @response = response
+    end
+
+    def response_body
+      response.fetch(:body, nil) if response.responds_to?(:fetch)
     end
 
     def to_s

data/lib/callcredit/errors/invalid_request_error.rb

@@ -1,9 +1,9 @@
 module Callcredit
   class InvalidRequestError < CallcreditError
-    attr_accessor :param
+    attr_reader :param
 
-    def initialize(message, param, status=nil, response_body=nil)
-      super(message, status, response_body)
+    def initialize(message, param, status = nil, response = nil)
+      super(message, status, response)
       @param = param
     end
   end

data/lib/callcredit/middleware/check_response.rb

@@ -2,18 +2,22 @@ module Callcredit
   module Middleware
     class CheckResponse < Faraday::Middleware
       def call(env)
-        @app.call(env).on_complete do |env|
-          unless results = env[:body]["Results"]
+        @app.call(env).on_complete do |completed_env|
+          results = completed_env[:body]["Results"]
+
+          unless results
             raise InvalidResponseError.new(
-              "Invalid response", env[:status], env)
+              "Invalid response", completed_env[:status], completed_env)
           end
 
           if results["Errors"]
             errors = results["Errors"].values.flatten
             messages = errors.map { |e| e.is_a?(Hash) ? e["__content__"] : e }
-            raise APIError.new(messages.join(" | "), env[:status], env)
+
+            raise APIError.new(messages.join(" | "), completed_env[:status],
+                               completed_env)
           end
-          response_values(env)
+          response_values(completed_env)
         end
       end
 

data/lib/callcredit/request.rb

@@ -22,7 +22,7 @@ module Callcredit
     end
 
     # Compile the complete XML request to send to Callcredit
-    def build_request_xml(checks, check_data={})
+    def build_request_xml(checks, check_data = {})
       builder = Nokogiri::XML::Builder.new do |xml|
         xml.callvalidate do
           authentication(xml)
@@ -66,9 +66,11 @@ module Callcredit
     end
 
     def personal_data(xml, data)
+      return unless data
+
       unless data.is_a? Hash
         raise InvalidRequestError.new(
-          "All checks require personal_data", :personal_data)
+          "Personal data must be a hash (if provided)", :personal_data)
       end
 
       xml.Personalinformation do
@@ -87,15 +89,27 @@ module Callcredit
       end
     end
 
-    def card_data(xml, data)
+    def card_data(_xml, _data)
       # Not implemented
     end
 
     def bank_data(xml, data)
-      # Not implemented
+      return unless data
+
+      unless data.is_a? Hash
+        raise InvalidRequestError.new(
+          "Bank data must be a hash (if provided)", :bank_data)
+      end
+
+      xml.Bankinformation do
+        Constants::BANK_DETAILS.each do |param, element_name|
+          value = Validations.clean_param(param, data[param])
+          xml.send(element_name, value) if value
+        end
+      end
     end
 
-    def income_data(xml, data)
+    def income_data(_xml, _data)
       # Not implemented
     end
   end

data/lib/callcredit/response.rb

@@ -17,7 +17,8 @@ module Callcredit
     end
 
     def result
-      @response_data["Results"]["Result"]["Displays"]["IdentityCheck"]
+      @response_data["Results"]["Result"]["Displays"].
+        reject { |k, v| displays_excluded_from_results.include?(k) }
     end
 
     def warnings
@@ -27,5 +28,11 @@ module Callcredit
     def full_result
       @response_data
     end
+
+    private
+
+    def displays_excluded_from_results
+      %w(ChecksCompleted InputData Warnings InternalUse)
+    end
   end
 end

data/lib/callcredit/util.rb

@@ -7,10 +7,10 @@ module Callcredit
     end
 
     def underscore(str)
-      str.to_s.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+      str.to_s.gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+        gsub(/([a-z\d])([A-Z])/, '\1_\2').
         tr("-", "_").
         downcase
     end
   end
-end
+end

data/lib/callcredit/validations.rb

@@ -1,19 +1,19 @@
 module Callcredit
   module Validations
-
     VALIDATIONS = {
-      date_of_birth:      ->(value) { clean_date_of_birth(value) },
-      title:              ->(value) { value || "Unknown" },
-      first_name:         ->(value) { clean_name(value, :first_name) },
-      last_name:          ->(value) { clean_name(value, :last_name) },
-      middle_names:       ->(value) { clean_name(value, :middle_names) },
-      postcode:           ->(value) { clean_postcode(value, :postcode) },
-      previous_postcode:  ->(value) { clean_postcode(value, :previous_postcode) },
-      delivery_postcode:  ->(value) { clean_postcode(value, :delivery_postcode) }
+      date_of_birth:     ->(val) { clean_date_of_birth(val) },
+      title:             ->(val) { val || "Unknown" },
+      first_name:        ->(val) { clean_name(val, :first_name) },
+      last_name:         ->(val) { clean_name(val, :last_name) },
+      middle_names:      ->(val) { clean_name(val, :middle_names) },
+      postcode:          ->(val) { clean_postcode(val, :postcode) },
+      previous_postcode: ->(val) { clean_postcode(val, :previous_postcode) },
+      account_number:    ->(val) { clean_account_number(val) },
+      sort_code:         ->(val) { clean_sort_code(val) },
     }
 
     def self.clean_param(key, value)
-      validator = VALIDATIONS.fetch(key, ->(value){ value })
+      validator = VALIDATIONS.fetch(key, ->(val) { val })
       validator.call(value)
     end
 
@@ -28,7 +28,7 @@ module Callcredit
     def self.clean_name(name, param)
       return unless name
       # Convert name to ASCII characters only
-      name = UnicodeUtils.nfkd(name).gsub(/(\p{Letter})\p{Mark}+/,'\\1')
+      name = UnicodeUtils.nfkd(name).gsub(/(\p{Letter})\p{Mark}+/, '\\1')
       input_error(param, name) unless name =~ /\A[a-z A-Z'-]{1,30}\z/
       name
     end
@@ -40,13 +40,30 @@ module Callcredit
       postcode
     end
 
-    def self.input_error(param, value=nil)
-      msg = if value.nil?
-        "#{param} is a required param"
-      else
-        %{Invalid value "#{value}" for #{param}}
+    def self.clean_account_number(account_number)
+      return unless account_number
+      cleaned_value = account_number.to_s.gsub(/[-\s]/, '')
+      unless cleaned_value =~ /\A\d{6,8}\z/
+        input_error(:account_number, account_number)
       end
+      cleaned_value
+    end
+
+    def self.clean_sort_code(sort_code)
+      return unless sort_code
+      cleaned_value = sort_code.to_s.gsub(/[-\s]/, '')
+      input_error(:sort_code, sort_code) unless cleaned_value =~ /\A\d{6}\z/
+      cleaned_value
+    end
+
+    def self.input_error(param, value = nil)
+      msg = if value.nil?
+              "#{param} is a required param"
+            else
+              "Invalid value \"#{value}\" for #{param}"
+            end
+
       raise InvalidRequestError.new(msg, param)
     end
   end
-end
+end

data/lib/callcredit/version.rb

@@ -1,3 +1,3 @@
 module Callcredit
-  VERSION = '0.3.8'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/spec/callcredit_spec.rb

@@ -10,7 +10,7 @@ describe Callcredit do
         before { Callcredit.configure { |config| config[key] = key } }
 
         describe [key] do
-          subject { super()[key] }
+          subject { Callcredit.config[key] }
           it { should == key }
         end
       end
@@ -36,6 +36,28 @@ describe Callcredit do
     end
   end
 
+  describe '#bank_standard_check' do
+    before { configure_callcredit }
+    let(:data) { { account_number: "44779911", sort_code: "200000" } }
+
+    it "delegates to the client" do
+      expect_any_instance_of(Callcredit::Client).
+        to receive(:bank_standard_check).with(data)
+      Callcredit.bank_standard_check(data)
+    end
+  end
+
+  describe '#bank_enhanced_check' do
+    before { configure_callcredit }
+    let(:data) { { first_name: "Grey", last_name: "Baker" } }
+
+    it "delegates to the client" do
+      expect_any_instance_of(Callcredit::Client).
+        to receive(:bank_enhanced_check).with(data)
+      Callcredit.bank_enhanced_check(data)
+    end
+  end
+
   describe '#perform_check' do
     before { configure_callcredit }
     let(:data) do

data/spec/checks/bank_enhanced_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe Callcredit::Checks::BankEnhanced do
+  let(:bank_enhanced_check) { Callcredit::Checks::BankEnhanced.new(client) }
+  let(:client) { Callcredit::Client.new(config) }
+  let(:config) { Callcredit::Config.new }
+
+  let(:response_hash) { { status: status, body: body } }
+  let(:status) { 200 }
+  let(:body) { response_xml }
+  let(:response_xml) { load_fixture('response.xml') }
+  before { stub_request(:get, config[:api_endpoint]).to_return(response_hash) }
+
+  describe "#perform" do
+    subject(:perform_check) { bank_enhanced_check.perform(check_data) }
+
+    let(:check_data) do
+      { first_name: "Grey",
+        last_name: "Baker",
+        postcode: "EC2A 1DX",
+        building_number: "22-25",
+        sort_code: "200000",
+        account_number: "44779911" }
+    end
+
+    it "separates the supplied data into personal and bank details" do
+      expect(client).to receive(:perform_check) do |check_types, data|
+        expect(data[:personal_data][:postcode]).to eq(check_data[:postcode])
+        expect(data[:bank_data][:sort_code]).to eq(check_data[:sort_code])
+      end
+
+      perform_check
+    end
+
+    it "makes a get request" do
+      perform_check
+      expect(a_request(:get, config[:api_endpoint])).to have_been_made
+    end
+
+    it { is_expected.to be_a Callcredit::Response }
+
+    context "when the config[:raw] is true" do
+      before { config[:raw] = true }
+      it { is_expected.to be_a Faraday::Response }
+
+      describe '#body' do
+        subject { perform_check.body }
+        it { should be_a String }
+      end
+    end
+
+    describe "validates inputs" do
+      it_behaves_like "it validates presence", :first_name
+      it_behaves_like "it validates presence", :last_name
+      it_behaves_like "it validates presence", :postcode
+      it_behaves_like "it validates presence", :building_number
+      it_behaves_like "it validates presence", :account_number
+      it_behaves_like "it validates presence", :sort_code
+
+      context "with a building_name instead of building number" do
+        before { check_data.delete(:building_number) }
+        before { check_data[:building_name] = "The Mill" }
+
+        it "makes a get request" do
+          perform_check
+          expect(a_request(:get, config[:api_endpoint])).to have_been_made
+        end
+      end
+    end
+  end
+end

data/spec/checks/bank_standard_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Callcredit::Checks::BankStandard do
+  let(:bank_standard_check) { Callcredit::Checks::BankStandard.new(client) }
+  let(:client) { Callcredit::Client.new(config) }
+  let(:config) { Callcredit::Config.new }
+
+  let(:response_hash) { { status: status, body: body } }
+  let(:status) { 200 }
+  let(:body) { response_xml }
+  let(:response_xml) { load_fixture('response.xml') }
+  before { stub_request(:get, config[:api_endpoint]).to_return(response_hash) }
+
+  describe "#perform" do
+    subject(:perform_check) { bank_standard_check.perform(check_data) }
+
+    let(:check_data) do
+      { account_number: "44779911",
+        sort_code: "200000" }
+    end
+
+    it "makes a get request" do
+      perform_check
+      expect(a_request(:get, config[:api_endpoint])).to have_been_made
+    end
+
+    it { is_expected.to be_a Callcredit::Response }
+
+    context "when the config[:raw] is true" do
+      before { config[:raw] = true }
+      it { is_expected.to be_a Faraday::Response }
+
+      describe '#body' do
+        subject { perform_check.body }
+        it { should be_a String }
+      end
+    end
+
+    describe "validates inputs" do
+      it_behaves_like "it validates presence", :account_number
+      it_behaves_like "it validates presence", :sort_code
+    end
+  end
+end

data/spec/checks/id_enhanced_spec.rb

@@ -34,7 +34,7 @@ describe Callcredit::Checks::IDEnhanced do
       it { is_expected.to be_a Faraday::Response }
 
       describe '#body' do
-        subject { super().body }
+        subject { perform_check.body }
         it { should be_a String }
       end
     end

data/spec/client_spec.rb

@@ -11,7 +11,7 @@ describe Callcredit::Client do
       subject(:new_client) { Callcredit::Client.new }
 
       describe '#config' do
-        subject { super().config }
+        subject { new_client.config }
         it { should_not == Callcredit.config }
       end
       it "has the attributes of the global config" do
@@ -24,7 +24,7 @@ describe Callcredit::Client do
       subject(:new_client) { Callcredit::Client.new(config) }
 
       describe '#config' do
-        subject { super().config }
+        subject { new_client.config }
         it { should_not == config }
       end
       it "has the attributes of the passed in config" do
@@ -41,6 +41,22 @@ describe Callcredit::Client do
     end
   end
 
+  describe "#bank_standard_check" do
+    it "delegates to an instance of BankStandard" do
+      expect_any_instance_of(Callcredit::Checks::BankStandard).
+        to receive(:perform).once
+      client.bank_standard_check(check_data)
+    end
+  end
+
+  describe "#bank_enhanced_check" do
+    it "delegates to an instance of BankEnhanced" do
+      expect_any_instance_of(Callcredit::Checks::BankEnhanced).
+        to receive(:perform).once
+      client.bank_enhanced_check(check_data)
+    end
+  end
+
   describe "#perform_check" do
     subject(:perform_check) { client.perform_check(:check_type, check_data) }
 

data/spec/request_spec.rb

@@ -41,6 +41,40 @@ describe Callcredit::Request do
         expect(xsd.validate(request_xml)).to eq([])
       end
     end
+
+    context "for a BankStandard check" do
+      before do
+        check_data.merge!(
+          bank_data: { account_number: 55779911, sort_code: 200000 }
+        )
+      end
+
+      subject(:request_xml) do
+        request.build_request_xml(:bank_standard, check_data)
+      end
+
+      it "generates a valid XML request" do
+        expect(xsd.validate(request_xml)).to eq([])
+      end
+    end
+
+    context "for a BankEnhanced check" do
+      before do
+        check_data.merge!(
+          bank_data: { account_number: 55779911, sort_code: 200000 },
+          personal_data: { first_name: "Tim", last_name: "Rogers",
+                           postcode: "EC1V 7LQ", building_number: "338-346" }
+        )
+      end
+
+      subject(:request_xml) do
+        request.build_request_xml(:bank_enhanced, check_data)
+      end
+
+      it "generates a valid XML request" do
+        expect(xsd.validate(request_xml)).to eq([])
+      end
+    end
   end
 
   describe "#perform" do
@@ -56,7 +90,7 @@ describe Callcredit::Request do
       it { is_expected.to be_a Faraday::Response }
 
       describe '#body' do
-        subject { super().body }
+        subject { perform_check.body }
         it { should be_a String }
       end
     end

data/spec/validations_spec.rb

@@ -85,4 +85,70 @@ describe Callcredit::Validations do
       end
     end
   end
+
+  describe '#clean_account_number' do
+    subject { Callcredit::Validations.clean_account_number(account_number) }
+
+    context "without an account_number" do
+      let(:account_number) { nil }
+      it { is_expected.to eq(nil) }
+    end
+
+    context "with a correct account_number" do
+      let(:account_number) { "12345678" }
+      it { is_expected.to eq(account_number) }
+    end
+
+    context "with a padded account_number" do
+      let(:account_number) { " 1234 5678   " }
+      it { is_expected.to eq("12345678") }
+    end
+
+    context "with an account_number with letters" do
+      let(:account_number) { "N1234567" }
+      it "raises an error" do
+        expect { subject }.to raise_error Callcredit::InvalidRequestError
+      end
+    end
+
+    context "with an account_number with too many numbers" do
+      let(:account_number) { "123456789" }
+      it "raises an error" do
+        expect { subject }.to raise_error Callcredit::InvalidRequestError
+      end
+    end
+  end
+
+  describe '#clean_sort_code' do
+    subject { Callcredit::Validations.clean_sort_code(sort_code) }
+
+    context "without a sort_code" do
+      let(:sort_code) { nil }
+      it { is_expected.to eq(nil) }
+    end
+
+    context "with a correct sort_code" do
+      let(:sort_code) { "123456" }
+      it { is_expected.to eq(sort_code) }
+    end
+
+    context "with a padded sort_code" do
+      let(:sort_code) { " 1234 56   " }
+      it { is_expected.to eq("123456") }
+    end
+
+    context "with a sort_code with letters" do
+      let(:sort_code) { "N12345" }
+      it "raises an error" do
+        expect { subject }.to raise_error Callcredit::InvalidRequestError
+      end
+    end
+
+    context "with a sort_code with too many numbers" do
+      let(:sort_code) { "1234567" }
+      it "raises an error" do
+        expect { subject }.to raise_error Callcredit::InvalidRequestError
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: callcredit
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.0
 platform: ruby
 authors:
 - Grey Baker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
@@ -108,6 +108,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rubocop.yml
+- .rubocop_todo.yml
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -115,6 +117,8 @@ files:
 - README.md
 - callcredit.gemspec
 - lib/callcredit.rb
+- lib/callcredit/checks/bank_enhanced.rb
+- lib/callcredit/checks/bank_standard.rb
 - lib/callcredit/checks/id_enhanced.rb
 - lib/callcredit/client.rb
 - lib/callcredit/config.rb
@@ -130,6 +134,8 @@ files:
 - lib/callcredit/validations.rb
 - lib/callcredit/version.rb
 - spec/callcredit_spec.rb
+- spec/checks/bank_enhanced_spec.rb
+- spec/checks/bank_standard_spec.rb
 - spec/checks/id_enhanced_spec.rb
 - spec/client_spec.rb
 - spec/fixtures/access_denied.xml
@@ -166,6 +172,8 @@ specification_version: 4
 summary: Ruby wrapper for Callcredit's CallValidate API
 test_files:
 - spec/callcredit_spec.rb
+- spec/checks/bank_enhanced_spec.rb
+- spec/checks/bank_standard_spec.rb
 - spec/checks/id_enhanced_spec.rb
 - spec/client_spec.rb
 - spec/fixtures/access_denied.xml