killbill 3.2.2 → 3.2.3

data/lib/killbill/invoice.rb

@@ -9,6 +9,12 @@ module Killbill
         []
       end
 
+      # Override this method in your plugin to act upon received events
+      def on_event(event)
+        # No-op by default
+      end
+
+
       # Helper method to build a new item from an existing one
       def build_item(item_model, amount, description = nil, type = :EXTERNAL_CHARGE)
         item = Model::InvoiceItem.new

data/lib/killbill/payment.rb

@@ -74,6 +74,12 @@ module Killbill
       def process_notification(notification, properties, context)
         raise OperationUnsupportedByGatewayError
       end
+
+      # Override this method in your plugin to act upon received events
+      def on_event(event)
+        # No-op by default
+      end
+
     end
   end
 end

data/lib/killbill/plugin.rb

@@ -22,6 +22,7 @@ module Killbill
 
       # Extra services
       attr_accessor :root,
+                    :plugin_name,
                     :logger,
                     :conf_dir,
                     :kb_apis
@@ -45,7 +46,6 @@ module Killbill
       # Will be called by each thread before returning to Killbill
       def after_request
       end
-
     end
   end
 end

data/lib/killbill/rake_task.rb

@@ -220,7 +220,7 @@ module Killbill
     end
 
     def do_install_gem(path, name, version)
-      gem_installer                       = Gem::Installer.new(path,
+      gem_installer                       = Gem::Installer.new(path.to_s,
                                                                {
                                                                    :force       => true,
                                                                    :install_dir => @target_dir,

data/spec/killbill/helpers/configuration_spec.rb

@@ -5,6 +5,29 @@ describe Killbill::Plugin::ActiveMerchant do
   before(:all) do
     @logger       = Logger.new(STDOUT)
     @logger.level = Logger::INFO
+
+    @call_context           = Killbill::Plugin::Model::CallContext.new
+    @call_context.tenant_id = '00001011-a022-b033-0055-aa0000000066'
+    @call_context           = @call_context.to_ruby(@call_context)
+
+  end
+
+
+  it 'should support multi-tenancy configurations' do
+    do_initialize!(<<-eos)
+  :login: admin
+  :password: password
+  :test: true
+    eos
+
+    do_common_checks
+
+    gw = ::Killbill::Plugin::ActiveMerchant.gateways(@call_context.tenant_id)
+    gw.size.should == 1
+    gw[:default][:login].should == 'admin2'
+    gw[:default][:password].should == 'password2'
+
+    ::Killbill::Plugin::ActiveMerchant.config_key_name.should == :KEY
   end
 
   it 'should support a configuration for a single gateway' do
@@ -105,11 +128,24 @@ describe Killbill::Plugin::ActiveMerchant do
       eos
       file.close
 
-      ::Killbill::Plugin::ActiveMerchant.initialize! Proc.new { |config| config },
-                                                     :test,
-                                                     @logger,
-                                                     file.path,
-                                                     ::Killbill::Plugin::KillbillApi.new('test', {})
+      per_tenant_config =<<-oes
+:test:
+  :login: admin2
+  :password: password2
+:database:
+  :adapter: 'sqlite3'
+  :database: 'test.db'
+      oes
+
+      @tenant_api = ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaTenantUserApi.new({@call_context.tenant_id => per_tenant_config})
+    svcs = {:tenant_user_api => @tenant_api}
+
+     ::Killbill::Plugin::ActiveMerchant.initialize! Proc.new { |config| config },
+                                                   :test,
+                                                   @logger,
+                                                   :KEY,
+                                                   file.path,
+                                                   ::Killbill::Plugin::KillbillApi.new('test', svcs)
     end
   end
 end

data/spec/killbill/helpers/payment_plugin_spec.rb

@@ -28,10 +28,13 @@ describe Killbill::Plugin::ActiveMerchant::PaymentPlugin do
                                                                                    ::Killbill::Test::TestTransaction,
                                                                                    ::Killbill::Test::TestResponse)
       @payment_api         = ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaPaymentApi.new
-      @plugin.kb_apis      = ::Killbill::Plugin::KillbillApi.new('test', {:payment_api => @payment_api})
+      @tenant_api = ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaTenantUserApi.new({})
+
+      @plugin.kb_apis      = ::Killbill::Plugin::KillbillApi.new('test', {:payment_api => @payment_api, :tenant_user_api => @tenant_api})
       @plugin.logger       = Logger.new(STDOUT)
       @plugin.logger.level = Logger::INFO
       @plugin.conf_dir     = File.dirname(file)
+      @plugin.root         = File.dirname(file)
 
       # Start the plugin here - since the config file will be deleted
       @plugin.start_plugin

data/spec/killbill/helpers/private_payment_plugin_spec.rb

@@ -72,10 +72,12 @@ Pay!
                                                                               ::Killbill::Test::TestTransaction,
                                                                               ::Killbill::Test::TestResponse)
       payment_api     = ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaPaymentApi.new
-      plugin.kb_apis  = ::Killbill::Plugin::KillbillApi.new('test', {:payment_api => payment_api})
+      tenant_api = ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaTenantUserApi.new({})
+
+      plugin.kb_apis  = ::Killbill::Plugin::KillbillApi.new('test', {:payment_api => payment_api, :tenant_user_api => tenant_api})
       plugin.logger   = Logger.new(STDOUT)
       plugin.conf_dir = File.dirname(file)
-
+      plugin.root     = File.dirname(file)
       # Start the plugin here - since the config file will be deleted
       plugin.start_plugin
     end

data/spec/killbill/helpers/utils_spec.rb

@@ -41,11 +41,11 @@ describe Killbill::Plugin::ActiveMerchant::Utils do
 
     runs            = 2
     cache_size      = 50
-    nb_threads      = 200
+    nb_threads      = (ENV['NB_THREADS'] || 200).to_i
     keys_per_thread = 1000
 
     cache = nil
-    bm    = Benchmark.bm do |x|
+    Benchmark.bm do |x|
       runs.times do |n|
         x.report("run ##{n}:") do
           cache = ::Killbill::Plugin::ActiveMerchant::Utils::BoundedLRUCache.new(Proc.new { |value| -1 }, cache_size)
@@ -66,14 +66,14 @@ describe Killbill::Plugin::ActiveMerchant::Utils do
       end
     end
 
-    last_keys   = cache.keys_to_a
-    last_values = cache.values_to_a
+    last_keys   = cache.keys
+    last_values = cache.values
     0.upto(cache_size - 1) do |i|
       # No overlap with test keys or values above
       cache[-1 * i - 1] = -2
 
-      new_keys   = cache.keys_to_a
-      new_values = cache.values_to_a
+      new_keys   = cache.keys
+      new_values = cache.values
 
       # Verify the changes we made
       0.upto(i) do |j|

data/spec/killbill/invoice_plugin_api_spec.rb

@@ -4,7 +4,7 @@ describe Killbill::Plugin::Api::InvoicePluginApi do
 
   before(:all) do
     logger            = ::Logger.new(STDOUT)
-    @invoicePluginApi = Killbill::Plugin::Api::InvoicePluginApi.new('Killbill::Plugin::InvoiceTest', {'logger' => logger})
+    @invoicePluginApi = Killbill::Plugin::Api::InvoicePluginApi.new('Killbill::Plugin::InvoiceTest', {'logger' => logger, "root" => "/a/b/plugin_name/1.2.3"})
   end
 
   it 'should add items' do

data/spec/killbill/notification_plugin_api_spec.rb

@@ -5,7 +5,7 @@ describe Killbill::Plugin::Api::NotificationPluginApi do
 
   before(:all) do
     logger = ::Logger.new(STDOUT)
-    @notificationPluginApi =  Killbill::Plugin::Api::NotificationPluginApi.new("Killbill::Plugin::NotificationTest", { "logger" => logger })
+    @notificationPluginApi =  Killbill::Plugin::Api::NotificationPluginApi.new("Killbill::Plugin::NotificationTest", { "logger" => logger, "root" => "/a/b/plugin_name/1.2.3" })
   end
 
 

data/spec/killbill/payment_plugin_api_spec.rb

@@ -6,7 +6,7 @@ describe Killbill::Plugin::Api::PaymentPluginApi do
   before(:all) do
     @call_context          = Killbill::Plugin::Model::CallContext.new
     logger                 = ::Logger.new(STDOUT)
-    @paymentPluginApi      = Killbill::Plugin::Api::PaymentPluginApi.new("Killbill::Plugin::PaymentTest", {"logger" => logger})
+    @paymentPluginApi      = Killbill::Plugin::Api::PaymentPluginApi.new("Killbill::Plugin::PaymentTest", {"logger" => logger, "root" => "/a/b/plugin_name/1.2.3"})
     @kb_account_id         = java.util.UUID.fromString("aa5c926e-3d9d-4435-b44b-719d7b583256")
     @kb_payment_id         = java.util.UUID.fromString("bf5c926e-3d9c-470e-b34b-719d7b58323a")
     @kb_payment_method_id  = java.util.UUID.fromString("bf5c926e-3d9c-470e-b34b-719d7b58323a")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -52,6 +52,20 @@ dependencies:
         version: 1.1.0
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: thread_safe
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.4
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: activerecord
   version_requirements: !ruby/object:Gem::Requirement
@@ -411,14 +425,17 @@ files:
 - lib/killbill/gen/api/usage_record.rb
 - lib/killbill/gen/api/usage_user_api.rb
 - lib/killbill/gen/plugin-api/currency_plugin_api.rb
+- lib/killbill/gen/plugin-api/currency_plugin_with_events_api.rb
 - lib/killbill/gen/plugin-api/ext_bus_event.rb
 - lib/killbill/gen/plugin-api/gateway_notification.rb
 - lib/killbill/gen/plugin-api/hosted_payment_page_form_descriptor.rb
 - lib/killbill/gen/plugin-api/invoice_plugin_api.rb
+- lib/killbill/gen/plugin-api/invoice_plugin_with_events_api.rb
 - lib/killbill/gen/plugin-api/notification_plugin_api.rb
 - lib/killbill/gen/plugin-api/payment_method_info_plugin.rb
 - lib/killbill/gen/plugin-api/payment_plugin_api.rb
 - lib/killbill/gen/plugin-api/payment_plugin_api_exception.rb
+- lib/killbill/gen/plugin-api/payment_plugin_with_events_api.rb
 - lib/killbill/gen/plugin-api/payment_transaction_info_plugin.rb
 - lib/killbill/gen/plugin-api/require_gen.rb
 - lib/killbill/helpers/active_merchant.rb
@@ -439,7 +456,6 @@ files:
 - lib/killbill/helpers/active_merchant/utils.rb
 - lib/killbill/http_servlet.rb
 - lib/killbill/invoice.rb
-- lib/killbill/jnotification.rb
 - lib/killbill/jplugin.rb
 - lib/killbill/killbill_api.rb
 - lib/killbill/killbill_logger.rb

data/lib/killbill/jnotification.rb

@@ -1,31 +0,0 @@
-require 'java'
-
-require 'singleton'
-
-require 'killbill/creator'
-require 'killbill/plugin'
-
-include Java
-
-module Killbill
-  module Plugin
-
-    java_package 'org.killbill.billing.notification.plugin.api'
-    class JNotification < JPlugin
-
-      include org.killbill.billing.notification.plugin.api.NotificationPluginApi
-
-      def initialize(real_class_name, services = {})
-        super(real_class_name, services)
-      end
-
-      java_signature 'void onEvent(Java::org.killbill.billing.notification.plugin.api.ExtBusEvent)'
-      def on_event(*args)
-         do_call_handle_exception(__method__, *args) do |res|
-            return nil
-          end
-      end
-
-    end
-  end
-end