killbill-client 0.32.1 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 429e34a1e84caaf6e880e1031735712002339abc
-  data.tar.gz: 7797e4a71966c5928b7286f89609034343ebacec
+  metadata.gz: 7884db06718c90098514ddffc4d5840fdf2eea57
+  data.tar.gz: c062ac56ca9e7c9037d49fe6ec26563c76b09fff
 SHA512:
-  metadata.gz: ccfac22784ffb80172dd79ebec334249bb2d9fce0a6a31e1c1bed6d9b1c12cca3969a5367853a2c0fac58915896dd266c33a31ebe0c974818c37ad439ef91346
-  data.tar.gz: 4e97fa033a317ecf8ecd4afb99d620d90ff9bddf9e40dda9fab9198911f520cb714e6acba6f71c34fa91202af795ec6bcdd833e82d2417ec06ecd125514940f4
+  metadata.gz: 9f67cdd02e9ede604d08f25f35cdb27402953d4222ef7863d5cd1608c1d8154887a05e175033950c1a0a793a459f91874ebbdd67b9983caf7c976b95387992f4
+  data.tar.gz: c2a63017349eedd279f487fd431145711db6b15dfc2fcb5649826ac40e4ebf6746f0bb060d793b97f1bc942a99979f2d061100ef28edf038f8f49b172e2dc4d8

data/lib/killbill_client/api/errors.rb

@@ -26,6 +26,10 @@ module KillBillClient
         ]
       end
 
+      def self.error_for(status, request, response)
+        ERRORS[status].new(request, response)
+      end
+
       private
 
       def description
@@ -69,6 +73,12 @@ module KillBillClient
     class Unauthorized < ClientError
     end
 
+    # === 402 Payment Required
+    #
+    # The payment failed with a transaction declined error
+    class PaymentRequired < ClientError
+    end
+
     # === 403 Forbidden
     #
     # The login is attempting to perform an action it does not have privileges
@@ -116,8 +126,7 @@ module KillBillClient
 
     # === 422 Unprocessable Entity
     #
-    # Could not process a POST or PUT request because the request is invalid.
-    # See the response body for more details.
+    # The payment was aborted before anything happened
     class UnprocessableEntity < ClientError
     end
 
@@ -146,6 +155,12 @@ module KillBillClient
     class ServiceUnavailable < ServerError
     end
 
+    # === 504 Gateway Timeout
+    #
+    # The service did not receive a timely response from the upstream server.
+    class GatewayTimeout < ServerError
+    end
+
     # Error mapping by status code.
     ERRORS = Hash.new { |hash, code|
       unless hash.key? code
@@ -162,6 +177,7 @@ module KillBillClient
         304 => NotModified,
         400 => BadRequest,
         401 => Unauthorized,
+        402 => PaymentRequired,
         403 => Forbidden,
         404 => NotFound,
         406 => NotAcceptable,
@@ -169,7 +185,8 @@ module KillBillClient
         422 => UnprocessableEntity,
         500 => InternalServerError,
         502 => GatewayError,
-        503 => ServiceUnavailable
+        503 => ServiceUnavailable,
+        504 => GatewayTimeout
     ).freeze
   end
 end

data/lib/killbill_client/api/net_http_adapter.rb

@@ -68,11 +68,17 @@ module KillBillClient
           head.update options[:head] if options[:head]
           head.delete_if { |_, value| value.nil? }
 
-          uri = (options[:base_uri] || base_uri)
-          # Note: make sure to keep the full path (if any) from URI::HTTP, for non-ROOT deployments
-          # See https://github.com/killbill/killbill/issues/221#issuecomment-151980263
-          base_path = uri.request_uri == '/' ? '' : uri.request_uri
-          uri += (base_path + URI.escape(relative_uri))
+          if URI(relative_uri).scheme.nil?
+            uri = (options[:base_uri] || base_uri)
+            uri = URI.parse(uri) unless uri.is_a?(URI)
+            # Note: make sure to keep the full path (if any) from URI::HTTP, for non-ROOT deployments
+            # See https://github.com/killbill/killbill/issues/221#issuecomment-151980263
+            base_path = uri.request_uri == '/' ? '' : uri.request_uri
+            uri += (base_path + URI.escape(relative_uri))
+          else
+            uri = relative_uri
+            uri = URI.parse(uri) unless uri.is_a?(URI)
+          end
           uri += encode_params(options).to_s
           request = METHODS[method].new uri.request_uri, head
 
@@ -198,7 +204,7 @@ module KillBillClient
             when 200...300 then
               response
             else
-              raise ERRORS[code].new request, response
+              raise ResponseError.error_for(code, request, response)
           end
         end
       end

data/lib/killbill_client/models/combo_transaction.rb

@@ -23,14 +23,24 @@ module KillBillClient
       private
 
       def combo_payment(user, reason, comment, options, refresh_options = nil)
-        created_transaction = self.class.post "#{Payment::KILLBILL_API_PAYMENTS_PREFIX}/combo",
-                                              to_json,
-                                              {},
-                                              {
-                                                  :user => user,
-                                                  :reason => reason,
-                                                  :comment => comment,
-                                              }.merge(options)
+        begin
+          created_transaction = self.class.post "#{Payment::KILLBILL_API_PAYMENTS_PREFIX}/combo",
+                                                to_json,
+                                                {},
+                                                {
+                                                    :user => user,
+                                                    :reason => reason,
+                                                    :comment => comment,
+                                                }.merge(options)
+        rescue KillBillClient::API::ResponseError => error
+          response = error.response
+          if response.header['location']
+            created_transaction = ComboTransaction.new
+            created_transaction.uri = response.header['location']
+          else
+            raise error
+          end
+        end
         created_transaction.refresh(refresh_options || options, Payment)
       end
     end

data/lib/killbill_client/models/subscription.rb

@@ -7,6 +7,8 @@ module KillBillClient
       KILLBILL_API_ENTITLEMENT_PREFIX = "#{KILLBILL_API_PREFIX}/subscriptions"
 
       has_many :events, KillBillClient::Model::EventSubscription
+      has_many :price_overrides, KillBillClient::Model::PhasePriceOverrideAttributes
+
       has_custom_fields KILLBILL_API_ENTITLEMENT_PREFIX, :subscription_id
 
       class << self

data/lib/killbill_client/models/transaction.rb

@@ -1,3 +1,5 @@
+require 'killbill_client/api/errors'
+
 module KillBillClient
   module Model
     class Transaction < PaymentTransactionAttributes
@@ -61,53 +63,58 @@ module KillBillClient
       end
 
       def capture(user = nil, reason = nil, comment = nil, options = {})
-        created_transaction = self.class.post "#{follow_up_path(payment_id)}",
-                                              to_json,
-                                              {},
-                                              {
-                                                  :user    => user,
-                                                  :reason  => reason,
-                                                  :comment => comment,
-                                              }.merge(options)
+        created_transaction = with_payment_failure_handling do
+          self.class.post "#{follow_up_path(payment_id)}",
+                          to_json,
+                          {},
+                          {
+                              :user    => user,
+                              :reason  => reason,
+                              :comment => comment,
+                          }.merge(options)
+        end
         created_transaction.refresh(options, Payment)
       end
 
       def refund(user = nil, reason = nil, comment = nil, options = {})
-
-        created_transaction = self.class.post "#{follow_up_path(payment_id)}/refunds",
-                                              to_json,
-                                              {},
-                                              {
-                                                  :user    => user,
-                                                  :reason  => reason,
-                                                  :comment => comment,
-                                              }.merge(options)
+        created_transaction = with_payment_failure_handling do
+          self.class.post "#{follow_up_path(payment_id)}/refunds",
+                          to_json,
+                          {},
+                          {
+                              :user    => user,
+                              :reason  => reason,
+                              :comment => comment,
+                          }.merge(options)
+        end
         created_transaction.refresh(options, Payment)
       end
 
       def void(user = nil, reason = nil, comment = nil, options = {})
-
-        created_transaction = self.class.delete "#{follow_up_path(payment_id)}",
-                                                to_json,
-                                                {},
-                                                {
-                                                    :user    => user,
-                                                    :reason  => reason,
-                                                    :comment => comment,
-                                                }.merge(options)
+        created_transaction = with_payment_failure_handling do
+          self.class.delete "#{follow_up_path(payment_id)}",
+                            to_json,
+                            {},
+                            {
+                                :user    => user,
+                                :reason  => reason,
+                                :comment => comment,
+                            }.merge(options)
+        end
         created_transaction.refresh(options, Payment)
       end
 
       def chargeback(user = nil, reason = nil, comment = nil, options = {})
-
-        created_transaction = self.class.post "#{follow_up_path(payment_id)}/chargebacks",
-                                              to_json,
-                                              {},
-                                              {
-                                                  :user    => user,
-                                                  :reason  => reason,
-                                                  :comment => comment,
-                                              }.merge(options)
+        created_transaction = with_payment_failure_handling do
+          self.class.post "#{follow_up_path(payment_id)}/chargebacks",
+                          to_json,
+                          {},
+                          {
+                              :user    => user,
+                              :reason  => reason,
+                              :comment => comment,
+                          }.merge(options)
+        end
         created_transaction.refresh(options, Payment)
       end
 
@@ -123,28 +130,50 @@ module KillBillClient
       def create_initial_transaction(path, query_map, payment_method_id, user, reason, comment, options)
         query_map[:paymentMethodId] = payment_method_id unless payment_method_id.nil?
 
-        created_transaction = self.class.post path,
-                                              to_json,
-                                              query_map,
-                                              {
-                                                  :user => user,
-                                                  :reason => reason,
-                                                  :comment => comment,
-                                              }.merge(options)
+        created_transaction = with_payment_failure_handling do
+          self.class.post path,
+                          to_json,
+                          query_map,
+                          {
+                              :user => user,
+                              :reason => reason,
+                              :comment => comment
+                          }.merge(options)
+        end
         created_transaction.refresh(options, Payment)
       end
 
       def complete_initial_transaction(user, reason, comment, options)
-        created_transaction = self.class.put follow_up_path(payment_id),
-                                             to_json,
-                                             {},
-                                             {
-                                                 :user => user,
-                                                 :reason => reason,
-                                                 :comment => comment,
-                                             }.merge(options)
+        created_transaction = with_payment_failure_handling do
+          self.class.put follow_up_path(payment_id),
+                         to_json,
+                         {},
+                         {
+                             :user => user,
+                             :reason => reason,
+                             :comment => comment
+                         }.merge(options)
+        end
         created_transaction.refresh(options, Payment)
       end
+
+      private
+
+      def with_payment_failure_handling
+        begin
+          created_transaction = yield
+        rescue KillBillClient::API::ResponseError => error
+          response = error.response
+          if response.header['location']
+            created_transaction = Transaction.new
+            created_transaction.uri = response.header['location']
+          else
+            raise error
+          end
+        end
+
+        created_transaction
+      end
     end
   end
 end

data/lib/killbill_client/version.rb

@@ -1,8 +1,8 @@
 module KillBillClient
   module Version
     MAJOR = 0
-    MINOR = 32
-    PATCH = 1
+    MINOR = 34
+    PATCH = 0
     PRE = nil
 
     VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.').freeze

data/spec/killbill_client/errors_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe KillBillClient::API::ResponseError do
+  describe '::error_for' do
+    let(:request) { double('request') }
+    let(:response) { double('response') }
+    before do
+      allow(response).to receive(:body)
+      allow(response).to receive(:code)
+    end
+
+    it 'maps 402 errors' do
+      error = described_class.error_for(402, request, response)
+
+      expect(error).to be_a(KillBillClient::API::PaymentRequired)
+      expect(error.request).to eq(request)
+      expect(error.response).to eq(response)
+    end
+
+    it 'maps 422 errors' do
+      error = described_class.error_for(422, request, response)
+
+      expect(error).to be_a(KillBillClient::API::UnprocessableEntity)
+      expect(error.request).to eq(request)
+      expect(error.response).to eq(response)
+    end
+
+    it 'maps 502 errors' do
+      error = described_class.error_for(502, request, response)
+
+      expect(error).to be_a(KillBillClient::API::GatewayError)
+      expect(error.request).to eq(request)
+      expect(error.response).to eq(response)
+    end
+
+    it 'maps 503 errors' do
+      error = described_class.error_for(503, request, response)
+
+      expect(error).to be_a(KillBillClient::API::ServiceUnavailable)
+      expect(error.request).to eq(request)
+      expect(error.response).to eq(response)
+    end
+
+    it 'maps 504 errors' do
+      error = described_class.error_for(504, request, response)
+
+      expect(error).to be_a(KillBillClient::API::GatewayTimeout)
+      expect(error.request).to eq(request)
+      expect(error.response).to eq(response)
+    end
+  end
+end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 0.32.1
+  version: 0.34.0
 platform: ruby
 authors:
 - Killbill core team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 10.0.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 11.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 10.0.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 11.0.0
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
+  prerelease: false
+  type: :development
 description: An API client library for Kill Bill.
 email: killbilling-users@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -182,6 +182,7 @@ files:
 - lib/rails/killbill_client.rb
 - spec/killbill_client/base_uri_spec.rb
 - spec/killbill_client/encoding_spec.rb
+- spec/killbill_client/errors_spec.rb
 - spec/killbill_client/model_relation_spec.rb
 - spec/killbill_client/remote/api_spec.rb
 - spec/killbill_client/remote/model_spec.rb
@@ -192,34 +193,26 @@ homepage: http://www.killbilling.org
 licenses:
 - Apache License (2.0)
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
-- "--exclude"
-- "."
+- --exclude
+- .
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.6
+signing_key:
 specification_version: 4
 summary: Kill Bill client library.
-test_files:
-- spec/killbill_client/base_uri_spec.rb
-- spec/killbill_client/encoding_spec.rb
-- spec/killbill_client/model_relation_spec.rb
-- spec/killbill_client/remote/api_spec.rb
-- spec/killbill_client/remote/model_spec.rb
-- spec/killbill_client/resource_spec.rb
-- spec/killbill_client/resources_spec.rb
-- spec/spec_helper.rb
+test_files: []