killbill 1.0.2 → 1.0.3

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/killbill.rb

@@ -1,45 +1,47 @@
 begin
   require 'java'
-rescue LoadError => e
-  warn 'You need JRuby to run Killbill plugins'
-  raise e
-end
 
-KILLBILL_APIS = %w(
-  com.ning.billing.account.api.AccountUserApi
-  com.ning.billing.analytics.api.sanity.AnalyticsSanityApi
-  com.ning.billing.analytics.api.user.AnalyticsUserApi
-  com.ning.billing.catalog.api.CatalogUserApi
-  com.ning.billing.entitlement.api.migration.EntitlementMigrationApi
-  com.ning.billing.entitlement.api.timeline.EntitlementTimelineApi
-  com.ning.billing.entitlement.api.transfer.EntitlementTransferApi
-  com.ning.billing.entitlement.api.user.EntitlementUserApi
-  com.ning.billing.invoice.api.InvoiceMigrationApi
-  com.ning.billing.invoice.api.InvoicePaymentApi
-  com.ning.billing.invoice.api.InvoiceUserApi
-  com.ning.billing.overdue.OverdueUserApi
-  com.ning.billing.payment.api.PaymentApi
-  com.ning.billing.tenant.api.TenantUserApi
-  com.ning.billing.usage.api.UsageUserApi
-  com.ning.billing.util.api.AuditUserApi
-  com.ning.billing.util.api.CustomFieldUserApi
-  com.ning.billing.util.api.ExportUserApi
-  com.ning.billing.util.api.TagUserApi
-)
+  KILLBILL_APIS = %w(
+    com.ning.billing.account.api.AccountUserApi
+    com.ning.billing.analytics.api.sanity.AnalyticsSanityApi
+    com.ning.billing.analytics.api.user.AnalyticsUserApi
+    com.ning.billing.catalog.api.CatalogUserApi
+    com.ning.billing.entitlement.api.migration.EntitlementMigrationApi
+    com.ning.billing.entitlement.api.timeline.EntitlementTimelineApi
+    com.ning.billing.entitlement.api.transfer.EntitlementTransferApi
+    com.ning.billing.entitlement.api.user.EntitlementUserApi
+    com.ning.billing.invoice.api.InvoiceMigrationApi
+    com.ning.billing.invoice.api.InvoicePaymentApi
+    com.ning.billing.invoice.api.InvoiceUserApi
+    com.ning.billing.overdue.OverdueUserApi
+    com.ning.billing.payment.api.PaymentApi
+    com.ning.billing.tenant.api.TenantUserApi
+    com.ning.billing.usage.api.UsageUserApi
+    com.ning.billing.util.api.AuditUserApi
+    com.ning.billing.util.api.CustomFieldUserApi
+    com.ning.billing.util.api.ExportUserApi
+    com.ning.billing.util.api.TagUserApi
+  )
 
-begin
-  KILLBILL_APIS.each { |api| java_import api }
-rescue NameError
-  # killbill-api should be provided by the JRuby OSGI bundle. We default to using JBundler for development purposes only
   begin
-    require 'jbundler'
     KILLBILL_APIS.each { |api| java_import api }
-    warn 'Using JBundler to load killbill-api (see .jbundler/classpath.rb). This should only happen in development mode!'
-  rescue LoadError => e
-    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\')'
+  rescue NameError
+    # killbill-api should be provided by the JRuby OSGI bundle. We default to using JBundler for development purposes only
+    begin
+      require 'jbundler'
+      KILLBILL_APIS.each { |api| java_import api }
+      warn 'Using JBundler to load killbill-api (see .jbundler/classpath.rb). This should only happen in development mode!'
+    rescue LoadError => e
+      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
+
+rescue LoadError => e
+  warn 'You need JRuby to run Killbill plugins'
+  #raise e
 end
 
+
 require 'killbill/http_servlet'
 require 'killbill/notification'
 require 'killbill/payment'

data/lib/killbill/creator.rb

@@ -0,0 +1,28 @@
+
+module Killbill
+  module Plugin
+    class Creator
+
+      attr_reader :target_class_name
+
+      def initialize(target_class_name)
+        @target_class_name = target_class_name
+      end
+
+      def create(*args)
+         real_class = class_from_string
+          args.nil? ? real_class.new : real_class.new(*args)
+      end
+
+      private
+
+      def class_from_string()
+        @target_class_name.split('::').inject(Kernel) do |mod, class_name|
+          mod.const_get(class_name)
+        end
+      end
+
+    end
+  end
+end
+

data/lib/killbill/jpayment.rb

@@ -1,5 +1,6 @@
 require 'singleton'
 
+require 'killbill/creator'
 require 'killbill/plugin'
 require 'killbill/jresponse/jpayment_response'
 require 'killbill/jresponse/jrefund_response'
@@ -18,8 +19,7 @@ module Killbill
       attr_reader :real_payment
 
       def initialize(real_class_name, services = {})
-        real_payment_class = class_from_string(real_class_name)
-        @real_payment = real_payment_class.new(services)
+        @real_payment = Creator.new(real_class_name).create(services)
       end
 
       # TODO STEPH decide what to do the getName()
@@ -110,11 +110,6 @@ module Killbill
         raise Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException.new("#{api} failure", e.message)
       end
 
-      def class_from_string(str)
-        str.split('::').inject(Kernel) do |mod, class_name|
-          mod.const_get(class_name)
-        end
-      end
 
       def convert_args(api, args)
         args.collect! do |a|

data/lib/killbill/jplugin.rb

@@ -0,0 +1,45 @@
+require 'killbill/http_servlet'
+require 'killbill/logger'
+
+module Killbill
+  # There are various types of plugins one can write for Killbill:
+  #
+  #   1)  notifications plugins, which listen to external bus events and can react to it
+  #   2)  payment plugins, which are used to issue payments against a payment gateway
+  module Plugin
+    class JPlugin
+
+      attr_reader :delegate_plugin
+
+      # Called by the Killbill lifecycle when initializing the plugin
+      def start_plugin
+        @delegate_plugin.start_plugin
+      end
+
+      # Called by the Killbill lifecycle when stopping the plugin
+      def stop_plugin
+        @delegate_plugin.stop_plugin
+      end
+
+      # Called by the Killbill lifecycle when instantiating the plugin
+      def initialize(plugin_class_name, services = {})
+        @delegate_plugin = Creator.new(plugin_class_name).create(services)
+      end
+
+      # Called by the Killbill lifecycle to register the servlet
+      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}"
+          instance = Killbill::Plugin::RackHandler.instance
+          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}"
+          nil
+        end
+      end
+
+    end
+  end
+end

data/lib/killbill/plugin.rb

@@ -1,4 +1,3 @@
-require 'killbill/http_servlet'
 require 'killbill/logger'
 
 module Killbill
@@ -47,6 +46,7 @@ module Killbill
 
       # Called by the Killbill lifecycle when instantiating the plugin
       def initialize(services = {})
+
         @active = false
 
         services.each do |service_name, service_instance|
@@ -62,18 +62,8 @@ module Killbill
         @logger = Killbill::Plugin::Logger.new(logger)
       end
 
-      # Called by the Killbill lifecycle to register the servlet
-      def rack_handler
-        config_ru = Pathname.new("#{@root}/config.ru").expand_path
-        if config_ru.file?
-          @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
-        else
-          @logger.info "No Rack configuration file found at #{config_ru.to_s}"
-          nil
-        end
+      def logger
+        @logger ||= Logger.new(STDOUT)
       end
 
       class APINotAvailableError < NotImplementedError

data/lib/killbill/response/payment_method_response.rb

@@ -26,6 +26,12 @@ module Killbill
          @properties = properties
        end
 
+       def value(key)
+         (@properties || []).each do |prop|
+           return prop.value if prop.key == key
+         end
+         nil
+       end
     end
   end
-end
+end

metadata

@@ -2,14 +2,14 @@
 name: killbill
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbundler
@@ -106,8 +106,10 @@ files:
 - VERSION
 - killbill.gemspec
 - lib/killbill.rb
+- lib/killbill/creator.rb
 - lib/killbill/http_servlet.rb
 - lib/killbill/jpayment.rb
+- lib/killbill/jplugin.rb
 - lib/killbill/jresponse/jconverter.rb
 - lib/killbill/jresponse/jpayment_method_response.rb
 - lib/killbill/jresponse/jpayment_method_response_internal.rb