killbill-client 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1557b30b93a8605ae8e3d36179b24a93b439c839
-  data.tar.gz: 267910459ce59518aab8abba5b9f62cb1ed773f0
+  metadata.gz: b42d9b6165b77debb78d4ad43bf66931d4c0efc9
+  data.tar.gz: ad346ea2dc5ec3caa7fc49109ed103b264fc26f4
 SHA512:
-  metadata.gz: 86c73b8dadf31bb8d0e96fb40e1157ad8971392dd63c3d15d697f7eeef84a29b0497c8ab897f065f181ed38fa1a041f2851156adecdea6c9c763f05981033720
-  data.tar.gz: c4eaaa21e76392bab84bfd341aa7b5d8761fa1cfabf86a604da08e4cc8fccc311cb8affa0faf9cd5b318f4a5b7428ea545c49b68b731a0c7a0b3a0db7ccaf733
+  metadata.gz: 2962275a008bc054ed028028800a001277d2b9abefcd6f4c9c1404b14cea5938158c013242e1ef41663d98f00b2a32c2fd1f34eb3c663631d4ab7e4c03e9e96f
+  data.tar.gz: 22bf03cddacefed827af25c1447462dada86d7bc6449ab95dca3827ce43e375c29664e9391d2ededbd034376b6b55e362855af9a10913bb569df410822ff2bb6

data/lib/killbill_client.rb

@@ -63,11 +63,11 @@ module KillBillClient
     # @return [Logger, nil]
     # @example
     #   require 'logger'
-    #   KillBill.logger = Logger.new STDOUT
+    #   KillBillClient.logger = Logger.new STDOUT
     # @example Rails applications automatically log to the Rails log:
-    #   KillBill.logger = Rails.logger
+    #   KillBillClient.logger = Rails.logger
     # @example Turn off logging entirely:
-    #   KillBill.logger = nil # Or KillBill.logger = Logger.new nil
+    #   KillBillClient.logger = nil # Or KillBillClient.logger = Logger.new nil
     attr_accessor :logger
 
     # Convenience logging method includes a Logger#progname dynamically.

data/lib/killbill_client/api/net_http_adapter.rb

@@ -36,12 +36,16 @@ module KillBillClient
         }
 
         def encode_params(options = {})
-          # Plugin properties are passed in the options but we want to send them as query parameters,
+          # Plugin properties and controlPluginNames are passed in the options but we want to send them as query parameters,
           # so remove with from global hash and insert them under :params
           plugin_properties = options.delete :pluginProperty
           if plugin_properties && plugin_properties.size > 0
             options[:params][:pluginProperty] = plugin_properties.map { |p| "#{CGI.escape p.key}=#{CGI.escape p.value}" }
           end
+
+          control_plugin_names = options.delete(:controlPluginNames)
+          options[:params][:controlPluginName] = control_plugin_names if control_plugin_names
+
           return nil unless (options[:params] && !options[:params].empty?)
 
           pairs = options[:params].map { |key, value|
@@ -135,12 +139,12 @@ module KillBillClient
           net_http.each_pair { |key, value| http.send "#{key}=", value }
 
           if KillBillClient.logger
-            KillBillClient.log :info, '===> %s %s' % [request.method, uri]
+            KillBillClient.log :info, "Request method='%s', uri='%s'" % [request.method, uri]
             headers = request.to_hash
             headers['authorization'] &&= ['Basic [FILTERED]']
-            KillBillClient.log :debug, headers.inspect
+            KillBillClient.log :debug, headers.keys.map { |k| "#{k}='#{headers[k].join(',')}'" }.join(', ')
             if request.body && !request.body.empty? && request['Content-Type'].include?('application/json')
-              KillBillClient.log :debug, request.body
+              KillBillClient.log :debug, "requestBody='#{request.body}'"
             end
             start_time = Time.now
           end
@@ -178,15 +182,16 @@ module KillBillClient
                       else
                         :fatal
                     end
-            KillBillClient.log level, '<=== %d %s (%.1fms)' % [
+            KillBillClient.log level, "Response code='%d', reason='%s', latency='%.1f'" % [
                 code,
                 response.class.name[9, response.class.name.length].gsub(
                     /([a-z])([A-Z])/, '\1 \2'
                 ),
                 latency
             ]
-            KillBillClient.log :debug, response.to_hash.inspect
-            KillBillClient.log :debug, response.body if response.body
+            hash_response = response.to_hash
+            KillBillClient.log :debug, hash_response.keys.map { |k| "#{k}='#{hash_response[k].join(',')}'" }.join(', ')
+            KillBillClient.log :debug, "responseBody='#{response.body}'" if response.body
           end
 
           case code

data/lib/killbill_client/models/combo_hosted_payment_page.rb

@@ -3,15 +3,9 @@ module KillBillClient
     class ComboHostedPaymentPage < ComboHostedPaymentPageAttributes
 
       def build_form_descriptor(user = nil, reason = nil, comment = nil, options = {})
-        query_map = {
-        }
-        if options.include? :controlPluginNames
-          query_map[:controlPluginName] = options.delete(:controlPluginNames)
-        end
-
         self.class.post "#{HostedPaymentPage::KILLBILL_API_HPP_PREFIX}/hosted/form",
                         to_json,
-                        query_map,
+                        {},
                         {
                             :user => user,
                             :reason => reason,

data/lib/killbill_client/models/combo_transaction.rb

@@ -23,15 +23,9 @@ module KillBillClient
       private
 
       def combo_payment(user, reason, comment, options, refresh_options = nil)
-        query_map = {
-        }
-        if options.include? :controlPluginNames
-          query_map[:controlPluginName] = options.delete(:controlPluginNames)
-        end
-
         created_transaction = self.class.post "#{Payment::KILLBILL_API_PAYMENTS_PREFIX}/combo",
                                               to_json,
-                                              query_map,
+                                              {},
                                               {
                                                   :user => user,
                                                   :reason => reason,

data/lib/killbill_client/models/nodes_info.rb

@@ -105,7 +105,7 @@ module KillBillClient
 
         def wait_for_plugin_command_completion(command, plugin, timeout_sec, sleep_sec)
           if KillBillClient.logger
-            KillBillClient.log :info, 'NodesInfo wait for plugin command %s, plugin =%s' % [command, plugin]
+            KillBillClient.log :info, "NodesInfo waiting for command='%s', plugin='%s'" % [command, plugin]
           end
           begin
             Timeout::timeout(timeout_sec) do
@@ -117,7 +117,7 @@ module KillBillClient
             end
           rescue Timeout::Error => e
             if KillBillClient.logger
-              KillBillClient.log :info, 'Reached timeout after %s sec: command=%s, plugin=%s' % [timeout_sec, command, plugin]
+              KillBillClient.log :warn, "NodesInfo timeout after %s sec for command='%s', plugin='%s'" % [timeout_sec, command, plugin]
             end
             raise e
           end

data/lib/killbill_client/models/transaction.rb

@@ -61,15 +61,9 @@ module KillBillClient
       end
 
       def capture(user = nil, reason = nil, comment = nil, options = {})
-        query_map = {
-        }
-        if options.include? :controlPluginNames
-          query_map[:controlPluginName] = options.delete(:controlPluginNames)
-        end
-
         created_transaction = self.class.post "#{follow_up_path(payment_id)}",
                                               to_json,
-                                              query_map,
+                                              {},
                                               {
                                                   :user    => user,
                                                   :reason  => reason,
@@ -80,14 +74,9 @@ module KillBillClient
 
       def refund(user = nil, reason = nil, comment = nil, options = {})
 
-        query_map = {
-        }
-        if options.include? :controlPluginNames
-          query_map[:controlPluginName] = options.delete(:controlPluginNames)
-        end
         created_transaction = self.class.post "#{follow_up_path(payment_id)}/refunds",
                                               to_json,
-                                              query_map,
+                                              {},
                                               {
                                                   :user    => user,
                                                   :reason  => reason,
@@ -98,14 +87,9 @@ module KillBillClient
 
       def void(user = nil, reason = nil, comment = nil, options = {})
 
-        query_map = {
-        }
-        if options.include? :controlPluginNames
-          query_map[:controlPluginName] = options.delete(:controlPluginNames)
-        end
         created_transaction = self.class.delete "#{follow_up_path(payment_id)}",
                                                 to_json,
-                                                query_map,
+                                                {},
                                                 {
                                                     :user    => user,
                                                     :reason  => reason,
@@ -116,14 +100,9 @@ module KillBillClient
 
       def chargeback(user = nil, reason = nil, comment = nil, options = {})
 
-        query_map = {
-        }
-        if options.include? :controlPluginNames
-          query_map[:controlPluginName] = options.delete(:controlPluginNames)
-        end
         created_transaction = self.class.post "#{follow_up_path(payment_id)}/chargebacks",
                                               to_json,
-                                              query_map,
+                                              {},
                                               {
                                                   :user    => user,
                                                   :reason  => reason,

data/lib/killbill_client/version.rb

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

data/spec/spec_helper.rb

@@ -11,6 +11,7 @@ KillBillClient.url = 'http://127.0.0.1:8080'
 KillBillClient.username = 'admin'
 KillBillClient.password = 'password'
 
+KillBillClient.logger = Logger.new(STDOUT)
 
 RSpec.configure do |config|
   config.color = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json