killbill-cybersource 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950d43cbe1c9ee42d76be9c94189d221f0af7031
-  data.tar.gz: e4ece8048f20cbc213ac36fe6c04474eb95c6d3c
+  metadata.gz: c2d37e65ee9d3acaaac4c660e0ddc9236e02f1cc
+  data.tar.gz: 7f3ce57e4d99791a099b4f13f239b8f3bee5f088
 SHA512:
-  metadata.gz: d5ae87ca50bc360957b908acd356960d3b89e986c1bd8692127cb754ae3c51c0cac86b7141bb2f84b7b212e16cd52a13dc68e75d670873758d48b1916cb08559
-  data.tar.gz: 55eb701e46ed22387387d1846ce8678205ad3e1ed4c6e616ffe746f836d95bf9da57ebd603b2d0921260c03899b25e0785f43e7582e799df3eaeda14e9c4599b
+  metadata.gz: 256d147d0d079d7ff5e7a1cf1bca4ff7fecd12cf9ef9e626ba9de684231982b1c9eb8a30a1f8079870ee21be92b3d89dddf8a7beaf7b62469b28035720d5ae12
+  data.tar.gz: 5e89701f55c38d154be6ccc56f9edc907a01c9c3a06530cff0c27f7c6f3752b0f64b207eebec558a79f0a507a6a4f32814bb193cf9c366693bf3e4e5c0afa14c

data/Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 
 gemspec
+#gem 'killbill', :github => 'killbill/killbill-plugin-framework-ruby'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill-cybersource (3.2.0)
+    killbill-cybersource (3.3.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 (~> 6.1.0)
+      killbill (~> 6.5.0)
       monetize (~> 1.1.0)
       money (~> 6.5.1)
       offsite_payments (~> 2.1.0)
@@ -63,11 +63,11 @@ GEM
     jbundler (0.4.3)
       maven-tools (~> 0.32.1)
       ruby-maven (~> 3.0.4)
-    jdbc-mariadb (1.1.8)
-    jdbc-sqlite3 (3.8.10.1)
+    jdbc-mariadb (1.2.3)
+    jdbc-sqlite3 (3.8.11.2)
     jruby-openssl (0.9.12-java)
     json (1.8.3-java)
-    killbill (6.1.0)
+    killbill (6.5.0)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.3.0

data/killbill-cybersource.gemspec

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

data/lib/cybersource/api.rb

@@ -239,6 +239,8 @@ module Killbill #:nodoc:
       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)
 
@@ -246,8 +248,10 @@ module Killbill #:nodoc:
         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
+
+        # we might want a 'util' function to make the conversion joda DateTime to a ruby Time object
+        now = Time.parse(@clock.get_clock.get_utc_now.to_s)
+        (now - transaction.created_at) >= threshold
       end
 
       # Make calls idempotent

data/pom.xml

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-cybersource
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -16,12 +16,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.5.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.5.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency