killbill 3.1.7 → 3.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 840154880668dbe44506afa06448cca00b735211
-  data.tar.gz: ab55ade3ab7c798f73dd41ae6ea5416ccee13b54
+  metadata.gz: 1564801f1c0cf35922d6784c77c6bad9a0e16cb0
+  data.tar.gz: f3f0d953fb91af7b5bf848ed44bad0d12f485c0b
 SHA512:
-  metadata.gz: 4a45e5751639706d0796ef92704f9ef92b3ee7ac14ff8e292254560d5b7e4bcb2bf59c0ff019948af8962c3b8810b82f168113d4d514f6746551238c2ae24bd9
-  data.tar.gz: ce45e19db6c7fa36e955fd250c36cbae052f0d4b86761d10974928e03596b98058a045a571eb757704fc8f85aae4ed8635a919091759a44405d3bbd8fadf8744
+  metadata.gz: 287c4cbadcce9715807704728cc7a718e521bf4ec2ef807749c81a036b381a8ed680ccb21aa4d6c280cb93dfd4be369426534ff11bd35b87a2bd71060435adb3
+  data.tar.gz: 22c5ca459cf77f5e096f76688c5fb0283076255a641ef2259be3c52e71dc8d7bdca31a6f8ea6ca11a7e25bd310460091cbd2d002ab4a3ba9e51080b72fc4de35

data/NEWS

@@ -1,3 +1,10 @@
+3.1.8
+    Make ActiveMerchant HTTP backend configurable, add support for Typhoeus
+    generator:
+      - Remove transactions.txn_id, transactions.amount_in_cents and transactions.currency NOT NULL constraint
+      - Update PaymentMethod.from_response signature
+      - Add :skip_gw option to skip the gateway entirely
+
 3.1.7
     Support more Logger APIs
 

data/Rakefile

@@ -6,8 +6,21 @@ Bundler::GemHelper.install_tasks
 
 # Install test tasks
 require 'rspec/core/rake_task'
-desc "Run RSpec"
-RSpec::Core::RakeTask.new
+namespace :test do
+  desc 'Run RSpec tests'
+  RSpec::Core::RakeTask.new do |task|
+    task.name    = 'spec'
+    task.pattern = './spec/*/{,helpers/}*_spec.rb'
+  end
+
+  namespace :remote do
+    desc 'Run RSpec remote tests'
+    RSpec::Core::RakeTask.new do |task|
+      task.name    = 'spec'
+      task.pattern = './spec/*/remote/*_spec.rb'
+    end
+  end
+end
 
 # Run tests by default
-task :default => :spec
+task :default => 'test:spec'

data/VERSION

@@ -1 +1 @@
-3.1.7
+3.1.8

data/generators/active_merchant/templates/db/ddl.sql.rb

@@ -37,9 +37,9 @@ CREATE TABLE `<%= identifier %>_transactions` (
   `kb_payment_id` varchar(255) NOT NULL,
   `kb_payment_transaction_id` varchar(255) NOT NULL,
   `transaction_type` varchar(255) NOT NULL,
-  `txn_id` varchar(255) NOT NULL,
-  `amount_in_cents` int(11) NOT NULL,
-  `currency` varchar(255) NOT NULL,
+  `txn_id` varchar(255) DEFAULT NULL,
+  `amount_in_cents` int(11) DEFAULT NULL,
+  `currency` varchar(255) DEFAULT NULL,
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
   `kb_account_id` varchar(255) NOT NULL,

data/generators/active_merchant/templates/db/schema.rb

@@ -39,8 +39,9 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.string   "kb_payment_transaction_id",      :null => false
     t.string   "transaction_type",               :null => false
     t.string   "txn_id"                          # <%= identifier %> transaction id
-    t.integer  "amount_in_cents",                :null => false
-    t.string   "currency",                       :null => false
+    # Both null for void
+    t.integer  "amount_in_cents"
+    t.string   "currency"
     t.datetime "created_at",                     :null => false
     t.datetime "updated_at",                     :null => false
     t.string   "kb_account_id",                  :null => false

data/generators/active_merchant/templates/lib/models/payment_method.rb

@@ -4,7 +4,7 @@ module Killbill #:nodoc:
 
       self.table_name = '<%= identifier %>_payment_methods'
 
-      def self.from_response(kb_account_id, kb_payment_method_id, kb_tenant_id, cc_or_token, response, options, extra_params = {})
+      def self.from_response(kb_account_id, kb_payment_method_id, kb_tenant_id, cc_or_token, response, options, extra_params = {}, model = ::Killbill::<%= class_name %>::<%= class_name %>PaymentMethod)
         super(kb_account_id,
               kb_payment_method_id,
               kb_tenant_id,
@@ -16,7 +16,7 @@ module Killbill #:nodoc:
                   #:params_id => extract(response, 'id'),
                   #:params_card_id => extract(response, 'card', 'id')
               }.merge!(extra_params),
-              ::Killbill::<%= class_name %>::<%= class_name %>PaymentMethod)
+              model)
       end
     end
   end

data/generators/active_merchant/templates/plugin.gemspec.rb

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 3.1.6'
+  s.add_dependency 'killbill', '~> 3.1.8'
   s.add_dependency 'activemerchant', '~> 1.42.9'
   s.add_dependency 'activerecord', '~> 4.1.0'
   s.add_dependency 'actionpack', '~> 4.1.0'

data/killbill.gemspec

@@ -17,21 +17,25 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.bindir        = 'bin'
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.rdoc_options << '--exclude' << '.'
 
   s.add_dependency 'sinatra', '~> 1.3.4'
+  s.add_dependency 'typhoeus', '~> 0.6.9'
   s.add_dependency 'tzinfo', '~> 1.1.0'
 
   s.add_development_dependency 'activerecord', '~> 4.1.0'
   if defined?(JRUBY_VERSION)
+    s.add_development_dependency 'activerecord-jdbcmysql-adapter', '~> 1.3.7'
     s.add_development_dependency 'activerecord-jdbcsqlite3-adapter', '~> 1.3.7'
   else
     s.add_development_dependency 'sqlite3', '~> 1.3.7'
   end
   s.add_development_dependency 'activemerchant', '~> 1.42.0'
+  s.add_development_dependency 'monetize', '~> 0.3.0'
+  s.add_development_dependency 'money', '~> 6.1.1'
   s.add_development_dependency 'jbundler', '~> 0.4.3'
   s.add_development_dependency 'rack', '>= 1.5.2'
   s.add_development_dependency 'rake', '>= 0.8.7'

data/lib/killbill/ext/active_merchant/typhoeus_connection.rb

@@ -0,0 +1,82 @@
+require 'benchmark'
+require 'active_utils/common/error'
+require 'active_utils/common/network_connection_retries'
+require 'active_utils/common/connection'
+require 'typhoeus'
+
+module ActiveMerchant
+  class Connection
+
+    def request(method, body, headers = {})
+      request_start = Time.now.to_f
+
+      retry_exceptions(:max_retries => max_retries, :logger => logger, :tag => tag) do
+        begin
+          debug "connection_http_method=#{method.to_s.upcase} connection_uri=#{endpoint}", tag
+
+          result   = nil
+          realtime = Benchmark.realtime do
+            options        = {:method => method, :headers => headers}
+            options[:body] = body if body
+            result         = http(endpoint.to_s, options)
+          end
+
+          debug '--> response_code=%d (body_length=%d total_time=%.4fs realtime=%.4fs)' % [result.code, result.body ? result.body.length : 0, result.total_time, realtime], tag
+          result
+        end
+      end
+    ensure
+      debug 'connection_request_total_time=%.4fs' % [Time.now.to_f - request_start], tag
+    end
+
+    private
+
+    def http(endpoint, options = {})
+      configure_ssl(options)
+
+      request = ::Typhoeus::Request.new(endpoint, options)
+      configure_debugging(request)
+
+      hydra = ::Typhoeus::Hydra.hydra
+      hydra.queue request
+      hydra.run
+
+      request.response
+    end
+
+    def configure_debugging(request)
+      request.on_complete do |response|
+        wiredump_device << 'Request: '
+        wiredump_device << response.request.base_url
+        wiredump_device << ' '
+        wiredump_device << response.request.options
+        wiredump_device << "\nResponse: "
+        wiredump_device << response.return_code
+        wiredump_device << ' '
+        wiredump_device << response.return_message
+        wiredump_device << ' '
+        wiredump_device << response.response_headers
+        wiredump_device << ' '
+        wiredump_device << response.response_body
+        wiredump_device << "\n\n"
+      end
+    end
+
+    def configure_ssl(options)
+      return unless endpoint.scheme == 'https'
+
+      if verify_peer
+        options[:ssl_verifypeer] ||= true
+        options[:ssl_verifyhost] ||= 2
+        # ca_file / ca_path configured in libcurl
+      else
+        options[:ssl_verifypeer] ||= false
+        options[:ssl_verifyhost] ||= 0
+      end
+    end
+
+    def log_with_retry_details(logger, attempts, time, message, tag)
+      NetworkConnectionRetries.log(logger, :debug, "connection_attempt=%d connection_request_time=%.4fs connection_msg=\"%s\"" % [attempts, time, message], tag)
+    end
+  end
+end

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

@@ -35,19 +35,19 @@ module Killbill
                       }.merge!(extra_params))
           end
 
-          def self.create_response_and_transaction(identifier, transaction_model, api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, kb_tenant_id, am_response, amount_in_cents, currency, extra_params = {}, model = Response)
+          def self.create_response_and_transaction(identifier, transaction_model, api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, kb_tenant_id, gw_response, amount_in_cents, currency, extra_params = {}, model = Response)
             response, transaction, exception = nil
 
             # Rails wraps all create/save calls in a transaction. To speed things up, create a single transaction for both rows.
             # This has a small gotcha in the unhappy path though (see below).
             transaction do
               # Save the response to our logs
-              response = from_response(api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, kb_tenant_id, am_response, extra_params, model)
+              response = from_response(api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, kb_tenant_id, gw_response, extra_params, model)
               response.save!(shared_activerecord_options)
 
               transaction = nil
               txn_id      = response.txn_id
-              if response.success and !kb_payment_id.blank? and !txn_id.blank?
+              if response.success and !kb_payment_id.blank?
                 # Record the transaction
                 # Note that we want to avoid throwing an exception here because we don't want to rollback the response row
                 begin

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

@@ -19,7 +19,7 @@ module Killbill
         @@kb_apis = kb_apis
         @@test = @@config[gateway_name][:test]
 
-        @@gateway = Gateway.wrap(gateway_builder, @@config[gateway_name.to_sym])
+        @@gateway = Gateway.wrap(gateway_builder, logger, @@config[gateway_name.to_sym])
 
         @@logger = logger
         @@logger.log_level = Logger::DEBUG if (@@config[:logger] || {})[:debug]
@@ -42,6 +42,12 @@ module Killbill
           @@logger.warn "Unable to establish a database connection: #{e}"
         end
 
+        # Configure the ActiveMerchant HTTP backend
+        connection_type = (@@config[:active_merchant] || {})[:connection_type]
+        if connection_type == :typhoeus
+          require 'killbill/ext/active_merchant/typhoeus_connection'
+        end
+
         @@initialized = true
       end
 

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

@@ -4,7 +4,9 @@ module Killbill
       require 'active_merchant'
 
       class Gateway
-        def self.wrap(gateway_builder, config)
+        def self.wrap(gateway_builder, logger, config)
+          ::ActiveMerchant::Billing::Gateway.logger = logger
+
           if config[:test]
             ::ActiveMerchant::Billing::Base.mode = :test
           end
@@ -23,10 +25,17 @@ module Killbill
 
         # Unfortunate name...
         def capture(money, authorization, options = {})
-          @gateway.capture(money, authorization, options)
+          method_missing(:capture, money, authorization, options)
         end
 
         def method_missing(m, *args, &block)
+          # The options hash should be the last argument, iterate through all to be safe
+          args.reverse.each do |arg|
+            if arg.respond_to?(:has_key?) && arg.has_key?(:skip_gw)
+              return ::ActiveMerchant::Billing::Response.new(true, 'Skipped Gateway call')
+            end
+          end
+
           @gateway.send(m, *args, &block)
         end
       end

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

@@ -2,6 +2,7 @@ module Killbill
   module Plugin
     module ActiveMerchant
       require 'active_record'
+      require 'monetize'
       require 'money'
 
       class PaymentPlugin < ::Killbill::Plugin::Payment
@@ -161,12 +162,19 @@ module Killbill
           payment_source        = get_payment_source(nil, all_properties, options, context)
 
           # Go to the gateway
-          gw_response           = gateway.store payment_source, options
+          gw_response           = gateway.store(payment_source, options)
           response, transaction = save_response_and_transaction gw_response, :add_payment_method, kb_account_id, context.tenant_id
 
           if response.success
-            # response.authorization may be a String combination separated by ; - don't split it! Some plugins expect it as-is (they split it themselves)
-            payment_method = @payment_method_model.from_response(kb_account_id, kb_payment_method_id, context.tenant_id, response.authorization, gw_response, options)
+            # If we have skipped the call to the gateway, we still need to store the payment method
+            if options[:skip_gw]
+              cc_or_token = payment_source
+            else
+              # response.authorization may be a String combination separated by ; - don't split it! Some plugins expect it as-is (they split it themselves)
+              cc_or_token = response.authorization
+            end
+
+            payment_method = @payment_method_model.from_response(kb_account_id, kb_payment_method_id, context.tenant_id, cc_or_token, gw_response, options, {}, @payment_method_model)
             payment_method.save!
             payment_method
           else
@@ -346,7 +354,7 @@ module Killbill
 
         def to_cents(amount, currency)
           # Use Money to compute the amount in cents, as it depends on the currency (1 cent of BTC is 1 Satoshi, not 0.01 BTC)
-          Monetize.from_numeric(amount, currency).cents.to_i
+          ::Monetize.from_numeric(amount, currency).cents.to_i
         end
 
         def get_payment_source(kb_payment_method_id, properties, options, context)
@@ -398,10 +406,10 @@ module Killbill
           account.currency
         end
 
-        def save_response_and_transaction(response, api_call, kb_account_id, kb_tenant_id, kb_payment_id=nil, kb_payment_transaction_id=nil, transaction_type=nil, amount_in_cents=0, currency=nil)
-          @logger.warn "Unsuccessful #{api_call}: #{response.message}" unless response.success?
+        def save_response_and_transaction(gw_response, api_call, kb_account_id, kb_tenant_id, kb_payment_id=nil, kb_payment_transaction_id=nil, transaction_type=nil, amount_in_cents=0, currency=nil)
+          @logger.warn "Unsuccessful #{api_call}: #{gw_response.message}" unless gw_response.success?
 
-          response, transaction = @response_model.create_response_and_transaction(@identifier, @transaction_model, api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, kb_tenant_id, response, amount_in_cents, currency, {}, @response_model)
+          response, transaction = @response_model.create_response_and_transaction(@identifier, @transaction_model, api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, kb_tenant_id, gw_response, amount_in_cents, currency, {}, @response_model)
 
           @logger.debug "Recorded transaction: #{transaction.inspect}" unless transaction.nil?
 

data/spec/killbill/helpers/payment_plugin_spec.rb

@@ -0,0 +1,115 @@
+require 'spec_helper'
+require 'spec/killbill/helpers/payment_method_spec'
+require 'spec/killbill/helpers/response_spec'
+require 'spec/killbill/helpers/transaction_spec'
+
+describe Killbill::Plugin::ActiveMerchant::PaymentPlugin do
+
+  before(:all) do
+    Dir.mktmpdir do |dir|
+      file = File.new(File.join(dir, 'test.yml'), "w+")
+      file.write(<<-eos)
+:test:
+  :test: true
+# As defined by spec_helper.rb
+:database:
+  :adapter: 'sqlite3'
+  :database: 'test.db'
+      eos
+      file.close
+
+      @plugin              = ::Killbill::Plugin::ActiveMerchant::PaymentPlugin.new(Proc.new { |config| nil },
+                                                                                   :test,
+                                                                                   ::Killbill::Test::TestPaymentMethod,
+                                                                                   ::Killbill::Test::TestTransaction,
+                                                                                   ::Killbill::Test::TestResponse)
+      @plugin.logger       = Logger.new(STDOUT)
+      @plugin.logger.level = Logger::INFO
+      @plugin.conf_dir     = File.dirname(file)
+
+      # Start the plugin here - since the config file will be deleted
+      @plugin.start_plugin
+    end
+  end
+
+  before(:each) do
+    @kb_account_id        = SecureRandom.uuid
+    @kb_payment_id        = SecureRandom.uuid
+    @kb_payment_method_id = SecureRandom.uuid
+
+    @amount_in_cents        = rand(100000)
+    @currency               = 'USD'
+    @call_context           = Killbill::Plugin::Model::CallContext.new
+    @call_context.tenant_id = SecureRandom.uuid
+
+    property       = ::Killbill::Plugin::Model::PluginProperty.new
+    property.key   = 'skip_gw'
+    property.value = 'true'
+    @properties    = [property]
+
+    token                            = ::Killbill::Plugin::Model::PluginProperty.new
+    token.key                        = 'token'
+    token.value                      = SecureRandom.uuid
+    @payment_method_props            = ::Killbill::Plugin::Model::PaymentMethodPlugin.new
+    @payment_method_props.properties = [token]
+  end
+
+  after(:all) do
+    @plugin.stop_plugin
+  end
+
+  it 'should implement payment plugin API calls' do
+    @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
+
+    @plugin.add_payment_method(@kb_account_id, @kb_payment_method_id, @payment_method_props, true, @properties, @call_context)
+    @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 1
+    ::Killbill::Test::TestPaymentMethod.where(:kb_payment_method_id => @kb_payment_method_id).first.token.should == @payment_method_props.properties[0].value
+
+    authorization_id = SecureRandom.uuid
+    authorization    = @plugin.authorize_payment(@kb_account_id, @kb_payment_id, authorization_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
+    verify_transaction_info_plugin(authorization, authorization_id, :AUTHORIZE, 1)
+
+    capture_id = SecureRandom.uuid
+    capture    = @plugin.capture_payment(@kb_account_id, @kb_payment_id, capture_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
+    verify_transaction_info_plugin(capture, capture_id, :CAPTURE, 2)
+
+    purchase_id = SecureRandom.uuid
+    purchase    = @plugin.purchase_payment(@kb_account_id, @kb_payment_id, purchase_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
+    verify_transaction_info_plugin(purchase, purchase_id, :PURCHASE, 3)
+
+    void_id = SecureRandom.uuid
+    void    = @plugin.void_payment(@kb_account_id, @kb_payment_id, void_id, @kb_payment_method_id, @properties, @call_context)
+    verify_transaction_info_plugin(void, void_id, :VOID, 4)
+
+    credit_id = SecureRandom.uuid
+    credit    = @plugin.credit_payment(@kb_account_id, @kb_payment_id, credit_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
+    verify_transaction_info_plugin(credit, credit_id, :CREDIT, 5)
+
+    refund_id = SecureRandom.uuid
+    refund    = @plugin.refund_payment(@kb_account_id, @kb_payment_id, refund_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
+    verify_transaction_info_plugin(refund, refund_id, :REFUND, 6)
+
+    @plugin.delete_payment_method(@kb_account_id, @kb_payment_method_id, @properties, @call_context)
+    @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
+  end
+
+  private
+
+  def verify_transaction_info_plugin(t_info_plugin, kb_transaction_id, type, transaction_nb)
+    t_info_plugin.kb_payment_id.should == @kb_payment_id
+    t_info_plugin.kb_transaction_payment_id.should == kb_transaction_id
+    t_info_plugin.transaction_type.should == type
+    if type == :VOID
+      t_info_plugin.amount.should be_nil
+      t_info_plugin.currency.should be_nil
+    else
+      t_info_plugin.amount.should == @amount_in_cents
+      t_info_plugin.currency.should == @currency
+    end
+    t_info_plugin.status.should == :PROCESSED
+
+    transactions = @plugin.get_payment_info(@kb_account_id, @kb_payment_id, [], @call_context)
+    transactions.size.should == transaction_nb
+    transactions[transaction_nb - 1].to_json.should == t_info_plugin.to_json
+  end
+end

data/spec/killbill/helpers/test_schema.rb

@@ -33,8 +33,8 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.string   "kb_payment_transaction_id", :null => false
     t.string   "transaction_type",          :null => false
     t.string   "txn_id"
-    t.integer  "amount_in_cents",           :null => false
-    t.string   "currency",                  :null => false
+    t.integer  "amount_in_cents"
+    t.string   "currency"
     t.datetime "created_at",                :null => false
     t.datetime "updated_at",                :null => false
     t.string   "kb_account_id",             :null => false

data/spec/killbill/payment_plugin_spec.rb

@@ -12,7 +12,6 @@ describe Killbill::Plugin::Payment do
     @currency                  = 'USD'
     @call_context              = Killbill::Plugin::Model::CallContext.new
 
-    @payment_method       = Hash.new(:credit_card => SecureRandom.uuid)
     @kb_payment_method_id = SecureRandom.uuid
 
     @search_key = SecureRandom.uuid
@@ -36,10 +35,10 @@ describe Killbill::Plugin::Payment do
     lambda { @plugin.refund_payment(@kb_account_id, @kb_payment_id, @kb_payment_transaction_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
     lambda { @plugin.get_payment_info(@kb_account_id, @kb_payment_id, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
     lambda { @plugin.search_payments(@search_key, @offset, @limit, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
-    lambda { @plugin.add_payment_method(@kb_account_id, @payment_method, @payment_method_props, true, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.add_payment_method(@kb_account_id, @kb_payment_method_id, @payment_method_props, true, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
     lambda { @plugin.delete_payment_method(@kb_account_id, @kb_payment_method_id, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
-    lambda { @plugin.get_payment_method_detail(@kb_account_id, @payment_method, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
-    lambda { @plugin.set_default_payment_method(@kb_account_id, @payment_method, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.get_payment_method_detail(@kb_account_id, @kb_payment_method_id, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.set_default_payment_method(@kb_account_id, @kb_payment_method_id, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
     lambda { @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
     lambda { @plugin.search_payment_methods(@search_key, @offset, @limit, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
     lambda { @plugin.reset_payment_methods(@kb_account_id, @payment_methods, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError

data/spec/killbill/remote/active_merchant_typhoeus_connection_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe ActiveMerchant::Connection do
+
+  before :all do
+    @logger       = Logger.new(STDOUT)
+    @logger.level = Logger::DEBUG
+
+    @wiredump_device = Tempfile.new('foo')
+  end
+
+  after :all do
+    @wiredump_device.close
+    @wiredump_device.unlink
+  end
+
+  it 'should delegate to Typhoeus' do
+    response = ssl_get('https://github.com/killbill/killbill/blob/master/pom.xml')
+    response.code.should == 200
+    response.return_code.should == :ok
+    response.body.size.should > 0
+
+    response = ssl_get('https://github.com/killbill/killbill/blob/master/pomme.xml')
+    response.code.should == 404
+    response.return_code.should == :ok
+    response.body.size.should > 0
+
+    response = ssl_get('/something')
+    response.return_code.should == :url_malformat
+    response.body.size.should == 0
+  end
+
+  private
+
+  def ssl_get(endpoint, headers={})
+    ssl_request(:get, endpoint, nil, headers)
+  end
+
+  def ssl_request(method, endpoint, data, headers = {})
+    connection                 = ::ActiveMerchant::Connection.new(endpoint)
+    connection.open_timeout    = 60
+    connection.read_timeout    = 60
+    connection.retry_safe      = true
+    connection.verify_peer     = true
+    connection.logger          = @logger
+    connection.tag             = self.class.name
+    connection.wiredump_device = @wiredump_device
+    connection.pem             = nil
+    connection.pem_password    = nil
+
+    connection.request(method, data, headers)
+  end
+end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'java'
 
 require 'bundler'
 require 'logger'
+require 'tempfile'
 
 require 'killbill'
 require 'killbill/killbill_logger'
@@ -13,6 +14,8 @@ require 'killbill/notification_test'
 require 'killbill/helpers/active_merchant'
 require 'killbill/helpers/active_merchant/active_record/models/helpers'
 
+require 'killbill/ext/active_merchant/typhoeus_connection'
+
 %w(
   MockAccountUserApi
 ).each do |api|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 3.1.8
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -24,6 +24,20 @@ dependencies:
         version: 1.3.4
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.9
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.9
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: tzinfo
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
         version: 4.1.0
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: activerecord-jdbcmysql-adapter
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.7
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.7
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: activerecord-jdbcsqlite3-adapter
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,6 +108,34 @@ dependencies:
         version: 1.42.0
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: monetize
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: money
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 6.1.1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 6.1.1
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: jbundler
   version_requirements: !ruby/object:Gem::Requirement
@@ -199,6 +255,7 @@ files:
 - lib/killbill.rb
 - lib/killbill/creator.rb
 - lib/killbill/currency.rb
+- lib/killbill/ext/active_merchant/typhoeus_connection.rb
 - lib/killbill/gen/api/account.rb
 - lib/killbill/gen/api/account_api_exception.rb
 - lib/killbill/gen/api/account_audit_logs.rb
@@ -348,6 +405,7 @@ files:
 - spec/killbill/config_test.ru
 - spec/killbill/gen_conversions_spec.rb
 - spec/killbill/helpers/payment_method_spec.rb
+- spec/killbill/helpers/payment_plugin_spec.rb
 - spec/killbill/helpers/response_spec.rb
 - spec/killbill/helpers/test_schema.rb
 - spec/killbill/helpers/transaction_spec.rb
@@ -362,6 +420,7 @@ files:
 - spec/killbill/payment_plugin_spec.rb
 - spec/killbill/payment_test.rb
 - spec/killbill/rack_handler_spec.rb
+- spec/killbill/remote/active_merchant_typhoeus_connection_spec.rb
 - spec/spec_helper.rb
 homepage: http://kill-bill.org
 licenses:
@@ -396,6 +455,7 @@ test_files:
 - spec/killbill/config_test.ru
 - spec/killbill/gen_conversions_spec.rb
 - spec/killbill/helpers/payment_method_spec.rb
+- spec/killbill/helpers/payment_plugin_spec.rb
 - spec/killbill/helpers/response_spec.rb
 - spec/killbill/helpers/test_schema.rb
 - spec/killbill/helpers/transaction_spec.rb
@@ -410,4 +470,5 @@ test_files:
 - spec/killbill/payment_plugin_spec.rb
 - spec/killbill/payment_test.rb
 - spec/killbill/rack_handler_spec.rb
+- spec/killbill/remote/active_merchant_typhoeus_connection_spec.rb
 - spec/spec_helper.rb