killbill 4.4.0 → 5.0.0

data/lib/killbill/gen/plugin-api/{prior_payment_routing_result.rb → prior_payment_control_result.rb}

@@ -29,17 +29,26 @@ module Killbill
   module Plugin
     module Model
 
-      java_package 'org.killbill.billing.routing.plugin.api'
-      class PriorPaymentRoutingResult
+      java_package 'org.killbill.billing.control.plugin.api'
+      class PriorPaymentControlResult
 
-        include org.killbill.billing.routing.plugin.api.PriorPaymentRoutingResult
+        include org.killbill.billing.control.plugin.api.PriorPaymentControlResult
 
-        attr_accessor :is_aborted, :adjusted_amount, :adjusted_currency, :adjusted_payment_method_id, :adjusted_plugin_properties
+        attr_accessor :adjusted_plugin_properties, :is_aborted, :adjusted_amount, :adjusted_currency, :adjusted_payment_method_id
 
         def initialize()
         end
 
         def to_java()
+          # conversion for adjusted_plugin_properties [type = java.lang.Iterable]
+          tmp = java.util.ArrayList.new
+          (@adjusted_plugin_properties || []).each do |m|
+            # conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @adjusted_plugin_properties = tmp
+
           # conversion for is_aborted [type = boolean]
           @is_aborted = @is_aborted.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_aborted)
 
@@ -55,19 +64,20 @@ module Killbill
 
           # conversion for adjusted_payment_method_id [type = java.util.UUID]
           @adjusted_payment_method_id = java.util.UUID.fromString(@adjusted_payment_method_id.to_s) unless @adjusted_payment_method_id.nil?
+          self
+        end
 
+        def to_ruby(j_obj)
           # conversion for adjusted_plugin_properties [type = java.lang.Iterable]
-          tmp = java.util.ArrayList.new
-          (@adjusted_plugin_properties || []).each do |m|
+          @adjusted_plugin_properties = j_obj.adjusted_plugin_properties
+          tmp = []
+          (@adjusted_plugin_properties.nil? ? [] : @adjusted_plugin_properties.iterator).each do |m|
             # conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
-            m = m.to_java unless m.nil?
-            tmp.add(m)
+            m = Killbill::Plugin::Model::PluginProperty.new.to_ruby(m) unless m.nil?
+            tmp << m
           end
           @adjusted_plugin_properties = tmp
-          self
-        end
 
-        def to_ruby(j_obj)
           # conversion for is_aborted [type = boolean]
           @is_aborted = j_obj.is_aborted
           if @is_aborted.nil?
@@ -88,16 +98,6 @@ module Killbill
           # conversion for adjusted_payment_method_id [type = java.util.UUID]
           @adjusted_payment_method_id = j_obj.adjusted_payment_method_id
           @adjusted_payment_method_id = @adjusted_payment_method_id.nil? ? nil : @adjusted_payment_method_id.to_s
-
-          # conversion for adjusted_plugin_properties [type = java.lang.Iterable]
-          @adjusted_plugin_properties = j_obj.adjusted_plugin_properties
-          tmp = []
-          (@adjusted_plugin_properties.nil? ? [] : @adjusted_plugin_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
-          @adjusted_plugin_properties = tmp
           self
         end
 

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

@@ -32,15 +32,22 @@ 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/currency_plugin_api'
-require 'killbill/gen/plugin-api/on_failure_payment_routing_result'
-require 'killbill/gen/plugin-api/on_success_payment_routing_result'
-require 'killbill/gen/plugin-api/payment_routing_api_exception'
-require 'killbill/gen/plugin-api/payment_routing_context'
-require 'killbill/gen/plugin-api/payment_routing_plugin_api'
-require 'killbill/gen/plugin-api/prior_payment_routing_result'
+require 'killbill/gen/plugin-api/control_result'
+require 'killbill/gen/plugin-api/on_failure_payment_control_result'
+require 'killbill/gen/plugin-api/on_success_payment_control_result'
+require 'killbill/gen/plugin-api/payment_control_api_exception'
+require 'killbill/gen/plugin-api/payment_control_context'
+require 'killbill/gen/plugin-api/payment_control_plugin_api'
+require 'killbill/gen/plugin-api/prior_payment_control_result'
 require 'killbill/gen/plugin-api/catalog_plugin_api'
 require 'killbill/gen/plugin-api/standalone_plugin_catalog'
 require 'killbill/gen/plugin-api/versioned_plugin_catalog'
+require 'killbill/gen/plugin-api/entitlement_context'
+require 'killbill/gen/plugin-api/entitlement_plugin_api'
+require 'killbill/gen/plugin-api/entitlement_plugin_api_exception'
+require 'killbill/gen/plugin-api/on_failure_entitlement_result'
+require 'killbill/gen/plugin-api/on_success_entitlement_result'
+require 'killbill/gen/plugin-api/prior_entitlement_result'
 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/helpers/active_merchant/active_record/models/payment_method.rb

@@ -45,14 +45,14 @@ module Killbill
 
           def self.from_kb_account_id(kb_account_id, kb_tenant_id)
             if kb_tenant_id.nil?
-              where("kb_account_id = #{@@quotes_cache[kb_account_id]} AND kb_tenant_id is NULL AND is_deleted = #{@@quotes_cache[false]}")
+              where("kb_account_id = #{@@quotes_cache[kb_account_id]} AND kb_tenant_id is NULL AND is_deleted = #{@@quotes_cache[false]}").order(:id)
             else
-              where("kb_account_id = #{@@quotes_cache[kb_account_id]} AND kb_tenant_id = #{@@quotes_cache[kb_tenant_id]} AND is_deleted = #{@@quotes_cache[false]}")
+              where("kb_account_id = #{@@quotes_cache[kb_account_id]} AND kb_tenant_id = #{@@quotes_cache[kb_tenant_id]} AND is_deleted = #{@@quotes_cache[false]}").order(:id)
             end
           end
 
           def self.from_kb_account_id_and_token(token, kb_account_id, kb_tenant_id)
-            from_kb_account_id(kb_account_id, kb_tenant_id).where("token = #{@@quotes_cache[token]}")
+            from_kb_account_id(kb_account_id, kb_tenant_id).where("token = #{@@quotes_cache[token]}").order(:id)
           end
 
           def self.from_kb_payment_method_id(kb_payment_method_id, kb_tenant_id)
@@ -103,16 +103,15 @@ module Killbill
 
             if kb_tenant_id.nil?
               query = t.where(search_where_clause(t, search_key))
-              .order(t[:id])
             else
               query = t.where(search_where_clause(t, search_key).and(t[:kb_tenant_id].eq(kb_tenant_id)))
-              .order(t[:id])
             end
 
             if offset.blank? and limit.blank?
               # true is for count distinct
               query.project(t[:id].count(true))
             else
+              query.order(t[:id])
               query.skip(offset) unless offset.blank?
               query.take(limit) unless limit.blank?
               query.project(t[Arel.star])

data/lib/killbill/helpers/active_merchant/active_record/models/response.rb

@@ -176,16 +176,15 @@ module Killbill
 
             if kb_tenant_id.nil?
               query = t.where(search_where_clause(t, search_key))
-              .order(t[:id])
             else
               query = t.where(search_where_clause(t, search_key).and(t[:kb_tenant_id].eq(kb_tenant_id)))
-              .order(t[:id])
             end
 
             if offset.blank? and limit.blank?
               # true is for count distinct
               query.project(t[:id].count(true))
             else
+              query.order(t[:id])
               query.skip(offset) unless offset.blank?
               query.take(limit) unless limit.blank?
               query.project(t[Arel.star])
@@ -239,6 +238,20 @@ module Killbill
             nil
           end
 
+          # authorization was the old name (reserved on PostgreSQL) - make sure we support both column names for backward compatibility
+
+          def authorization=(auth)
+            write_attribute(column_for_attribute('authorization').name, auth)
+          end
+
+          def authorization
+            read_attribute(column_for_attribute('authorization').name)
+          end
+
+          def column_for_attribute(name)
+            name == 'authorization' ? (super('authorisation') || super('authorization')) : super(name)
+          end
+
           private
 
           def create_plugin_property(key, value)

data/lib/killbill/helpers/active_merchant/configuration.rb

@@ -122,7 +122,7 @@ module Killbill
             @@glob_config = {}
           end
 
-          @@logger.log_level = Logger::DEBUG if (@@glob_config[:logger] || {})[:debug]
+          @@logger.level = Logger::DEBUG if (@@glob_config[:logger] || {})[:debug]
 
           @@glob_currency_conversions = @@glob_config[:currency_conversions]
 

data/lib/killbill/helpers/active_merchant/payment_plugin.rb

@@ -146,7 +146,7 @@ module Killbill
 
         def search_payments(search_key, offset = 0, limit = 100, properties, context)
           options = properties_to_hash(properties)
-          @response_model.search(search_key, context.tenant_id, offset, limit, :payment)
+          @response_model.search(search_key, context.tenant_id, offset, limit)
         end
 
         def add_payment_method(kb_account_id, kb_payment_method_id, payment_method_props, set_default, properties, context)

data/lib/killbill/killbill_logger.rb

@@ -30,6 +30,8 @@ module Killbill
         @logger.log(1, build_message(message, &block)) if error?
       end
 
+      alias_method :level=, :log_level=
+
       # Rack Error stream
       alias_method :puts, :warn
       alias_method :write, :warn

data/lib/killbill/payment_control.rb

@@ -2,20 +2,20 @@ require 'killbill/plugin'
 
 module Killbill
   module Plugin
-    class PaymentRoutingPluginApi < Notification
+    class PaymentControlPluginApi < Notification
 
       class OperationUnsupportedByGatewayError < NotImplementedError
       end
 
-      def prior_call(routing_context, properties)
+      def prior_call(control_context, properties)
         raise OperationUnsupportedByGatewayError
       end
 
-      def on_success_call(routing_context, properties)
+      def on_success_call(control_context, properties)
         raise OperationUnsupportedByGatewayError
       end
 
-      def on_failure_call(routing_context, properties)
+      def on_failure_call(control_context, properties)
         raise OperationUnsupportedByGatewayError
       end
     end

data/lib/killbill/version.rb

@@ -1,3 +1,3 @@
 module Killbill
-  VERSION = '4.4.0'
+  VERSION = '5.0.0'
 end

data/spec/killbill/helpers/payment_method_spec.rb

@@ -182,7 +182,7 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod do
 
   it 'should generate the right SQL query' do
     # Check count query (search query numeric)
-    expected_query = "SELECT COUNT(DISTINCT #{q('test_payment_methods')}.#{q('id')}) FROM #{q('test_payment_methods')}  WHERE ((((((((((((((#{q('test_payment_methods')}.#{q('kb_account_id')} = '1234' OR #{q('test_payment_methods')}.#{q('kb_payment_method_id')} = '1234') OR #{q('test_payment_methods')}.#{q('token')} = '1234') OR #{q('test_payment_methods')}.#{q('cc_type')} = '1234') OR #{q('test_payment_methods')}.#{q('state')} = '1234') OR #{q('test_payment_methods')}.#{q('zip')} = '1234') OR #{q('test_payment_methods')}.#{q('cc_first_name')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('cc_last_name')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('address1')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('address2')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('city')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('country')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('cc_exp_month')} = '1234') OR #{q('test_payment_methods')}.#{q('cc_exp_year')} = '1234') OR #{q('test_payment_methods')}.#{q('cc_last_4')} = '1234') AND #{q('test_payment_methods')}.#{q('kb_tenant_id')} = '11-22-33'  ORDER BY #{q('test_payment_methods')}.#{q('id')}"
+    expected_query = "SELECT COUNT(DISTINCT #{q('test_payment_methods')}.#{q('id')}) FROM #{q('test_payment_methods')}  WHERE ((((((((((((((#{q('test_payment_methods')}.#{q('kb_account_id')} = '1234' OR #{q('test_payment_methods')}.#{q('kb_payment_method_id')} = '1234') OR #{q('test_payment_methods')}.#{q('token')} = '1234') OR #{q('test_payment_methods')}.#{q('cc_type')} = '1234') OR #{q('test_payment_methods')}.#{q('state')} = '1234') OR #{q('test_payment_methods')}.#{q('zip')} = '1234') OR #{q('test_payment_methods')}.#{q('cc_first_name')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('cc_last_name')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('address1')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('address2')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('city')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('country')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('cc_exp_month')} = '1234') OR #{q('test_payment_methods')}.#{q('cc_exp_year')} = '1234') OR #{q('test_payment_methods')}.#{q('cc_last_4')} = '1234') AND #{q('test_payment_methods')}.#{q('kb_tenant_id')} = '11-22-33'"
     # Note that Kill Bill will pass a String, even for numeric types
     ::Killbill::Test::TestPaymentMethod.search_query('1234', '11-22-33').to_sql.should == expected_query
 
@@ -192,7 +192,7 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod do
     ::Killbill::Test::TestPaymentMethod.search_query('1234', '11-22-33', 0, 10).to_sql.should == expected_query
 
     # Check count query (search query string)
-    expected_query = "SELECT COUNT(DISTINCT #{q('test_payment_methods')}.#{q('id')}) FROM #{q('test_payment_methods')}  WHERE (((((((((((#{q('test_payment_methods')}.#{q('kb_account_id')} = 'XXX' OR #{q('test_payment_methods')}.#{q('kb_payment_method_id')} = 'XXX') OR #{q('test_payment_methods')}.#{q('token')} = 'XXX') OR #{q('test_payment_methods')}.#{q('cc_type')} = 'XXX') OR #{q('test_payment_methods')}.#{q('state')} = 'XXX') OR #{q('test_payment_methods')}.#{q('zip')} = 'XXX') OR #{q('test_payment_methods')}.#{q('cc_first_name')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('cc_last_name')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('address1')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('address2')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('city')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('country')} LIKE '%XXX%') AND #{q('test_payment_methods')}.#{q('kb_tenant_id')} = '11-22-33'  ORDER BY #{q('test_payment_methods')}.#{q('id')}"
+    expected_query = "SELECT COUNT(DISTINCT #{q('test_payment_methods')}.#{q('id')}) FROM #{q('test_payment_methods')}  WHERE (((((((((((#{q('test_payment_methods')}.#{q('kb_account_id')} = 'XXX' OR #{q('test_payment_methods')}.#{q('kb_payment_method_id')} = 'XXX') OR #{q('test_payment_methods')}.#{q('token')} = 'XXX') OR #{q('test_payment_methods')}.#{q('cc_type')} = 'XXX') OR #{q('test_payment_methods')}.#{q('state')} = 'XXX') OR #{q('test_payment_methods')}.#{q('zip')} = 'XXX') OR #{q('test_payment_methods')}.#{q('cc_first_name')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('cc_last_name')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('address1')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('address2')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('city')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('country')} LIKE '%XXX%') AND #{q('test_payment_methods')}.#{q('kb_tenant_id')} = '11-22-33'"
     ::Killbill::Test::TestPaymentMethod.search_query('XXX', '11-22-33').to_sql.should == expected_query
 
     # Check query with results (search query string)

data/spec/killbill/helpers/payment_plugin_spec.rb

@@ -308,6 +308,17 @@ describe Killbill::Plugin::ActiveMerchant::PaymentPlugin do
       source.first_name.should == 'John'
       source.last_name.should == 'Doe'
     end
+
+    it "should support search_payments" do
+      response = ::Killbill::Test::TestResponse.create(
+        :api_call => :purchase, :kb_payment_id => @kb_payment_id,
+        :kb_account_id => @kb_account_id, :kb_tenant_id => @call_context.tenant_id,
+        :success => true, :created_at => Time.now, :updated_at => Time.now
+      )
+      results = plugin.search_payments(@kb_payment_id, 0, 100, [], @call_context).iterator.to_a
+      results.count.should == 1
+      results.last.kb_payment_id.to_s.should == response.kb_payment_id
+    end
   end
 
   context 'with a dummy gateway' do

data/spec/killbill/helpers/response_spec.rb

@@ -137,7 +137,7 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::Response do
 
   it 'should generate the right SQL query' do
     # Check count query (search query numeric)
-    expected_query = "SELECT COUNT(DISTINCT #{q('test_responses')}.#{q('id')}) FROM #{q('test_responses')}  WHERE ((((#{q('test_responses')}.#{q('kb_payment_id')} = '1234' OR #{q('test_responses')}.#{q('kb_payment_transaction_id')} = '1234') OR #{q('test_responses')}.#{q('message')} = '1234') OR #{q('test_responses')}.#{q('authorization')} = '1234') OR #{q('test_responses')}.#{q('fraud_review')} = '1234') AND #{q('test_responses')}.#{q('success')} = #{qtrue} AND #{q('test_responses')}.#{q('kb_tenant_id')} = '11-22-33'  ORDER BY #{q('test_responses')}.#{q('id')}"
+    expected_query = "SELECT COUNT(DISTINCT #{q('test_responses')}.#{q('id')}) FROM #{q('test_responses')}  WHERE ((((#{q('test_responses')}.#{q('kb_payment_id')} = '1234' OR #{q('test_responses')}.#{q('kb_payment_transaction_id')} = '1234') OR #{q('test_responses')}.#{q('message')} = '1234') OR #{q('test_responses')}.#{q('authorization')} = '1234') OR #{q('test_responses')}.#{q('fraud_review')} = '1234') AND #{q('test_responses')}.#{q('success')} = #{qtrue} AND #{q('test_responses')}.#{q('kb_tenant_id')} = '11-22-33'"
     # Note that Kill Bill will pass a String, even for numeric types
     ::Killbill::Test::TestResponse.search_query('1234', '11-22-33').to_sql.should == expected_query
 
@@ -147,7 +147,7 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::Response do
     ::Killbill::Test::TestResponse.search_query('1234', '11-22-33', 0, 10).to_sql.should == expected_query
 
     # Check count query (search query string)
-    expected_query = "SELECT COUNT(DISTINCT #{q('test_responses')}.#{q('id')}) FROM #{q('test_responses')}  WHERE ((((#{q('test_responses')}.#{q('kb_payment_id')} = 'XXX' OR #{q('test_responses')}.#{q('kb_payment_transaction_id')} = 'XXX') OR #{q('test_responses')}.#{q('message')} = 'XXX') OR #{q('test_responses')}.#{q('authorization')} = 'XXX') OR #{q('test_responses')}.#{q('fraud_review')} = 'XXX') AND #{q('test_responses')}.#{q('success')} = #{qtrue} AND #{q('test_responses')}.#{q('kb_tenant_id')} = '11-22-33'  ORDER BY #{q('test_responses')}.#{q('id')}"
+    expected_query = "SELECT COUNT(DISTINCT #{q('test_responses')}.#{q('id')}) FROM #{q('test_responses')}  WHERE ((((#{q('test_responses')}.#{q('kb_payment_id')} = 'XXX' OR #{q('test_responses')}.#{q('kb_payment_transaction_id')} = 'XXX') OR #{q('test_responses')}.#{q('message')} = 'XXX') OR #{q('test_responses')}.#{q('authorization')} = 'XXX') OR #{q('test_responses')}.#{q('fraud_review')} = 'XXX') AND #{q('test_responses')}.#{q('success')} = #{qtrue} AND #{q('test_responses')}.#{q('kb_tenant_id')} = '11-22-33'"
     ::Killbill::Test::TestResponse.search_query('XXX', '11-22-33').to_sql.should == expected_query
 
     # Check query with results (search query string)

data/spec/killbill/killbill_logger_spec.rb

@@ -8,6 +8,8 @@ describe Killbill::Plugin::KillbillLogger do
     logger.error "Argument #{@foo} mismatch."
     logger.info('initialize') { 'Initializing...' }
     logger.add(Logger::FATAL) { 'Fatal error!' }
+    logger.level = ::Logger::DEBUG
+    logger.log_level.should == ::Logger::DEBUG
     logger.close
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -343,6 +343,7 @@ files:
 - lib/killbill/catalog.rb
 - lib/killbill/creator.rb
 - lib/killbill/currency.rb
+- lib/killbill/entitlement.rb
 - lib/killbill/ext/active_merchant/typhoeus_connection.rb
 - lib/killbill/gen/api/account.rb
 - lib/killbill/gen/api/account_api_exception.rb
@@ -468,22 +469,29 @@ files:
 - lib/killbill/gen/api/usage_record.rb
 - lib/killbill/gen/api/usage_user_api.rb
 - lib/killbill/gen/plugin-api/catalog_plugin_api.rb
+- lib/killbill/gen/plugin-api/control_result.rb
 - lib/killbill/gen/plugin-api/currency_plugin_api.rb
+- lib/killbill/gen/plugin-api/entitlement_context.rb
+- lib/killbill/gen/plugin-api/entitlement_plugin_api.rb
+- lib/killbill/gen/plugin-api/entitlement_plugin_api_exception.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/notification_plugin_api.rb
-- lib/killbill/gen/plugin-api/on_failure_payment_routing_result.rb
-- lib/killbill/gen/plugin-api/on_success_payment_routing_result.rb
+- lib/killbill/gen/plugin-api/on_failure_entitlement_result.rb
+- lib/killbill/gen/plugin-api/on_failure_payment_control_result.rb
+- lib/killbill/gen/plugin-api/on_success_entitlement_result.rb
+- lib/killbill/gen/plugin-api/on_success_payment_control_result.rb
+- lib/killbill/gen/plugin-api/payment_control_api_exception.rb
+- lib/killbill/gen/plugin-api/payment_control_context.rb
+- lib/killbill/gen/plugin-api/payment_control_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_routing_api_exception.rb
-- lib/killbill/gen/plugin-api/payment_routing_context.rb
-- lib/killbill/gen/plugin-api/payment_routing_plugin_api.rb
 - lib/killbill/gen/plugin-api/payment_transaction_info_plugin.rb
-- lib/killbill/gen/plugin-api/prior_payment_routing_result.rb
+- lib/killbill/gen/plugin-api/prior_entitlement_result.rb
+- lib/killbill/gen/plugin-api/prior_payment_control_result.rb
 - lib/killbill/gen/plugin-api/require_gen.rb
 - lib/killbill/gen/plugin-api/standalone_plugin_catalog.rb
 - lib/killbill/gen/plugin-api/versioned_plugin_catalog.rb
@@ -573,7 +581,7 @@ requirements:
 - jar 'org.kill-bill.billing:killbill-api'
 - jar 'org.kill-bill.billing:killbill-util:tests'
 rubyforge_project:
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Framework to write Kill Bill plugins in Ruby.