killbill-cybersource 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a43a923c2c9b198447cd1479a2ca3478685f706b
-  data.tar.gz: cb7b47881a91c1ca479153f97960e649fd21531d
+  metadata.gz: 94ede73472f0efc7fcb99f2096e257964eb0a013
+  data.tar.gz: 7fc15969cdb1d4fd53086a035fe1ae4a30b5d78f
 SHA512:
-  metadata.gz: 8643323ee817645537cb091d16d08c4853bcf4f875e7bc37904dda13731c124c22018e9cd5ad5052a68acc7a5f5eee6793760054f4f612ce57865ce5da9328c7
-  data.tar.gz: beeae965c890f3ada234a6db810ca535569399f52da5d3c744f23d0cb791941f9923dcb20fd8c3160dc780b68762f150b30dca1333697fbee9c03c0ad4165866
+  metadata.gz: db42929422720141856c0d853dc85fc26413c30e087c5f1a2c7d0a4eb0cf36fb4b1de5d333fe29afcb19562932a9e48fabf5b159f5998b3320e874bdcb459456
+  data.tar.gz: c52284173c58b08b29003dc19e81ebc0610e831339f8389cabe375d4f435a1515faf2ed2b5107f5dd6edfe91fb133ca5b3ec14d4b09cb3c9632638e6c2444d00

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill-cybersource (3.0.0)
+    killbill-cybersource (3.1.0)
       actionpack (~> 4.1.0)
       actionview (~> 4.1.0)
       activemerchant (~> 1.48.0)
@@ -9,7 +9,7 @@ PATH
       activerecord-bogacs (~> 0.3)
       activerecord-jdbc-adapter (~> 1.3)
       jruby-openssl (~> 0.9.6)
-      killbill (~> 5.1.0)
+      killbill (~> 6.1.0)
       monetize (~> 1.1.0)
       money (~> 6.5.1)
       offsite_payments (~> 2.1.0)
@@ -19,13 +19,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.1.12)
-      actionview (= 4.1.12)
-      activesupport (= 4.1.12)
+    actionpack (4.1.14)
+      actionview (= 4.1.14)
+      activesupport (= 4.1.14)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.12)
-      activesupport (= 4.1.12)
+    actionview (4.1.14)
+      activesupport (= 4.1.14)
       builder (~> 3.1)
       erubis (~> 2.7.0)
     active_utils (3.0.0)
@@ -36,18 +36,17 @@ GEM
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
       nokogiri (~> 1.4)
-    activemodel (4.1.12)
-      activesupport (= 4.1.12)
+    activemodel (4.1.14)
+      activesupport (= 4.1.14)
       builder (~> 3.1)
-    activerecord (4.1.12)
-      activemodel (= 4.1.12)
-      activesupport (= 4.1.12)
+    activerecord (4.1.14)
+      activemodel (= 4.1.14)
+      activesupport (= 4.1.14)
       arel (~> 5.0.0)
-    activerecord-bogacs (0.3.0)
-      thread_safe (~> 0.3)
-    activerecord-jdbc-adapter (1.3.17)
+    activerecord-bogacs (0.4.1)
+    activerecord-jdbc-adapter (1.3.19)
       activerecord (>= 2.2)
-    activesupport (4.1.12)
+    activesupport (4.1.14)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -57,7 +56,7 @@ GEM
     builder (3.2.2)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    ethon (0.7.4)
+    ethon (0.8.0)
       ffi (>= 1.3.0)
     ffi (1.9.10-java)
     i18n (0.7.0)
@@ -66,20 +65,20 @@ GEM
       ruby-maven (~> 3.0.4)
     jdbc-mariadb (1.1.8)
     jdbc-sqlite3 (3.8.10.1)
-    jruby-openssl (0.9.7-java)
+    jruby-openssl (0.9.12-java)
     json (1.8.3-java)
-    killbill (5.1.0)
+    killbill (6.1.0)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)
       tzinfo (~> 1.2.0)
     maven-tools (0.32.5)
-    minitest (5.7.0)
+    minitest (5.8.3)
     monetize (1.1.0)
       money (~> 6.5.0)
     money (6.5.1)
       i18n (>= 0.6.4, <= 0.7.0)
-    nokogiri (1.6.6.2-java)
+    nokogiri (1.6.7-java)
     offsite_payments (2.1.0)
       actionpack (>= 3.2.20, < 5.0.0)
       active_utils (~> 3.0.0)

data/Jarfile

@@ -1,11 +1,11 @@
-jar 'org.kill-bill.billing:killbill-api', '0.20'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.15'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.15'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.15'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.15'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.15'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.15'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.15'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.15.3'
+jar 'org.kill-bill.billing:killbill-api', '0.30'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.18'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.18'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.18'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.18'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.18'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.18'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.18'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.15.9'
 jar 'org.mockito:mockito-all', '1.10.19'
 jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/Jarfile.lock

@@ -1,14 +1,14 @@
-org.kill-bill.billing:killbill-api:jar:0.20
+org.kill-bill.billing:killbill-api:jar:0.30
 com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
 joda-time:joda-time:jar:2.3
-org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.15
-org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.15
-org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.15
-org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.15
-org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.15
-org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.15
-org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.15
-org.kill-bill.billing:killbill-util:jar:tests:0.15.3
+org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.18
+org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.18
+org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.18
+org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.18
+org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.18
+org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.18
+org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.18
+org.kill-bill.billing:killbill-util:jar:tests:0.15.9
 com.fasterxml.jackson.core:jackson-databind:jar:2.4.3
 com.fasterxml.jackson.core:jackson-core:jar:2.4.3
 com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.3
@@ -32,22 +32,22 @@ aopalliance:aopalliance:jar:1.0
 com.google.inject.extensions:guice-multibindings:jar:3.0
 org.jdbi:jdbi:jar:2.62
 org.joda:joda-money:jar:0.9
-org.kill-bill.billing:killbill-internal-api:jar:0.15.3
-org.kill-bill.billing:killbill-platform-api:jar:0.8
-org.kill-bill.billing:killbill-platform-base:jar:0.8
+org.kill-bill.billing:killbill-internal-api:jar:0.15.9
+org.kill-bill.billing:killbill-platform-api:jar:0.13
+org.kill-bill.billing:killbill-platform-base:jar:0.13
 com.google.code.findbugs:annotations:jar:3.0.0
 org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
-org.kill-bill.billing:killbill-platform-osgi-api:jar:0.8
+org.kill-bill.billing:killbill-platform-osgi-api:jar:0.13
 org.osgi:org.osgi.core:jar:5.0.0
-org.kill-bill.commons:killbill-clock:jar:0.6
-org.kill-bill.commons:killbill-concurrent:jar:0.6
-org.kill-bill.commons:killbill-embeddeddb-common:jar:0.6
-org.kill-bill.commons:killbill-jdbi:jar:0.6
+org.kill-bill.commons:killbill-clock:jar:0.10
+org.kill-bill.commons:killbill-concurrent:jar:0.10
+org.kill-bill.commons:killbill-embeddeddb-common:jar:0.10
+org.kill-bill.commons:killbill-jdbi:jar:0.10
 com.h2database:h2:jar:1.4.186
 javax.inject:javax.inject:jar:1
-org.kill-bill.commons:killbill-locker:jar:0.6
-org.kill-bill.commons:killbill-queue:jar:0.6
-org.kill-bill.commons:killbill-xmlloader:jar:0.6
+org.kill-bill.commons:killbill-locker:jar:0.10
+org.kill-bill.commons:killbill-queue:jar:0.10
+org.kill-bill.commons:killbill-xmlloader:jar:0.10
 org.skife.config:config-magic:jar:0.14
 org.slf4j:jcl-over-slf4j:jar:1.7.12
 org.slf4j:slf4j-api:jar:1.7.12

data/README.md

@@ -11,6 +11,7 @@ Kill Bill compatibility
 | Plugin version | Kill Bill version |
 | -------------: | ----------------: |
 | 1.x.y          | 0.14.z            |
+| 3.x.y          | 0.15.z            |
 
 Requirements
 ------------

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.1.0

data/cybersource.yml

@@ -3,10 +3,10 @@
     :test: true
     :login: <%= ENV['LOGIN'] %>
     :password: <%= ENV['PASSWORD'] %>
-  - :account_id: on_demand
-    :merchantID: <%= ENV['MERCHANT_ID'] %>
-    :username: <%= ENV['OD_USERNAME'] %>
-    :password: <%= ENV['OD_PASSWORD'] %>
+#  - :account_id: on_demand
+#    :merchantID: <%= ENV['MERCHANT_ID'] %>
+#    :username: <%= ENV['OD_USERNAME'] %>
+#    :password: <%= ENV['OD_PASSWORD'] %>
 
 :database:
 # SQLite (development)

data/killbill-cybersource.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 5.1.0'
+  s.add_dependency 'killbill', '~> 6.1.0'
 
   s.add_dependency 'sinatra', '~> 1.3.4'
   s.add_dependency 'thread_safe', '~> 0.3.4'

data/lib/cybersource/api.rb

@@ -2,6 +2,8 @@ module Killbill #:nodoc:
   module Cybersource #:nodoc:
     class PaymentPlugin < ::Killbill::Plugin::ActiveMerchant::PaymentPlugin
 
+      SIXTY_DAYS_AGO = (60 * 86400)
+
       def initialize
         gateway_builder = Proc.new do |config|
           ::ActiveMerchant::Billing::CyberSourceGateway.new :login => config[:login], :password => config[:password]
@@ -73,6 +75,11 @@ module Killbill #:nodoc:
       end
 
       def refund_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+        if should_credit?(kb_payment_id, context, properties_to_hash(properties))
+          # Note: from the plugin perspective, this transaction is a CREDIT but Kill Bill doesn't care about PaymentTransactionInfoPlugin#TransactionType
+          return credit_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+        end
+
         # Pass extra parameters for the gateway here
         options = {}
 
@@ -231,6 +238,18 @@ module Killbill #:nodoc:
         end
       end
 
+      def should_credit?(kb_payment_id, context, options = {})
+        # Transform refunds on old payments into credits automatically unless the disable_auto_credit property is passed
+        return false if Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :disable_auto_credit)
+
+        transaction = @transaction_model.find_candidate_transaction_for_refund(kb_payment_id, context.tenant_id)
+        return false if transaction.nil?
+
+        threshold = (Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :auto_credit_threshold) || SIXTY_DAYS_AGO).to_i
+        # Note: we cannot use Kill Bill clock yet (see https://github.com/killbill/killbill-platform/issues/4)
+        (Time.now - transaction.created_at) >= threshold
+      end
+
       # Make calls idempotent
       def before_gateway(gateway, kb_transaction, last_transaction, payment_source, amount_in_cents, currency, options, context)
         super

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>cybersource-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.0</version>
+    <version>3.1.0</version>
     <name>cybersource-plugin</name>
     <url>http://github.com/killbill/killbill-cybersource-plugin</url>
     <description>Plugin for accessing Cybersource as a payment gateway</description>

data/spec/cybersource/base_plugin_spec.rb

@@ -27,4 +27,41 @@ describe Killbill::Cybersource::PaymentPlugin do
   it 'should start and stop correctly' do
     @plugin.stop_plugin
   end
+
+  it 'should detect when to credit refunds' do
+    context = build_call_context
+    kb_payment_id = SecureRandom.uuid
+
+    @plugin.should_credit?(SecureRandom.uuid, context).should be_false
+
+    with_transaction(kb_payment_id, :AUTHORIZE, 60.days.ago, build_call_context(SecureRandom.uuid)) { @plugin.should_credit?(kb_payment_id, context).should be_false }
+    with_transaction(kb_payment_id, :AUTHORIZE, 59.days.ago, context) { @plugin.should_credit?(kb_payment_id, context).should be_false }
+    with_transaction(kb_payment_id, :VOID, 60.days.ago, context) { @plugin.should_credit?(kb_payment_id, context).should be_false }
+    with_transaction(SecureRandom.uuid, :AUTHORIZE, 60.days.ago, context) { @plugin.should_credit?(kb_payment_id, context).should be_false }
+
+    with_transaction(kb_payment_id, :AUTHORIZE, 60.days.ago, context) do
+      @plugin.should_credit?(kb_payment_id, context, {:disable_auto_credit => true}).should be_false
+      @plugin.should_credit?(kb_payment_id, context, {:auto_credit_threshold => 61 * 86400}).should be_false
+      @plugin.should_credit?(kb_payment_id, context).should be_true
+    end
+  end
+
+  private
+
+  def with_transaction(kb_payment_id, transaction_type, created_at, context)
+    t = ::Killbill::Cybersource::CybersourceTransaction.create(:kb_payment_id => kb_payment_id,
+                                                               :transaction_type => transaction_type,
+                                                               :kb_tenant_id => context.tenant_id,
+                                                               :created_at => created_at,
+                                                               # The data below doesn't matter
+                                                               :updated_at => created_at,
+                                                               :kb_account_id => SecureRandom.uuid,
+                                                               :kb_payment_transaction_id => SecureRandom.uuid,
+                                                               :api_call => :refund,
+                                                               :cybersource_response_id => 1)
+    t.should_not be_nil
+    yield t if block_given?
+  ensure
+    t.destroy! unless t.nil?
+  end
 end

data/spec/cybersource/remote/integration_spec.rb

@@ -31,6 +31,10 @@ describe Killbill::Cybersource::PaymentPlugin do
     @plugin.stop_plugin
   end
 
+  let(:with_report_api) do
+    @plugin.get_report_api(@call_context.tenant_id).present?
+  end
+
   it 'should be able to charge a Credit Card directly and calls should be idempotent' do
     properties = build_pm_properties
 
@@ -56,6 +60,9 @@ describe Killbill::Cybersource::PaymentPlugin do
     transactions.size.should == 1
     transactions[0].api_call.should == 'purchase'
 
+    # Skip the rest of the test if the report API isn't configured
+    break unless with_report_api
+
     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.amount.should == @amount
     payment_response.status.should == :PROCESSED
@@ -101,15 +108,18 @@ describe Killbill::Cybersource::PaymentPlugin do
     transaction_info_plugins.size.should == 1
     transaction_info_plugins.first.status.should eq(:UNDEFINED)
 
-    # Fix it
-    transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, @properties, @call_context)
-    transaction_info_plugins.size.should == 1
-    transaction_info_plugins.first.status.should eq(:PROCESSED)
-
-    # Set skip_gw=true, to check the local state
-    transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, properties_with_skip_gw, @call_context)
-    transaction_info_plugins.size.should == 1
-    transaction_info_plugins.first.status.should eq(:PROCESSED)
+    # Skip if the report API isn't configured
+    if with_report_api
+      # Fix it
+      transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, @properties, @call_context)
+      transaction_info_plugins.size.should == 1
+      transaction_info_plugins.first.status.should eq(:PROCESSED)
+
+      # Set skip_gw=true, to check the local state
+      transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, properties_with_skip_gw, @call_context)
+      transaction_info_plugins.size.should == 1
+      transaction_info_plugins.first.status.should eq(:PROCESSED)
+    end
 
     # Compare the state of the old and new response
     new_response = Killbill::Cybersource::CybersourceResponse.last
@@ -134,7 +144,7 @@ describe Killbill::Cybersource::PaymentPlugin do
     new_response.params_avs_code_raw.should == response.params_avs_code_raw
     new_response.params_reconciliation_id.should == response.params_reconciliation_id
     new_response.success.should be_true
-    new_response.message.should == 'Request was processed successfully.'
+    new_response.message.should == (with_report_api ? 'Request was processed successfully.' : '{"payment_plugin_status":"UNDEFINED"}')
   end
 
   it 'should be able to charge and refund' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-cybersource
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-22 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -16,12 +16,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 6.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 6.1.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -324,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key:
 specification_version: 4
 summary: Plugin to use Cybersource as a gateway.