companies-house-gateway 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 730c887e04b54fc8bb3e60f7540e68eae00d59a9
-  data.tar.gz: b5f7058d26397da50d1afb2ae9be1eda41e916b8
+  metadata.gz: 1849937f401ec3fe9197d91cc25f8ace31043df1
+  data.tar.gz: bbcfd60440e011fa247b5ba9aa324e3de76569a7
 SHA512:
-  metadata.gz: 6b0d5806eb08164da30a9fc469429ee2807ad4fb9e7f98eee4da224a2d0d2acd8c57deeb2270bf84588b15bdd42d3ef047a188e83abedc4ad172737f2fdea9a9
-  data.tar.gz: 11dc3b0517c6d66b87654fd3136ee3a1c6bacb5391eb6e5bfc9c670ab00e9ddb8599232ddcd0317d244effdd10db905ad7d1d329df5b11b51d0b20dc1fe6cd8a
+  metadata.gz: 9d0b5788b304f5a6e380678910bb3416d6c917f80e783a7a76fc1fd63808c3d93b7f8878114938032e1afb012c8675fc3cdc5eea1e6839d40f5a533208503951
+  data.tar.gz: b6e03f18aea13bd71d6e082d09e7c13c4e54b4854e448e416b0c1e1b06ce415653628fd6c6866827d53a0c08cad95bba41d46a50b6823ec64543c86008da6262

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.6 - March 3, 2014
+
+- Add error_code attribute to APIError
+
 ## 0.3.5 - February 26, 2014
 
 - Allow requests to be cached

data/lib/companies_house_gateway/errors/api_error.rb

@@ -1,4 +1,16 @@
 module CompaniesHouseGateway
   class APIError < CompaniesHouseGatewayError
+    attr_accessor :error_code
+
+    def initialize(message, error_code=nil, status=nil, response_body=nil)
+      super(message, status, response_body)
+      @error_code = error_code
+    end
+
+    def to_s
+      str = super
+      str += " [Error code: #{error_code}]" if error_code
+      str
+    end
   end
 end

data/lib/companies_house_gateway/errors/invalid_request_error.rb

@@ -2,7 +2,7 @@ module CompaniesHouseGateway
   class InvalidRequestError < CompaniesHouseGatewayError
     attr_accessor :param
 
-    def initialize(message, param, status=nil, response_body=nil)
+    def initialize(message=nil, param=nil, status=nil, response_body=nil)
       super(message, status, response_body)
       @param = param
     end

data/lib/companies_house_gateway/middleware/check_response.rb

@@ -3,18 +3,7 @@ module CompaniesHouseGateway
     class CheckResponse < Faraday::Middleware
       def call(env)
         @app.call(env).on_complete do |env|
-          response_body = env[:body]["GovTalkMessage"]
-
-          unless response_body && response_body["GovTalkDetails"]
-            raise InvalidResponseError.new(nil, env[:status], env)
-          end
-
-          if errors = response_body["GovTalkDetails"]["GovTalkErrors"]
-            errors = errors.values.flatten
-            messages = errors.map { |e| "(#{e['Number']}) #{e['Text']}" }
-            raise APIError.new(messages.join(" | "), env[:status], env)
-          end
-
+          check_for_errors(env)
           response_values(env)
         end
       end
@@ -22,6 +11,18 @@ module CompaniesHouseGateway
       def response_values(env)
         { status: env[:status], headers: env[:headers], body: env[:body] }
       end
+
+      def check_for_errors(env)
+        body = env[:body]["GovTalkMessage"]
+        unless body && body["GovTalkDetails"]
+          raise InvalidResponseError.new(env[:body], env[:status], env)
+        end
+
+        if body["GovTalkDetails"]["GovTalkErrors"]
+          error = body["GovTalkDetails"]["GovTalkErrors"].values.flatten.first
+          raise APIError.new(error['Text'], error['Number'], env[:status], env)
+        end
+      end
     end
 
     Faraday.register_middleware :response, check_ch_response: CheckResponse

data/lib/companies_house_gateway/version.rb

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

data/spec/request_spec.rb

@@ -79,8 +79,10 @@ describe CompaniesHouseGateway::Request do
 
           it "wraps the error" do
             expect { perform_check }.
-              to raise_error(
-                CompaniesHouseGateway::APIError, "(604) Error text")
+              to raise_error CompaniesHouseGateway::APIError do |error|
+                error.error_code.should == "604"
+                error.message.should == "Error text"
+              end
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: companies-house-gateway
 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-27 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday