killbill 1.0.13 → 1.0.14

data/Jarfile

@@ -1,3 +1,3 @@
-jar 'com.ning.billing:killbill-api', '0.1.61'
-jar 'com.ning.billing:killbill-util:tests', '0.1.61'
+jar 'com.ning.billing:killbill-api', '0.1.76-SNAPSHOT'
+jar 'com.ning.billing:killbill-util:tests', '0.1.76-SNAPSHOT'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/VERSION

@@ -1 +1 @@
-1.0.13
+1.0.14

data/lib/killbill/jnotification.rb

@@ -0,0 +1,35 @@
+require 'java'
+
+require 'singleton'
+
+require 'killbill/creator'
+require 'killbill/plugin'
+require 'killbill/jresponse/jpayment_response'
+require 'killbill/jresponse/jrefund_response'
+require 'killbill/jresponse/jpayment_method_response'
+require 'killbill/jresponse/jpayment_method_response_internal'
+
+include Java
+
+module Killbill
+  module Plugin
+
+    java_package 'com.ning.billing.notification.plugin.api'
+    class JNotification < JPlugin
+
+      include 'com.ning.billing.notification.plugin.api.NotificationPluginApi'
+
+      def initialize(real_class_name, services = {})
+        super(real_class_name, services)
+      end
+
+      java_signature 'void onEvent(Java::com.ning.billing.beatrix.bus.api.ExtBusEvent killbillEvent)'
+      def on_event(killbill_event)
+         do_call_handle_exception(__method__, *args) do |res|
+            return nil
+          end
+      end
+
+    end
+  end
+end

data/lib/killbill/jpayment.rb

@@ -111,71 +111,6 @@ module Killbill
         end
       end
 
-      private
-
-      def do_call_handle_exception(method_name, *args)
-        begin
-          rargs = convert_args(method_name, args)
-          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)
-        ensure
-          @delegate_plugin.after_request
-        end
-      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
-
-
-      def convert_args(api, args)
-        args.collect! do |a|
-         if a.nil?
-           nil
-         elsif a.java_kind_of? java.util.UUID
-           JConverter.from_uuid(a)
-         elsif a.java_kind_of? java.math.BigDecimal
-           JConverter.from_big_decimal(a)
-         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))
-           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
-             first_element = a.get(0)
-             if first_element.java_kind_of? Java::com.ning.billing.payment.plugin.api.PaymentMethodInfoPlugin
-               a.each do |el|
-                 result << JConverter.from_payment_method_info_plugin(el)
-               end
-             else
-               raise Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException.new("#{api} failure", "Unexpected parameter type #{first_element.class} for list")
-             end
-           end
-           result
-         else
-           # 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
-        # Remove last argument if this is null (it means we passed a context)
-        args.delete_at(-1) if args[-1].nil?
-        args
-      end
-
     end
   end
 end

data/lib/killbill/jplugin.rb

@@ -50,6 +50,73 @@ module Killbill
         require 'logger'
         @delegate_plugin.nil? ? ::Logger.new(STDOUT) : @delegate_plugin.logger
       end
+
+      protected
+
+      def do_call_handle_exception(method_name, *args)
+         begin
+           rargs = convert_args(method_name, args)
+           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)
+         ensure
+           @delegate_plugin.after_request
+         end
+       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
+
+       def convert_args(api, args)
+          args.collect! do |a|
+           if a.nil?
+             nil
+           elsif a.java_kind_of? java.util.UUID
+             JConverter.from_uuid(a)
+           elsif a.java_kind_of? java.math.BigDecimal
+             JConverter.from_big_decimal(a)
+           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::com.ning.billing.beatrix.bus.api.ExtBusEvent
+             JConverter.from_ext_bus_event(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
+               first_element = a.get(0)
+               if first_element.java_kind_of? Java::com.ning.billing.payment.plugin.api.PaymentMethodInfoPlugin
+                 a.each do |el|
+                   result << JConverter.from_payment_method_info_plugin(el)
+                 end
+               else
+                 raise Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException.new("#{api} failure", "Unexpected parameter type #{first_element.class} for list")
+               end
+             end
+             result
+           else
+             # 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
+          # Remove last argument if this is null (it means we passed a context)
+          args.delete_at(-1) if args[-1].nil?
+          args
+        end
+
     end
   end
 end

data/lib/killbill/jresponse/jconverter.rb

@@ -115,6 +115,11 @@ module Killbill
         def from_payment_method_info_plugin(payment_method_info_plugin)
          JPaymentMethodResponseInternal.to_payment_method_response_internal(payment_method_info_plugin)
         end
+
+        def from_ext_bus_event(ext_bus)
+          JEvent.to_event(ext_bus)
+        end
+
       end
     end
   end

data/lib/killbill/jresponse/jevent.rb

@@ -0,0 +1,56 @@
+module Killbill
+  module Plugin
+
+    java_package'com.ning.billing.beatrix.bus.api'
+    class JEvent
+
+      include Java::com.ning.billing.beatrix.bus.api.ExtBusEvent
+
+      attr_reader :event_type, :object_type, :object_id, :account_id, :tenant_id
+
+      def initialize(event_type, object_type, object_id, account_id, tenant_id)
+        @event_type = event_type
+        @object_type = object_type
+        @object_id = object_id
+        @account_id = account_id
+        @tenant_id = tenant_id
+      end
+
+      java_signature 'Java::com.ning.billing.beatrix.bus.api.ExtBusEventType getEventType()'
+      def get_event_type
+        @event_type
+      end
+
+      java_signature 'Java::com.ning.billing.ObjectType getObjectType()'
+      def get_object_type
+        @object_type
+      end
+
+      java_signature 'java.lang.UUID getObjectId()'
+      def get_object_id
+        @object_id
+      end
+
+      java_signature 'java.lang.UUID getAccountId()'
+      def get_account_id
+        @account_id
+      end
+
+      java_signature 'java.lang.UUID getTenantId()'
+      def get_tenant_id
+        @tenant_id
+      end
+
+      class << self
+        def to_event(jevent)
+          event_type = jevent.get_event_type.to_s
+          object_type = jevent.get_object_type.to_s
+          object_id = JConverter.from_uuid(jevent.get_object_id)
+          account_id = JConverter.from_uuid(jevent.get_account_id)
+          tenant_id = JConverter.from_uuid(jevent.get_tenant_id)
+          Event.new(event_type, object_type, object_id, account_id, tenant_id)
+        end
+      end
+    end
+  end
+end

data/lib/killbill/jresponse/jpayment_method_response.rb

@@ -98,18 +98,18 @@ module Killbill
         get_value_string(PaymentMethodResponse::PROP_CC_TYPE)
       end
 
-      java_signature 'java.lang.String getCCExprirationMonth()'
+      java_signature 'java.lang.String getCCExpirationMonth()'
       def get_cc_expiration_month
         get_value_string(PaymentMethodResponse::PROP_CC_EXP_MONTH)
       end
 
-      java_signature 'java.lang.String getCCExprirationYear()'
+      java_signature 'java.lang.String getCCExpirationYear()'
       def get_cc_expiration_year
         get_value_string(PaymentMethodResponse::PROP_CC_EXP_YEAR)
       end
 
       java_signature 'java.lang.String getCCLast4()'
-      def get_cc_last_4
+      def get_cc_last4
         get_value_string(PaymentMethodResponse::PROP_CC_LAST_4)
       end
 

data/lib/killbill/notification.rb

@@ -6,7 +6,7 @@ module Killbill
 
       # Override this method in your plugin to act upon received events
       def on_event(event)
-        # no-op
+        # No-op by default
       end
 
     end

data/lib/killbill/payment.rb

@@ -24,6 +24,10 @@ module Killbill
         raise OperationUnsupportedByGatewayError
       end
 
+      def get_refund_info(kb_account_id, kb_payment_id, options = {})
+        raise OperationUnsupportedByGatewayError
+      end
+
       def add_payment_method(kb_account_id, kb_payment_method_id, payment_method_props, set_default, options = {})
         raise OperationUnsupportedByGatewayError
       end

data/lib/killbill/plugin.rb

@@ -42,11 +42,11 @@ module Killbill
                   :tag_user_api
       # Extra services
       attr_accessor :root,
-                    :logger
+                    :logger,
+                    :conf_dir
 
       # Called by the Killbill lifecycle when instantiating the plugin
       def initialize(services = {})
-
         @active = false
 
         services.each do |service_name, service_instance|

data/lib/killbill/response/event.rb

@@ -0,0 +1,18 @@
+
+module Killbill
+  module Plugin
+    class Event
+
+      attr_reader :event_type, :object_type, :object_id, :account_id, :tenant_id
+
+      def initialize(event_type, object_type, object_id, account_id, tenant_id)
+        @event_type = event_type
+        @object_type = object_type
+        @object_id = object_id
+        @account_id = account_id
+        @tenant_id = tenant_id
+      end
+
+    end
+  end
+end

data/spec/killbill/jresponse/jconverter_spec.rb

@@ -6,10 +6,12 @@ require 'killbill/response/payment_method_response_internal'
 require 'killbill/response/payment_status'
 require 'killbill/response/payment_response'
 require 'killbill/response/refund_response'
+require 'killbill/response/event'
 
 require 'killbill/jresponse/jconverter'
 require 'killbill/jresponse/jpayment_method_response'
 require 'killbill/jresponse/jpayment_method_response_internal'
+require 'killbill/jresponse/jevent'
 
 describe Killbill::Plugin::JConverter do
 
@@ -203,6 +205,33 @@ describe Killbill::Plugin::JConverter do
 
       output.external_payment_method_id.should be_an_instance_of String
       output.external_payment_method_id.should == payment_method_info.external_payment_method_id
-
      end
+
+     it "should_test_ext_bus_event__from_converter" do
+
+       object_type = Java::com.ning.billing.ObjectType::INVOICE
+       event_type = Java::com.ning.billing.beatrix.bus.api.ExtBusEventType::INVOICE_CREATION
+       uuid = java.util.UUID.random_uuid
+
+       input = Killbill::Plugin::JEvent.new(event_type, object_type, uuid, uuid, uuid)
+       output = Killbill::Plugin::JConverter.from_ext_bus_event(input)
+
+       output.should be_an_instance_of Killbill::Plugin::Event
+
+       output.event_type.should be_an_instance_of String
+       output.event_type.should == 'INVOICE_CREATION'
+
+       output.object_type.should be_an_instance_of String
+       output.object_type.should == 'INVOICE'
+
+       output.object_id.should be_an_instance_of String
+       output.object_id.should == Killbill::Plugin::JConverter.from_uuid(uuid)
+
+       output.account_id.should be_an_instance_of String
+       output.account_id.should == Killbill::Plugin::JConverter.from_uuid(uuid)
+
+       output.tenant_id.should be_an_instance_of String
+       output.tenant_id.should == Killbill::Plugin::JConverter.from_uuid(uuid)
+
+      end
 end

data/spec/killbill/payment_plugin_spec.rb

@@ -24,6 +24,7 @@ describe Killbill::Plugin::Payment do
     lambda { @plugin.process_payment(@kb_account_id, @kb_payment_id, @kb_payment_method_id, @amount_in_cents, @currency) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
     lambda { @plugin.process_refund(@kb_account_id, @kb_payment_id, @amount_in_cents, @currency) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
     lambda { @plugin.get_payment_info(@kb_account_id, @kb_payment_id) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.get_refund_info(@kb_account_id, @kb_payment_id) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
     lambda { @plugin.add_payment_method(@kb_account_id, @payment_method, @payment_method_props, true ) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
     lambda { @plugin.delete_payment_method(@kb_account_id, @kb_payment_method_id) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
     lambda { @plugin.set_default_payment_method(@kb_account_id, @payment_method) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
+  version: 1.0.14
   prerelease:
-  version: 1.0.13
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbundler
@@ -108,9 +108,11 @@ files:
 - lib/killbill.rb
 - lib/killbill/creator.rb
 - lib/killbill/http_servlet.rb
+- lib/killbill/jnotification.rb
 - lib/killbill/jpayment.rb
 - lib/killbill/jplugin.rb
 - lib/killbill/jresponse/jconverter.rb
+- lib/killbill/jresponse/jevent.rb
 - lib/killbill/jresponse/jpayment_method_response.rb
 - lib/killbill/jresponse/jpayment_method_response_internal.rb
 - lib/killbill/jresponse/jpayment_response.rb
@@ -120,6 +122,7 @@ files:
 - lib/killbill/payment.rb
 - lib/killbill/plugin.rb
 - lib/killbill/rake_task.rb
+- lib/killbill/response/event.rb
 - lib/killbill/response/payment_method_response.rb
 - lib/killbill/response/payment_method_response_internal.rb
 - lib/killbill/response/payment_response.rb
@@ -160,9 +163,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 2
       version: !binary |-
         MA==
+      hash: 2
   none: false
 requirements: []
 rubyforge_project: