killbill 7.0.1 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbad6a58f042a015aede5807c95e57ac86d66fdc
-  data.tar.gz: 85594f0640bc24e2c653f5fe5dfe4901c8b8b069
+  metadata.gz: 00abb7d62cbbd3b1acc310c30aa019e49b77d97b
+  data.tar.gz: 24147e06c6b475e35445ff4e6d4ff2854adc22ef
 SHA512:
-  metadata.gz: 62361ea463e1bede2da261aa960bef3454647f9b6d39822dd327bb3fca96740568ced1caf72497c12320dd4913d33dc868ef5c17e73f8297171a48d4120a76d0
-  data.tar.gz: 76ca4e94b266214e9b0e4b3e068a70cbf8a0ac39d7cb66d22e14cec88c348162815f19f392d92be97ad489b671cd90385f585c9b68ce7918526fc7e4d76eb02e
+  metadata.gz: 8dea0afb1b1749936bd9571c4b033b67ad5832d98dcafaa0ef67763c13a66a0881115d6a15cfa98f4249ac279d3b5ab6b286451dca9454edf2835229562e544c
+  data.tar.gz: 50d34ba943202a7de31eaa8f2576825bc16da05625a6cb1a819f5b835d42ab95f1eec044a9d97c762229ef7a5a39df73943552d51314d4df7a008ca8e8392464

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill (7.0.1)
+    killbill (7.0.2)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)
@@ -56,7 +56,7 @@ GEM
     diff-lcs (1.1.3)
     equalizer (0.0.11)
     erubis (2.7.0)
-    ethon (0.8.0)
+    ethon (0.8.1)
       ffi (>= 1.3.0)
     ffi (1.9.10-java)
     i18n (0.7.0)

data/NEWS

@@ -1,3 +1,6 @@
+7.0.2
+    Handle blank tokens
+
 7.0.1
     Update ActiveMerchant config helper to retrieve per-tenant configuration
     Improve exception logging in ActiveMerchant

data/generators/active_merchant/templates/LICENSE.rb

@@ -186,7 +186,7 @@ Apache License
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2015 The Billing Project, LLC
+   Copyright 2016 The Billing Project, LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

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

@@ -48,6 +48,7 @@ CREATE TABLE <%= identifier %>_transactions (
   PRIMARY KEY (id)
 ) /*! ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin */;
 CREATE INDEX index_<%= identifier %>_transactions_kb_payment_id ON <%= identifier %>_transactions(kb_payment_id);
+CREATE INDEX index_<%= identifier %>_transactions_<%= identifier %>_response_id ON <%= identifier %>_transactions(<%= identifier %>_response_id);
 
 CREATE TABLE <%= identifier %>_responses (
   id serial UNIQUE,
@@ -73,3 +74,4 @@ CREATE TABLE <%= identifier %>_responses (
   kb_tenant_id varchar(255) DEFAULT NULL,
   PRIMARY KEY (id)
 ) /*! ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin */;
+CREATE INDEX index_<%= identifier %>_responses_kb_payment_id_kb_tenant_id ON <%= identifier %>_responses(kb_payment_id, kb_tenant_id);

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

@@ -50,6 +50,7 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
   end
 
   add_index(:<%= identifier %>_transactions, :kb_payment_id)
+  add_index(:<%= identifier %>_transactions, :<%= identifier %>_response_id)
 
   create_table "<%= identifier %>_responses", :force => true do |t|
     t.string   "api_call",          :null => false
@@ -73,4 +74,6 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.string   "kb_account_id"
     t.string   "kb_tenant_id"
   end
+
+  add_index(:<%= identifier %>_responses, [:kb_payment_id, :kb_tenant_id])
 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', '~> 4'
+  s.add_dependency 'killbill', '~> 7.0'
 
   s.add_dependency 'sinatra', '~> 1.3.4'
   s.add_dependency 'thread_safe', '~> 0.3.4'
@@ -34,7 +34,8 @@ Gem::Specification.new do |s|
   end
   s.add_dependency 'actionpack', '~> 4.1.0'
   s.add_dependency 'actionview', '~> 4.1.0'
-  s.add_dependency 'activemerchant', '~> 1.48.0'
+  # 1.56.0 and above requires Ruby 2.0
+  s.add_dependency 'activemerchant', '~> 1.55.0'
   s.add_dependency 'offsite_payments', '~> 2.1.0'
   s.add_dependency 'monetize', '~> 1.1.0'
   s.add_dependency 'money', '~> 6.5.1'

data/generators/active_merchant/templates/pom.xml.rb

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-~ Copyright 2015 The Billing Project, LLC
+~ Copyright 2016 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

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

@@ -24,7 +24,7 @@ module Killbill
                           :kb_account_id        => kb_account_id,
                           :kb_payment_method_id => kb_payment_method_id,
                           :kb_tenant_id         => kb_tenant_id,
-                          :token                => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? response.authorization : (cc_or_token || response.authorization),
+                          :token                => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? response.authorization.presence : (cc_or_token || response.authorization).presence,
                           :cc_first_name        => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.first_name : extra_params[:cc_first_name],
                           :cc_last_name         => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.last_name : extra_params[:cc_last_name],
                           :cc_type              => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.brand : extra_params[:cc_type],

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

@@ -499,7 +499,7 @@ module Killbill
 
             if cc_number.blank? && !pm.nil?
               # Lookup existing token
-              if pm.token.nil?
+              if pm.token.blank?
                 # Real credit card
                 cc_or_token = build_am_credit_card(pm.cc_number, attributes, pm)
               else

data/lib/killbill/version.rb

@@ -1,3 +1,3 @@
 module Killbill
-  VERSION = '7.0.1'
+  VERSION = '7.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.2
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra