killbill 3.2.3 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81fd77593c6707e51b7365481f0796b8df77cd6c
-  data.tar.gz: 78da91e758f7cc14cf63ebe0b5581220dd52545f
+  metadata.gz: 5d80b160cae829b2ae91a6b4f855c1c9ba32c245
+  data.tar.gz: 82d8f22ef535dc276de788d2cd1824855ea8d394
 SHA512:
-  metadata.gz: d36c0fd012d95ea600cc317a8b7c23e1355987989d66b564e5ce54dd8d75c457f4d3ef757787c2db5f0bd3179464865e9235e42abb53c455e6eb583d13e0c263
-  data.tar.gz: 5510fa30a9acc0cc9ca5fc6cd15b0aef3f22d7cad6d7ba4385007a1ff88c20633a55466fdcc9bae41fe40b8896636179fa7d9c106116be88524e5250a47461e0
+  metadata.gz: 657b255d6384163a553f11fbd08587c30e32f4c661d2b825ffa343d00cb9ef2cf032803a074c7462c6fb39ec75ce508eb4ae9d74fcbafb4a5de7eea9a94296e2
+  data.tar.gz: f03c8efa2fceb92d1f27eba7b9fca205549ec7e2b00b483e75288938d75c4ab1bb92533ddd5889e0f11fa2b7af83b47b4ac3bd0ca0d8c5e833efdcc8c4d2dbff

data/VERSION

@@ -1 +1 @@
-3.2.3
+3.2.4

data/killbill.gemspec

@@ -25,9 +25,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'sinatra', '~> 1.3.4'
   s.add_dependency 'typhoeus', '~> 0.6.9'
   s.add_dependency 'tzinfo', '~> 1.1.0'
-  s.add_dependency 'thread_safe', '~> 0.3.4'
 
   s.add_development_dependency 'activerecord', '~> 4.1.0'
+  s.add_development_dependency 'thread_safe', '~> 0.3.4'
   if defined?(JRUBY_VERSION)
     s.add_development_dependency 'activerecord-jdbcmysql-adapter', '~> 1.3.7'
     s.add_development_dependency 'activerecord-jdbcsqlite3-adapter', '~> 1.3.7'

data/lib/killbill/currency.rb

@@ -2,7 +2,7 @@ require 'killbill/plugin'
 
 module Killbill
   module Plugin
-    class Currency < PluginBase
+    class Currency < Notification
 
       class OperationUnsupportedError < NotImplementedError
       end
@@ -27,11 +27,6 @@ module Killbill
         raise OperationUnsupportedError
       end
 
-      # Override this method in your plugin to act upon received events
-      def on_event(event)
-        # No-op by default
-      end
-
 
     end
   end

data/lib/killbill/gen/plugin-api/currency_plugin_api.rb

@@ -25,12 +25,13 @@
 #
 
 
+require 'killbill/gen/plugin-api/notification_plugin_api'
 module Killbill
   module Plugin
     module Api
 
       java_package 'org.killbill.billing.currency.plugin.api'
-      class CurrencyPluginApi < JPlugin
+      class CurrencyPluginApi < NotificationPluginApi
 
         include org.killbill.billing.currency.plugin.api.CurrencyPluginApi
 

data/lib/killbill/gen/plugin-api/invoice_plugin_api.rb

@@ -25,12 +25,13 @@
 #
 
 
+require 'killbill/gen/plugin-api/notification_plugin_api'
 module Killbill
   module Plugin
     module Api
 
       java_package 'org.killbill.billing.invoice.plugin.api'
-      class InvoicePluginApi < JPlugin
+      class InvoicePluginApi < NotificationPluginApi
 
         include org.killbill.billing.invoice.plugin.api.InvoicePluginApi
 

data/lib/killbill/gen/plugin-api/payment_plugin_api.rb

@@ -25,12 +25,13 @@
 #
 
 
+require 'killbill/gen/plugin-api/notification_plugin_api'
 module Killbill
   module Plugin
     module Api
 
       java_package 'org.killbill.billing.payment.plugin.api'
-      class PaymentPluginApi < JPlugin
+      class PaymentPluginApi < NotificationPluginApi
 
         include org.killbill.billing.payment.plugin.api.PaymentPluginApi
 

data/lib/killbill/gen/plugin-api/require_gen.rb

@@ -28,13 +28,10 @@
 require 'killbill/gen/plugin-api/payment_method_info_plugin'
 require 'killbill/gen/plugin-api/payment_plugin_api'
 require 'killbill/gen/plugin-api/payment_plugin_api_exception'
-require 'killbill/gen/plugin-api/payment_plugin_with_events_api'
 require 'killbill/gen/plugin-api/ext_bus_event'
 require 'killbill/gen/plugin-api/notification_plugin_api'
 require 'killbill/gen/plugin-api/invoice_plugin_api'
-require 'killbill/gen/plugin-api/invoice_plugin_with_events_api'
 require 'killbill/gen/plugin-api/currency_plugin_api'
-require 'killbill/gen/plugin-api/currency_plugin_with_events_api'
 require 'killbill/gen/plugin-api/gateway_notification'
 require 'killbill/gen/plugin-api/hosted_payment_page_form_descriptor'
 require 'killbill/gen/plugin-api/payment_transaction_info_plugin'

data/lib/killbill/invoice.rb

@@ -3,17 +3,12 @@ require 'securerandom'
 
 module Killbill
   module Plugin
-    class Invoice < PluginBase
+    class Invoice < Notification
 
       def get_additional_invoice_items(invoice, properties, context)
         []
       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)

data/lib/killbill/payment.rb

@@ -2,7 +2,7 @@ require 'killbill/plugin'
 
 module Killbill
   module Plugin
-    class Payment < PluginBase
+    class Payment < Notification
 
       class OperationUnsupportedByGatewayError < NotImplementedError
       end
@@ -75,11 +75,6 @@ module Killbill
         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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.4
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -53,31 +53,31 @@ dependencies:
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: thread_safe
+  name: activerecord
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 4.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 4.1.0
   prerelease: false
-  type: :runtime
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: thread_safe
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 0.3.4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 0.3.4
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -425,17 +425,14 @@ 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

data/lib/killbill/gen/plugin-api/currency_plugin_with_events_api.rb

@@ -1,207 +0,0 @@
-#############################################################################################
-#                                                                                           #
-#                   Copyright 2010-2013 Ning, Inc.                                          #
-#                   Copyright 2014 Groupon, Inc.                                            #
-#                   Copyright 2014 The Billing Project, LLC                                 #
-#                                                                                           #
-#      The Billing Project licenses this file to you under the Apache License, version 2.0  #
-#      (the "License"); you may not use this file except in compliance with the             #
-#      License.  You may obtain a copy of the License at:                                   #
-#                                                                                           #
-#          http://www.apache.org/licenses/LICENSE-2.0                                       #
-#                                                                                           #
-#      Unless required by applicable law or agreed to in writing, software                  #
-#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT            #
-#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the            #
-#      License for the specific language governing permissions and limitations              #
-#      under the License.                                                                   #
-#                                                                                           #
-#############################################################################################
-
-
-#
-#                       DO NOT EDIT!!!
-#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
-#
-
-
-module Killbill
-  module Plugin
-    module Api
-
-      java_package 'org.killbill.billing.currency.plugin.api'
-      class CurrencyPluginWithEventsApi < JPlugin
-
-        include org.killbill.billing.currency.plugin.api.CurrencyPluginWithEventsApi
-
-        def initialize(real_class_name, services = {})
-          super(real_class_name, services)
-        end
-
-
-        java_signature 'Java::void onEvent(Java::org.killbill.billing.notification.plugin.api.ExtBusEvent)'
-        def on_event(killbillEvent)
-
-          # conversion for killbillEvent [type = org.killbill.billing.notification.plugin.api.ExtBusEvent]
-          killbillEvent = Killbill::Plugin::Model::ExtBusEvent.new.to_ruby(killbillEvent) unless killbillEvent.nil?
-          begin
-            @delegate_plugin.on_event(killbillEvent)
-          rescue Exception => e
-            message = "Failure in on_event: #{e}"
-            unless e.backtrace.nil?
-              message = "#{message}\n#{e.backtrace.join("\n")}"
-            end
-            logger.warn message
-            raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("on_event failure", e.message)
-          ensure
-            @delegate_plugin.after_request
-          end
-        end
-
-        java_signature 'Java::java.util.Set getBaseCurrencies()'
-        def get_base_currencies()
-        begin
-          res = @delegate_plugin.get_base_currencies()
-          # conversion for res [type = java.util.Set]
-          tmp = java.util.TreeSet.new
-          (res || []).each do |m|
-            # conversion for m [type = org.killbill.billing.catalog.api.Currency]
-            m = Java::org.killbill.billing.catalog.api.Currency.value_of("#{m.to_s}") unless m.nil?
-            tmp.add(m)
-          end
-          res = tmp
-          return res
-        rescue Exception => e
-          message = "Failure in get_base_currencies: #{e}"
-          unless e.backtrace.nil?
-            message = "#{message}\n#{e.backtrace.join("\n")}"
-          end
-          logger.warn message
-          raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("get_base_currencies failure", e.message)
-        ensure
-          @delegate_plugin.after_request
-        end
-      end
-
-      java_signature 'Java::org.joda.time.DateTime getLatestConversionDate(Java::org.killbill.billing.catalog.api.Currency)'
-      def get_latest_conversion_date(baseCurrency)
-
-        # conversion for baseCurrency [type = org.killbill.billing.catalog.api.Currency]
-        baseCurrency = baseCurrency.to_s.to_sym unless baseCurrency.nil?
-        begin
-          res = @delegate_plugin.get_latest_conversion_date(baseCurrency)
-          # conversion for res [type = org.joda.time.DateTime]
-          if !res.nil?
-            res =  (res.kind_of? Time) ? DateTime.parse(res.to_s) : res
-            res = Java::org.joda.time.DateTime.new(res.to_s, Java::org.joda.time.DateTimeZone::UTC)
-          end
-          return res
-        rescue Exception => e
-          message = "Failure in get_latest_conversion_date: #{e}"
-          unless e.backtrace.nil?
-            message = "#{message}\n#{e.backtrace.join("\n")}"
-          end
-          logger.warn message
-          raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("get_latest_conversion_date failure", e.message)
-        ensure
-          @delegate_plugin.after_request
-        end
-      end
-
-      java_signature 'Java::java.util.SortedSet getConversionDates(Java::org.killbill.billing.catalog.api.Currency)'
-      def get_conversion_dates(baseCurrency)
-
-        # conversion for baseCurrency [type = org.killbill.billing.catalog.api.Currency]
-        baseCurrency = baseCurrency.to_s.to_sym unless baseCurrency.nil?
-        begin
-          res = @delegate_plugin.get_conversion_dates(baseCurrency)
-          # conversion for res [type = java.util.SortedSet]
-          tmp = java.util.TreeSet.new
-          (res || []).each do |m|
-            # conversion for m [type = org.joda.time.DateTime]
-            if !m.nil?
-              m =  (m.kind_of? Time) ? DateTime.parse(m.to_s) : m
-              m = Java::org.joda.time.DateTime.new(m.to_s, Java::org.joda.time.DateTimeZone::UTC)
-            end
-            tmp.add(m)
-          end
-          res = tmp
-          return res
-        rescue Exception => e
-          message = "Failure in get_conversion_dates: #{e}"
-          unless e.backtrace.nil?
-            message = "#{message}\n#{e.backtrace.join("\n")}"
-          end
-          logger.warn message
-          raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("get_conversion_dates failure", e.message)
-        ensure
-          @delegate_plugin.after_request
-        end
-      end
-
-      java_signature 'Java::java.util.Set getCurrentRates(Java::org.killbill.billing.catalog.api.Currency)'
-      def get_current_rates(baseCurrency)
-
-        # conversion for baseCurrency [type = org.killbill.billing.catalog.api.Currency]
-        baseCurrency = baseCurrency.to_s.to_sym unless baseCurrency.nil?
-        begin
-          res = @delegate_plugin.get_current_rates(baseCurrency)
-          # conversion for res [type = java.util.Set]
-          tmp = java.util.TreeSet.new
-          (res || []).each do |m|
-            # conversion for m [type = org.killbill.billing.currency.api.Rate]
-            m = m.to_java unless m.nil?
-            tmp.add(m)
-          end
-          res = tmp
-          return res
-        rescue Exception => e
-          message = "Failure in get_current_rates: #{e}"
-          unless e.backtrace.nil?
-            message = "#{message}\n#{e.backtrace.join("\n")}"
-          end
-          logger.warn message
-          raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("get_current_rates failure", e.message)
-        ensure
-          @delegate_plugin.after_request
-        end
-      end
-
-      java_signature 'Java::java.util.Set getRates(Java::org.killbill.billing.catalog.api.Currency, Java::org.joda.time.DateTime)'
-      def get_rates(baseCurrency, conversionDate)
-
-        # conversion for baseCurrency [type = org.killbill.billing.catalog.api.Currency]
-        baseCurrency = baseCurrency.to_s.to_sym unless baseCurrency.nil?
-
-        # conversion for conversionDate [type = org.joda.time.DateTime]
-        if !conversionDate.nil?
-          fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
-          str = fmt.print(conversionDate)
-          conversionDate = DateTime.iso8601(str)
-        end
-        begin
-          res = @delegate_plugin.get_rates(baseCurrency, conversionDate)
-          # conversion for res [type = java.util.Set]
-          tmp = java.util.TreeSet.new
-          (res || []).each do |m|
-            # conversion for m [type = org.killbill.billing.currency.api.Rate]
-            m = m.to_java unless m.nil?
-            tmp.add(m)
-          end
-          res = tmp
-          return res
-        rescue Exception => e
-          message = "Failure in get_rates: #{e}"
-          unless e.backtrace.nil?
-            message = "#{message}\n#{e.backtrace.join("\n")}"
-          end
-          logger.warn message
-          raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("get_rates failure", e.message)
-        ensure
-          @delegate_plugin.after_request
-        end
-      end
-    end
-  end
-end
-end

data/lib/killbill/gen/plugin-api/invoice_plugin_with_events_api.rb

@@ -1,103 +0,0 @@
-#############################################################################################
-#                                                                                           #
-#                   Copyright 2010-2013 Ning, Inc.                                          #
-#                   Copyright 2014 Groupon, Inc.                                            #
-#                   Copyright 2014 The Billing Project, LLC                                 #
-#                                                                                           #
-#      The Billing Project licenses this file to you under the Apache License, version 2.0  #
-#      (the "License"); you may not use this file except in compliance with the             #
-#      License.  You may obtain a copy of the License at:                                   #
-#                                                                                           #
-#          http://www.apache.org/licenses/LICENSE-2.0                                       #
-#                                                                                           #
-#      Unless required by applicable law or agreed to in writing, software                  #
-#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT            #
-#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the            #
-#      License for the specific language governing permissions and limitations              #
-#      under the License.                                                                   #
-#                                                                                           #
-#############################################################################################
-
-
-#
-#                       DO NOT EDIT!!!
-#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
-#
-
-
-module Killbill
-  module Plugin
-    module Api
-
-      java_package 'org.killbill.billing.invoice.plugin.api'
-      class InvoicePluginWithEventsApi < JPlugin
-
-        include org.killbill.billing.invoice.plugin.api.InvoicePluginWithEventsApi
-
-        def initialize(real_class_name, services = {})
-          super(real_class_name, services)
-        end
-
-
-        java_signature 'Java::void onEvent(Java::org.killbill.billing.notification.plugin.api.ExtBusEvent)'
-        def on_event(killbillEvent)
-
-          # conversion for killbillEvent [type = org.killbill.billing.notification.plugin.api.ExtBusEvent]
-          killbillEvent = Killbill::Plugin::Model::ExtBusEvent.new.to_ruby(killbillEvent) unless killbillEvent.nil?
-          begin
-            @delegate_plugin.on_event(killbillEvent)
-          rescue Exception => e
-            message = "Failure in on_event: #{e}"
-            unless e.backtrace.nil?
-              message = "#{message}\n#{e.backtrace.join("\n")}"
-            end
-            logger.warn message
-            raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("on_event failure", e.message)
-          ensure
-            @delegate_plugin.after_request
-          end
-        end
-
-        java_signature 'Java::java.util.List getAdditionalInvoiceItems(Java::org.killbill.billing.invoice.api.Invoice, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def get_additional_invoice_items(invoice, properties, context)
-
-          # conversion for invoice [type = org.killbill.billing.invoice.api.Invoice]
-          invoice = Killbill::Plugin::Model::Invoice.new.to_ruby(invoice) unless invoice.nil?
-
-          # conversion for properties [type = java.lang.Iterable]
-          tmp = []
-          (properties.nil? ? [] : properties.iterator).each do |m|
-            # conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
-            m = Killbill::Plugin::Model::PluginProperty.new.to_ruby(m) unless m.nil?
-            tmp << m
-          end
-          properties = tmp
-
-          # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
-          context = Killbill::Plugin::Model::CallContext.new.to_ruby(context) unless context.nil?
-          begin
-            res = @delegate_plugin.get_additional_invoice_items(invoice, properties, context)
-            # conversion for res [type = java.util.List]
-            tmp = java.util.ArrayList.new
-            (res || []).each do |m|
-              # conversion for m [type = org.killbill.billing.invoice.api.InvoiceItem]
-              m = m.to_java unless m.nil?
-              tmp.add(m)
-            end
-            res = tmp
-            return res
-          rescue Exception => e
-            message = "Failure in get_additional_invoice_items: #{e}"
-            unless e.backtrace.nil?
-              message = "#{message}\n#{e.backtrace.join("\n")}"
-            end
-            logger.warn message
-            raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("get_additional_invoice_items failure", e.message)
-          ensure
-            @delegate_plugin.after_request
-          end
-        end
-      end
-    end
-  end
-end