callcredit 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa5511f62db44e4945ee93b3f8be5bdc295ee064
-  data.tar.gz: 4cee4c1eaca735897d678190311dc9ff62383aab
+  metadata.gz: a0b7b4efd89e1305129eb3d2ddd8647df7287f2b
+  data.tar.gz: d259558cc18200f91398fcdf91d569a08d0e84c7
 SHA512:
-  metadata.gz: 3b63ca88889c45fba9f6369c647e54168b266563c47f237230563992fe3e348b0e2d60dc0f5cada2d6b0e8e887e960ed560a2fd5f15ea0ce4df261258e25dab8
-  data.tar.gz: e4e06bc0571ce0f04c5277843330184e73f70333024253007e32c06ea8533a22470ef011b7e417d8d172717047ad9debdbe1d11f557fb3f2166cc7a0d2efaf91
+  metadata.gz: c9c8638f029f7ec78207d9b4039cf6abe97efa32cd050604de97263a1c64910162a01f2f5f72a6a3c47754b82edccc011478a823734878fcca725731e26fc3c6
+  data.tar.gz: 59f925b4e118bf737f787974c2098668163e5b5093fff3868f747bb92c3a0f79a02d531c4882ddf0b26acaed6acd92964ea1616385a039d19be6687f1928dd6d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.6 - April 22, 2014
+
+- Catch Faraday errors without a response
+
 ## 0.3.5 - February 24, 2014
 
 - Remove insistence on inclusion of date_of_birth, postcode and names

data/callcredit.gemspec

@@ -5,10 +5,10 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'faraday_middleware',  '>= 0.8.2'
   gem.add_runtime_dependency 'multi_xml',           '~> 0.5.1'
   gem.add_runtime_dependency 'nokogiri',            '~> 1.4'
-  gem.add_runtime_dependency 'unidecoder',          '~> 1.1.2'
+  gem.add_runtime_dependency 'unicode_utils',       '~> 1.4.0'
 
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'webmock'
+  gem.add_development_dependency 'rspec',           '~> 2.14.1'
+  gem.add_development_dependency 'webmock',         '~> 1.17.2'
 
   gem.authors = ['Grey Baker']
   gem.description = %q{Ruby wrapper for Callcredit's CallValidate API}

data/lib/callcredit.rb

@@ -1,5 +1,6 @@
 require 'faraday_middleware'
 require 'nokogiri'
+require 'unicode_utils'
 
 require 'callcredit/version'
 require 'callcredit/util'
@@ -15,8 +16,8 @@ require 'callcredit/middleware/check_response'
 # Errors
 require 'callcredit/errors/callcredit_error'
 require 'callcredit/errors/api_error'
-require 'callcredit/errors/authentication_error'
 require 'callcredit/errors/invalid_request_error'
+require 'callcredit/errors/invalid_response_error'
 
 module Callcredit
   def self.configure(&block)
@@ -38,7 +39,7 @@ module Callcredit
     else
       msg = "No config found. Use Callcredit.configure to set username, " +
             "password, company and application name. See " +
-            "https://github.com/gocardless/callcredit for details."
+            "https://github.com/gocardless/callcredit-ruby for details."
       raise CallcreditError.new(msg)
     end
   end

data/lib/callcredit/errors/invalid_response_error.rb

@@ -0,0 +1,4 @@
+module Callcredit
+  class InvalidResponseError < CallcreditError
+  end
+end

data/lib/callcredit/middleware/check_response.rb

@@ -4,7 +4,8 @@ module Callcredit
       def call(env)
         @app.call(env).on_complete do |env|
           unless results = env[:body]["Results"]
-            raise APIError.new("Received unexpected XML (Results tag missing)")
+            raise InvalidResponseError.new(
+              "Invalid response", env[:status], env)
           end
 
           if results["Errors"]

data/lib/callcredit/request.rb

@@ -14,7 +14,11 @@ module Callcredit
       end
       @config[:raw] ? response : response.body
     rescue Faraday::Error::ClientError => e
-      raise APIError.new(e.response[:body], e.response[:status], e.response)
+      if e.response.nil?
+        raise APIError.new
+      else
+        raise APIError.new(e.response[:body], e.response[:status], e.response)
+      end
     end
 
     # Compile the complete XML request to send to Callcredit
@@ -76,7 +80,8 @@ module Callcredit
         end
         xml.AddressDetails do
           Constants::ADDRESS_DETAILS.each do |param, element_name|
-            xml.send(element_name, data[param]) if data[param]
+            value = Validations.clean_param(param, data[param])
+            xml.send(element_name, value) if value
           end
         end
       end

data/lib/callcredit/validations.rb

@@ -1,15 +1,15 @@
-require 'unidecoder'
-
 module Callcredit
   module Validations
 
     VALIDATIONS = {
       date_of_birth:      ->(value) { clean_date_of_birth(value) },
       title:              ->(value) { value || "Unknown" },
-      first_name:         ->(value) { clean_first_name(value) },
-      last_name:          ->(value) { clean_last_name(value) },
-      middle_names:       ->(value) { clean_middle_names(value) },
-      postcode:           ->(value) { clean_postcode(value) }
+      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) }
     }
 
     def self.clean_param(key, value)
@@ -25,31 +25,18 @@ module Callcredit
       input_error(:date_of_birth, date_of_birth)
     end
 
-    def self.clean_first_name(name)
-      return unless name
-      name = name.to_ascii
-      input_error(:first_name, name) unless name =~ /\A[a-z A-Z'-]{1,30}\z/
-      name
-    end
-
-    def self.clean_last_name(name)
-      return unless name
-      name = name.to_ascii
-      input_error(:last_name, name) unless name =~ /\A[a-z A-Z'-]{1,30}\z/
-      name
-    end
-
-    def self.clean_middle_names(name)
+    def self.clean_name(name, param)
       return unless name
-      name = name.to_ascii
-      input_error(:middle_names, name) unless name =~ /\A[a-z A-Z'-]{1,30}\z/
+      # Convert name to ASCII characters only
+      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
 
-    def self.clean_postcode(postcode)
+    def self.clean_postcode(postcode, param)
       return unless postcode
       postcode = postcode.upcase.strip
-      input_error(:postcode, postcode) unless postcode =~ /\A[A-Z 0-9]{5,8}\z/
+      input_error(param, postcode) unless postcode =~ /\A[A-Z 0-9]{5,8}\z/
       postcode
     end
 

data/lib/callcredit/version.rb

@@ -1,3 +1,3 @@
 module Callcredit
-  VERSION = '0.3.5'.freeze
+  VERSION = '0.3.6'.freeze
 end

data/spec/request_spec.rb

@@ -109,7 +109,8 @@ describe Callcredit::Request do
           let(:body) { "<TopLevel></TopLevel>" }
 
           it "wraps the error" do
-            expect { perform_check }.to raise_error Callcredit::APIError
+            expect { perform_check }.
+              to raise_error Callcredit::InvalidResponseError
           end
         end
       end

data/spec/validations_spec.rb

@@ -1,18 +1,6 @@
 require 'spec_helper'
 
 describe Callcredit::Validations do
-  let(:check_data) do
-    { personal_data: {
-        first_name: "Grey",
-        last_name: "Baker",
-        date_of_birth: date_of_birth,
-        postcode: "EC2A 1DX",
-        building_number: "22-25"
-      }
-    }
-  end
-  let(:date_of_birth) { "01/01/2000" }
-
   describe '#clean_date_of_birth' do
     subject { Callcredit::Validations.clean_date_of_birth(date_of_birth) }
 
@@ -39,62 +27,53 @@ describe Callcredit::Validations do
     end
   end
 
-  describe '#clean_first_name' do
-    subject { Callcredit::Validations.clean_first_name(first_name) }
+  describe '#clean_name' do
+    subject { Callcredit::Validations.clean_name(name, :first_name) }
 
-    context "without a first name" do
-      let(:first_name) { nil }
+    context "without a name" do
+      let(:name) { nil }
       it { should == nil }
     end
 
-    context "with a simple first name" do
-      let(:first_name) { "Grey" }
-      it { should == first_name }
+    context "with a simple name" do
+      let(:name) { "Grey" }
+      it { should == name }
     end
 
-    context "with a first name with non-ASCII characters" do
-      let(:first_name) { "Gréy" }
+    context "with a name with non-ASCII characters" do
+      let(:name) { "Gréy" }
       it { should == "Grey" }
     end
 
-    context "with a very long first name" do
-      let(:first_name) { "A" * 31 }
+    context "with a very long name" do
+      let(:name) { "A" * 31 }
       it "raises an error" do
         expect { subject }.to raise_error Callcredit::InvalidRequestError
       end
     end
 
-    context "with a first name with numbers in it" do
-      let(:first_name) { "David the 3rd" }
+    context "with a name with numbers in it" do
+      let(:name) { "David the 3rd" }
       it "raises an error" do
         expect { subject }.to raise_error Callcredit::InvalidRequestError
       end
     end
   end
 
-  describe '#clean_middle_names' do
-    subject { Callcredit::Validations.clean_middle_names(name) }
-
-    context "without a middle name" do
-      let(:name) { nil }
-      it { should == nil }
-    end
-  end
-
   describe '#clean_postcode' do
-    subject { Callcredit::Validations.clean_postcode(postcode) }
+    subject { Callcredit::Validations.clean_postcode(postcode, :postcode) }
 
-    context "without a post code" do
+    context "without a postcode" do
       let(:postcode) { nil }
       it { should == nil }
     end
 
-    context "with a correct post code" do
+    context "with a correct postcode" do
       let(:postcode) { "EC2A 1DX" }
       it { should == postcode }
     end
 
-    context "with a padded post code" do
+    context "with a padded postcode" do
       let(:postcode) { "EC2A 1DX    " }
       it { should == "EC2A 1DX" }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: callcredit
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Grey Baker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -67,47 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: unidecoder
+  name: unicode_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.17.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.17.2
 description: Ruby wrapper for Callcredit's CallValidate API
 email:
 - grey@gocardless.com
@@ -127,9 +127,9 @@ files:
 - lib/callcredit/config.rb
 - lib/callcredit/constants.rb
 - lib/callcredit/errors/api_error.rb
-- lib/callcredit/errors/authentication_error.rb
 - lib/callcredit/errors/callcredit_error.rb
 - lib/callcredit/errors/invalid_request_error.rb
+- lib/callcredit/errors/invalid_response_error.rb
 - lib/callcredit/middleware/check_response.rb
 - lib/callcredit/request.rb
 - lib/callcredit/response.rb

data/lib/callcredit/errors/authentication_error.rb

@@ -1,4 +0,0 @@
-module Callcredit
-  class AuthenticationError < CallcreditError
-  end
-end