killbill-cybersource 4.0.11 → 4.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db9792953a69106b202f109daf49dc42834880c8
-  data.tar.gz: 95a7b770d587d04b1b63b9b44cf2e555357076a5
+  metadata.gz: d3829c58435861307b9d3b37eec1043a039b63bb
+  data.tar.gz: b0d538cb0fb26e1f890d8d4f3d2746c3cf46c184
 SHA512:
-  metadata.gz: 4a8efbb283b8fc5f1a41bcdada9182e9cd5d74a08e1ba45a9a003db97d21d32f9df8a199cc09563de6d48d7ff237f219e68ad157f86076f018ebb992acc1e109
-  data.tar.gz: a659b3c97b7f34f6a70ce786f1a23935de4e26448ccb3093c480a7c47c46e7953991819fc426632f1ae4cbe05cc8b413373b229366dbb9d319fd20f7c683d123
+  metadata.gz: 028ca234cfb6b64f10edffff9b60e584a36898e45c0b6cfe7a96400f4e48061e92666ecfc036b24028a3d902f818874c42c634b488136750a5a0619e0a43bf59
+  data.tar.gz: bbd9f8aecc13fd66db71ab04f27df70e2d507f4c9fde1d95ee607ede7a98d35e2fe7155f815403492209743905ea393ec5b2d37d545f46d4eb2d9b4131933a4b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill-cybersource (4.0.11)
+    killbill-cybersource (4.0.12)
       actionpack (~> 4.1.0)
       actionview (~> 4.1.0)
       activemerchant (~> 1.48.0)
@@ -19,13 +19,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.1.15)
-      actionview (= 4.1.15)
-      activesupport (= 4.1.15)
+    actionpack (4.1.16)
+      actionview (= 4.1.16)
+      activesupport (= 4.1.16)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.15)
-      activesupport (= 4.1.15)
+    actionview (4.1.16)
+      activesupport (= 4.1.16)
       builder (~> 3.1)
       erubis (~> 2.7.0)
     active_utils (3.0.0)
@@ -36,17 +36,17 @@ GEM
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
       nokogiri (~> 1.4)
-    activemodel (4.1.15)
-      activesupport (= 4.1.15)
+    activemodel (4.1.16)
+      activesupport (= 4.1.16)
       builder (~> 3.1)
-    activerecord (4.1.15)
-      activemodel (= 4.1.15)
-      activesupport (= 4.1.15)
+    activerecord (4.1.16)
+      activemodel (= 4.1.16)
+      activesupport (= 4.1.16)
       arel (~> 5.0.0)
-    activerecord-bogacs (0.4.1)
-    activerecord-jdbc-adapter (1.3.20)
+    activerecord-bogacs (0.5.0)
+    activerecord-jdbc-adapter (1.3.21)
       activerecord (>= 2.2)
-    activesupport (4.1.15)
+    activesupport (4.1.16)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -65,34 +65,34 @@ GEM
     diff-lcs (1.1.3)
     equalizer (0.0.11)
     erubis (2.7.0)
-    ethon (0.9.0)
+    ethon (0.9.1)
       ffi (>= 1.3.0)
-    ffi (1.9.10-java)
+    ffi (1.9.14-java)
     i18n (0.7.0)
-    ice_nine (0.11.1)
-    jar-dependencies (0.3.1)
-    jbundler (0.9.2)
+    ice_nine (0.11.2)
+    jar-dependencies (0.3.4)
+    jbundler (0.9.3)
       bundler (~> 1.5)
-      jar-dependencies (~> 0.2)
-      maven-tools (~> 1.0.10)
-      ruby-maven (~> 3.3, >= 3.3.3)
-    jdbc-mariadb (1.2.3)
+      jar-dependencies (~> 0.3)
+      maven-tools (~> 1.1)
+      ruby-maven (~> 3.3, >= 3.3.8)
+    jdbc-mariadb (1.3.4)
     jdbc-sqlite3 (3.8.11.2)
-    jruby-openssl (0.9.17-java)
+    jruby-openssl (0.9.18-java)
     json (1.8.3-java)
     killbill (7.0.6)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)
       tzinfo (~> 1.2.0)
-    maven-tools (1.0.13)
+    maven-tools (1.1.6)
       virtus (~> 1.0)
-    minitest (5.8.4)
+    minitest (5.9.1)
     monetize (1.1.0)
       money (~> 6.5.0)
     money (6.5.1)
       i18n (>= 0.6.4, <= 0.7.0)
-    nokogiri (1.6.7.2-java)
+    nokogiri (1.6.8.1-java)
     offsite_payments (2.1.0)
       actionpack (>= 3.2.20, < 5.0.0)
       active_utils (~> 3.0.0)
@@ -106,7 +106,7 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rake (10.4.2)
+    rake (11.2.2)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -115,9 +115,9 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.2)
-    ruby-maven (3.3.8)
-      ruby-maven-libs (~> 3.3.1)
-    ruby-maven-libs (3.3.3)
+    ruby-maven (3.3.12)
+      ruby-maven-libs (~> 3.3.9)
+    ruby-maven-libs (3.3.9)
     sinatra (1.3.6)
       rack (~> 1.4)
       rack-protection (~> 1.3)

data/Jarfile.lock

@@ -14,6 +14,8 @@
 - org.osgi:org.osgi.core:jar:5.0.0
 - org.slf4j:slf4j-api:jar:1.7.12
 - com.samskivert:jmustache:jar:1.5
+- org.bouncycastle:bcprov-jdk15on:jar:1.55
+- org.bouncycastle:bcpkix-jdk15on:jar:1.55
 - org.kill-bill.billing:killbill-util:jar:tests:0.15.10
 - org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.18
 - org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
@@ -22,8 +24,8 @@
 - org.skife.config:config-magic:jar:0.14
 - com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.3
 - org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.18
-- org.apache.commons:commons-email:jar:1.2
 - org.mockito:mockito-all:jar:1.10.19
+- org.apache.commons:commons-email:jar:1.2
 - antlr:antlr:jar:2.7.7
 - aopalliance:aopalliance:jar:1.0
 - com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
@@ -36,13 +38,11 @@
 - org.jdbi:jdbi:jar:2.62
 - org.kill-bill.billing:killbill-platform-api:jar:0.15
 - org.kill-bill.billing:killbill-platform-osgi:jar:0.15
-- org.bouncycastle:bcprov-jdk15on:jar:1.50
 - org.apache.felix:org.apache.felix.framework:jar:4.4.1
 - org.joda:joda-money:jar:0.9
 - org.kill-bill.commons:killbill-jdbi:jar:0.11
 - org.kill-bill.commons:killbill-embeddeddb-common:jar:0.11
 - org.apache.shiro:shiro-core:jar:1.2.3
-- org.bouncycastle:bcpkix-jdk15on:jar:1.50
 - org.kill-bill.billing:killbill-platform-osgi-api:jar:0.15
 - org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.18
 - com.fasterxml.jackson.core:jackson-databind:jar:2.4.3

data/NEWS

@@ -1,3 +1,6 @@
+5.0.0
+    Initial release for Kill Bill 0.18.x
+
 4.0.11
     Bugfix for OnDemand API
 

data/README.md

@@ -11,8 +11,8 @@ Kill Bill compatibility
 | Plugin version | Kill Bill version |
 | -------------: | ----------------: |
 | 1.x.y          | 0.14.z            |
-| 3.x.y          | 0.15.z            |
 | 4.x.y          | 0.16.z            |
+| 5.x.y          | 0.18.z            |
 
 Requirements
 ------------

data/VERSION

@@ -1 +1 @@
-4.0.11
+4.0.12

data/lib/cybersource/api.rb

@@ -89,9 +89,10 @@ 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))
+        credit_opts = properties_to_hash(properties)
+        if should_credit?(kb_payment_id, context, credit_opts)
           # 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)
+          return credit_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, hash_to_properties(credit_opts), context)
         end
 
         # Pass extra parameters for the gateway here
@@ -276,6 +277,8 @@ module Killbill #:nodoc:
 
         threshold = (Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :auto_credit_threshold) || SIXTY_DAYS_AGO).to_i
 
+        options[:payment_processor_account_id] ||= transaction.payment_processor_account_id
+
         (now - transaction.created_at) >= threshold
       end
 

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>cybersource-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>4.0.11</version>
+    <version>4.0.12</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

@@ -61,8 +61,15 @@ describe Killbill::Cybersource::PaymentPlugin do
 
     with_transaction(kb_payment_id, :AUTHORIZE, 61.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 + 10}).should be_false
-      @plugin.should_credit?(kb_payment_id, context).should be_true
+      @plugin.should_credit?(kb_payment_id, context, {:auto_credit_threshold => 61 * 86400 + 3600 + 10}).should be_false
+
+      options = {}
+      @plugin.should_credit?(kb_payment_id, context, options).should be_true
+      options[:payment_processor_account_id].should == 'GOOD'
+
+      options = {:payment_processor_account_id => 'OVERRIDDEN'}
+      @plugin.should_credit?(kb_payment_id, context, options).should be_true
+      options[:payment_processor_account_id].should == 'OVERRIDDEN'
     end
   end
 
@@ -300,6 +307,7 @@ describe Killbill::Cybersource::PaymentPlugin do
                                                                :transaction_type => transaction_type,
                                                                :kb_tenant_id => context.tenant_id,
                                                                :created_at => created_at,
+                                                               :payment_processor_account_id => 'GOOD',
                                                                # The data below doesn't matter
                                                                :updated_at => created_at,
                                                                :kb_account_id => SecureRandom.uuid,

metadata

@@ -1,275 +1,275 @@
 --- !ruby/object:Gem::Specification
 name: killbill-cybersource
 version: !ruby/object:Gem::Version
-  version: 4.0.11
+  version: 4.0.12
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: killbill
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '7.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
+  name: killbill
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: sinatra
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: '7.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.4
+  name: sinatra
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: thread_safe
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 1.3.4
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.4
+  name: thread_safe
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: activerecord
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 0.3.4
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
+  name: activerecord
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: activerecord-bogacs
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 4.1.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+  name: activerecord-bogacs
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: activerecord-jdbc-adapter
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.3'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+  name: activerecord-jdbc-adapter
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jruby-openssl
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: '1.3'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.6
+  name: jruby-openssl
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: actionpack
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 0.9.6
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
+  name: actionpack
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: actionview
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
+  name: actionview
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: activemerchant
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.48.0
+        version: 4.1.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.48.0
+  name: activemerchant
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: offsite_payments
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 1.48.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
+  name: offsite_payments
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: monetize
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
+  name: monetize
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: money
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.5.1
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 6.5.1
+  name: money
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jbundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 6.5.1
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
+  name: jbundler
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
+  name: rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 10.0.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
+  name: rspec
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: jdbc-sqlite3
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
+  name: jdbc-sqlite3
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: jdbc-mariadb
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.7'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+  name: jdbc-mariadb
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: Kill Bill payment plugin for Cybersource.
 email: killbilling-users@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.head
 - Gemfile.lock
@@ -309,23 +309,23 @@ licenses:
 metadata: {}
 post_install_message:
 rdoc_options:
-- --exclude
-- .
+- "--exclude"
+- "."
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Plugin to use Cybersource as a gateway.