killbill 3.1.12 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb6ce6556b61301d292afa1aa2747c108fd4687e
-  data.tar.gz: b3416f3c099da146bfbe28436af347b23e12c7ee
+  metadata.gz: 965d63f0683725af63c46999dd4b3bce2ed2bab6
+  data.tar.gz: 6a722d920223f7123dab21b7f1dbbb2277abbf12
 SHA512:
-  metadata.gz: 341509f358870f14af3ed361cc6d32b8bd234b2a18277fefd88dac6ea5876c2533e4576b32523b0de739c112d3b6974bff147c44c88b9404ca2b6ef67ce6d1eb
-  data.tar.gz: 0cf95757be6be80a1cf04757f284cdef25bccf4936db9d46ed02f8fe5ea2f0068092270fe9adbb0a934afb11c3207c36289dfc5eda7728bbc14baa2fe714dd1b
+  metadata.gz: ad59ce23431fcceb7352641ac951e642bc1cd5d91f501ad0022984f32afc68bf25d6312ce31d0c7fc87c5511a990302c65b60258127b0a481f3ab6ac06856e00
+  data.tar.gz: 1a670e318c45f7c630a2d8c238aa888e08427c423123c63214397f2ecaaf365e3b4347e25013e4398813df0f73b258952e8c45eef44904c3ab6e601137bcffbd

data/Jarfile

@@ -1,8 +1,8 @@
 jar 'org.kill-bill.billing:killbill-api', '0.10.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.8.1'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.8.1'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.8.1'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.8.2'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.8.2'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.8.2'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-retry', '0.8.1'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.8.1'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.11.9'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.8.2'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.12.0'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/NEWS

@@ -1,3 +1,10 @@
+3.2.0
+    ActiveMerchant:
+      - fix openssl require error with the latest version of active_utils
+      - fix gateway configuration parsing (add support for false values)
+      - store and retrieve the full credit card when not using a third-party vault
+      - switch database fields to varchar to support tokenized PANs (DDL change)
+
 3.1.12
     ActiveMerchant:
       - store payment_processor_account_id (DDL change)

data/VERSION

@@ -1 +1 @@
-3.1.12
+3.2.0

data/generators/active_merchant/templates/Jarfile.rb

@@ -1,8 +1,8 @@
 jar 'org.kill-bill.billing:killbill-api', '0.10.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.8.1'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.8.1'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.8.1'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.8.2'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.8.2'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.8.2'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-retry', '0.8.1'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.8.1'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.11.9'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.8.2'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.12.1'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/generators/active_merchant/templates/config.yml.rb

@@ -1,6 +1,5 @@
 :<%= identifier %>:
   :test: true
-  :log_file: /var/tmp/<%= identifier %>.log
 
 :database:
   :adapter: sqlite3
@@ -14,6 +13,5 @@
 # In Kill Bill
 #  :adapter: 'jdbcmysql'
 #  :jndi: 'killbill/osgi/jdbc'
-#  :driver: 'com.mysql.jdbc.Driver'
 #  :connection_alive_sql: 'select 1'
 #  :pool: 250

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

@@ -5,10 +5,10 @@ CREATE TABLE `<%= identifier %>_payment_methods` (
   `cc_first_name` varchar(255) DEFAULT NULL,
   `cc_last_name` varchar(255) DEFAULT NULL,
   `cc_type` varchar(255) DEFAULT NULL,
-  `cc_exp_month` int(11) DEFAULT NULL,
-  `cc_exp_year` int(11) DEFAULT NULL,
-  `cc_number` int(11) DEFAULT NULL,
-  `cc_last_4` int(11) DEFAULT NULL,
+  `cc_exp_month` varchar(255) DEFAULT NULL,
+  `cc_exp_year` varchar(255) DEFAULT NULL,
+  `cc_number` varchar(255) DEFAULT NULL,
+  `cc_last_4` varchar(255) DEFAULT NULL,
   `cc_start_month` varchar(255) DEFAULT NULL,
   `cc_start_year` varchar(255) DEFAULT NULL,
   `cc_issue_number` varchar(255) DEFAULT NULL,

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

@@ -7,15 +7,15 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.string   "cc_first_name"
     t.string   "cc_last_name"
     t.string   "cc_type"
-    t.integer  "cc_exp_month"
-    t.integer  "cc_exp_year"
-    t.integer  "cc_number"
-    t.integer  "cc_last_4"
-    t.integer  "cc_start_month"
-    t.integer  "cc_start_year"
-    t.integer  "cc_issue_number"
-    t.integer  "cc_verification_value"
-    t.integer  "cc_track_data"
+    t.string   "cc_exp_month"
+    t.string   "cc_exp_year"
+    t.string   "cc_number"
+    t.string   "cc_last_4"
+    t.string   "cc_start_month"
+    t.string   "cc_start_year"
+    t.string   "cc_issue_number"
+    t.string   "cc_verification_value"
+    t.string   "cc_track_data"
     t.string   "address1"
     t.string   "address2"
     t.string   "city"

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

@@ -1,3 +1,4 @@
+require 'openssl'
 require 'action_controller'
 require 'active_record'
 require 'action_view'

data/generators/active_merchant/templates/spec/integration_spec.rb

@@ -45,7 +45,7 @@ describe Killbill::<%= class_name %>::PaymentPlugin do
     Killbill::<%= class_name %>::<%= class_name %>Response.all.size.should == 1
     Killbill::<%= class_name %>::<%= class_name %>Transaction.all.size.should == 0
 
-    payment_response = @plugin.purchase_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[0].id, SecureRandom.uuid, @amount, @currency, properties, @call_context)
+    payment_response = @plugin.purchase_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[0].id, @pm.kb_payment_method_id, @amount, @currency, properties, @call_context)
     payment_response.status.should eq(:PROCESSED), payment_response.gateway_error
     payment_response.amount.should == @amount
     payment_response.transaction_type.should == :PURCHASE

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

@@ -29,6 +29,7 @@ module Killbill
                           :cc_exp_month         => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.month : nil,
                           :cc_exp_year          => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.year : nil,
                           :cc_last_4            => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.last_digits : nil,
+                          :cc_number            => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.number : nil,
                           :address1             => (options[:billing_address] || {})[:address1],
                           :address2             => (options[:billing_address] || {})[:address2],
                           :city                 => (options[:billing_address] || {})[:city],
@@ -147,11 +148,14 @@ module Killbill
           def to_payment_method_plugin
             properties = []
             properties << create_plugin_property('token', external_payment_method_id)
+            properties << create_plugin_property('ccFirstName', cc_first_name)
+            properties << create_plugin_property('ccLastName', cc_last_name)
             properties << create_plugin_property('ccName', cc_name)
             properties << create_plugin_property('ccType', cc_type)
             properties << create_plugin_property('ccExpirationMonth', cc_exp_month)
             properties << create_plugin_property('ccExpirationYear', cc_exp_year)
             properties << create_plugin_property('ccLast4', cc_last_4)
+            properties << create_plugin_property('ccNumber', cc_number)
             properties << create_plugin_property('address1', address1)
             properties << create_plugin_property('address2', address2)
             properties << create_plugin_property('city', city)

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

@@ -19,14 +19,14 @@ module Killbill
           end
           ::ActiveMerchant::Billing::Gateway.wiredump_device.sync = true
 
-          ::ActiveMerchant::Billing::Gateway.open_timeout  = config[:open_timeout] if config[:open_timeout]
-          ::ActiveMerchant::Billing::Gateway.read_timeout  = config[:read_timeout] if config[:read_timeout]
-          ::ActiveMerchant::Billing::Gateway.retry_safe    = config[:retry_safe] if config[:retry_safe]
-          ::ActiveMerchant::Billing::Gateway.ssl_strict    = config[:ssl_strict] if config[:ssl_strict]
-          ::ActiveMerchant::Billing::Gateway.ssl_version   = config[:ssl_version] if config[:ssl_version]
-          ::ActiveMerchant::Billing::Gateway.max_retries   = config[:max_retries] if config[:max_retries]
-          ::ActiveMerchant::Billing::Gateway.proxy_address = config[:proxy_address] if config[:proxy_address]
-          ::ActiveMerchant::Billing::Gateway.proxy_port    = config[:proxy_port] if config[:proxy_port]
+          ::ActiveMerchant::Billing::Gateway.open_timeout  = config[:open_timeout] unless config[:open_timeout].nil?
+          ::ActiveMerchant::Billing::Gateway.read_timeout  = config[:read_timeout] unless config[:read_timeout].nil?
+          ::ActiveMerchant::Billing::Gateway.retry_safe    = config[:retry_safe] unless config[:retry_safe].nil?
+          ::ActiveMerchant::Billing::Gateway.ssl_strict    = config[:ssl_strict] unless config[:ssl_strict].nil?
+          ::ActiveMerchant::Billing::Gateway.ssl_version   = config[:ssl_version] unless config[:ssl_version].nil?
+          ::ActiveMerchant::Billing::Gateway.max_retries   = config[:max_retries] unless config[:max_retries].nil?
+          ::ActiveMerchant::Billing::Gateway.proxy_address = config[:proxy_address] unless config[:proxy_address].nil?
+          ::ActiveMerchant::Billing::Gateway.proxy_port    = config[:proxy_port] unless config[:proxy_port].nil?
 
           Gateway.new(config, gateway_builder.call(config))
         end

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

@@ -152,7 +152,12 @@ module Killbill
           options[:order_id]    ||= kb_payment_method_id
 
           # Registering a card or a token
-          payment_source        = get_payment_source(nil, all_properties, options, context)
+          if options[:skip_gw]
+            # If nothing is passed, that's fine -  we probably just want a placeholder row in the plugin
+            payment_source = get_payment_source(nil, all_properties, options, context) rescue nil
+          else
+            payment_source = get_payment_source(nil, all_properties, options, context)
+          end
 
           # Go to the gateway
           payment_processor_account_id = options[:payment_processor_account_id] || :default
@@ -161,7 +166,7 @@ module Killbill
           response, transaction        = save_response_and_transaction(gw_response, :add_payment_method, kb_account_id, context.tenant_id, payment_processor_account_id)
 
           if response.success
-            # If we have skipped the call to the gateway, we still need to store the payment method
+            # If we have skipped the call to the gateway, we still need to store the payment method (either a token or the full credit card)
             if options[:skip_gw]
               cc_or_token = payment_source
             else
@@ -442,12 +447,30 @@ module Killbill
         end
 
         def get_payment_source(kb_payment_method_id, properties, options, context)
+          # Use ccNumber for the real number (if stored locally) or an in-house token (proxy tokenization). It is assumed the rest
+          # of the card details are filled (expiration dates, etc.).
           cc_number   = find_value_from_properties(properties, 'ccNumber')
+          # Use token for the token stored in an external vault. The token itself should be enough to process payments.
           cc_or_token = find_value_from_properties(properties, 'token') || find_value_from_properties(properties, 'cardId')
 
           if cc_number.blank? and cc_or_token.blank?
-            # Existing token
-            cc_or_token = @payment_method_model.from_kb_payment_method_id(kb_payment_method_id, context.tenant_id).token
+            # Lookup existing token
+            pm = @payment_method_model.from_kb_payment_method_id(kb_payment_method_id, context.tenant_id)
+            if pm.token.nil?
+              # Real credit card
+              cc_or_token = ::ActiveMerchant::Billing::CreditCard.new(
+                  :number             => pm.cc_number,
+                  :brand              => pm.cc_type,
+                  :month              => pm.cc_exp_month,
+                  :year               => pm.cc_exp_year,
+                  :verification_value => pm.cc_verification_value,
+                  :first_name         => pm.cc_first_name,
+                  :last_name          => pm.cc_last_name
+              )
+            else
+              # Tokenized card
+              cc_or_token = pm.token
+            end
           elsif !cc_number.blank? and cc_or_token.blank?
             # Real credit card
             cc_or_token = ::ActiveMerchant::Billing::CreditCard.new(

data/spec/killbill/helpers/gateway_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Killbill::Plugin::ActiveMerchant::Gateway do
+
+  it 'should honor configuration options' do
+    gateway_builder = Proc.new {}
+    logger          = Logger.new(STDOUT)
+    config          = {}
+
+    verify_config
+
+    ::Killbill::Plugin::ActiveMerchant::Gateway.wrap(gateway_builder, logger, config)
+    verify_config(config)
+
+    config1 = {:open_timeout => 12, :ssl_version => 5}
+    ::Killbill::Plugin::ActiveMerchant::Gateway.wrap(gateway_builder, logger, config1)
+    verify_config(config1)
+
+    config2 = {:retry_safe => true, :ssl_strict => false, :max_retries => nil}
+    ::Killbill::Plugin::ActiveMerchant::Gateway.wrap(gateway_builder, logger, config2)
+    verify_config(config1.merge(config2).delete_if { |k, v| v.nil? })
+  end
+
+  private
+
+  def verify_config(config = {})
+    ::ActiveMerchant::Billing::Gateway.open_timeout.should == (config.has_key?(:open_timeout) ? config[:open_timeout] : 60)
+    ::ActiveMerchant::Billing::Gateway.read_timeout.should == (config.has_key?(:read_timeout) ? config[:read_timeout] : 60)
+    ::ActiveMerchant::Billing::Gateway.retry_safe.should == (config.has_key?(:retry_safe) ? config[:retry_safe] : false)
+    ::ActiveMerchant::Billing::Gateway.ssl_strict.should == (config.has_key?(:ssl_strict) ? config[:ssl_strict] : true)
+    ::ActiveMerchant::Billing::Gateway.ssl_version.should == (config.has_key?(:ssl_version) ? config[:ssl_version] : nil)
+    ::ActiveMerchant::Billing::Gateway.max_retries.should == (config.has_key?(:max_retries) ? config[:max_retries] : 3)
+    ::ActiveMerchant::Billing::Gateway.proxy_address.should == (config.has_key?(:proxy_address) ? config[:proxy_address] : nil)
+    ::ActiveMerchant::Billing::Gateway.proxy_port.should == (config.has_key?(:proxy_port) ? config[:proxy_port] : nil)
+  end
+end

data/spec/killbill/helpers/payment_method_spec.rb

@@ -12,7 +12,7 @@ end
 
 describe Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod do
 
-  before :all do
+  before :each do
     ::Killbill::Test::TestPaymentMethod.delete_all
   end
 
@@ -50,9 +50,9 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod do
     pm.cc_first_name.should == cc.first_name
     pm.cc_last_name.should == cc.last_name
     pm.cc_type.should == cc.brand
-    pm.cc_exp_month.should == cc.month.to_i
-    pm.cc_exp_year.should == cc.year.to_i
-    pm.cc_last_4.should == cc.last_digits.to_i
+    pm.cc_exp_month.should == cc.month
+    pm.cc_exp_year.should == cc.year
+    pm.cc_last_4.should == cc.last_digits
     pm.address1.should == options[:billing_address][:address1]
     pm.address2.should == options[:billing_address][:address2]
     pm.city.should == options[:billing_address][:city]
@@ -71,9 +71,9 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod do
     pm.cc_first_name.should == cc.first_name
     pm.cc_last_name.should == cc.last_name
     pm.cc_type.should == cc.brand
-    pm.cc_exp_month.should == cc.month.to_i
-    pm.cc_exp_year.should == cc.year.to_i
-    pm.cc_last_4.should == cc.last_digits.to_i
+    pm.cc_exp_month.should == cc.month
+    pm.cc_exp_year.should == cc.year
+    pm.cc_last_4.should == cc.last_digits
     pm.address1.should be_nil
     pm.address2.should be_nil
     pm.city.should be_nil
@@ -132,7 +132,7 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod do
     kb_tenant_id         = SecureRandom.uuid
     response             = ::ActiveMerchant::Billing::Response.new(true, nil, {}, {:authorization => SecureRandom.uuid})
     token                = SecureRandom.uuid
-    pm = ::Killbill::Test::TestPaymentMethod.from_response(kb_account_id, kb_payment_method_id, kb_tenant_id, token, response, {}, {}, ::Killbill::Test::TestPaymentMethod)
+    pm                   = ::Killbill::Test::TestPaymentMethod.from_response(kb_account_id, kb_payment_method_id, kb_tenant_id, token, response, {}, {}, ::Killbill::Test::TestPaymentMethod)
     pm.save!
 
     # Retrieve by account id
@@ -160,14 +160,39 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod do
     expect { ::Killbill::Test::TestPaymentMethod.from_kb_payment_method_id(kb_payment_method_id, kb_tenant_id) }.to raise_error
   end
 
+  it 'should handle non-numeric credit card values' do
+    pm = ::Killbill::Test::TestPaymentMethod.create :kb_account_id        => '11-22-33-44',
+                                                    :kb_payment_method_id => '55-66-77-88',
+                                                    :kb_tenant_id         => '11-22-33',
+                                                    :cc_first_name        => 'ccFirstName',
+                                                    :cc_last_name         => 'ccLastName',
+                                                    :cc_type              => 'ccType',
+                                                    :cc_exp_month         => '07',
+                                                    :cc_exp_year          => '01',
+                                                    :cc_last_4            => '0001',
+                                                    :cc_number            => 'some-proprietary-token-format',
+                                                    :address1             => 'address1',
+                                                    :address2             => 'address2',
+                                                    :city                 => 'city',
+                                                    :state                => 'state',
+                                                    :zip                  => 'zip',
+                                                    :country              => 'country'
+
+    pm = ::Killbill::Test::TestPaymentMethod.from_kb_payment_method_id(pm.kb_payment_method_id, pm.kb_tenant_id)
+    pm.cc_exp_month.should == '07'
+    pm.cc_exp_year.should == '01'
+    pm.cc_last_4.should == '0001'
+    pm.cc_number.should == 'some-proprietary-token-format'
+  end
+
   it 'should generate the right SQL query' do
     # Check count query (search query numeric)
-    expected_query = "SELECT COUNT(DISTINCT \"test_payment_methods\".\"id\") FROM \"test_payment_methods\"  WHERE ((((((((((((((\"test_payment_methods\".\"kb_account_id\" = '1234' OR \"test_payment_methods\".\"kb_payment_method_id\" = '1234') OR \"test_payment_methods\".\"token\" = '1234') OR \"test_payment_methods\".\"cc_type\" = '1234') OR \"test_payment_methods\".\"state\" = '1234') OR \"test_payment_methods\".\"zip\" = '1234') OR \"test_payment_methods\".\"cc_first_name\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_last_name\" LIKE '%1234%') OR \"test_payment_methods\".\"address1\" LIKE '%1234%') OR \"test_payment_methods\".\"address2\" LIKE '%1234%') OR \"test_payment_methods\".\"city\" LIKE '%1234%') OR \"test_payment_methods\".\"country\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_exp_month\" = 1234) OR \"test_payment_methods\".\"cc_exp_year\" = 1234) OR \"test_payment_methods\".\"cc_last_4\" = 1234) AND \"test_payment_methods\".\"kb_tenant_id\" = '11-22-33'  ORDER BY \"test_payment_methods\".\"id\""
+    expected_query = "SELECT COUNT(DISTINCT \"test_payment_methods\".\"id\") FROM \"test_payment_methods\"  WHERE ((((((((((((((\"test_payment_methods\".\"kb_account_id\" = '1234' OR \"test_payment_methods\".\"kb_payment_method_id\" = '1234') OR \"test_payment_methods\".\"token\" = '1234') OR \"test_payment_methods\".\"cc_type\" = '1234') OR \"test_payment_methods\".\"state\" = '1234') OR \"test_payment_methods\".\"zip\" = '1234') OR \"test_payment_methods\".\"cc_first_name\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_last_name\" LIKE '%1234%') OR \"test_payment_methods\".\"address1\" LIKE '%1234%') OR \"test_payment_methods\".\"address2\" LIKE '%1234%') OR \"test_payment_methods\".\"city\" LIKE '%1234%') OR \"test_payment_methods\".\"country\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_exp_month\" = '1234') OR \"test_payment_methods\".\"cc_exp_year\" = '1234') OR \"test_payment_methods\".\"cc_last_4\" = '1234') AND \"test_payment_methods\".\"kb_tenant_id\" = '11-22-33'  ORDER BY \"test_payment_methods\".\"id\""
     # 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
 
     # Check query with results (search query numeric)
-    expected_query = "SELECT  DISTINCT \"test_payment_methods\".* FROM \"test_payment_methods\"  WHERE ((((((((((((((\"test_payment_methods\".\"kb_account_id\" = '1234' OR \"test_payment_methods\".\"kb_payment_method_id\" = '1234') OR \"test_payment_methods\".\"token\" = '1234') OR \"test_payment_methods\".\"cc_type\" = '1234') OR \"test_payment_methods\".\"state\" = '1234') OR \"test_payment_methods\".\"zip\" = '1234') OR \"test_payment_methods\".\"cc_first_name\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_last_name\" LIKE '%1234%') OR \"test_payment_methods\".\"address1\" LIKE '%1234%') OR \"test_payment_methods\".\"address2\" LIKE '%1234%') OR \"test_payment_methods\".\"city\" LIKE '%1234%') OR \"test_payment_methods\".\"country\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_exp_month\" = 1234) OR \"test_payment_methods\".\"cc_exp_year\" = 1234) OR \"test_payment_methods\".\"cc_last_4\" = 1234) AND \"test_payment_methods\".\"kb_tenant_id\" = '11-22-33'  ORDER BY \"test_payment_methods\".\"id\" LIMIT 10 OFFSET 0"
+    expected_query = "SELECT  DISTINCT \"test_payment_methods\".* FROM \"test_payment_methods\"  WHERE ((((((((((((((\"test_payment_methods\".\"kb_account_id\" = '1234' OR \"test_payment_methods\".\"kb_payment_method_id\" = '1234') OR \"test_payment_methods\".\"token\" = '1234') OR \"test_payment_methods\".\"cc_type\" = '1234') OR \"test_payment_methods\".\"state\" = '1234') OR \"test_payment_methods\".\"zip\" = '1234') OR \"test_payment_methods\".\"cc_first_name\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_last_name\" LIKE '%1234%') OR \"test_payment_methods\".\"address1\" LIKE '%1234%') OR \"test_payment_methods\".\"address2\" LIKE '%1234%') OR \"test_payment_methods\".\"city\" LIKE '%1234%') OR \"test_payment_methods\".\"country\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_exp_month\" = '1234') OR \"test_payment_methods\".\"cc_exp_year\" = '1234') OR \"test_payment_methods\".\"cc_last_4\" = '1234') AND \"test_payment_methods\".\"kb_tenant_id\" = '11-22-33'  ORDER BY \"test_payment_methods\".\"id\" LIMIT 10 OFFSET 0"
     # Note that Kill Bill will pass a String, even for numeric types
     ::Killbill::Test::TestPaymentMethod.search_query('1234', '11-22-33', 0, 10).to_sql.should == expected_query
 
@@ -250,7 +275,7 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod do
     pmp = pm.to_payment_method_plugin
     pmp.kb_payment_method_id.should == kb_payment_method_id
     pmp.external_payment_method_id.should == external_payment_method_id
-    pmp.properties.size.should == 12
+    pmp.properties.size.should == 15
 
     # Verify conversion to PaymentMethodInfoPlugin
     pmip = pm.to_payment_method_info_plugin

data/spec/killbill/helpers/payment_plugin_spec.rb

@@ -4,6 +4,7 @@ require 'spec/killbill/helpers/response_spec'
 require 'spec/killbill/helpers/transaction_spec'
 
 describe Killbill::Plugin::ActiveMerchant::PaymentPlugin do
+  include Killbill::Plugin::ActiveMerchant::RSpec
 
   before(:all) do
     Dir.mktmpdir do |dir|
@@ -78,32 +79,32 @@ describe Killbill::Plugin::ActiveMerchant::PaymentPlugin do
 
     authorization_id = SecureRandom.uuid
     @payment_api.add_payment(@kb_payment_id, authorization_id, SecureRandom.uuid, :AUTHORIZE)
-    authorization    = @plugin.authorize_payment(@kb_account_id, @kb_payment_id, authorization_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
+    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
     @payment_api.add_payment(@kb_payment_id, capture_id, SecureRandom.uuid, :CAPTURE)
-    capture    = @plugin.capture_payment(@kb_account_id, @kb_payment_id, capture_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
+    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
     @payment_api.add_payment(@kb_payment_id, purchase_id, SecureRandom.uuid, :PURCHASE)
-    purchase    = @plugin.purchase_payment(@kb_account_id, @kb_payment_id, purchase_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
+    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
     @payment_api.add_payment(@kb_payment_id, void_id, SecureRandom.uuid, :VOID)
-    void    = @plugin.void_payment(@kb_account_id, @kb_payment_id, void_id, @kb_payment_method_id, @properties, @call_context)
+    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
     @payment_api.add_payment(@kb_payment_id, credit_id, SecureRandom.uuid, :CREDIT)
-    credit    = @plugin.credit_payment(@kb_account_id, @kb_payment_id, credit_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
+    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
     @payment_api.add_payment(@kb_payment_id, refund_id, SecureRandom.uuid, :REFUND)
-    refund    = @plugin.refund_payment(@kb_account_id, @kb_payment_id, refund_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
+    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)
@@ -129,6 +130,97 @@ describe Killbill::Plugin::ActiveMerchant::PaymentPlugin do
     verify_transaction_info_plugin(capture, capture_id, :CAPTURE, 2, @ppai.value)
   end
 
+  it 'should support storing a credit card' do
+    @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
+
+    properties = []
+    properties << create_pm_kv_info('ccNumber', '41111111111111111')
+    properties << create_pm_kv_info('ccFirstName', 'Paul')
+    properties << create_pm_kv_info('ccLastName', 'Dupond')
+    properties << create_pm_kv_info('ccType', 'VISA')
+    properties << create_pm_kv_info('ccExpirationMonth', '12')
+    properties << create_pm_kv_info('ccExpirationYear', '17')
+    payment_method_props            = ::Killbill::Plugin::Model::PaymentMethodPlugin.new
+    payment_method_props.properties = properties
+    @plugin.add_payment_method(@kb_account_id, SecureRandom.uuid, payment_method_props, true, @properties, @call_context)
+
+    pms = @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context)
+    pms.size.should == 1
+    pm = @plugin.get_payment_method_detail(@kb_account_id, pms[0].payment_method_id, @properties, @call_context)
+    @plugin.find_value_from_properties(pm.properties, 'token').should be_nil
+    @plugin.find_value_from_properties(pm.properties, 'ccFirstName').should == 'Paul'
+    @plugin.find_value_from_properties(pm.properties, 'ccLastName').should == 'Dupond'
+    @plugin.find_value_from_properties(pm.properties, 'ccType').should == 'visa'
+    @plugin.find_value_from_properties(pm.properties, 'ccExpirationMonth').should == '12'
+    @plugin.find_value_from_properties(pm.properties, 'ccExpirationYear').should == '17'
+    @plugin.find_value_from_properties(pm.properties, 'ccLast4').should == '1111'
+    @plugin.find_value_from_properties(pm.properties, 'ccNumber').should == '41111111111111111'
+
+    # Verify we can retrieve the payment source, during the payment call
+    source = @plugin.get_payment_source(pm.kb_payment_method_id, [], {}, @call_context)
+    source.is_a?(::ActiveMerchant::Billing::CreditCard).should be_true
+    source.first_name.should == 'Paul'
+    source.last_name.should == 'Dupond'
+    source.brand.should == 'visa'
+    source.month.should == 12
+    source.year.should == 17
+    source.number.should == '41111111111111111'
+  end
+
+  it 'should support storing a token' do
+    @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
+
+    properties = []
+    properties << create_pm_kv_info('token', 'ABCDEF')
+    payment_method_props            = ::Killbill::Plugin::Model::PaymentMethodPlugin.new
+    payment_method_props.properties = properties
+    @plugin.add_payment_method(@kb_account_id, SecureRandom.uuid, payment_method_props, true, @properties, @call_context)
+
+    pms = @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context)
+    pms.size.should == 1
+    pm = @plugin.get_payment_method_detail(@kb_account_id, pms[0].payment_method_id, @properties, @call_context)
+    @plugin.find_value_from_properties(pm.properties, 'token').should == 'ABCDEF'
+    @plugin.find_value_from_properties(pm.properties, 'ccFirstName').should be_nil
+    @plugin.find_value_from_properties(pm.properties, 'ccLastName').should be_nil
+    @plugin.find_value_from_properties(pm.properties, 'ccType').should be_nil
+    @plugin.find_value_from_properties(pm.properties, 'ccExpirationMonth').should be_nil
+    @plugin.find_value_from_properties(pm.properties, 'ccExpirationYear').should be_nil
+    @plugin.find_value_from_properties(pm.properties, 'ccLast4').should be_nil
+    @plugin.find_value_from_properties(pm.properties, 'ccNumber').should be_nil
+
+    # Verify we can retrieve the payment source, during the payment call
+    source = @plugin.get_payment_source(pm.kb_payment_method_id, [], {}, @call_context)
+    source.should == 'ABCDEF'
+  end
+
+  it 'should support storing a placeholder row' do
+    @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
+
+    @plugin.add_payment_method(@kb_account_id, SecureRandom.uuid, ::Killbill::Plugin::Model::PaymentMethodPlugin.new, true, @properties, @call_context)
+
+    pms = @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context)
+    pms.size.should == 1
+    pm = @plugin.get_payment_method_detail(@kb_account_id, pms[0].payment_method_id, @properties, @call_context)
+    @plugin.find_value_from_properties(pm.properties, 'token').should be_nil
+    @plugin.find_value_from_properties(pm.properties, 'ccFirstName').should be_nil
+    @plugin.find_value_from_properties(pm.properties, 'ccLastName').should be_nil
+    @plugin.find_value_from_properties(pm.properties, 'ccType').should be_nil
+    @plugin.find_value_from_properties(pm.properties, 'ccExpirationMonth').should be_nil
+    @plugin.find_value_from_properties(pm.properties, 'ccExpirationYear').should be_nil
+    @plugin.find_value_from_properties(pm.properties, 'ccLast4').should be_nil
+    @plugin.find_value_from_properties(pm.properties, 'ccNumber').should be_nil
+
+    # Verify we can retrieve the payment source, during the payment call
+    source = @plugin.get_payment_source(pm.kb_payment_method_id, [], {}, @call_context)
+    source.is_a?(::ActiveMerchant::Billing::CreditCard).should be_true
+    source.first_name.should be_nil
+    source.last_name.should be_nil
+    source.brand.should be_nil
+    source.month.should be_nil
+    source.year.should be_nil
+    source.number.should be_nil
+  end
+
   private
 
   def verify_transaction_info_plugin(t_info_plugin, kb_transaction_id, type, transaction_nb, payment_processor_account_id='default')

data/spec/killbill/helpers/test_schema.rb

@@ -7,9 +7,15 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.string   "cc_first_name"
     t.string   "cc_last_name"
     t.string   "cc_type"
-    t.integer  "cc_exp_month"
-    t.integer  "cc_exp_year"
-    t.integer  "cc_last_4"
+    t.string   "cc_exp_month"
+    t.string   "cc_exp_year"
+    t.string   "cc_number"
+    t.string   "cc_last_4"
+    t.string   "cc_start_month"
+    t.string   "cc_start_year"
+    t.string   "cc_issue_number"
+    t.string   "cc_verification_value"
+    t.string   "cc_track_data"
     t.string   "address1"
     t.string   "address2"
     t.string   "city"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 3.1.12
+  version: 3.2.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -451,6 +451,7 @@ files:
 - spec/killbill/gen_conversions_spec.rb
 - spec/killbill/helpers/configuration_spec.rb
 - spec/killbill/helpers/connection_spec.rb
+- spec/killbill/helpers/gateway_spec.rb
 - spec/killbill/helpers/killbill_spec_helper_spec.rb
 - spec/killbill/helpers/payment_method_spec.rb
 - spec/killbill/helpers/payment_plugin_spec.rb
@@ -506,6 +507,7 @@ test_files:
 - spec/killbill/gen_conversions_spec.rb
 - spec/killbill/helpers/configuration_spec.rb
 - spec/killbill/helpers/connection_spec.rb
+- spec/killbill/helpers/gateway_spec.rb
 - spec/killbill/helpers/killbill_spec_helper_spec.rb
 - spec/killbill/helpers/payment_method_spec.rb
 - spec/killbill/helpers/payment_plugin_spec.rb