killbill 1.0.14 → 1.0.15

data/VERSION

@@ -1 +1 @@
-1.0.14
+1.0.15

data/lib/killbill.rb

@@ -36,12 +36,12 @@ begin
       warn 'Unable to load killbill-api. For development purposes, use JBundler (create the following Jarfile: http://git.io/eobYXA and run: `bundle install && jbundle install\')'
     end
   end
-
   # jbundler needs to be loaded first!
   require 'killbill/jplugin'
   require 'killbill/jpayment'
+  require 'killbill/jnotification'
 rescue LoadError => e
-  warn 'You need JRuby to run Killbill plugins'
+  warn "You need JRuby to run Killbill plugins #{e}"
 end
 
 require 'killbill/notification'

data/lib/killbill/jnotification.rb

@@ -4,10 +4,7 @@ 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'
+require 'killbill/jresponse/jevent'
 
 include Java
 
@@ -17,14 +14,14 @@ module Killbill
     java_package 'com.ning.billing.notification.plugin.api'
     class JNotification < JPlugin
 
-      include 'com.ning.billing.notification.plugin.api.NotificationPluginApi'
+      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)
+      java_signature 'void onEvent(Java::com.ning.billing.beatrix.bus.api.ExtBusEvent)'
+      def on_event(*args)
          do_call_handle_exception(__method__, *args) do |res|
             return nil
           end

data/lib/killbill/jplugin.rb

@@ -1,8 +1,12 @@
+require 'java'
+
 require 'pathname'
 
 require 'killbill/http_servlet'
 require 'killbill/creator'
 
+include Java
+
 module Killbill
   # There are various types of plugins one can write for Killbill:
   #
@@ -75,7 +79,7 @@ module Killbill
        end
 
        def convert_args(api, args)
-          args.collect! do |a|
+         args.collect! do |a|
            if a.nil?
              nil
            elsif a.java_kind_of? java.util.UUID
@@ -111,11 +115,11 @@ module Killbill
              #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
+        # 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

data/lib/killbill/jresponse/jevent.rb

@@ -1,7 +1,9 @@
+require 'killbill/jresponse/jconverter'
+
 module Killbill
   module Plugin
 
-    java_package'com.ning.billing.beatrix.bus.api'
+    java_package 'com.ning.billing.beatrix.bus.api'
     class JEvent
 
       include Java::com.ning.billing.beatrix.bus.api.ExtBusEvent

data/lib/killbill/notification.rb

@@ -1,4 +1,5 @@
 require 'killbill/plugin'
+require 'killbill/response/event'
 
 module Killbill
   module Plugin

data/spec/killbill/jnotification_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+require 'killbill/jnotification'
+
+describe Killbill::Plugin::JNotification do
+
+  before(:all) do
+    @jnotification =  Killbill::Plugin::JNotification.new("Killbill::Plugin::NotificationTest")
+  end
+
+
+  it "should_test_on_event_ok" 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
+
+    event = Java::com.ning.billing.mock.api.MockExtBusEvent.new(event_type, object_type, uuid, uuid, uuid)
+    @jnotification.on_event(event)
+    @jnotification.on_event(event)
+    @jnotification.on_event(event)
+    @jnotification.delegate_plugin.counter.should == 3
+  end
+end

data/spec/killbill/jresponse/jevent_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'date'
+
+require 'killbill/response/event'
+require 'killbill/jresponse/jevent'
+
+
+describe Killbill::Plugin::JEvent do
+
+    it "should_test_jevent" 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)
+      #input.should be_an_instance_of Java::com.ning.billing.beatrix.bus.api.ExtBusEvent
+    end
+end

data/spec/killbill/notification_test.rb

@@ -0,0 +1,19 @@
+require 'killbill/notification'
+
+module Killbill
+  module Plugin
+    class NotificationTest < Notification
+
+      attr_reader :counter
+
+      def initialize(*args)
+        @counter = 0
+      end
+
+      def on_event(event)
+        @counter += 1
+      end
+
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'killbill'
 require 'killbill/http_servlet'
 
 require 'killbill/payment_test'
+require 'killbill/notification_test'
 
 
 %w(

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 1.0.14
   prerelease:
+  version: 1.0.15
 platform: ruby
 authors:
 - Killbill core team
@@ -130,14 +130,17 @@ files:
 - lib/killbill/response/refund_response.rb
 - spec/killbill/base_plugin_spec.rb
 - spec/killbill/config_test.ru
+- spec/killbill/jnotification_spec.rb
 - spec/killbill/jpayment_spec.rb
 - spec/killbill/jresponse/jconverter_spec.rb
+- spec/killbill/jresponse/jevent_spec.rb
 - spec/killbill/jresponse/jpayment_method_response_internal_spec.rb
 - spec/killbill/jresponse/jpayment_method_response_spec.rb
 - spec/killbill/jresponse/jpayment_response_spec.rb
 - spec/killbill/jresponse/jrefund_response_spec.rb
 - spec/killbill/killbill_integration_spec.rb
 - spec/killbill/notification_plugin_spec.rb
+- spec/killbill/notification_test.rb
 - spec/killbill/payment_plugin_spec.rb
 - spec/killbill/payment_test.rb
 - spec/killbill/rack_handler_spec.rb
@@ -163,9 +166,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:
@@ -176,14 +179,17 @@ summary: Framework to write Killbill plugins in Ruby.
 test_files:
 - spec/killbill/base_plugin_spec.rb
 - spec/killbill/config_test.ru
+- spec/killbill/jnotification_spec.rb
 - spec/killbill/jpayment_spec.rb
 - spec/killbill/jresponse/jconverter_spec.rb
+- spec/killbill/jresponse/jevent_spec.rb
 - spec/killbill/jresponse/jpayment_method_response_internal_spec.rb
 - spec/killbill/jresponse/jpayment_method_response_spec.rb
 - spec/killbill/jresponse/jpayment_response_spec.rb
 - spec/killbill/jresponse/jrefund_response_spec.rb
 - spec/killbill/killbill_integration_spec.rb
 - spec/killbill/notification_plugin_spec.rb
+- spec/killbill/notification_test.rb
 - spec/killbill/payment_plugin_spec.rb
 - spec/killbill/payment_test.rb
 - spec/killbill/rack_handler_spec.rb