killbill 3.1.3 → 3.1.4

data/spec/killbill/helpers/test_schema.rb

@@ -28,14 +28,16 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
 
   create_table "test_transactions", :force => true do |t|
     t.integer  "response_id",  :null => false
-    t.string   "api_call",              :null => false
-    t.string   "kb_payment_id",         :null => false
-    t.integer  "amount_in_cents",       :null => false
-    t.string   "currency",              :null => false
-    t.datetime "created_at",            :null => false
-    t.datetime "updated_at",            :null => false
-    t.string   "kb_account_id",         :null => false
-    t.string   "kb_tenant_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.integer  "amount_in_cents",           :null => false
+    t.string   "currency",                  :null => false
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+    t.string   "kb_account_id",             :null => false
+    t.string   "kb_tenant_id",              :null => false
   end
 
   add_index(:test_transactions, :kb_payment_id)
@@ -43,6 +45,8 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
   create_table "test_responses", :force => true do |t|
     t.string   "api_call",        :null => false
     t.string   "kb_payment_id"
+    t.string   "kb_payment_transaction_id"
+    t.string   "transaction_type"
     t.string   "message"
     t.string   "authorization"
     t.boolean  "fraud_review"

data/spec/killbill/helpers/transaction_spec.rb

@@ -0,0 +1,134 @@
+require 'spec_helper'
+
+module Killbill #:nodoc:
+  module Test #:nodoc:
+    class TestTransaction < ::Killbill::Plugin::ActiveMerchant::ActiveRecord::Transaction
+
+      self.table_name = 'test_transactions'
+
+    end
+  end
+end
+
+describe Killbill::Plugin::ActiveMerchant::ActiveRecord::Transaction do
+
+  before :all do
+    ::Killbill::Test::TestTransaction.delete_all
+  end
+
+  it 'should store and retrieve transactions correctly' do
+    api_call        = 'for debugging only'
+    amount_in_cents = 1242
+    currency        = :USD
+    kb_account_id   = SecureRandom.uuid
+    kb_tenant_id    = SecureRandom.uuid
+
+    kb_payment_id1             = SecureRandom.uuid
+    kb_payment_id2             = SecureRandom.uuid
+    kb_payment_transaction_id1 = SecureRandom.uuid
+    kb_payment_transaction_id2 = SecureRandom.uuid
+    kb_payment_transaction_id3 = SecureRandom.uuid
+    kb_payment_transaction_id4 = SecureRandom.uuid
+    kb_payment_transaction_id5 = SecureRandom.uuid
+    transaction_type1          = :AUTHORIZE
+    transaction_type2          = :CAPTURE
+    transaction_type3          = :CAPTURE
+    transaction_type4          = :PURCHASE
+    transaction_type5          = :REFUND
+
+    create_transaction(api_call, kb_payment_id1, kb_payment_transaction_id1, transaction_type1, amount_in_cents, currency, kb_account_id, kb_tenant_id)
+    create_transaction(api_call, kb_payment_id1, kb_payment_transaction_id2, transaction_type2, amount_in_cents, currency, kb_account_id, kb_tenant_id)
+    create_transaction(api_call, kb_payment_id1, kb_payment_transaction_id3, transaction_type3, amount_in_cents, currency, kb_account_id, kb_tenant_id)
+    create_transaction(api_call, kb_payment_id2, kb_payment_transaction_id4, transaction_type4, amount_in_cents, currency, kb_account_id, kb_tenant_id)
+    create_transaction(api_call, kb_payment_id2, kb_payment_transaction_id5, transaction_type5, amount_in_cents, currency, kb_account_id, kb_tenant_id)
+
+    ::Killbill::Test::TestTransaction.transactions_from_kb_payment_id(kb_payment_id1, nil).size.should == 0
+    ::Killbill::Test::TestTransaction.transactions_from_kb_payment_id(kb_payment_id1, SecureRandom.uuid).size.should == 0
+    ::Killbill::Test::TestTransaction.transactions_from_kb_payment_id(SecureRandom.uuid, kb_tenant_id).size.should == 0
+
+    # Lookup transactions for kb_payment_id1
+    ts = ::Killbill::Test::TestTransaction.transactions_from_kb_payment_id(kb_payment_id1, kb_tenant_id)
+    ts.size.should == 3
+    ts[0].kb_payment_transaction_id.should == kb_payment_transaction_id1
+    ts[1].kb_payment_transaction_id.should == kb_payment_transaction_id2
+    ts[2].kb_payment_transaction_id.should == kb_payment_transaction_id3
+
+    # Lookup transactions for kb_payment_id2
+    ts = ::Killbill::Test::TestTransaction.transactions_from_kb_payment_id(kb_payment_id2, kb_tenant_id)
+    ts.size.should == 2
+    ts[0].kb_payment_transaction_id.should == kb_payment_transaction_id4
+    ts[1].kb_payment_transaction_id.should == kb_payment_transaction_id5
+
+    # Lookup AUTH for kb_payment_id1
+    ts = ::Killbill::Test::TestTransaction.authorizes_from_kb_payment_id(kb_payment_id1, kb_tenant_id)
+    ts.size.should == 1
+    ts[0].kb_payment_transaction_id.should == kb_payment_transaction_id1
+    ts = ::Killbill::Test::TestTransaction.authorizations_from_kb_payment_id(kb_payment_id1, kb_tenant_id)
+    ts.size.should == 1
+    ts[0].kb_payment_transaction_id.should == kb_payment_transaction_id1
+
+    # Lookup CAPTURE for kb_payment_id1
+    ts = ::Killbill::Test::TestTransaction.captures_from_kb_payment_id(kb_payment_id1, kb_tenant_id)
+    ts.size.should == 2
+    ts[0].kb_payment_transaction_id.should == kb_payment_transaction_id2
+    ts[1].kb_payment_transaction_id.should == kb_payment_transaction_id3
+
+    # Lookup PURCHASE for kb_payment_id1
+    ::Killbill::Test::TestTransaction.purchases_from_kb_payment_id(kb_payment_id1, kb_tenant_id).size.should == 0
+
+    # Lookup CREDIT for kb_payment_id1
+    ::Killbill::Test::TestTransaction.credits_from_kb_payment_id(kb_payment_id1, kb_tenant_id).size.should == 0
+
+    # Lookup REFUND for kb_payment_id1
+    ::Killbill::Test::TestTransaction.refunds_from_kb_payment_id(kb_payment_id1, kb_tenant_id).size.should == 0
+
+    # Lookup VOID for kb_payment_id1
+    ::Killbill::Test::TestTransaction.void_from_kb_payment_id(kb_payment_id1, kb_tenant_id).should be_nil
+
+    # Lookup AUTH for kb_payment_id2
+    ::Killbill::Test::TestTransaction.authorizes_from_kb_payment_id(kb_payment_id2, kb_tenant_id).size.should == 0
+    ::Killbill::Test::TestTransaction.authorizations_from_kb_payment_id(kb_payment_id2, kb_tenant_id).size.should == 0
+
+    # Lookup CAPTURE for kb_payment_id2
+    ::Killbill::Test::TestTransaction.captures_from_kb_payment_id(kb_payment_id2, kb_tenant_id).size.should == 0
+
+    # Lookup PURCHASE for kb_payment_id2
+    ts = ::Killbill::Test::TestTransaction.purchases_from_kb_payment_id(kb_payment_id2, kb_tenant_id)
+    ts.size.should == 1
+    ts[0].kb_payment_transaction_id.should == kb_payment_transaction_id4
+
+    # Lookup CREDIT for kb_payment_id2
+    ::Killbill::Test::TestTransaction.credits_from_kb_payment_id(kb_payment_id2, kb_tenant_id).size.should == 0
+
+    # Lookup REFUND for kb_payment_id2
+    ts = ::Killbill::Test::TestTransaction.refunds_from_kb_payment_id(kb_payment_id2, kb_tenant_id)
+    ts.size.should == 1
+    ts[0].kb_payment_transaction_id.should == kb_payment_transaction_id5
+
+    # Lookup VOID for kb_payment_id2
+    ::Killbill::Test::TestTransaction.void_from_kb_payment_id(kb_payment_id2, kb_tenant_id).should be_nil
+
+    # Lookup individual transactions
+    ::Killbill::Test::TestTransaction.from_kb_payment_transaction_id(kb_payment_transaction_id1, SecureRandom.uuid).should be_nil
+    ::Killbill::Test::TestTransaction.from_kb_payment_transaction_id(SecureRandom.uuid, kb_tenant_id).should be_nil
+    ::Killbill::Test::TestTransaction.from_kb_payment_transaction_id(kb_payment_transaction_id1, kb_tenant_id).transaction_type.should == 'AUTHORIZE'
+    ::Killbill::Test::TestTransaction.from_kb_payment_transaction_id(kb_payment_transaction_id2, kb_tenant_id).transaction_type.should == 'CAPTURE'
+    ::Killbill::Test::TestTransaction.from_kb_payment_transaction_id(kb_payment_transaction_id3, kb_tenant_id).transaction_type.should == 'CAPTURE'
+    ::Killbill::Test::TestTransaction.from_kb_payment_transaction_id(kb_payment_transaction_id4, kb_tenant_id).transaction_type.should == 'PURCHASE'
+    ::Killbill::Test::TestTransaction.from_kb_payment_transaction_id(kb_payment_transaction_id5, kb_tenant_id).transaction_type.should == 'REFUND'
+  end
+
+  private
+
+  def create_transaction(api_call, kb_payment_id, kb_payment_transaction_id, transaction_type, amount_in_cents, currency, kb_account_id, kb_tenant_id)
+    ::Killbill::Test::TestTransaction.create(:api_call                  => api_call,
+                                             :kb_payment_id             => kb_payment_id,
+                                             :kb_payment_transaction_id => kb_payment_transaction_id,
+                                             :transaction_type          => transaction_type,
+                                             :amount_in_cents           => amount_in_cents,
+                                             :currency                  => currency,
+                                             :kb_account_id             => kb_account_id,
+                                             :kb_tenant_id              => kb_tenant_id,
+                                             :response_id               => 0)
+  end
+end

data/spec/killbill/payment_plugin_api_spec.rb

@@ -4,18 +4,18 @@ require 'spec_helper'
 describe Killbill::Plugin::Api::PaymentPluginApi do
 
   before(:all) do
-    @call_context = Killbill::Plugin::Model::CallContext.new
-    logger = ::Logger.new(STDOUT)
-    @paymentPluginApi =  Killbill::Plugin::Api::PaymentPluginApi.new("Killbill::Plugin::PaymentTest", { "logger" => logger })
-    @kb_account_id = java.util.UUID.fromString("aa5c926e-3d9d-4435-b44b-719d7b583256")
-    @kb_payment_id = java.util.UUID.fromString("bf5c926e-3d9c-470e-b34b-719d7b58323a")
-    @kb_payment_method_id = java.util.UUID.fromString("bf5c926e-3d9c-470e-b34b-719d7b58323a")
+    @call_context          = Killbill::Plugin::Model::CallContext.new
+    logger                 = ::Logger.new(STDOUT)
+    @paymentPluginApi      = Killbill::Plugin::Api::PaymentPluginApi.new("Killbill::Plugin::PaymentTest", {"logger" => logger})
+    @kb_account_id         = java.util.UUID.fromString("aa5c926e-3d9d-4435-b44b-719d7b583256")
+    @kb_payment_id         = java.util.UUID.fromString("bf5c926e-3d9c-470e-b34b-719d7b58323a")
+    @kb_payment_method_id  = java.util.UUID.fromString("bf5c926e-3d9c-470e-b34b-719d7b58323a")
     @payment_method_plugin = nil
-    @amount = java.math.BigDecimal.new("50")
-    @currency = Java::org.killbill.billing.catalog.api.Currency::USD
-    propertyA = Java::org.killbill.billing.payment.api.PluginProperty.new('keyA', 'valueA', false)
-    propertyB = Java::org.killbill.billing.payment.api.PluginProperty.new('keyB', 'valueB', true)
-    @properties = java.util.ArrayList.new
+    @amount                = java.math.BigDecimal.new("50")
+    @currency              = Java::org.killbill.billing.catalog.api.Currency::USD
+    propertyA              = Java::org.killbill.billing.payment.api.PluginProperty.new('keyA', 'valueA', false)
+    propertyB              = Java::org.killbill.billing.payment.api.PluginProperty.new('keyB', 'valueB', true)
+    @properties            = java.util.ArrayList.new
     @properties.add(propertyA)
     @properties.add(propertyB)
   end
@@ -25,7 +25,7 @@ describe Killbill::Plugin::Api::PaymentPluginApi do
   end
 
   it "should_test_charge_ok" do
-    output = @paymentPluginApi.process_payment(@kb_account_id, @kb_payment_id, @kb_payment_method_id, @amount, @currency, @properties, nil)
+    output = @paymentPluginApi.purchase_payment(@kb_account_id, @kb_payment_id, @kb_payment_transaction_id, @kb_payment_method_id, @amount, @currency, @properties, nil)
     output.amount.should be_an_instance_of java.math.BigDecimal
     output.amount.compare_to(@amount).should == 0
     output.status.java_kind_of?(Java::org.killbill.billing.payment.plugin.api.PaymentPluginStatus).should == true
@@ -34,35 +34,35 @@ describe Killbill::Plugin::Api::PaymentPluginApi do
 
   it "should_test_charge_exception" do
     @paymentPluginApi.delegate_plugin.send(:raise_exception_on_next_calls)
-    lambda { @paymentPluginApi.process_payment(@kb_account_id, @kb_payment_id, @kb_payment_method_id, @amount, @currency, @properties, nil) }.should raise_error Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException
+    lambda { @paymentPluginApi.purchase_payment(@kb_account_id, @kb_payment_id, @kb_payment_transaction_id, @kb_payment_method_id, @amount, @currency, @properties, nil) }.should raise_error Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException
   end
 
   it "should_test_get_payment_info_ok" do
     output = @paymentPluginApi.get_payment_info(@kb_account_id, @kb_payment_method_id, @properties, nil)
+    output.size.should == 1
+    output = output.first
     output.amount.should be_an_instance_of java.math.BigDecimal
     output.amount.compare_to(java.math.BigDecimal.new(0)).should == 0
     output.status.java_kind_of?(Java::org.killbill.billing.payment.plugin.api.PaymentPluginStatus).should == true
     output.status.to_s.should == "PROCESSED"
   end
 
-
   it "should_test_get_payment_info_exception" do
     @paymentPluginApi.delegate_plugin.send(:raise_exception_on_next_calls)
     lambda { @paymentPluginApi.get_payment_info(@kb_account_id, @kb_payment_method_id, @properties, nil) }.should raise_error Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException
   end
 
   it "should_test_refund_ok" do
-    output = @paymentPluginApi.process_refund(@kb_account_id, @kb_payment_method_id, @amount, @currency, @properties, nil)
+    output = @paymentPluginApi.refund_payment(@kb_account_id, @kb_payment_id, @kb_payment_transaction_id, @kb_payment_method_id, @amount, @currency, @properties, nil)
     output.amount.should be_an_instance_of java.math.BigDecimal
     output.amount.compare_to(@amount).should == 0
-    output.status.java_kind_of?(Java::org.killbill.billing.payment.plugin.api.RefundPluginStatus).should == true
+    output.status.java_kind_of?(Java::org.killbill.billing.payment.plugin.api.PaymentPluginStatus).should == true
     output.status.to_s.should == "PROCESSED"
   end
 
-
   it "should_test_refund_exception" do
     @paymentPluginApi.delegate_plugin.send(:raise_exception_on_next_calls)
-    lambda { @paymentPluginApi.process_refund(@kb_account_id, @kb_payment_method_id, @amount, @currency, @properties, nil) }.should raise_error Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException
+    lambda { @paymentPluginApi.refund_payment(@kb_account_id, @kb_payment_id, @kb_payment_transaction_id, @kb_payment_method_id, @amount, @currency, @properties, nil) }.should raise_error Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException
   end
 
   it "should_test_add_payment_method_ok" do

data/spec/killbill/payment_plugin_spec.rb

@@ -5,34 +5,45 @@ end
 
 describe Killbill::Plugin::Payment do
   before(:each) do
-    @kb_account_id = SecureRandom.uuid
-    @kb_payment_id = SecureRandom.uuid
-    @amount_in_cents = rand(100000)
-    @currency = 'USD'
-    @call_context = Killbill::Plugin::Model::CallContext.new
+    @kb_account_id             = SecureRandom.uuid
+    @kb_payment_id             = SecureRandom.uuid
+    @kb_payment_transaction_id = SecureRandom.uuid
+    @amount_in_cents           = rand(100000)
+    @currency                  = 'USD'
+    @call_context              = Killbill::Plugin::Model::CallContext.new
 
-    @payment_method = Hash.new(:credit_card => SecureRandom.uuid)
+    @payment_method       = Hash.new(:credit_card => SecureRandom.uuid)
     @kb_payment_method_id = SecureRandom.uuid
 
-    @properties = [::Killbill::Plugin::Model::PluginProperty.new]
+    @search_key = SecureRandom.uuid
+    @offset     = 0
+    @limit      = 100
+
+    @properties           = [::Killbill::Plugin::Model::PluginProperty.new]
     @payment_method_props = Hash.new
-    @payment_methods = Hash.new
-    @killbill_account = Hash.new(:name => SecureRandom.uuid)
+    @payment_methods      = Hash.new
+    @killbill_account     = Hash.new(:name => SecureRandom.uuid)
 
     @plugin = DummyPaymentPlugin.new
   end
 
   it "should raise exceptions for unsupported operations" do
-    lambda { @plugin.process_payment(@kb_account_id, @kb_payment_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
-    lambda { @plugin.process_refund(@kb_account_id, @kb_payment_id, @amount_in_cents, @currency, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.authorize_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.capture_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.purchase_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.void_payment(@kb_account_id, @kb_payment_id, @kb_payment_transaction_id, @kb_payment_method_id, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.credit_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.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.get_refund_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.delete_payment_method(@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, @payment_method, @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_methods(@kb_account_id, true, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
-    lambda { @plugin.reset_payment_methods(@kb_account_id, @properties, @payment_methods, @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
+    lambda { @plugin.build_form_descriptor(@kb_account_id, [], @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.process_notification("{ 'key' => 'value' }", @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
   end
 end

data/spec/killbill/payment_test.rb

@@ -8,11 +8,11 @@ module Killbill
         @raise_exception = false
       end
 
-      def process_payment(kb_account_id, kb_payment_id, kb_payment_method_id, amount_in_cents, currency, properties, context)
+      def purchase_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount_in_cents, currency, properties, context)
         if @raise_exception
           raise StandardError.new("Test exception")
         else
-          res = Killbill::Plugin::Model::PaymentInfoPlugin.new
+          res = Killbill::Plugin::Model::PaymentTransactionInfoPlugin.new
           res.amount=amount_in_cents
           res.status=:PROCESSED
           res
@@ -23,18 +23,18 @@ module Killbill
         if @raise_exception
           raise StandardError.new("Test exception")
         else
-          res = Killbill::Plugin::Model::PaymentInfoPlugin.new
+          res = Killbill::Plugin::Model::PaymentTransactionInfoPlugin.new
           res.amount=0
           res.status=:PROCESSED
-          res
+          [res]
         end
       end
 
-      def process_refund(kb_account_id, kb_payment_id, amount_in_cents, currency, properties, context)
+      def refund_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount_in_cents, currency, properties, context)
         if @raise_exception
           raise StandardError.new("Test exception")
         else
-          res = Killbill::Plugin::Model::RefundInfoPlugin.new
+          res = Killbill::Plugin::Model::PaymentTransactionInfoPlugin.new
           res.amount=50
           res.status=:PROCESSED
           res
@@ -98,7 +98,6 @@ module Killbill
       def clear_exception_on_next_calls
         @raise_exception = false
       end
-
     end
   end
 end

data/spec/spec_helper.rb

@@ -34,6 +34,9 @@ ActiveRecord::Base.establish_connection(
   :adapter => 'sqlite3',
   :database => 'test.db'
 )
+# For debugging
+#ActiveRecord::Base.logger = Logger.new(STDOUT)
+# Create the schema
 require File.expand_path(File.dirname(__FILE__) + '/killbill/helpers/test_schema.rb')
 
 begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -257,7 +257,6 @@ files:
 - lib/killbill/gen/api/osgi_killbill.rb
 - lib/killbill/gen/api/osgi_plugin_properties.rb
 - lib/killbill/gen/api/pagination.rb
-- lib/killbill/gen/api/payment.rb
 - lib/killbill/gen/api/payment_api.rb
 - lib/killbill/gen/api/payment_api_exception.rb
 - lib/killbill/gen/api/payment_attempt.rb
@@ -265,6 +264,7 @@ files:
 - lib/killbill/gen/api/payment_method.rb
 - lib/killbill/gen/api/payment_method_kv_info.rb
 - lib/killbill/gen/api/payment_method_plugin.rb
+- lib/killbill/gen/api/payment_options.rb
 - lib/killbill/gen/api/plan.rb
 - lib/killbill/gen/api/plan_change_result.rb
 - lib/killbill/gen/api/plan_phase.rb
@@ -313,11 +313,10 @@ files:
 - lib/killbill/gen/plugin-api/gateway_notification.rb
 - lib/killbill/gen/plugin-api/hosted_payment_page_form_descriptor.rb
 - lib/killbill/gen/plugin-api/notification_plugin_api.rb
-- lib/killbill/gen/plugin-api/payment_info_plugin.rb
 - lib/killbill/gen/plugin-api/payment_method_info_plugin.rb
 - lib/killbill/gen/plugin-api/payment_plugin_api.rb
 - lib/killbill/gen/plugin-api/payment_plugin_api_exception.rb
-- lib/killbill/gen/plugin-api/refund_info_plugin.rb
+- lib/killbill/gen/plugin-api/payment_transaction_info_plugin.rb
 - lib/killbill/gen/plugin-api/require_gen.rb
 - lib/killbill/helpers/active_merchant.rb
 - lib/killbill/helpers/active_merchant/active_record.rb
@@ -351,6 +350,7 @@ files:
 - spec/killbill/helpers/payment_method_spec.rb
 - spec/killbill/helpers/response_spec.rb
 - spec/killbill/helpers/test_schema.rb
+- spec/killbill/helpers/transaction_spec.rb
 - spec/killbill/helpers/utils_spec.rb
 - spec/killbill/killbill_integration_spec.rb
 - spec/killbill/killbillapi_spec.rb
@@ -397,6 +397,7 @@ test_files:
 - spec/killbill/helpers/payment_method_spec.rb
 - spec/killbill/helpers/response_spec.rb
 - spec/killbill/helpers/test_schema.rb
+- spec/killbill/helpers/transaction_spec.rb
 - spec/killbill/helpers/utils_spec.rb
 - spec/killbill/killbill_integration_spec.rb
 - spec/killbill/killbillapi_spec.rb

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

@@ -1,187 +0,0 @@
-###################################################################################
-#                                                                                 #
-#                   Copyright 2010-2013 Ning, Inc.                                #
-#                                                                                 #
-#      Ning licenses this file to you under the Apache License, version 2.0       #
-#      (the "License"); you may not use this file except in compliance with the   #
-#      License.  You may obtain a copy of the License at:                         #
-#                                                                                 #
-#          http://www.apache.org/licenses/LICENSE-2.0                             #
-#                                                                                 #
-#      Unless required by applicable law or agreed to in writing, software        #
-#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT  #
-#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the  #
-#      License for the specific language governing permissions and limitations    #
-#      under the License.                                                         #
-#                                                                                 #
-###################################################################################
-
-
-#
-#                       DO NOT EDIT!!!
-#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
-#
-
-
-module Killbill
-  module Plugin
-    module Model
-
-      java_package 'org.killbill.billing.payment.api'
-      class Payment
-
-        include org.killbill.billing.payment.api.Payment
-
-        attr_accessor :id, :created_date, :updated_date, :account_id, :invoice_id, :payment_method_id, :payment_number, :amount, :paid_amount, :effective_date, :currency, :payment_status, :attempts, :payment_info_plugin
-
-        def initialize()
-        end
-
-        def to_java()
-          # conversion for id [type = java.util.UUID]
-          @id = java.util.UUID.fromString(@id.to_s) unless @id.nil?
-
-          # conversion for created_date [type = org.joda.time.DateTime]
-          if !@created_date.nil?
-            @created_date =  (@created_date.kind_of? Time) ? DateTime.parse(@created_date.to_s) : @created_date
-            @created_date = Java::org.joda.time.DateTime.new(@created_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
-          end
-
-          # conversion for updated_date [type = org.joda.time.DateTime]
-          if !@updated_date.nil?
-            @updated_date =  (@updated_date.kind_of? Time) ? DateTime.parse(@updated_date.to_s) : @updated_date
-            @updated_date = Java::org.joda.time.DateTime.new(@updated_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
-          end
-
-          # conversion for account_id [type = java.util.UUID]
-          @account_id = java.util.UUID.fromString(@account_id.to_s) unless @account_id.nil?
-
-          # conversion for invoice_id [type = java.util.UUID]
-          @invoice_id = java.util.UUID.fromString(@invoice_id.to_s) unless @invoice_id.nil?
-
-          # conversion for payment_method_id [type = java.util.UUID]
-          @payment_method_id = java.util.UUID.fromString(@payment_method_id.to_s) unless @payment_method_id.nil?
-
-          # conversion for payment_number [type = java.lang.Integer]
-          @payment_number = @payment_number
-
-          # conversion for amount [type = java.math.BigDecimal]
-          if @amount.nil?
-            @amount = java.math.BigDecimal::ZERO
-          else
-            @amount = java.math.BigDecimal.new(@amount.to_s)
-          end
-
-          # conversion for paid_amount [type = java.math.BigDecimal]
-          if @paid_amount.nil?
-            @paid_amount = java.math.BigDecimal::ZERO
-          else
-            @paid_amount = java.math.BigDecimal.new(@paid_amount.to_s)
-          end
-
-          # conversion for effective_date [type = org.joda.time.DateTime]
-          if !@effective_date.nil?
-            @effective_date =  (@effective_date.kind_of? Time) ? DateTime.parse(@effective_date.to_s) : @effective_date
-            @effective_date = Java::org.joda.time.DateTime.new(@effective_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
-          end
-
-          # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
-          @currency = Java::org.killbill.billing.catalog.api.Currency.value_of("#{@currency.to_s}") unless @currency.nil?
-
-          # conversion for payment_status [type = org.killbill.billing.payment.api.PaymentStatus]
-          @payment_status = Java::org.killbill.billing.payment.api.PaymentStatus.value_of("#{@payment_status.to_s}") unless @payment_status.nil?
-
-          # conversion for attempts [type = java.util.List]
-          tmp = java.util.ArrayList.new
-          (@attempts || []).each do |m|
-            # conversion for m [type = org.killbill.billing.payment.api.PaymentAttempt]
-            m = m.to_java unless m.nil?
-            tmp.add(m)
-          end
-          @attempts = tmp
-
-          # conversion for payment_info_plugin [type = org.killbill.billing.payment.plugin.api.PaymentInfoPlugin]
-          @payment_info_plugin = @payment_info_plugin.to_java unless @payment_info_plugin.nil?
-          self
-        end
-
-        def to_ruby(j_obj)
-          # conversion for id [type = java.util.UUID]
-          @id = j_obj.id
-          @id = @id.nil? ? nil : @id.to_s
-
-          # conversion for created_date [type = org.joda.time.DateTime]
-          @created_date = j_obj.created_date
-          if !@created_date.nil?
-            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
-            str = fmt.print(@created_date)
-            @created_date = DateTime.iso8601(str)
-          end
-
-          # conversion for updated_date [type = org.joda.time.DateTime]
-          @updated_date = j_obj.updated_date
-          if !@updated_date.nil?
-            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
-            str = fmt.print(@updated_date)
-            @updated_date = DateTime.iso8601(str)
-          end
-
-          # conversion for account_id [type = java.util.UUID]
-          @account_id = j_obj.account_id
-          @account_id = @account_id.nil? ? nil : @account_id.to_s
-
-          # conversion for invoice_id [type = java.util.UUID]
-          @invoice_id = j_obj.invoice_id
-          @invoice_id = @invoice_id.nil? ? nil : @invoice_id.to_s
-
-          # conversion for payment_method_id [type = java.util.UUID]
-          @payment_method_id = j_obj.payment_method_id
-          @payment_method_id = @payment_method_id.nil? ? nil : @payment_method_id.to_s
-
-          # conversion for payment_number [type = java.lang.Integer]
-          @payment_number = j_obj.payment_number
-
-          # conversion for amount [type = java.math.BigDecimal]
-          @amount = j_obj.amount
-          @amount = @amount.nil? ? 0 : BigDecimal.new(@amount.to_s)
-
-          # conversion for paid_amount [type = java.math.BigDecimal]
-          @paid_amount = j_obj.paid_amount
-          @paid_amount = @paid_amount.nil? ? 0 : BigDecimal.new(@paid_amount.to_s)
-
-          # conversion for effective_date [type = org.joda.time.DateTime]
-          @effective_date = j_obj.effective_date
-          if !@effective_date.nil?
-            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
-            str = fmt.print(@effective_date)
-            @effective_date = DateTime.iso8601(str)
-          end
-
-          # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
-          @currency = j_obj.currency
-          @currency = @currency.to_s.to_sym unless @currency.nil?
-
-          # conversion for payment_status [type = org.killbill.billing.payment.api.PaymentStatus]
-          @payment_status = j_obj.payment_status
-          @payment_status = @payment_status.to_s.to_sym unless @payment_status.nil?
-
-          # conversion for attempts [type = java.util.List]
-          @attempts = j_obj.attempts
-          tmp = []
-          (@attempts || []).each do |m|
-            # conversion for m [type = org.killbill.billing.payment.api.PaymentAttempt]
-            m = Killbill::Plugin::Model::PaymentAttempt.new.to_ruby(m) unless m.nil?
-            tmp << m
-          end
-          @attempts = tmp
-
-          # conversion for payment_info_plugin [type = org.killbill.billing.payment.plugin.api.PaymentInfoPlugin]
-          @payment_info_plugin = j_obj.payment_info_plugin
-          @payment_info_plugin = Killbill::Plugin::Model::PaymentInfoPlugin.new.to_ruby(@payment_info_plugin) unless @payment_info_plugin.nil?
-          self
-        end
-
-      end
-    end
-  end
-end