companies-house-gateway 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05a3d186a2b57c5de2e17b78a83a675e9153e0c0
-  data.tar.gz: 3588395c41471554e498d46e42bb452a624c28f7
+  metadata.gz: 04cf38078081525f799988721cdbf1b56edeff84
+  data.tar.gz: 7d930409cc38db5bb0ce57180953fc4d0b0f2752
 SHA512:
-  metadata.gz: 58f37a2cd12dadb470d10704dcf50ec443437c3f8b48dbf54d0002b379dd6b2c945759d1cdfb29aa2ed7261c205531cb96d386f7506b2d7a87f33ca507c2abf6
-  data.tar.gz: 5a8f495818a5196eb50d67ebab79d5fc0147223a152eca941a277af2bfaa810f28a3c1a6733d891b7057d691e3c3f99cabe3ccd4702f79f027487933dc3e4fe2
+  metadata.gz: 216bc972349999e778674cb0fe63d4ef2af2aef28059f805ced622099a1db751d594222d20ee31114c0ed3d185505b7726ce7063e16e58d297115abf275a0103
+  data.tar.gz: a27e4551ee2a88f49006a1e1f80c35617d70fdff0ceada8c263c35a806fa6e58b67c73ca4302d9cffdfe8deb080336f2198a6ca88f925a0c2b0ac65e2a50addc

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
-  - 2.1.0
-  - 2.0.0
   - 1.9.3
-  - 1.9.2
+  - 2.0.0
+  - 2.1
+  - 2.2
 notifications:
   email:
     recipients:

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.11 - June 28, 2015
+
+- Upcase company numbers whilst cleaning them. Stops lower-case prefixes
+  causing errors
+
 ## 0.3.10 - June 3, 2014
 
 - Add support for Faraday 0.9

data/README.md

@@ -1,8 +1,6 @@
 # Companies House Gateway
 
-Simple Ruby Gem for interacting with the Companies House XML Gateway API. Wraps
-the XML submissions and responses required so you can deal with Ruby hashes
-instead.
+Simple Ruby Gem for interacting with the [Companies House XML Gateway API](http://xmlgw.companieshouse.gov.uk/).
 
 [![Gem Version](https://badge.fury.io/rb/companies-house-gateway.svg)](http://badge.fury.io/rb/companies-house-gateway)
 [![Build Status](https://travis-ci.org/gocardless/companies-house-gateway-ruby.svg?branch=master)](https://travis-ci.org/gocardless/companies-house-gateway-ruby)

data/companies_house_gateway.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'multi_xml',           '~> 0.5.1'
   gem.add_runtime_dependency 'nokogiri',            '~> 1.4'
 
-  gem.add_development_dependency 'rspec',           '~> 2.14.1'
-  gem.add_development_dependency 'webmock',         '~> 1.17.2'
+  gem.add_development_dependency 'rspec',           '~> 3.0'
+  gem.add_development_dependency 'webmock',         '~> 1.21'
 
   gem.authors = ['Grey Baker']
   gem.description = %q{Ruby wrapper for the Companies House XML Gateway}

data/lib/companies_house_gateway/validations.rb

@@ -69,6 +69,7 @@ module CompaniesHouseGateway
     def self.clean_company_number(number)
       return unless number
       number = number.to_s.strip # remove whitespace
+      number = number.upcase # upcase any prefixes
 
       # 0-pad 5 or 7 digit registration number
       if number.match /\A(\D{2})(\d{5})\z/
@@ -94,4 +95,4 @@ module CompaniesHouseGateway
       raise InvalidRequestError.new(msg, param)
     end
   end
-end
+end

data/lib/companies_house_gateway/version.rb

@@ -1,3 +1,3 @@
 module CompaniesHouseGateway
-  VERSION = '0.3.10'.freeze
+  VERSION = '0.3.11'.freeze
 end

data/spec/client_spec.rb

@@ -19,7 +19,10 @@ describe CompaniesHouseGateway::Client do
       before { configure_companies_house_gateway }
       subject(:new_client) { CompaniesHouseGateway::Client.new }
 
-      its(:config) { should_not == CompaniesHouseGateway.config }
+      describe '#config' do
+        subject { super().config }
+        it { should_not == CompaniesHouseGateway.config }
+      end
       it "has the attributes of the global config" do
         new_client.config[:sender_id] ==
           CompaniesHouseGateway.config[:sender_id]
@@ -30,7 +33,10 @@ describe CompaniesHouseGateway::Client do
       before { config[:first_name] = "test" }
       subject(:new_client) { CompaniesHouseGateway::Client.new(config) }
 
-      its(:config) { should_not == config }
+      describe '#config' do
+        subject { super().config }
+        it { should_not == config }
+      end
       it "has the attributes of the passed in config" do
         new_client.config[:sender_id] == config[:sender_id]
       end

data/spec/companies_house_gateway_spec.rb

@@ -5,8 +5,8 @@ shared_examples "it delegates to the client" do |method_name|
   let(:data) { "data" }
 
   it "delegates #{method_name} to the client" do
-    CompaniesHouseGateway::Client.any_instance.
-      should_receive(method_name).with(data)
+    expect_any_instance_of(CompaniesHouseGateway::Client).
+      to receive(method_name).with(data)
     CompaniesHouseGateway.send(method_name, data)
   end
 end
@@ -21,7 +21,11 @@ describe CompaniesHouseGateway do
         before do
           CompaniesHouseGateway.configure { |config| config[key] = key }
         end
-        its([key]) { should == key }
+
+        describe [key] do
+          subject { super()[key] }
+          it { should == key }
+        end
       end
     end
   end

data/spec/request_spec.rb

@@ -25,14 +25,14 @@ describe CompaniesHouseGateway::Request do
     let(:xsd) { Nokogiri::XML::Schema(xml_schema) }
 
     it "generates a valid XML request" do
-      xsd.validate(request_xml).should == []
+      expect(xsd.validate(request_xml)).to eq([])
     end
 
     context "with an email address" do
       before { config[:email] = "grey@gocardless.com" }
 
       it "generates a valid XML request" do
-        xsd.validate(request_xml).should == []
+        expect(xsd.validate(request_xml)).to eq([])
       end
     end
   end
@@ -42,18 +42,22 @@ describe CompaniesHouseGateway::Request do
 
     it "makes a get request" do
       perform_check
-      a_request(:post, config[:api_endpoint]).should have_been_made
+      expect(a_request(:post, config[:api_endpoint])).to have_been_made
     end
 
     context "when the config[:raw] is true" do
       before { config[:raw] = true }
-      it { should be_a Faraday::Response }
-      its(:body) { should be_a String }
+      it { is_expected.to be_a Faraday::Response }
+
+      describe '#body' do
+        subject { super().body }
+        it { should be_a String }
+      end
     end
 
     context "when the config[:raw] is false" do
-      it { should be_a Hash }
-      it { should include "GovTalkMessage" }
+      it { is_expected.to be_a Hash }
+      it { is_expected.to include "GovTalkMessage" }
 
       context "errors" do
         context "500" do
@@ -80,8 +84,8 @@ describe CompaniesHouseGateway::Request do
           it "wraps the error" do
             expect { perform_check }.
               to raise_error CompaniesHouseGateway::APIError do |error|
-                error.error_code.should == "604"
-                error.message.should == "Error text"
+                expect(error.error_code).to eq("604")
+                expect(error.message).to eq("Error text")
               end
           end
         end

data/spec/shared_examples.rb

@@ -35,7 +35,7 @@ shared_examples 'it generates valid xml' do
   let(:xsd) { Nokogiri::XML::Schema.from_document(xsd_doc) }
 
   it "generates a valid XML request" do
-    xsd.validate(request_xml).should == []
+    expect(xsd.validate(request_xml)).to eq([])
   end
 end
 
@@ -51,7 +51,7 @@ shared_examples 'it returns only the body of the response' do
   before { stub_request(:post, config[:api_endpoint]).to_return(response) }
   subject { described_class.new(client).perform(check_data) }
 
-  it { should be_a Hash }
-  it { should_not be_empty }
-  it { should_not include klass }
+  it { is_expected.to be_a Hash }
+  it { is_expected.not_to be_empty }
+  it { is_expected.not_to include klass }
 end

data/spec/spec_helper.rb

@@ -1,7 +1,12 @@
 require 'companies_house_gateway'
 require 'webmock/rspec'
 require 'shared_examples'
-RSpec.configure { |config| config.include WebMock::API }
+
+RSpec.configure do |config|
+  config.mock_with(:rspec) { |mocks| mocks.verify_partial_doubles = true }
+  config.raise_errors_for_deprecations!
+  config.include WebMock::API
+end
 
 def configure_companies_house_gateway
   CompaniesHouseGateway.configure { |config| config[:sender_id] = "Grey" }

data/spec/validations_spec.rb

@@ -6,12 +6,12 @@ describe CompaniesHouseGateway::Validations do
 
     context "without a string" do
       let(:string) { nil }
-      it { should == nil }
+      it { is_expected.to eq(nil) }
     end
 
     context "with a short string" do
       let(:string) { "A" * 160 }
-      it { should == string }
+      it { is_expected.to eq(string) }
     end
 
     context "with a long string" do
@@ -28,17 +28,17 @@ describe CompaniesHouseGateway::Validations do
 
     context "without a date" do
       let(:date) { nil }
-      it { should == nil }
+      it { is_expected.to eq(nil) }
     end
 
     context "with a date object" do
       let(:date) { Date.parse("01/01/2000") }
-      it { should == date.strftime("%d/%m/%Y") }
+      it { is_expected.to eq(date.strftime("%d/%m/%Y")) }
     end
 
     context "with a parseable string" do
       let(:date) { "01-01-2000" }
-      it { should == "01/01/2000" }
+      it { is_expected.to eq("01/01/2000") }
     end
 
     context "with a load of rubbish" do
@@ -55,12 +55,12 @@ describe CompaniesHouseGateway::Validations do
 
     context "without a boolean" do
       let(:bool) { nil }
-      it { should == nil }
+      it { is_expected.to eq(nil) }
     end
 
     context "with a boolean" do
       let(:bool) { true }
-      it { should == bool }
+      it { is_expected.to eq(bool) }
     end
 
     context "with a load of rubbish" do
@@ -77,17 +77,17 @@ describe CompaniesHouseGateway::Validations do
 
     context "without a number" do
       let(:number) { nil }
-      it { should == nil }
+      it { is_expected.to eq(nil) }
     end
 
     context "with a number" do
       let(:number) { 9 }
-      it { should == number.to_s }
+      it { is_expected.to eq(number.to_s) }
     end
 
     context "with a string that looks like a number" do
       let(:number) { "91" }
-      it { should == number }
+      it { is_expected.to eq(number) }
     end
 
     context "with a load of rubbish" do
@@ -104,17 +104,17 @@ describe CompaniesHouseGateway::Validations do
 
     context "without a data_set" do
       let(:data_set) { nil }
-      it { should == nil }
+      it { is_expected.to eq(nil) }
     end
 
     context "with a valid symbol" do
       let(:data_set) { :live }
-      it { should == "LIVE" }
+      it { is_expected.to eq("LIVE") }
     end
 
     context "with a valid string" do
       let(:data_set) { "LIVE" }
-      it { should == "LIVE" }
+      it { is_expected.to eq("LIVE") }
     end
 
     context "with a load of rubbish" do
@@ -133,17 +133,17 @@ describe CompaniesHouseGateway::Validations do
 
     context "without an officer_type" do
       let(:officer_type) { nil }
-      it { should == nil }
+      it { is_expected.to eq(nil) }
     end
 
     context "with a valid symbol" do
       let(:officer_type) { :dis }
-      it { should == "DIS" }
+      it { is_expected.to eq("DIS") }
     end
 
     context "with a valid string" do
       let(:officer_type) { "DIS" }
-      it { should == "DIS" }
+      it { is_expected.to eq("DIS") }
     end
 
     context "with a load of rubbish" do
@@ -196,28 +196,33 @@ describe CompaniesHouseGateway::Validations do
       context "allows a company number starting with #{prefix}" do
         prefix = (prefix == '\d\d') ? '07' : prefix
         let(:number) { "#{prefix}112233" }
-        it { should == "#{prefix}112233" }
+        it { is_expected.to eq("#{prefix}112233") }
       end
     end
 
     context "does not 0-pads 8 digit registration numbers" do
       let(:number) { "17495895" }
-      it { should == "17495895" }
+      it { is_expected.to eq("17495895") }
     end
 
     context "0-pads 7 digit registration numbers" do
       let(:number) { "7495895" }
-      it { should == "07495895" }
+      it { is_expected.to eq("07495895") }
     end
 
     context "0-pads 5 digit NI registration numbers" do
       let(:number) { "NI27768" }
-      it { should == "NI027768" }
+      it { is_expected.to eq("NI027768") }
     end
 
-    context "does not 0-pads 6 digit NI registration numbers" do
+    context "does not 0-pad 6 digit NI registration numbers" do
       let(:number) { "NI127768" }
-      it { should == "NI127768" }
+      it { is_expected.to eq("NI127768") }
+    end
+
+    context "upcases prefixes" do
+      let(:number) { "sc127768" }
+      it { is_expected.to eq("SC127768") }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: companies-house-gateway
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Grey Baker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2015-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
@@ -64,28 +64,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '1.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '1.21'
 description: Ruby wrapper for the Companies House XML Gateway
 email:
 - grey@gocardless.com