killbill 4.0.0 → 4.1.0

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

@@ -0,0 +1,107 @@
+#############################################################################################
+#                                                                                           #
+#                   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 Model
+
+      java_package 'org.killbill.billing.routing.plugin.api'
+      class PriorPaymentRoutingResult
+
+        include org.killbill.billing.routing.plugin.api.PriorPaymentRoutingResult
+
+        attr_accessor :is_aborted, :adjusted_amount, :adjusted_currency, :adjusted_payment_method_id, :adjusted_plugin_properties
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for is_aborted [type = boolean]
+          @is_aborted = @is_aborted.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_aborted)
+
+          # conversion for adjusted_amount [type = java.math.BigDecimal]
+          if @adjusted_amount.nil?
+            @adjusted_amount = java.math.BigDecimal::ZERO
+          else
+            @adjusted_amount = java.math.BigDecimal.new(@adjusted_amount.to_s)
+          end
+
+          # conversion for adjusted_currency [type = org.killbill.billing.catalog.api.Currency]
+          @adjusted_currency = Java::org.killbill.billing.catalog.api.Currency.value_of( @adjusted_currency.to_s ) unless @adjusted_currency.nil?
+
+          # 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?
+
+          # 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
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for is_aborted [type = boolean]
+          @is_aborted = j_obj.is_aborted
+          if @is_aborted.nil?
+            @is_aborted = false
+          else
+            tmp_bool = (@is_aborted.java_kind_of? java.lang.Boolean) ? @is_aborted.boolean_value : @is_aborted
+            @is_aborted = tmp_bool ? true : false
+          end
+
+          # conversion for adjusted_amount [type = java.math.BigDecimal]
+          @adjusted_amount = j_obj.adjusted_amount
+          @adjusted_amount = @adjusted_amount.nil? ? 0 : BigDecimal.new(@adjusted_amount.to_s)
+
+          # conversion for adjusted_currency [type = org.killbill.billing.catalog.api.Currency]
+          @adjusted_currency = j_obj.adjusted_currency
+          @adjusted_currency = @adjusted_currency.to_s.to_sym unless @adjusted_currency.nil?
+
+          # 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
+
+      end
+    end
+  end
+end

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

@@ -32,6 +32,15 @@ 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/catalog_plugin_api'
+require 'killbill/gen/plugin-api/standalone_plugin_catalog'
+require 'killbill/gen/plugin-api/versioned_plugin_catalog'
 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/gen/plugin-api/standalone_plugin_catalog.rb

@@ -0,0 +1,174 @@
+#############################################################################################
+#                                                                                           #
+#                   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 Model
+
+      java_package 'org.killbill.billing.catalog.plugin.api'
+      class StandalonePluginCatalog
+
+        include org.killbill.billing.catalog.plugin.api.StandalonePluginCatalog
+
+        attr_accessor :effective_date, :currencies, :units, :products, :plans, :default_price_list, :children_price_list, :plan_rules
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for effective_date [type = org.joda.time.DateTime]
+          if !@effective_date.nil?
+            @effective_date =  (@effective_date.kind_of? Time) ? DateTime.parse(@effective_date.to_s) : @effective_date
+            @effective_date = Java::org.joda.time.DateTime.new(@effective_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
+          end
+
+          # conversion for currencies [type = java.lang.Iterable]
+          tmp = java.util.ArrayList.new
+          (@currencies || []).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
+          @currencies = tmp
+
+          # conversion for units [type = java.lang.Iterable]
+          tmp = java.util.ArrayList.new
+          (@units || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.Unit]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @units = tmp
+
+          # conversion for products [type = java.lang.Iterable]
+          tmp = java.util.ArrayList.new
+          (@products || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.Product]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @products = tmp
+
+          # conversion for plans [type = java.lang.Iterable]
+          tmp = java.util.ArrayList.new
+          (@plans || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.Plan]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @plans = tmp
+
+          # conversion for default_price_list [type = org.killbill.billing.catalog.api.PriceList]
+          @default_price_list = @default_price_list.to_java unless @default_price_list.nil?
+
+          # conversion for children_price_list [type = java.lang.Iterable]
+          tmp = java.util.ArrayList.new
+          (@children_price_list || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.PriceList]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @children_price_list = tmp
+
+          # conversion for plan_rules [type = org.killbill.billing.catalog.api.rules.PlanRules]
+          @plan_rules = @plan_rules.to_java unless @plan_rules.nil?
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for effective_date [type = org.joda.time.DateTime]
+          @effective_date = j_obj.effective_date
+          if !@effective_date.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(@effective_date)
+            @effective_date = DateTime.iso8601(str)
+          end
+
+          # conversion for currencies [type = java.lang.Iterable]
+          @currencies = j_obj.currencies
+          tmp = []
+          (@currencies.nil? ? [] : @currencies.iterator).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.Currency]
+            m = m.to_s.to_sym unless m.nil?
+            tmp << m
+          end
+          @currencies = tmp
+
+          # conversion for units [type = java.lang.Iterable]
+          @units = j_obj.units
+          tmp = []
+          (@units.nil? ? [] : @units.iterator).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.Unit]
+            m = Killbill::Plugin::Model::Unit.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @units = tmp
+
+          # conversion for products [type = java.lang.Iterable]
+          @products = j_obj.products
+          tmp = []
+          (@products.nil? ? [] : @products.iterator).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.Product]
+            m = Killbill::Plugin::Model::Product.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @products = tmp
+
+          # conversion for plans [type = java.lang.Iterable]
+          @plans = j_obj.plans
+          tmp = []
+          (@plans.nil? ? [] : @plans.iterator).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.Plan]
+            m = Killbill::Plugin::Model::Plan.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @plans = tmp
+
+          # conversion for default_price_list [type = org.killbill.billing.catalog.api.PriceList]
+          @default_price_list = j_obj.default_price_list
+          @default_price_list = Killbill::Plugin::Model::PriceList.new.to_ruby(@default_price_list) unless @default_price_list.nil?
+
+          # conversion for children_price_list [type = java.lang.Iterable]
+          @children_price_list = j_obj.children_price_list
+          tmp = []
+          (@children_price_list.nil? ? [] : @children_price_list.iterator).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.PriceList]
+            m = Killbill::Plugin::Model::PriceList.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @children_price_list = tmp
+
+          # conversion for plan_rules [type = org.killbill.billing.catalog.api.rules.PlanRules]
+          @plan_rules = j_obj.plan_rules
+          @plan_rules = Killbill::Plugin::Model::PlanRules.new.to_ruby(@plan_rules) unless @plan_rules.nil?
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,83 @@
+#############################################################################################
+#                                                                                           #
+#                   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 Model
+
+      java_package 'org.killbill.billing.catalog.plugin.api'
+      class VersionedPluginCatalog
+
+        include org.killbill.billing.catalog.plugin.api.VersionedPluginCatalog
+
+        attr_accessor :catalog_name, :recurring_billing_mode, :standalone_plugin_catalogs
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for catalog_name [type = java.lang.String]
+          @catalog_name = @catalog_name.to_s unless @catalog_name.nil?
+
+          # conversion for recurring_billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
+          @recurring_billing_mode = Java::org.killbill.billing.catalog.api.BillingMode.value_of( @recurring_billing_mode.to_s ) unless @recurring_billing_mode.nil?
+
+          # conversion for standalone_plugin_catalogs [type = java.lang.Iterable]
+          tmp = java.util.ArrayList.new
+          (@standalone_plugin_catalogs || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.plugin.api.StandalonePluginCatalog]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @standalone_plugin_catalogs = tmp
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for catalog_name [type = java.lang.String]
+          @catalog_name = j_obj.catalog_name
+
+          # conversion for recurring_billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
+          @recurring_billing_mode = j_obj.recurring_billing_mode
+          @recurring_billing_mode = @recurring_billing_mode.to_s.to_sym unless @recurring_billing_mode.nil?
+
+          # conversion for standalone_plugin_catalogs [type = java.lang.Iterable]
+          @standalone_plugin_catalogs = j_obj.standalone_plugin_catalogs
+          tmp = []
+          (@standalone_plugin_catalogs.nil? ? [] : @standalone_plugin_catalogs.iterator).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.plugin.api.StandalonePluginCatalog]
+            m = Killbill::Plugin::Model::StandalonePluginCatalog.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @standalone_plugin_catalogs = tmp
+          self
+        end
+
+      end
+    end
+  end
+end

data/lib/killbill/helpers/active_merchant.rb

@@ -3,12 +3,14 @@ module Killbill
     module ActiveMerchant
       require 'killbill'
 
-      require File.dirname(__FILE__) + '/properties_helper.rb'
-      require File.dirname(__FILE__) + '/active_merchant/active_record/active_record_helper.rb'
+      require 'killbill/helpers/properties_helper'
+      require 'killbill/helpers/active_merchant/active_record/active_record_helper.rb'
+
+      require 'active_support'
 
       require 'active_support/core_ext'
-      require File.dirname(__FILE__) + '/active_merchant/core_ext.rb'
-      require File.dirname(__FILE__) + '/active_merchant/configuration.rb'
+      require 'killbill/helpers/active_merchant/core_ext'
+      require 'killbill/helpers/active_merchant/configuration'
 
       Dir[File.dirname(__FILE__) + '/active_merchant/*.rb'].each do |f|
         # Get camelized class name

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

@@ -99,16 +99,28 @@ module Killbill
           end
 
           def to_transaction_info_plugin(transaction=nil)
+            error_details = {}
+
             if transaction.nil?
               amount_in_cents = nil
               currency        = nil
               created_date    = created_at
-              status          = :UNDEFINED # Likely pending
+              # See Killbill::Plugin::ActiveMerchant::Gateway
+              error_details   = JSON.parse(message) rescue {}
             else
               amount_in_cents = transaction.amount_in_cents
               currency        = transaction.currency
               created_date    = transaction.created_at
-              status          = success ? :PROCESSED : :ERROR
+            end
+
+            # See https://github.com/killbill/killbill-plugin-framework-ruby/issues/43
+            # Note: status could also be :PENDING, but it would be handled only in the plugins which need it
+            if !error_details['payment_plugin_status'].blank?
+              status = error_details['payment_plugin_status'].to_sym
+            else
+              # Note: (success && transaction.nil?) _could_ happen (see above), but it would be an issue on our side
+              # (the payment did go through in the gateway).
+              status = success ? :PROCESSED : :ERROR
             end
 
             t_info_plugin                             = Killbill::Plugin::Model::PaymentTransactionInfoPlugin.new
@@ -120,8 +132,8 @@ module Killbill
             t_info_plugin.created_date                = created_date
             t_info_plugin.effective_date              = effective_date
             t_info_plugin.status                      = status
-            t_info_plugin.gateway_error               = gateway_error
-            t_info_plugin.gateway_error_code          = gateway_error_code
+            t_info_plugin.gateway_error               = error_details['exception_message'] || gateway_error
+            t_info_plugin.gateway_error_code          = error_details['exception_class'] || gateway_error_code
             t_info_plugin.first_payment_reference_id  = first_reference_id
             t_info_plugin.second_payment_reference_id = second_reference_id
 

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

@@ -78,13 +78,18 @@ module Killbill
               if gateway_account_id.nil?
                 @@logger.warn "Skipping config #{gateway_config} -- missing :account_id"
               else
-                gateways_config[gateway_account_id.to_sym] = Gateway.wrap(gateway_builder, gateway_config)
+                gateways_config[gateway_account_id.to_sym] = Gateway.wrap(gateway_builder, gateway_config, @@logger)
                 default_gateway = gateways_config[gateway_account_id.to_sym] if idx == 0
               end
             end
             gateways_config[:default] = default_gateway if gateways_config[:default].nil?
           else
-            gateways_config[:default] = Gateway.wrap(@@gateway_builder, gateway_configs)
+            # We assume the configuration should never be nil (if you really do have a use-case, just specify a dummy config)
+            if gateway_configs.nil?
+              @@logger.warn "Unable to configure gateway #{@@gateway_name}, invalid configuration: #{config}"
+            else
+              gateways_config[:default] = Gateway.wrap(@@gateway_builder, gateway_configs, @@logger)
+            end
           end
           gateways_config
         end