killbill 1.0.8 → 1.0.9

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.0.9

data/lib/killbill.rb

@@ -39,6 +39,7 @@ begin
 
   # jbundler needs to be loaded first!
   require 'killbill/jplugin'
+  require 'killbill/jpayment'
 rescue LoadError => e
   warn 'You need JRuby to run Killbill plugins'
 end

data/lib/killbill/jpayment.rb

@@ -1,3 +1,5 @@
+require 'java'
+
 require 'singleton'
 
 require 'killbill/creator'
@@ -7,19 +9,28 @@ require 'killbill/jresponse/jrefund_response'
 require 'killbill/jresponse/jpayment_method_response'
 require 'killbill/jresponse/jpayment_method_response_internal'
 
+include Java
+
+class String
+   def snake_case
+     return downcase if match(/\A[A-Z]+\z/)
+     gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+     gsub(/([a-z])([A-Z])/, '\1_\2').
+     downcase
+   end
+end
 
 module Killbill
   module Plugin
 
     java_package 'com.ning.billing.payment.plugin.api'
-    class JPayment
+    class JPayment < JPlugin
 
-      include Java::com.ning.billing.payment.plugin.api.PaymentPluginApi
-
-      attr_reader :real_payment
+#      java_implements com.ning.billing.payment.plugin.api.PaymentPluginApi
+      include com.ning.billing.payment.plugin.api.PaymentPluginApi
 
       def initialize(real_class_name, services = {})
-        @real_payment = Creator.new(real_class_name).create(services)
+        super(real_class_name, services)
       end
 
       # TODO STEPH decide what to do the getName()
@@ -27,8 +38,8 @@ module Killbill
       def get_name
       end
 
-      java_signature 'Java::com.ning.billing.payment.plugin.api.PaymentInfoPlugin processPayment(java.util.UUID, java.util.UUID, java.lang.BigDecimal, Java::com.ning.billing.util.callcontext.CallContext)'
-      def charge(*args)
+      java_signature 'com.ning.billing.payment.plugin.api.PaymentInfoPlugin processPayment(java.util.UUID, java.util.UUID, java.lang.BigDecimal, com.ning.billing.util.callcontext.CallContext)'
+      def process_payment(*args)
         do_call_handle_exception(__method__, *args) do |res|
           return JPaymentResponse.new(res)
         end
@@ -42,7 +53,7 @@ module Killbill
       end
 
       java_signature 'Java::com.ning.billing.payment.plugin.api.RefundInfoPlugin processRefund(java.util.UUID, java.lang.BigDecimal, Java::com.ning.billing.util.callcontext.CallContext)'
-      def refund(*args)
+      def process_refund(*args)
         do_call_handle_exception(__method__, *args) do |res|
           return JRefundResponse.new(res)
         end
@@ -99,7 +110,7 @@ module Killbill
       def do_call_handle_exception(method_name, *args)
         begin
           rargs = convert_args(method_name, args)
-          res = @real_payment.send(method_name, *rargs)
+          res = @delegate_plugin.send(method_name.to_s.snake_case.to_sym, *rargs)
           yield(res)
         rescue Exception => e
           wrap_and_throw_exception(method_name, e)
@@ -123,6 +134,9 @@ module Killbill
            JConverter.from_payment_method_plugin(a)
          elsif ((a.java_kind_of? Java::boolean) || (a.java_kind_of? java.lang.Boolean))
            JConverter.from_boolean(a)
+         # Require because it looks like if non boxed value are passed they already arrive as Ruby type
+         elsif ((a.java_kind_of? TrueClass) || (a.java_kind_of? FalseClass))
+           a
          elsif a.java_kind_of? java.util.List
            result = Array.new
            if a.size > 0
@@ -137,7 +151,9 @@ module Killbill
            end
            result
          else
-           raise Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException.new("#{api} failure", "Unexpected parameter type #{a.class}")
+           # Since we don't pass the Context at this point, we can't raise any exceptions for unexpected types.
+           #raise Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException.new("#{api} failure", "Unexpected parameter type #{a.class}")
+           nil
          end
         end
       end

data/lib/killbill/jresponse/jconverter.rb

@@ -34,6 +34,16 @@ module Killbill
           end
         end
 
+        def to_refund_plugin_status(status)
+          if status == PaymentStatus::SUCCESS
+            Java::com.ning.billing.payment.plugin.api.RefundInfoPlugin::RefundPluginStatus::PROCESSED
+          elsif status == PaymentStatus::ERROR
+            Java::com.ning.billing.payment.plugin.api.RefundInfoPlugin::RefundPluginStatus::ERROR
+          else
+            Java::com.ning.billing.payment.plugin.api.RefundInfoPlugin::RefundPluginStatus::UNDEFINED
+          end
+        end
+
         def to_big_decimal(amount_in_cents)
           amount_in_cents.nil? ? java.math.BigDecimal::ZERO : java.math.BigDecimal.new('%.2f' % (amount_in_cents.to_i/100.0))
         end
@@ -74,6 +84,16 @@ module Killbill
           end
         end
 
+        def from_refund_plugin_status(status)
+          if status == Java::com.ning.billing.payment.plugin.api.RefundInfoPlugin::RefundPluginStatus::PROCESSED
+            PaymentStatus::SUCCESS
+          elsif status == Java::com.ning.billing.payment.plugin.api.RefundInfoPlugin::RefundPluginStatus::ERROR
+            PaymentStatus::ERROR
+          else
+            PaymentStatus::UNDEFINED
+          end
+        end
+
         def from_big_decimal(big_decimal)
           big_decimal.nil? ? 0 : big_decimal.multiply(java.math.BigDecimal.valueOf(100)).to_s.to_i
         end

data/lib/killbill/jresponse/jrefund_response.rb

@@ -20,7 +20,7 @@ module Killbill
         @amount = JConverter.to_big_decimal(refund_response.amount_in_cents)
         @created_date = JConverter.to_joda_date_time(refund_response.created_date)
         @effective_date = JConverter.to_joda_date_time(refund_response.effective_date)
-        @status = JConverter.to_payment_plugin_status(refund_response.status)
+        @status = JConverter.to_refund_plugin_status(refund_response.status)
         @gateway_error = JConverter.to_string(refund_response.gateway_error)
         @gateway_error_code = JConverter.to_string(refund_response.gateway_error_code)
       end

data/lib/killbill/payment.rb

@@ -16,7 +16,7 @@ module Killbill
         raise OperationUnsupportedByGatewayError
       end
 
-      def charge(kb_payment_id, kb_payment_method_id, amount_in_cents, options = {})
+      def process_payment(kb_payment_id, kb_payment_method_id, amount_in_cents, options = {})
         raise OperationUnsupportedByGatewayError
       end
 
@@ -24,7 +24,7 @@ module Killbill
         raise OperationUnsupportedByGatewayError
       end
 
-      def refund(kb_payment_id, amount_in_cents, options = {})
+      def process_refund(kb_payment_id, amount_in_cents, options = {})
         raise OperationUnsupportedByGatewayError
       end
 
@@ -44,7 +44,7 @@ module Killbill
         raise OperationUnsupportedByGatewayError
       end
 
-      def get_payment_methods(kb_account_id, options = {})
+      def get_payment_methods(kb_account_id, refresh_from_gateway, options = {})
         raise OperationUnsupportedByGatewayError
       end
 

data/lib/killbill/plugin.rb

@@ -59,7 +59,9 @@ module Killbill
       end
 
       def logger=(logger)
-        @logger = Killbill::Plugin::Logger.new(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)
       end
 
       def logger

data/spec/killbill/base_plugin_spec.rb

@@ -29,6 +29,17 @@ describe Killbill::Plugin::PluginBase do
     lambda { plugin.blablabla }.should raise_error NoMethodError
   end
 
+  it 'should be able to default to the ruby logger for tests' do
+    logger = Logger.new(STDOUT)
+    logger.level = Logger::DEBUG
+
+    plugin = Killbill::Plugin::PluginBase.new
+    plugin.logger = logger
+    plugin.start_plugin
+
+    plugin.logger.level.should == logger.level
+  end
+
   it 'should be able to add custom code in the startup/shutdown sequence' do
     plugin = LifecycleNotificationPlugin.new
 

data/spec/killbill/jpayment_spec.rb

@@ -14,11 +14,11 @@ describe Killbill::Plugin::JPayment do
   end
 
   before(:each) do
-    @jpayment.real_payment.send(:clear_exception_on_next_calls)
+    @jpayment.delegate_plugin.send(:clear_exception_on_next_calls)
   end
 
   it "should_test_charge_ok" do
-    output = @jpayment.charge(@kb_payment_id, @kb_payment_method_id, @amount)
+    output = @jpayment.process_payment(@kb_payment_id, @kb_payment_method_id, @amount)
     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
@@ -26,8 +26,8 @@ describe Killbill::Plugin::JPayment do
   end
 
   it "should_test_charge_exception" do
-    @jpayment.real_payment.send(:raise_exception_on_next_calls)
-    lambda { @jpayment.charge(@kb_payment_id, @kb_payment_method_id, @amount) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
+    @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
   end
 
   it "should_test_get_payment_info_ok" do
@@ -39,21 +39,21 @@ describe Killbill::Plugin::JPayment do
   end
 
   it "should_test_get_payment_info_exception" do
-    @jpayment.real_payment.send(:raise_exception_on_next_calls)
+    @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
   end
 
   it "should_test_refund_ok" do
-    output = @jpayment.refund(@kb_payment_method_id, @amount)
+    output = @jpayment.process_refund(@kb_payment_method_id, @amount)
     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
+    output.get_status.should be_an_instance_of Java::com.ning.billing.payment.plugin.api.RefundInfoPlugin::RefundPluginStatus
     output.get_status.to_s.should == "PROCESSED"
   end
 
   it "should_test_refund_exception" do
-    @jpayment.real_payment.send(:raise_exception_on_next_calls)
-    lambda { @jpayment.refund(@kb_payment_method_id, @amount) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
+    @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
   end
 
   it "should_test_add_payment_method_ok" do
@@ -61,7 +61,7 @@ describe Killbill::Plugin::JPayment do
   end
 
   it "should_test_add_payment_method_exception" do
-    @jpayment.real_payment.send(:raise_exception_on_next_calls)
+    @jpayment.delegate_plugin.send(:raise_exception_on_next_calls)
     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
 
@@ -71,7 +71,7 @@ describe Killbill::Plugin::JPayment do
   end
 
   it "should_test_delete_payment_method_exception" do
-    @jpayment.real_payment.send(:raise_exception_on_next_calls)
+    @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
   end
 
@@ -82,7 +82,7 @@ describe Killbill::Plugin::JPayment do
   end
 
   it "should_test_get_payment_method_detail_exception" do
-    @jpayment.real_payment.send(:raise_exception_on_next_calls)
+    @jpayment.delegate_plugin.send(:raise_exception_on_next_calls)
     lambda { @jpayment.get_payment_method_detail(@kb_account_id, @kb_payment_method_id) }.should raise_error Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException
   end
 
@@ -91,7 +91,7 @@ describe Killbill::Plugin::JPayment do
   end
 
   it "should_test_set_default_payment_method_exception" do
-    @jpayment.real_payment.send(:raise_exception_on_next_calls)
+    @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
   end
 
@@ -104,9 +104,8 @@ 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.real_payment.send(:raise_exception_on_next_calls)
+    @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
 
@@ -115,7 +114,7 @@ describe Killbill::Plugin::JPayment do
   end
 
   it "should_test_reset_payment_methods_exception" do
-    @jpayment.real_payment.send(:raise_exception_on_next_calls)
+    @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
   end
 end

data/spec/killbill/jresponse/jrefund_response_spec.rb

@@ -29,7 +29,7 @@ describe Killbill::Plugin::JRefundResponse do
       output.get_effective_date.should be_an_instance_of org.joda.time.DateTime
       #output.get_effective_date.to_s.should == effective_date.to_s;
 
-      output.get_status.should be_an_instance_of Java::com.ning.billing.payment.plugin.api.PaymentInfoPlugin::PaymentPluginStatus
+      output.get_status.should be_an_instance_of Java::com.ning.billing.payment.plugin.api.RefundInfoPlugin::RefundPluginStatus
       output.get_status.to_s.should == "PROCESSED"
 
       output.get_gateway_error.should be_an_instance_of java.lang.String

data/spec/killbill/payment_plugin_spec.rb

@@ -20,15 +20,15 @@ describe Killbill::Plugin::Payment do
   end
 
   it "should raise exceptions for unsupported operations" do
-    lambda { @plugin.charge(@external_account_key, @killbill_payment_id, @amount_in_cents) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
-    lambda { @plugin.refund(@external_account_key, @killbill_payment_id, @amount_in_cents) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.process_payment(@external_account_key, @killbill_payment_id, @amount_in_cents) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.process_refund(@external_account_key, @killbill_payment_id, @amount_in_cents) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
     lambda { @plugin.get_payment_info(@killbill_payment_id) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
     lambda { @plugin.add_payment_method(@external_account_key, @payment_method, @payment_method_props, true ) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
     lambda { @plugin.delete_payment_method(@external_account_key, @external_payment_method_id) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
     lambda { @plugin.set_default_payment_method(@external_account_key, @payment_method) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
 
     lambda { @plugin.get_payment_method_detail(@external_account_key, @payment_method) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
-    lambda { @plugin.get_payment_methods(@external_account_key) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.get_payment_methods(@external_account_key, true) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
     lambda { @plugin.reset_payment_methods(@payment_methods) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
   end
 end

data/spec/killbill/payment_test.rb

@@ -11,7 +11,7 @@ module Killbill
       def get_name
       end
 
-      def charge(kb_payment_id, kb_payment_method_id, amount_in_cents, options = {})
+      def process_payment(kb_payment_id, kb_payment_method_id, amount_in_cents, options = {})
         if @raise_exception
           raise StandardError.new("Test exception")
         else
@@ -27,7 +27,7 @@ module Killbill
         end
       end
 
-      def refund(kb_payment_id, amount_in_cents, options = {})
+      def process_refund(kb_payment_id, amount_in_cents, options = {})
         if @raise_exception
           raise StandardError.new("Test exception")
         else

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'java'
 
 require 'bundler'
+require 'logger'
+
 require 'killbill'
 # JRuby specific, not required by default
 require 'killbill/http_servlet'

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 1.0.8
   prerelease:
+  version: 1.0.9
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
     none: false
@@ -31,13 +31,13 @@ dependencies:
   name: rack
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
     none: false
@@ -47,13 +47,13 @@ dependencies:
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
     none: false
@@ -63,13 +63,13 @@ dependencies:
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
     none: false
@@ -79,13 +79,13 @@ dependencies:
   name: sinatra
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.4
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.4
     none: false
@@ -97,8 +97,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Jarfile
 - README.md
@@ -144,25 +144,25 @@ licenses:
 - Apache License (2.0)
 post_install_message:
 rdoc_options:
-- --exclude
-- .
+- "--exclude"
+- "."
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       segments:
       - 0
+      hash: 2
       version: !binary |-
         MA==
-      hash: 2
   none: false
 requirements:
 - jar 'com.ning.billing:killbill-api'