killbill 1.0.10 → 1.0.11

data/VERSION

@@ -1 +1 @@
-1.0.10
+1.0.11

data/lib/killbill/jpayment.rb

@@ -118,6 +118,11 @@ module Killbill
       end
 
       def wrap_and_throw_exception(api, e)
+        message = "#{api} failure: #{e}"
+        unless e.backtrace.nil?
+          message = "#{message}\n#{e.backtrace.join("\n")}"
+        end
+        logger.warn message
         raise Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException.new("#{api} failure", e.message)
       end
 
@@ -130,8 +135,8 @@ module Killbill
            JConverter.from_uuid(a)
          elsif a.java_kind_of? java.math.BigDecimal
            JConverter.from_big_decimal(a)
-         elsif a.get_class.is_enum
-           a.nil? ? '' : a.to_string
+         elsif a.java_kind_of? Java::com.ning.billing.catalog.api.Currency
+           a.to_string
          elsif a.java_kind_of? Java::com.ning.billing.payment.api.PaymentMethodPlugin
            JConverter.from_payment_method_plugin(a)
          elsif ((a.java_kind_of? Java::boolean) || (a.java_kind_of? java.lang.Boolean))

data/lib/killbill/jplugin.rb

@@ -1,7 +1,6 @@
 require 'pathname'
 
 require 'killbill/http_servlet'
-require 'killbill/logger'
 require 'killbill/creator'
 
 module Killbill
@@ -37,16 +36,20 @@ module Killbill
       def rack_handler
         config_ru = Pathname.new("#{@delegate_plugin.root}/config.ru").expand_path
         if config_ru.file?
-          @delegate_plugin.logger.info "Found Rack configuration file at #{config_ru.to_s}"
+          logger.info "Found Rack configuration file at #{config_ru.to_s}"
           instance = Killbill::Plugin::RackHandler.instance
-          instance.configure(@logger, config_ru.to_s) unless instance.configured?
+          instance.configure(logger, config_ru.to_s) unless instance.configured?
           instance
         else
-          @delegate_plugin.logger.info "No Rack configuration file found at #{config_ru.to_s}"
+          logger.info "No Rack configuration file found at #{config_ru.to_s}"
           nil
         end
       end
 
+      def logger
+        require 'logger'
+        @delegate_plugin.nil? ? ::Logger.new(STDOUT) : @delegate_plugin.logger
+      end
     end
   end
 end

data/lib/killbill/{logger.rb → killbill_logger.rb}

@@ -1,7 +1,7 @@
 # Plugin logger that will delegate to the OSGI LogService
 module Killbill
   module Plugin
-    class Logger
+    class KillbillLogger
       def initialize(delegate)
         @logger = delegate
       end

data/lib/killbill/plugin.rb

@@ -1,4 +1,4 @@
-require 'killbill/logger'
+require 'killbill/killbill_logger'
 
 module Killbill
   # There are various types of plugins one can write for Killbill:
@@ -61,7 +61,7 @@ module Killbill
       def logger=(logger)
         # logger is an OSGI LogService in the Killbill environment. For testing purposes,
         # allow delegation to a standard logger
-        @logger = logger.respond_to?(:info) ? logger : Killbill::Plugin::Logger.new(logger)
+        @logger = logger.respond_to?(:info) ? logger : Killbill::Plugin::KillbillLogger.new(logger)
       end
 
       def logger

data/spec/killbill/jpayment_spec.rb

@@ -11,6 +11,7 @@ describe Killbill::Plugin::JPayment do
     @kb_payment_method_id = java.util.UUID.fromString("bf5c926e-3d9c-470e-b34b-719d7b58323a")
     @payment_method_plugin = nil
     @amount = java.math.BigDecimal.new("50")
+    @currency = Java::com.ning.billing.catalog.api.Currency::USD
   end
 
   before(:each) do
@@ -18,7 +19,7 @@ describe Killbill::Plugin::JPayment do
   end
 
   it "should_test_charge_ok" do
-    output = @jpayment.process_payment(@kb_payment_id, @kb_payment_method_id, @amount)
+    output = @jpayment.process_payment(@kb_account_id, @kb_payment_id, @kb_payment_method_id, @amount, @currency)
     output.get_amount.should be_an_instance_of java.math.BigDecimal
     output.get_amount.to_s.should == "50.00";
     output.get_status.should be_an_instance_of Java::com.ning.billing.payment.plugin.api.PaymentInfoPlugin::PaymentPluginStatus
@@ -27,11 +28,11 @@ describe Killbill::Plugin::JPayment do
 
   it "should_test_charge_exception" do
     @jpayment.delegate_plugin.send(:raise_exception_on_next_calls)
-    lambda { @jpayment.process_payment(@kb_payment_id, @kb_payment_method_id, @amount) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
+    lambda { @jpayment.process_payment(@kb_account_id, @kb_payment_id, @kb_payment_method_id, @amount, @currency) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
   end
 
   it "should_test_get_payment_info_ok" do
-    output = @jpayment.get_payment_info(@kb_payment_method_id)
+    output = @jpayment.get_payment_info(@kb_account_id, @kb_payment_method_id)
     output.get_amount.should be_an_instance_of java.math.BigDecimal
     output.get_amount.to_s.should == "0.00";
     output.get_status.should be_an_instance_of Java::com.ning.billing.payment.plugin.api.PaymentInfoPlugin::PaymentPluginStatus
@@ -40,11 +41,11 @@ describe Killbill::Plugin::JPayment do
 
   it "should_test_get_payment_info_exception" do
     @jpayment.delegate_plugin.send(:raise_exception_on_next_calls)
-    lambda { @jpayment.get_payment_info(@kb_payment_method_id) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
+    lambda { @jpayment.get_payment_info(@kb_account_id, @kb_payment_method_id) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
   end
 
   it "should_test_refund_ok" do
-    output = @jpayment.process_refund(@kb_payment_method_id, @amount)
+    output = @jpayment.process_refund(@kb_account_id, @kb_payment_method_id, @amount, @currency)
     output.get_amount.should be_an_instance_of java.math.BigDecimal
     output.get_amount.to_s.should == "50.00";
     output.get_status.should be_an_instance_of Java::com.ning.billing.payment.plugin.api.RefundInfoPlugin::RefundPluginStatus
@@ -53,7 +54,7 @@ describe Killbill::Plugin::JPayment do
 
   it "should_test_refund_exception" do
     @jpayment.delegate_plugin.send(:raise_exception_on_next_calls)
-    lambda { @jpayment.process_refund(@kb_payment_method_id, @amount) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
+    lambda { @jpayment.process_refund(@kb_account_id, @kb_payment_method_id, @amount, @currency) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
   end
 
   it "should_test_add_payment_method_ok" do
@@ -65,14 +66,13 @@ describe Killbill::Plugin::JPayment do
     lambda { @jpayment.add_payment_method(@kb_account_id, @kb_payment_method_id, @payment_method_plugin, true) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
   end
 
-
   it "should_test_delete_payment_method_ok" do
-    @jpayment.delete_payment_method(@kb_payment_method_id)
+    @jpayment.delete_payment_method(@kb_account_id, @kb_payment_method_id)
   end
 
   it "should_test_delete_payment_method_exception" do
     @jpayment.delegate_plugin.send(:raise_exception_on_next_calls)
-    lambda { @jpayment.delete_payment_method(@kb_payment_method_id) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
+    lambda { @jpayment.delete_payment_method(@kb_account_id, @kb_payment_method_id) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
   end
 
   it "should_test_get_payment_method_detail_ok" do
@@ -87,12 +87,12 @@ describe Killbill::Plugin::JPayment do
   end
 
   it "should_test_set_default_payment_method_ok" do
-    @jpayment.set_default_payment_method(@kb_payment_method_id)
+    @jpayment.set_default_payment_method(@kb_account_id, @kb_payment_method_id)
   end
 
   it "should_test_set_default_payment_method_exception" do
     @jpayment.delegate_plugin.send(:raise_exception_on_next_calls)
-    lambda { @jpayment.set_default_payment_method(@kb_payment_method_id) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
+    lambda { @jpayment.set_default_payment_method(@kb_account_id, @kb_payment_method_id) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
   end
 
   it "should_get_payment_methods_ok" do
@@ -104,17 +104,18 @@ describe Killbill::Plugin::JPayment do
     current_payment_method = output.get(0)
     current_payment_method.get_account_id.to_s.should == @kb_account_id.to_s
   end
+
   it "should_get_payment_methods_exception" do
     @jpayment.delegate_plugin.send(:raise_exception_on_next_calls)
     lambda { @jpayment.get_payment_methods(@kb_account_id, true) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
   end
 
   it "should_test_reset_payment_methods_ok" do
-    @jpayment.reset_payment_methods(java.util.ArrayList.new)
+    @jpayment.reset_payment_methods(@kb_account_id, java.util.ArrayList.new)
   end
 
   it "should_test_reset_payment_methods_exception" do
     @jpayment.delegate_plugin.send(:raise_exception_on_next_calls)
-    lambda { @jpayment.reset_payment_methods(java.util.ArrayList.new) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
+    lambda { @jpayment.reset_payment_methods(@kb_account_id, java.util.ArrayList.new) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
   end
 end

data/spec/killbill/payment_test.rb

@@ -11,7 +11,7 @@ module Killbill
       def get_name
       end
 
-      def process_payment(kb_payment_id, kb_payment_method_id, amount_in_cents, options = {})
+      def process_payment(kb_account_id, kb_payment_id, kb_payment_method_id, amount_in_cents, currency, options = {})
         if @raise_exception
           raise StandardError.new("Test exception")
         else
@@ -19,7 +19,7 @@ module Killbill
         end
       end
 
-      def get_payment_info(kb_payment_id, options = {})
+      def get_payment_info(kb_account_id, kb_payment_id, options = {})
         if @raise_exception
           raise StandardError.new("Test exception")
         else
@@ -27,7 +27,7 @@ module Killbill
         end
       end
 
-      def process_refund(kb_payment_id, amount_in_cents, options = {})
+      def process_refund(kb_account_id, kb_payment_id, amount_in_cents, currency, options = {})
         if @raise_exception
           raise StandardError.new("Test exception")
         else
@@ -41,7 +41,7 @@ module Killbill
         end
       end
 
-      def delete_payment_method(kb_payment_method_id, options = {})
+      def delete_payment_method(kb_account_id, kb_payment_method_id, options = {})
         if @raise_exception
           raise StandardError.new("Test exception")
         end
@@ -55,7 +55,7 @@ module Killbill
         end
       end
 
-      def set_default_payment_method(kb_payment_method_id, options = {})
+      def set_default_payment_method(kb_account_id, kb_payment_method_id, options = {})
         if @raise_exception
           raise StandardError.new("Test exception")
         end
@@ -69,7 +69,7 @@ module Killbill
         end
       end
 
-      def reset_payment_methods(payment_methods)
+      def reset_payment_methods(kb_account_id, payment_methods)
         if @raise_exception
           raise StandardError.new("Test exception")
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
   prerelease:
 platform: ruby
 authors:
@@ -115,7 +115,7 @@ files:
 - lib/killbill/jresponse/jpayment_method_response_internal.rb
 - lib/killbill/jresponse/jpayment_response.rb
 - lib/killbill/jresponse/jrefund_response.rb
-- lib/killbill/logger.rb
+- lib/killbill/killbill_logger.rb
 - lib/killbill/notification.rb
 - lib/killbill/payment.rb
 - lib/killbill/plugin.rb