gocardless 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 994ce7a109fb1c42f0f66f94e7fb38cff7ea1197
-  data.tar.gz: 8ac64f43f760b62644faccb532fadc0f86b89413
+  metadata.gz: d2a95fa2b5f9981334a068170e263b5e731e7de9
+  data.tar.gz: d8b06692dc05013bffc425c8d9cea9e6f9c96093
 SHA512:
-  metadata.gz: 815fb08aef927dbdfc4f285534b4cea78e346949fb0cbee8a5c36ba2cd679f978ebfa5bc652dd5925854feaf17a3d977b7563d9a887cd69904de99c6c25b9c6e
-  data.tar.gz: 47e2766271e9d6df79f1909409c8f128632e4ff1d9476bc81b5bbd3e810eb8a4a14ac360475dd0459c534375151b8a073261ae5a2c40a3727726ae23903ea4f6
+  metadata.gz: 897beea106a75050566280a6627fa28da35006e77acc267fcbd68ec087bbdc77b475edd721ece791a822a5028e6da41adba32af1402c8b6f75770392e9a9ed4c
+  data.tar.gz: 23d195be6de1f617a5b2aaf7de2485e3419545f439af1faa340c8bff73072299f98c52f4bd83b775ee70ced58bcdd42f4227341f02732cf357813996ba91224b

data/.travis.yml

@@ -6,6 +6,8 @@ rvm:
   - 1.9.2
   - jruby-19mode
   - rbx-2
+install:
+  - bundle install --retry=3
 notifications:
   email:
     recipients:

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.13.0 - May 05, 2015
+
+- Better handling of API error messages
+
+
 ## 1.12.0 - October 31, 2014
 
 - Update Gem Dependencies

data/lib/gocardless/errors.rb

@@ -10,15 +10,34 @@ module GoCardless
     def initialize(response)
       @response = response
       @code = response.status
-      body = MultiJson.decode(response.body) rescue nil
-      if body.is_a? Hash
-        @description = body["error"] || response.body.strip || "Unknown error"
+
+      begin
+        parsed_response = MultiJson.decode(response.body)
+        errors = parsed_response["error"] || parsed_response["errors"]
+        @description = stringify_errors(errors)
+      rescue MultiJson::ParseError
+        @description = response.body ? response.body.strip : "Unknown error"
       end
     end
 
     def to_s
       "#{super} [#{self.code}] #{self.description}"
     end
+
+    private
+
+    def stringify_errors(errors)
+      case errors
+      when Array
+        errors.join(", ")
+      when Hash
+        errors.flat_map do |field, messages|
+          messages.map { |message| "#{field} #{message}" }
+        end.join(", ")
+      else
+        errors.to_s
+      end
+    end
   end
 
   class ClientError < Error

data/lib/gocardless/version.rb

@@ -1,3 +1,3 @@
 module GoCardless
-  VERSION = '1.12.0'.freeze
+  VERSION = '1.13.0'.freeze
 end

data/spec/errors_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe GoCardless::ApiError do
+  let(:response) { double(body: body, status: 500) }
+  let(:error) { GoCardless::ApiError.new(response) }
+
+  describe "#description" do
+    subject { error.description }
+
+    context "given no response body" do
+      let(:body) { nil }
+      it { is_expected.to eq "Unknown error" }
+    end
+
+    context "given a json response body with an 'errors' hash" do
+      let(:body) do
+        MultiJson.dump(errors: { name: ["too short"], email: ["taken", "invalid"] })
+      end
+      it { is_expected.to eq "name too short, email taken, email invalid" }
+    end
+
+    context "given a json response body with an 'error' array" do
+      let(:body) { MultiJson.dump(error: ["Server Error", "Oops"]) }
+      it { is_expected.to eq "Server Error, Oops" }
+    end
+
+    context "with a non-JSON body" do
+      let(:body) { "non-json body" }
+      it { is_expected.to eq "non-json body" }
+    end
+  end
+end

data/spec/pre_authorization_spec.rb

@@ -13,6 +13,18 @@ describe GoCardless::PreAuthorization do
     preauth.cancel!
   end
 
+  it "should allow you to create a pre-authorised bill" do
+    mocked_data = {
+      :pre_authorization_id=>"009988",
+      :amount=>"15.00",
+      :name=>"150 credits",
+      :charge_customer_at=>DateTime.new(2013,8,27,0,0,0,'0')
+    }
+
+    expect(client).to receive(:api_post).with('/bills/', :bill => mocked_data)
+    preauth.create_bill(mocked_data)
+  end
+
   it_behaves_like "it has a query method for", "inactive"
   it_behaves_like "it has a query method for", "active"
   it_behaves_like "it has a query method for", "cancelled"

data/spec/resource_spec.rb

@@ -10,6 +10,18 @@ describe GoCardless::Resource do
     props.each { |k,v| expect(resource.send(k)).to eq(v) }
   end
 
+  describe "#inspect" do
+    let(:test_resource) do
+      Class.new(GoCardless::Resource) { reference_reader :foo_id }
+    end
+
+    it "shows text" do
+      resource = test_resource.new
+      resource.instance_variable_set(:@foo_id, 123)
+      expect(resource.inspect).to match(/#<#<Class:[a-z0-9]+> foo_id=123>/)
+    end
+  end
+
   describe "#date_writer" do
     let(:test_resource) do
       Class.new(GoCardless::Resource) { date_writer :created_at, :modified_at }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gocardless
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Harry Marr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -128,6 +128,7 @@ files:
 - lib/gocardless/version.rb
 - spec/bill_spec.rb
 - spec/client_spec.rb
+- spec/errors_spec.rb
 - spec/gocardless_spec.rb
 - spec/page_spec.rb
 - spec/paginator_spec.rb
@@ -157,13 +158,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for the GoCardless API
 test_files:
 - spec/bill_spec.rb
 - spec/client_spec.rb
+- spec/errors_spec.rb
 - spec/gocardless_spec.rb
 - spec/page_spec.rb
 - spec/paginator_spec.rb