killbill-client 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2ef126812dd995a0279bb40b3e5ebcbd8f6e846
-  data.tar.gz: 86db64653e7e29ae21541b4241dfcf01ee5de169
+  metadata.gz: af588a74667e14903ee145dfd23cd3ea1e39455e
+  data.tar.gz: ccd3d09f2fc6904e2ab688fbbbf63b924610acbb
 SHA512:
-  metadata.gz: 9b738f3f54f9d508126f79c0da7b962c87b2034524d38597dd9c68100b54b870dae165ca3a1584feb6e6dfd143bbb807b8a8e025a6df540b9dca53a55097f48e
-  data.tar.gz: 22dc8d5c9d4bd13fff971e20913be2e3a5a67fe150623c3cdeb6f44ff3aa8c9b10a870a0ba990c3ed87ae05eddd31e93189f00315e106ec3f352758a8f2a8684
+  metadata.gz: c29ea6b799ba99d3a40b31b43efb2b6c6ff1aafe2c64ddb868f10096b90f2113d64bfd5fd3e0441eb7b0e7b5df66eecc2b40aff62320d396ffed45996edab236
+  data.tar.gz: 5ef30ac236df22c9f86db03c2000182ced72ff3d3ecd28bb16923b654bfcd39490c88153aad5ef4f7dfb14febfe69bf84f658fe7d901f1bbc1c6fc66f7cdb5c2

data/lib/killbill_client/models/combo_transaction.rb

@@ -23,6 +23,8 @@ module KillBillClient
       private
 
       def combo_payment(user, reason, comment, options, refresh_options = nil)
+        follow_location = true
+        follow_location = options.delete(:follow_location) if options.has_key?(:follow_location)
         begin
           created_transaction = self.class.post "#{Payment::KILLBILL_API_PAYMENTS_PREFIX}/combo",
                                                 to_json,
@@ -34,14 +36,21 @@ module KillBillClient
                                                 }.merge(options)
         rescue KillBillClient::API::ResponseError => error
           response = error.response
-          if response.header['location']
+          if follow_location && 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)
+
+        if follow_location
+          return created_transaction.refresh(refresh_options || options, Payment)
+        end
+
+        created_payment = Payment.new
+        created_payment.uri = created_transaction.uri
+        created_payment
       end
     end
   end

data/lib/killbill_client/models/credit.rb

@@ -2,12 +2,14 @@ module KillBillClient
   module Model
     class Credit < CreditAttributes
       KILLBILL_API_CREDITS_PREFIX = "#{KILLBILL_API_PREFIX}/credits"
-      has_many :audit_logs, KillBillClient::Model::AuditLog      
+      has_many :audit_logs, KillBillClient::Model::AuditLog
 
-      def create(user = nil, reason = nil, comment = nil, options = {})
+      def create(auto_commit = false, user = nil, reason = nil, comment = nil, options = {})
         created_credit = self.class.post KILLBILL_API_CREDITS_PREFIX,
                                               to_json,
-                                              {},
+                                              {
+                                                  :autoCommit => auto_commit
+                                              },
                                               {
                                                   :user => user,
                                                   :reason => reason,

data/lib/killbill_client/models/transaction.rb

@@ -9,63 +9,64 @@ module KillBillClient
       has_many :properties, KillBillClient::Model::PluginPropertyAttributes
       has_many :audit_logs, KillBillClient::Model::AuditLog
 
-      def auth(account_id, payment_method_id = nil, user = nil, reason = nil, comment = nil, options = {})
+      def auth(account_id, payment_method_id = nil, user = nil, reason = nil, comment = nil, options = {}, refresh_options = nil)
         @transaction_type = 'AUTHORIZE'
         query_map = {}
-        create_initial_transaction("#{Account::KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/payments", query_map, payment_method_id, user, reason, comment, options)
+        create_initial_transaction("#{Account::KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/payments", query_map, payment_method_id, user, reason, comment, options, refresh_options)
       end
 
-      def purchase(account_id, payment_method_id = nil, user = nil, reason = nil, comment = nil, options = {})
+      def purchase(account_id, payment_method_id = nil, user = nil, reason = nil, comment = nil, options = {}, refresh_options = nil)
         @transaction_type = 'PURCHASE'
         query_map = {}
-        create_initial_transaction("#{Account::KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/payments", query_map, payment_method_id, user, reason, comment, options)
+        create_initial_transaction("#{Account::KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/payments", query_map, payment_method_id, user, reason, comment, options, refresh_options)
       end
 
-      def credit(account_id, payment_method_id = nil, user = nil, reason = nil, comment = nil, options = {})
+      def credit(account_id, payment_method_id = nil, user = nil, reason = nil, comment = nil, options = {}, refresh_options = nil)
         @transaction_type = 'CREDIT'
         query_map = {}
-        create_initial_transaction("#{Account::KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/payments", query_map, payment_method_id, user, reason, comment, options)
+        create_initial_transaction("#{Account::KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/payments", query_map, payment_method_id, user, reason, comment, options, refresh_options)
       end
 
-      def auth_by_external_key(account_external_key, payment_method_id = nil, user = nil, reason = nil, comment = nil, options = {})
+      def auth_by_external_key(account_external_key, payment_method_id = nil, user = nil, reason = nil, comment = nil, options = {}, refresh_options = nil)
         @transaction_type = 'AUTHORIZE'
         query_map = {:externalKey => account_external_key}
-        create_initial_transaction("#{Account::KILLBILL_API_ACCOUNTS_PREFIX}/payments", query_map, payment_method_id, user, reason, comment, options)
+        create_initial_transaction("#{Account::KILLBILL_API_ACCOUNTS_PREFIX}/payments", query_map, payment_method_id, user, reason, comment, options, refresh_options)
       end
 
-      def purchase_by_external_key(account_external_key, payment_method_id = nil, user = nil, reason = nil, comment = nil, options = {})
+      def purchase_by_external_key(account_external_key, payment_method_id = nil, user = nil, reason = nil, comment = nil, options = {}, refresh_options = nil)
         @transaction_type = 'PURCHASE'
         query_map = {:externalKey => account_external_key}
-        create_initial_transaction("#{Account::KILLBILL_API_ACCOUNTS_PREFIX}/payments", query_map, payment_method_id, user, reason, comment, options)
+        create_initial_transaction("#{Account::KILLBILL_API_ACCOUNTS_PREFIX}/payments", query_map, payment_method_id, user, reason, comment, options, refresh_options)
       end
 
-      def credit_by_external_key(account_external_key, payment_method_id = nil, user = nil, reason = nil, comment = nil, options = {})
+      def credit_by_external_key(account_external_key, payment_method_id = nil, user = nil, reason = nil, comment = nil, options = {}, refresh_options = nil)
         @transaction_type = 'CREDIT'
         query_map = {:externalKey => account_external_key}
-        create_initial_transaction("#{Account::KILLBILL_API_ACCOUNTS_PREFIX}/payments", query_map, payment_method_id, user, reason, comment, options)
+        create_initial_transaction("#{Account::KILLBILL_API_ACCOUNTS_PREFIX}/payments", query_map, payment_method_id, user, reason, comment, options, refresh_options)
       end
 
-      def complete(user = nil, reason = nil, comment = nil, options = {})
-        complete_initial_transaction(user, reason, comment, options)
+      def complete(user = nil, reason = nil, comment = nil, options = {}, refresh_options = nil)
+        complete_initial_transaction(user, reason, comment, options, refresh_options)
       end
 
-      def complete_auth(user = nil, reason = nil, comment = nil, options = {})
+      def complete_auth(user = nil, reason = nil, comment = nil, options = {}, refresh_options = nil)
         @transaction_type = 'AUTHORIZE'
-        complete_initial_transaction(user, reason, comment, options)
+        complete_initial_transaction(user, reason, comment, options, refresh_options)
       end
 
-      def complete_purchase(user = nil, reason = nil, comment = nil, options = {})
+      def complete_purchase(user = nil, reason = nil, comment = nil, options = {}, refresh_options = nil)
         @transaction_type = 'PURCHASE'
-        complete_initial_transaction(user, reason, comment, options)
+        complete_initial_transaction(user, reason, comment, options, refresh_options)
       end
 
-      def complete_credit(user = nil, reason = nil, comment = nil, options = {})
+      def complete_credit(user = nil, reason = nil, comment = nil, options = {}, refresh_options = nil)
         @transaction_type = 'CREDIT'
-        complete_initial_transaction(user, reason, comment, options)
+        complete_initial_transaction(user, reason, comment, options, refresh_options)
       end
 
-      def capture(user = nil, reason = nil, comment = nil, options = {})
-        created_transaction = with_payment_failure_handling do
+      def capture(user = nil, reason = nil, comment = nil, options = {}, refresh_options = nil)
+        follow_location = delete_follow_location(options)
+        refresh_payment_with_failure_handling(follow_location, refresh_options || options) do
           self.class.post "#{follow_up_path(payment_id)}",
                           to_json,
                           {},
@@ -75,11 +76,11 @@ module KillBillClient
                               :comment => comment,
                           }.merge(options)
         end
-        created_transaction.refresh(options, Payment)
       end
 
-      def refund(user = nil, reason = nil, comment = nil, options = {})
-        created_transaction = with_payment_failure_handling do
+      def refund(user = nil, reason = nil, comment = nil, options = {}, refresh_options = nil)
+        follow_location = delete_follow_location(options)
+        refresh_payment_with_failure_handling(follow_location, refresh_options || options) do
           self.class.post "#{follow_up_path(payment_id)}/refunds",
                           to_json,
                           {},
@@ -89,11 +90,11 @@ module KillBillClient
                               :comment => comment,
                           }.merge(options)
         end
-        created_transaction.refresh(options, Payment)
       end
 
-      def void(user = nil, reason = nil, comment = nil, options = {})
-        created_transaction = with_payment_failure_handling do
+      def void(user = nil, reason = nil, comment = nil, options = {}, refresh_options = nil)
+        follow_location = delete_follow_location(options)
+        refresh_payment_with_failure_handling(follow_location, refresh_options || options) do
           self.class.delete "#{follow_up_path(payment_id)}",
                             to_json,
                             {},
@@ -103,11 +104,11 @@ module KillBillClient
                                 :comment => comment,
                             }.merge(options)
         end
-        created_transaction.refresh(options, Payment)
       end
 
-      def chargeback(user = nil, reason = nil, comment = nil, options = {})
-        created_transaction = with_payment_failure_handling do
+      def chargeback(user = nil, reason = nil, comment = nil, options = {}, refresh_options = nil)
+        follow_location = delete_follow_location(options)
+        refresh_payment_with_failure_handling(follow_location, refresh_options || options) do
           self.class.post "#{follow_up_path(payment_id)}/chargebacks",
                           to_json,
                           {},
@@ -117,7 +118,6 @@ module KillBillClient
                               :comment => comment,
                           }.merge(options)
         end
-        created_transaction.refresh(options, Payment)
       end
 
 
@@ -147,10 +147,11 @@ module KillBillClient
         path
       end
 
-      def create_initial_transaction(path, query_map, payment_method_id, user, reason, comment, options)
+      def create_initial_transaction(path, query_map, payment_method_id, user, reason, comment, options, refresh_options)
         query_map[:paymentMethodId] = payment_method_id unless payment_method_id.nil?
 
-        created_transaction = with_payment_failure_handling do
+        follow_location = delete_follow_location(options)
+        refresh_payment_with_failure_handling(follow_location, refresh_options || options) do
           self.class.post path,
                           to_json,
                           query_map,
@@ -160,11 +161,11 @@ module KillBillClient
                               :comment => comment
                           }.merge(options)
         end
-        created_transaction.refresh(options, Payment)
       end
 
-      def complete_initial_transaction(user, reason, comment, options)
-        created_transaction = with_payment_failure_handling do
+      def complete_initial_transaction(user, reason, comment, options, refresh_options)
+        follow_location = delete_follow_location(options)
+        refresh_payment_with_failure_handling(follow_location, refresh_options || options) do
           self.class.put follow_up_path(payment_id),
                          to_json,
                          {},
@@ -174,17 +175,22 @@ module KillBillClient
                              :comment => comment
                          }.merge(options)
         end
-        created_transaction.refresh(options, Payment)
       end
 
-      private
+      def delete_follow_location(options, key = :follow_location, default_value = true)
+        if options.has_key?(key)
+          return options.delete(key)
+        end
+
+        default_value
+      end
 
-      def with_payment_failure_handling
+      def refresh_payment_with_failure_handling(follow_location, refresh_options)
         begin
           created_transaction = yield
         rescue KillBillClient::API::ResponseError => error
           response = error.response
-          if response['location']
+          if follow_location && response['location']
             created_transaction = Transaction.new
             created_transaction.uri = response['location']
           else
@@ -192,7 +198,13 @@ module KillBillClient
           end
         end
 
-        created_transaction
+        if follow_location
+          return created_transaction.refresh(refresh_options, Payment)
+        end
+
+        created_payment = Payment.new
+        created_payment.uri = created_transaction.uri
+        created_payment
       end
     end
   end

data/lib/killbill_client/version.rb

@@ -1,7 +1,7 @@
 module KillBillClient
   module Version
     MAJOR = 1
-    MINOR = 4
+    MINOR = 5
     PATCH = 0
     PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement