killbill 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6141d190c01d2ec61eda77a25f6695333d63621b
-  data.tar.gz: 9f4e38f84685bbdbdfa38029b35b7788f628356d
+  metadata.gz: ce31dbfe71c1ea2aae402a3a5f30d4635f1f44dc
+  data.tar.gz: 028044c61a02e5957099524601055f15c596e9a8
 SHA512:
-  metadata.gz: 6f00d1843589dbed8539e0f50032cce941b10c065a6e045ba451be1e336b5f21e34a6e65dda277a14313cd2680277726086ee72f88884e25e110ca222b144857
-  data.tar.gz: a70b7729a4ff199f52fbeee6b8f37c5a9c803edb70739c5c68c4407fb833dd01ca229fcbd6a86c456fdffe4e37dc310cb4ecbe9d9649997449d50e26f145063c
+  metadata.gz: 579efbe60b305303205c3e2cedc03b66cd6b2622244f304b0d05f5fe87729edeff61c07c7117819f38d422d48e8cb8d563c5e5f6759f3ba4fd79eaf061ffc55d
+  data.tar.gz: 99c8c98f3085e9fa83b1745cef3bd224c74c23efdd394a56cf9dde919ffc1090f59d96873d8fe7c64a1d0d9eadcef0a72fe7bdcff7d38dbc94310c5e37ad398d

data/Jarfile

@@ -1,4 +1,4 @@
-jar 'org.kill-bill.billing:killbill-api', '0.9.7'
+jar 'org.kill-bill.billing:killbill-api', '0.9.8'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.7.4'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.7.4'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.7.4'

data/NEWS

@@ -1,3 +1,8 @@
+3.1.6
+    Updates to support killbill-api 0.9.8
+    Fix properties handling in add_payment_method
+    Performance improvements
+
 3.1.5
     Updates to support killbill-api 0.9.7
 

data/VERSION

@@ -1 +1 @@
-3.1.5
+3.1.6

data/generators/active_merchant/templates/Jarfile.rb

@@ -1,4 +1,4 @@
-jar 'org.kill-bill.billing:killbill-api', '0.9.6'
+jar 'org.kill-bill.billing:killbill-api', '0.9.8'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.7.4'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.7.4'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.7.4'

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

@@ -6,7 +6,7 @@ module Killbill #:nodoc:
 
       has_one :<%= identifier %>_transaction
 
-      def self.from_response(api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, kb_tenant_id, response, extra_params = {})
+      def self.from_response(api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, kb_tenant_id, response, extra_params = {}, model = ::Killbill::<%= class_name %>::<%= class_name %>Response)
         super(api_call,
               kb_account_id,
               kb_payment_id,
@@ -19,7 +19,7 @@ module Killbill #:nodoc:
                   #:params_id => extract(response, 'id'),
                   #:params_card_id => extract(response, 'card', 'id')
               }.merge!(extra_params),
-              ::Killbill::<%= class_name %>::<%= class_name %>Response)
+              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.4'
+  s.add_dependency 'killbill', '~> 3.1.6'
   s.add_dependency 'activemerchant', '~> 1.42.9'
   s.add_dependency 'activerecord', '~> 4.1.0'
   s.add_dependency 'actionpack', '~> 4.1.0'

data/lib/killbill/gen/api/killbill_api.rb

@@ -0,0 +1,43 @@
+###################################################################################
+#                                                                                 #
+#                   Copyright 2010-2013 Ning, 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 Api
+
+      java_package 'org.killbill.billing'
+      class KillbillApi
+
+        include org.killbill.billing.KillbillApi
+
+        def initialize(real_java_api)
+          @real_java_api = real_java_api
+        end
+
+      end
+    end
+  end
+end

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

@@ -86,6 +86,7 @@ require 'killbill/gen/api/invoice_item'
 require 'killbill/gen/api/invoice_payment'
 require 'killbill/gen/api/invoice_payment_api'
 require 'killbill/gen/api/invoice_user_api'
+require 'killbill/gen/api/killbill_api'
 require 'killbill/gen/api/plugin_config_service_api'
 require 'killbill/gen/api/osgi_killbill'
 require 'killbill/gen/api/osgi_plugin_properties'

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

@@ -3,6 +3,37 @@ module Killbill
     module ActiveMerchant
       module Helpers
 
+        # In our profiling, we noticed that ActiveRecord::Sanitization::ClassMethods.sanitize_sql was taking
+        # about 50% of where queries calls time, mainly because of the String#gsub magic in ActiveRecord::Sanitization::ClassMethods.replace_bind_variables.
+        # We don't want to issue raw SQL because we still want to be able to support multiple back-ends (at least SQLite and MySQL),
+        # so we cache the quoted values (this should also give us SQL injection protection).
+        # The gain is not 50% but more around 30% due to the Mutex overhead in the cache
+        def build_quotes_cache(max_size=1000)
+          # See ::ActiveRecord::Sanitization::ClassMethods.quote_bound_value
+          quote_bound_value_proc = Proc.new { |value|
+            c = connection
+
+            if value.respond_to?(:map) && !value.acts_like?(:string)
+              if value.respond_to?(:empty?) && value.empty?
+                c.quote(nil)
+              else
+                value.map { |v| c.quote(v) }.join(',')
+              end
+            else
+              c.quote(value)
+            end
+          }
+
+          Killbill::Plugin::ActiveMerchant::Utils::BoundedLRUCache.new(quote_bound_value_proc, max_size)
+        end
+
+        def shared_activerecord_options
+          {
+              # We don't use validations -- small performance gain by bypassing the stack
+              :validate => false
+          }
+        end
+
         # Useful helper to extract params from AM response objects, e.g. extract(response, 'card', 'address_country')
         def extract(response, key1, key2=nil, key3=nil)
           return nil if response.nil? || response.params.nil?

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

@@ -12,6 +12,8 @@ module Killbill
 
           self.abstract_class = true
 
+          @@quotes_cache = build_quotes_cache
+
           def self.from_response(kb_account_id, kb_payment_method_id, kb_tenant_id, cc_or_token, response, options, extra_params = {}, model = PaymentMethod)
             model.new({
                           :kb_account_id        => kb_account_id,
@@ -35,17 +37,17 @@ module Killbill
 
           def self.from_kb_account_id(kb_account_id, kb_tenant_id)
             if kb_tenant_id.nil?
-              where('kb_account_id = ? AND kb_tenant_id is NULL AND is_deleted = ?', kb_account_id, false)
+              where("kb_account_id = #{@@quotes_cache[kb_account_id]} AND kb_tenant_id is NULL AND is_deleted = #{@@quotes_cache[false]}")
             else
-              where('kb_account_id = ? AND kb_tenant_id = ? AND is_deleted = ?', kb_account_id, kb_tenant_id, false)
+              where("kb_account_id = #{@@quotes_cache[kb_account_id]} AND kb_tenant_id = #{@@quotes_cache[kb_tenant_id]} AND is_deleted = #{@@quotes_cache[false]}")
             end
           end
 
           def self.from_kb_payment_method_id(kb_payment_method_id, kb_tenant_id)
             if kb_tenant_id.nil?
-              payment_methods = where('kb_payment_method_id = ? AND kb_tenant_id is NULL AND is_deleted = ?', kb_payment_method_id, false)
+              payment_methods = where("kb_payment_method_id = #{@@quotes_cache[kb_payment_method_id]} AND kb_tenant_id is NULL AND is_deleted = #{@@quotes_cache[false]}")
             else
-              payment_methods = where('kb_payment_method_id = ? AND kb_tenant_id = ? AND is_deleted = ?', kb_payment_method_id, kb_tenant_id, false)
+              payment_methods = where("kb_payment_method_id = #{@@quotes_cache[kb_payment_method_id]} AND kb_tenant_id = #{@@quotes_cache[kb_tenant_id]} AND is_deleted = #{@@quotes_cache[false]}")
             end
             raise "No payment method found for payment method #{kb_payment_method_id}" if payment_methods.empty?
             raise "Kill Bill payment method #{kb_payment_method_id} mapping to multiple active plugin payment methods" if payment_methods.size > 1
@@ -55,7 +57,7 @@ module Killbill
           def self.mark_as_deleted!(kb_payment_method_id, kb_tenant_id)
             payment_method = from_kb_payment_method_id(kb_payment_method_id, kb_tenant_id)
             payment_method.is_deleted = true
-            payment_method.save!
+            payment_method.save!(shared_activerecord_options)
           end
 
           # Override in your plugin if needed

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

@@ -35,6 +35,46 @@ 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)
+            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.save!(shared_activerecord_options)
+
+              transaction = nil
+              txn_id      = response.txn_id
+              if response.success and !kb_payment_id.blank? and !txn_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
+                  # Originally, we used response.send("build_#{identifier}_transaction"), but the ActiveRecord magic was adding
+                  # about 20% overhead - instead, we now construct the transaction record manually
+                  transaction = transaction_model.new(:kb_account_id              => kb_account_id,
+                                                      :kb_tenant_id               => kb_tenant_id,
+                                                      :amount_in_cents            => amount_in_cents,
+                                                      :currency                   => currency,
+                                                      :api_call                   => api_call,
+                                                      :kb_payment_id              => kb_payment_id,
+                                                      :kb_payment_transaction_id  => kb_payment_transaction_id,
+                                                      :transaction_type           => transaction_type,
+                                                      :txn_id                     => txn_id,
+                                                      "#{identifier}_response_id" => response.id)
+                  transaction.save!(shared_activerecord_options)
+                rescue => e
+                  exception = e
+                end
+              end
+            end
+
+            raise exception unless exception.nil?
+
+            return response, transaction
+          end
+
           def to_transaction_info_plugin(transaction=nil)
             if transaction.nil?
               amount_in_cents = nil

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

@@ -6,9 +6,14 @@ module Killbill
 
         class Transaction < ::ActiveRecord::Base
 
+          extend ::Killbill::Plugin::ActiveMerchant::Helpers
+
           self.abstract_class = true
 
+          @@quotes_cache = build_quotes_cache
+
           class << self
+
             def transactions_from_kb_payment_id(kb_payment_id, kb_tenant_id)
               where(:kb_payment_id => kb_payment_id, :kb_tenant_id => kb_tenant_id).order(:created_at)
             end
@@ -44,15 +49,14 @@ module Killbill
             def do_find_candidate_transaction_for_refund(api_call, kb_payment_id, kb_tenant_id, amount_in_cents)
               # Find one successful charge which amount is at least the amount we are trying to refund
               if kb_tenant_id.nil?
-                transactions = where('amount_in_cents >= ? AND api_call = ? AND kb_tenant_id is NULL AND kb_payment_id = ?', amount_in_cents, api_call, kb_payment_id).order(:created_at)
+                transactions = where("amount_in_cents >= #{@@quotes_cache[amount_in_cents]} AND api_call = #{@@quotes_cache[api_call]} AND kb_tenant_id is NULL AND kb_payment_id = #{@@quotes_cache[kb_payment_id]}").order(:created_at)
               else
-                transactions = where('amount_in_cents >= ? AND api_call = ? AND kb_tenant_id = ? AND kb_payment_id = ?', amount_in_cents, api_call, kb_tenant_id, kb_payment_id).order(:created_at)
+                transactions = where("amount_in_cents >= #{@@quotes_cache[amount_in_cents]} AND api_call = #{@@quotes_cache[api_call]} AND kb_tenant_id = #{@@quotes_cache[kb_tenant_id]} AND kb_payment_id = #{@@quotes_cache[kb_payment_id]}").order(:created_at)
               end
               raise "Unable to find transaction for payment #{kb_payment_id} and api_call #{api_call}" if transactions.size == 0
 
               # We have candidates, but we now need to make sure we didn't refund more than for the specified amount
-              amount_refunded_in_cents = where('api_call = ? and kb_payment_id = ?', :refund, kb_payment_id)
-                                         .sum('amount_in_cents')
+              amount_refunded_in_cents = where("api_call = #{@@quotes_cache['refund']} and kb_payment_id = #{@@quotes_cache[kb_payment_id]}").sum('amount_in_cents')
 
               amount_left_to_refund_in_cents = -amount_refunded_in_cents
               transactions.map { |transaction| amount_left_to_refund_in_cents += transaction.amount_in_cents }
@@ -67,13 +71,13 @@ module Killbill
                   if transaction_type.nil?
                     transactions = where("kb_tenant_id is NULL AND #{attribute.to_s} = ?", attribute_value).order(:created_at)
                   else
-                    transactions = where("transaction_type = ? AND kb_tenant_id is NULL AND #{attribute.to_s} = ?", transaction_type, attribute_value).order(:created_at)
+                    transactions = where("transaction_type = #{@@quotes_cache[transaction_type]} AND kb_tenant_id is NULL AND #{attribute.to_s} = #{@@quotes_cache[attribute_value]}").order(:created_at)
                   end
                 else
                   if transaction_type.nil?
-                    transactions = where("kb_tenant_id = ? AND #{attribute.to_s} = ?", kb_tenant_id, attribute_value).order(:created_at)
+                    transactions = where("kb_tenant_id = #{@@quotes_cache[kb_tenant_id]} AND #{attribute.to_s} = #{@@quotes_cache[attribute_value]}").order(:created_at)
                   else
-                    transactions = where("transaction_type = ? AND kb_tenant_id = ? AND #{attribute.to_s} = ?", transaction_type, kb_tenant_id, attribute_value).order(:created_at)
+                    transactions = where("transaction_type = #{@@quotes_cache[transaction_type]} AND kb_tenant_id = #{@@quotes_cache[kb_tenant_id]} AND #{attribute.to_s} = #{@@quotes_cache[attribute_value]}").order(:created_at)
                   end
                 end
                 if how_many == :single

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

@@ -152,7 +152,7 @@ module Killbill
         end
 
         def add_payment_method(kb_account_id, kb_payment_method_id, payment_method_props, set_default, properties, context)
-          all_properties = (payment_method_props || payment_method_props.properties || []) + properties
+          all_properties        = (payment_method_props.nil? || payment_method_props.properties.nil? ? [] : payment_method_props.properties) + properties
           options               = properties_to_hash(properties)
           options[:set_default] ||= set_default
           options[:order_id]    ||= kb_payment_method_id
@@ -401,27 +401,10 @@ module Killbill
         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?
 
-          # Save the response to our logs
-          response = @response_model.from_response(api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, kb_tenant_id, response)
-          response.save!
-
-          transaction = nil
-          txn_id      = response.txn_id
-          if response.success and !kb_payment_id.blank? and !txn_id.blank?
-            # Record the transaction
-            transaction = response.send("create_#{@identifier}_transaction!",
-                                        :kb_account_id             => kb_account_id,
-                                        :kb_tenant_id              => kb_tenant_id,
-                                        :amount_in_cents           => amount_in_cents,
-                                        :currency                  => currency,
-                                        :api_call                  => api_call,
-                                        :kb_payment_id             => kb_payment_id,
-                                        :kb_payment_transaction_id => kb_payment_transaction_id,
-                                        :transaction_type          => transaction_type,
-                                        :txn_id                    => txn_id)
-
-            @logger.debug "Recorded transaction: #{transaction.inspect}"
-          end
+          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)
+
+          @logger.debug "Recorded transaction: #{transaction.inspect}" unless transaction.nil?
+
           return response, transaction
         end
 

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

@@ -7,15 +7,53 @@ module Killbill
 
         def self.compact_uuid(uuid)
           uuid = uuid.gsub(/-/, '')
-          uuid.hex.base(62).map{ |i| BASE62[i].chr } * ''
+          uuid.hex.base(62).map { |i| BASE62[i].chr } * ''
         end
 
         def self.unpack_uuid(base62_uuid)
-          as_hex = base62_uuid.split(//).inject(0) { |i,e| i*62 + BASE62.index(e[0]) }
+          as_hex     = base62_uuid.split(//).inject(0) { |i, e| i*62 + BASE62.index(e[0]) }
           no_hyphens = "%x" % as_hex
           no_hyphens = '0' * (32 - no_hyphens.size) + no_hyphens
           no_hyphens.insert(8, "-").insert(13, "-").insert(18, "-").insert(23, "-")
         end
+
+        # Relies on the fact that hashes enumerate their values in the order that the corresponding keys were inserted (Ruby 1.9+)
+        class BoundedLRUCache
+
+          def initialize(proc, max_size=1000)
+            @proc     = proc
+            @max_size = max_size
+
+            @semaphore = Mutex.new
+            # TODO Pre-allocate?
+            @data      = {}
+          end
+
+          def [](key)
+            @semaphore.synchronize do
+              found = true
+              value = @data.delete(key) { found = false }
+              if found
+                @data[key] = value
+              else
+                value      = @proc.call(key)
+                @data[key] = value
+                value
+              end
+            end
+          end
+
+          def []=(key, val)
+            @semaphore.synchronize do
+              @data.delete(key)
+              @data[key] = val
+              if @data.length > @max_size
+                @data.delete(@data.first[0])
+              end
+              val
+            end
+          end
+        end
       end
     end
   end

data/spec/killbill/helpers/response_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'spec/killbill/helpers/transaction_spec'
 
 module Killbill #:nodoc:
   module Test #:nodoc:
@@ -6,6 +7,8 @@ module Killbill #:nodoc:
 
       self.table_name = 'test_responses'
 
+      has_one :test_transaction
+
     end
   end
 end
@@ -66,6 +69,37 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::Response do
     ptip.properties.size.should == 11
   end
 
+  it 'should create responses and transactions correctly' do
+    api_call                  = 'for debugging only'
+    kb_account_id             = SecureRandom.uuid
+    kb_payment_id             = SecureRandom.uuid
+    kb_payment_transaction_id = SecureRandom.uuid
+    transaction_type          = :PURCHASE
+    kb_tenant_id              = SecureRandom.uuid
+    success_response          = ::ActiveMerchant::Billing::Response.new(true, 'Message', {}, {
+        :authorization => SecureRandom.uuid,
+        :avs_result    => ::ActiveMerchant::Billing::AVSResult.new(:code => 'P')
+    })
+    failure_response          = ::ActiveMerchant::Billing::Response.new(false, 'Message', {}, {
+        :authorization => SecureRandom.uuid,
+        :avs_result    => ::ActiveMerchant::Billing::AVSResult.new(:code => 'P')
+    })
+
+    response, transaction = ::Killbill::Test::TestResponse.create_response_and_transaction('test', ::Killbill::Test::TestTransaction, api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, kb_tenant_id, success_response, 120, 'USD', {}, ::Killbill::Test::TestResponse)
+    found_response        = ::Killbill::Test::TestResponse.find(response.id)
+    found_response.should == response
+    found_response.test_transaction.should == transaction
+    found_transaction = ::Killbill::Test::TestTransaction.find(transaction.id)
+    found_transaction.should == transaction
+    found_transaction.test_response.should == response
+
+    response, transaction = ::Killbill::Test::TestResponse.create_response_and_transaction('test', ::Killbill::Test::TestTransaction, api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, kb_tenant_id, failure_response, 120, 'USD', {}, ::Killbill::Test::TestResponse)
+    transaction.should be_nil
+    found_response = ::Killbill::Test::TestResponse.find(response.id)
+    found_response.should == response
+    found_response.test_transaction.should be_nil
+  end
+
   it 'should generate the right SQL query' do
     # Check count query (search query numeric)
     expected_query = "SELECT COUNT(DISTINCT \"test_responses\".\"id\") FROM \"test_responses\"  WHERE ((((\"test_responses\".\"kb_payment_id\" = '1234' OR \"test_responses\".\"kb_payment_transaction_id\" = '1234') OR \"test_responses\".\"message\" = '1234') OR \"test_responses\".\"authorization\" = '1234') OR \"test_responses\".\"fraud_review\" = '1234') AND \"test_responses\".\"success\" = 't' AND \"test_responses\".\"kb_tenant_id\" = '11-22-33'  ORDER BY \"test_responses\".\"id\""

data/spec/killbill/helpers/test_schema.rb

@@ -27,11 +27,12 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
   add_index(:test_payment_methods, :kb_payment_method_id)
 
   create_table "test_transactions", :force => true do |t|
-    t.integer  "response_id",  :null => false
+    t.integer  "test_response_id",          :null => false
     t.string   "api_call",                  :null => false
     t.string   "kb_payment_id",             :null => false
     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.datetime "created_at",                :null => false
@@ -43,7 +44,7 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
   add_index(:test_transactions, :kb_payment_id)
 
   create_table "test_responses", :force => true do |t|
-    t.string   "api_call",        :null => false
+    t.string   "api_call",          :null => false
     t.string   "kb_payment_id"
     t.string   "kb_payment_transaction_id"
     t.string   "transaction_type"

data/spec/killbill/helpers/transaction_spec.rb

@@ -6,6 +6,8 @@ module Killbill #:nodoc:
 
       self.table_name = 'test_transactions'
 
+      belongs_to :test_response
+
     end
   end
 end
@@ -129,6 +131,6 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::Transaction do
                                              :currency                  => currency,
                                              :kb_account_id             => kb_account_id,
                                              :kb_tenant_id              => kb_tenant_id,
-                                             :response_id               => 0)
+                                             :test_response_id          => 0)
   end
 end

data/spec/spec_helper.rb

@@ -11,6 +11,7 @@ require 'killbill/http_servlet'
 require 'killbill/payment_test'
 require 'killbill/notification_test'
 require 'killbill/helpers/active_merchant'
+require 'killbill/helpers/active_merchant/active_record/models/helpers'
 
 %w(
   MockAccountUserApi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -247,6 +247,7 @@ files:
 - lib/killbill/gen/api/invoice_payment.rb
 - lib/killbill/gen/api/invoice_payment_api.rb
 - lib/killbill/gen/api/invoice_user_api.rb
+- lib/killbill/gen/api/killbill_api.rb
 - lib/killbill/gen/api/limit.rb
 - lib/killbill/gen/api/listing.rb
 - lib/killbill/gen/api/migration_plan.rb