killbill-payment-test 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b147831c6e1c2cc0656ef221245203ad0b90538
-  data.tar.gz: 83b58ceaaa2fb32a220876bdcc8efa656a058e9e
+  metadata.gz: 625cf68f3d3b8c505f9ebaf9bb6822b777c74069
+  data.tar.gz: b9a98c6ff4551f0574bda9a53e07c05000fac780
 SHA512:
-  metadata.gz: 667452a2cfb1a0168c6ccd6642814f0537344029520254a91ba5dd420a8fec74e928fc543c6a4b9a69e4fe13b65ce30ca2440c53461d2de458e55ed252598159
-  data.tar.gz: 7229fc663bbe511d7cf9c5dd40d2cf1bc9c774122570ed67685c00b12c48fc4b7bceec8018878b1305d9a1b37636ef0a40cfd6707dfde91ec7795adc98f97fec
+  metadata.gz: a318e54f07d3e72638ce93c994645ddca8831687ecd9edba5f328db6e1f253d1a7ee3c47d762447526958e232358fe2abd3b2cbcfb65e66b61f04ef549bd8a7c
+  data.tar.gz: 12ecfb91f2ae42c986e5456680aa6319e15a0ee5b7e81f2fe96954a2f234ecc7919b9c6f7de11f675975ccb1dfba43c1d24265b6a0a738f6b47ade362e41739f

data/Jarfile

@@ -1,6 +1,8 @@
-jar 'org.kill-bill.billing:killbill-api', '0.9.5'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.7.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.7.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.7.2'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.11.2'
+jar 'org.kill-bill.billing:killbill-api', '0.9.6'
+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'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-retry', '0.7.4'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.7.4'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.11.3'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/VERSION

@@ -1 +1 @@
-1.8.1
+1.8.2

data/killbill-payment-test.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.rdoc_options << '--exclude' << '.'
 
 
-  s.add_dependency 'killbill', '~> 3.1.1'
+  s.add_dependency 'killbill', '~> 3.1.4'
 
   s.add_development_dependency 'jbundler', '~> 0.4.1'
   s.add_development_dependency 'rake', '>= 10.0.0'

data/lib/payment_test.rb

@@ -1 +1,2 @@
+require 'killbill'
 require 'payment_test/api'

data/lib/payment_test/api.rb

@@ -1,99 +1,40 @@
-require 'date'
-
-require 'killbill/payment'
-
 module PaymentTest
   class PaymentPlugin < Killbill::Plugin::Payment
 
-
-    def start_plugin
-      super
-    end
-
-    def initialize()
-      @raise_exception = false
-      super()
-    end
-
-    def get_name
-    end
-
-    def process_payment(kb_account_id, kb_payment_id, kb_payment_method_id, amount, currency, properties, context)
-      # Make an API call from the payment call
-      account = @kb_apis.account_user_api.get_account_by_id(kb_account_id, @kb_apis.create_context)
-      res = Killbill::Plugin::Model::PaymentInfoPlugin.new
-      res.amount= amount
-      res.created_date= DateTime.now
-      res.effective_date= DateTime.now
-      res.status=:PROCESSED
-      res.gateway_error="gateway_error"
-      res.gateway_error_code="gateway_error_code"
-      res
+    def purchase_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+      build_transaction_info :PURCHASE, kb_payment_id, kb_payment_transaction_id, amount, currency
     end
 
     def get_payment_info(kb_account_id, kb_payment_id, properties, context)
-        res = Killbill::Plugin::Model::PaymentInfoPlugin.new
-        res.amount= 0
-        res.created_date= DateTime.now
-        res.effective_date= DateTime.now
-        res.status=:PROCESSED
-        res.gateway_error="gateway_error"
-        res.gateway_error_code="gateway_error_code"
-        res
+      [build_transaction_info(:PURCHASE, kb_payment_id)]
     end
 
-    def process_refund(kb_account_id, kb_payment_id, refund_amount, currency, properties, context)
-      res = Killbill::Plugin::Model::RefundInfoPlugin.new
-      res.amount= refund_amount
-      res.created_date= DateTime.now
-      res.effective_date=DateTime.now
-      res.status=:PROCESSED
-      res.gateway_error="gateway_error"
-      res.gateway_error_code="gateway_error_code"
-      res
+    def refund_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+      build_transaction_info :REFUND, kb_payment_id, kb_payment_transaction_id, amount, currency
     end
 
     def get_refund_info(kb_account_id, kb_payment_id, properties, context)
-      res = Killbill::Plugin::Model::RefundInfoPlugin.new
-      res.amount= 0
-      res.created_date= DateTime.now
-      res.effective_date=DateTime.now
-      res.status=:PROCESSED
-      res.gateway_error="gateway_error"
-      res.gateway_error_code="gateway_error_code"
-      res
+      build_transaction_info :REFUND, kb_payment_id
     end
 
     def add_payment_method(kb_account_id, kb_payment_method_id, payment_method_props, set_default, properties, context)
-      nil
     end
 
     def delete_payment_method(kb_account_id, kb_payment_method_id, properties, context)
     end
 
     def get_payment_method_detail(kb_account_id, kb_payment_method_id, properties, context)
-      res = Killbill::Plugin::Model::PaymentMethodPlugin.new
-      res.kb_payment_method_id="9e3ff858-809d-4d12-a1fa-da789e0841d"
-      res.external_payment_method_id="external_payment_method_id"
-      res.is_default_payment_method=true
-      res.type="Test"
-      res.cc_name="cc_name"
-      res.cc_expiration_month="cc_expiration_month"
-      res.cc_expiration_year="cc_expiration_year"
-      res.cc_last4="cc_last4"
-      res.address1="address1"
-      res.address2="address2"
-      res.city="city"
-      res.state="state"
-      res.zip="zip"
-      res.country="country"
-      properties = []
-      prop1 =  Killbill::Plugin::Model::PluginProperty.new
-      prop1.key = "key1"
-      prop1.value = "value1"
+      res                            = Killbill::Plugin::Model::PaymentMethodPlugin.new
+      res.kb_payment_method_id       = "9e3ff858-809d-4d12-a1fa-da789e0841d"
+      res.external_payment_method_id = "external_payment_method_id"
+      res.is_default_payment_method  = true
+      properties                     = []
+      prop1                          = Killbill::Plugin::Model::PluginProperty.new
+      prop1.key                      = "key1"
+      prop1.value                    = "value1"
       properties << prop1
-      prop2 =  Killbill::Plugin::Model::PluginProperty.new
-      prop2.key = "key2"
+      prop2       = Killbill::Plugin::Model::PluginProperty.new
+      prop2.key   = "key2"
       prop2.value = "value2"
       properties << prop2
       res.properties=properties
@@ -104,28 +45,35 @@ module PaymentTest
     end
 
     def get_payment_methods(kb_account_id, refresh_from_gateway, properties, context)
-      res = Killbill::Plugin::Model::PaymentMethodInfoPlugin.new
-      res.account_id=kb_account_id
-      res.payment_method_id=kb_account_id
-      res.is_default=true
-      res.external_payment_method_id="external_payment_method_id"
+      res                            = Killbill::Plugin::Model::PaymentMethodInfoPlugin.new
+      res.account_id                 = kb_account_id
+      res.payment_method_id          = kb_account_id
+      res.is_default                 = true
+      res.external_payment_method_id = "external_payment_method_id"
       [res]
     end
 
-    def search_payment_methods(search_key, offset, limit, properties, context)
-      [get_payment_method_detail(nil, nil, nil, nil)]
-    end
-
-    def reset_payment_methods(kb_account_id, payment_methods, properties)
+    def search_payment_methods(search_key, offset = 0, limit = 100, properties, context)
+      [get_payment_method_detail(nil, nil, properties, context)]
     end
 
-    def raise_exception_on_next_calls
-      @raise_exception = true
-    end
+    private
 
-    def clear_exception_on_next_calls
-      @raise_exception = false
+    def build_transaction_info(transaction_type, kb_payment_id, kb_payment_transaction_id=nil, amount=0, currency=:USD)
+      res                             = Killbill::Plugin::Model::PaymentTransactionInfoPlugin.new
+      res.kb_payment_id               = kb_payment_id
+      res.kb_transaction_payment_id   = kb_payment_transaction_id
+      res.transaction_type            = transaction_type
+      res.amount                      = amount
+      res.currency                    = currency
+      res.created_date                = DateTime.now
+      res.effective_date              = DateTime.now
+      res.status                      = :PROCESSED
+      res.gateway_error               = "gateway_error"
+      res.gateway_error_code          = "gateway_error_code"
+      res.first_payment_reference_id  = "first_payment_reference_id"
+      res.second_payment_reference_id = "second_payment_reference_id"
+      res
     end
-
   end
 end

data/pom.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 ~ Copyright 2010-2013 Ning, Inc.
+~ Copyright 2014 Groupon, Inc
+~ Copyright 2014 The Billing Project, LLC
 ~
 ~  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
@@ -25,7 +27,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>payment-test-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>1.8.1</version>
+    <version>1.8.2</version>
     <name>payment-test-plugin</name>
     <description></description>
     <scm>

data/spec/payment_test/base_plugin_spec.rb

@@ -1,31 +1,18 @@
 require 'spec_helper'
 require 'logger'
-require 'tempfile'
-
-require 'killbill'
 
 require 'payment_test'
 
-class FakeJavaUserAccountApi
-
-  # Returns an account where we specify the currency for the report group
-  def get_account_by_id(id, context)
-    account = Killbill::Plugin::Model::Account.new
-    account.id=id
-    account
-  end
-end
-
 describe PaymentTest::PaymentPlugin do
   before(:each) do
-    svcs = {:account_user_api =>  FakeJavaUserAccountApi.new}
-    kb_apis = Killbill::Plugin::KillbillApi.new("foo", svcs)
+    kb_apis = Killbill::Plugin::KillbillApi.new("killbill-payment-test", {})
     @plugin = PaymentTest::PaymentPlugin.new
     @plugin.logger = Logger.new(STDOUT)
     @plugin.kb_apis = kb_apis
 
     @kb_account_id = "a86ed6d4-c0bd-4a44-b49a-5ec29c3b314a"
     @kb_payment_id = "9f73c8e9-188a-4603-a3ba-2ce684411fb9"
+    @kb_payment_transaction_id = "46bb26b0-fae2-11e3-a3ac-0800200c9a66"
     @kb_payment_method_id = "b1396a76-b210-4690-a61e-e94c911a2a09"
     @amount_in_cents = 100
     @currency = 'USD'
@@ -38,9 +25,9 @@ describe PaymentTest::PaymentPlugin do
   end
 
   it "should test charge" do
-    output = @plugin.process_payment(@kb_account_id, @kb_payment_id, @kb_payment_method_id, @amount_in_cents, @currency, nil, @call_context)
+    output = @plugin.purchase_payment(@kb_account_id, @kb_payment_id, @kb_payment_transaction_id, @kb_payment_method_id, @amount_in_cents, @currency, [], @call_context)
 
-    output.should be_an_instance_of Killbill::Plugin::Model::PaymentInfoPlugin
+    output.should be_an_instance_of Killbill::Plugin::Model::PaymentTransactionInfoPlugin
     output.amount.should == @amount_in_cents
     output.status.to_s.should == "PROCESSED"
   end

data/spec/spec_helper.rb

@@ -7,9 +7,3 @@ RSpec.configure do |config|
   config.tty = true
   config.formatter = 'documentation'
 end
-
-class Object
-  def blank?
-    respond_to?(:empty?) ? empty? : !self
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-payment-test
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -16,12 +16,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.4
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency