killbill-stripe 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1852f0d82680be5f41cc76f715a85bb54cbbf8d
-  data.tar.gz: ee701bf472fcaf89509d8bc0de94127adc4b972e
+  metadata.gz: 189014b9952e1ebf288227534c9c3f812340da7c
+  data.tar.gz: a62c754aa854cc2c36888b894b5c2d37f868beee
 SHA512:
-  metadata.gz: ca23ed9798c2e9ba222f10249e4c2aadd9030bbd615b11db280b3f634e12513541c2b494d4fe1bd52d326a3b498db9cdbc933f75403b46c3db1e21d2cc59b15c
-  data.tar.gz: 518d935017fa68aa893dee12ebc9915dac96088239d2ecb0b70a88ebfe0cd6b8a21261809677914771ade9884ba21ef671a7de797690a9b4cfe02b05c0d8b6ac
+  metadata.gz: 69ec7c9d2476c67246da49f0b8c53561a57bb5804b9a28cbbeef304a6d36cc7d2e45b0f4646d1405b4c35ac33109598db1aaf605e9644204ceb7d92f0363210a
+  data.tar.gz: 2d16bee0cfcebd9c31daae6b47d25286592aa797da075faaae120c13953a47131bb29e3de119b18d0bdd1990bddbe4ef2a47145c1580a6162ab95fc85dd69af4

data/.gitignore

@@ -19,8 +19,8 @@ _yardoc
 doc/
 
 .jbundler
-Jarfile.lock
-Gemfile.lock
+
+stripe.log
 
 .DS_Store
 

data/.travis.yml

@@ -5,7 +5,6 @@ notifications:
     - kill-bill-commits@googlegroups.com
 
 rvm:
-  - jruby-19mode
   - jruby-20mode
   - jruby-head
 
@@ -17,3 +16,6 @@ jdk:
 matrix:
   allow_failures:
     - rvm: jruby-head
+  exclude:
+    - rvm: jruby-head
+      jdk: openjdk6

data/Gemfile.lock

@@ -0,0 +1,133 @@
+PATH
+  remote: .
+  specs:
+    killbill-stripe (0.2.2)
+      actionpack (~> 4.1.0)
+      actionview (~> 4.1.0)
+      activemerchant (~> 1.44.1)
+      activerecord (~> 4.1.0)
+      activerecord-jdbcmysql-adapter (~> 1.3.7)
+      activesupport (~> 4.1.0)
+      jruby-openssl (~> 0.9.4)
+      killbill (~> 3.2.4)
+      monetize (~> 0.3.0)
+      money (~> 6.1.1)
+      offsite_payments (~> 2.0.1)
+      sinatra (~> 1.3.4)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionpack (4.1.8)
+      actionview (= 4.1.8)
+      activesupport (= 4.1.8)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.8)
+      activesupport (= 4.1.8)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    active_utils (2.2.3)
+      activesupport (>= 2.3.11)
+      i18n
+    activemerchant (1.44.1)
+      active_utils (~> 2.2.0)
+      activesupport (>= 3.2.14, < 5.0.0)
+      builder (>= 2.1.2, < 4.0.0)
+      i18n (>= 0.6.9)
+      json (~> 1.7)
+      nokogiri (~> 1.4)
+      offsite_payments (~> 2.0.0)
+    activemodel (4.1.8)
+      activesupport (= 4.1.8)
+      builder (~> 3.1)
+    activerecord (4.1.8)
+      activemodel (= 4.1.8)
+      activesupport (= 4.1.8)
+      arel (~> 5.0.0)
+    activerecord-jdbc-adapter (1.3.13)
+      activerecord (>= 2.2)
+    activerecord-jdbcmysql-adapter (1.3.13)
+      activerecord-jdbc-adapter (~> 1.3.13)
+      jdbc-mysql (>= 5.1.22)
+    activerecord-jdbcsqlite3-adapter (1.3.13)
+      activerecord-jdbc-adapter (~> 1.3.13)
+      jdbc-sqlite3 (>= 3.7.2, < 3.9)
+    activesupport (4.1.8)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    ethon (0.7.3)
+      ffi (>= 1.3.0)
+    ffi (1.9.6-java)
+    i18n (0.6.11)
+    jbundler (0.4.3)
+      maven-tools (~> 0.32.1)
+      ruby-maven (~> 3.0.4)
+    jdbc-mysql (5.1.33)
+    jdbc-sqlite3 (3.8.7)
+    jruby-openssl (0.9.6-java)
+    json (1.8.2-java)
+    killbill (3.2.4)
+      sinatra (~> 1.3.4)
+      typhoeus (~> 0.6.9)
+      tzinfo (~> 1.1.0)
+    maven-tools (0.32.5)
+    minitest (5.5.1)
+    monetize (0.3.0)
+      money (~> 6.1.0.beta1)
+    money (6.1.1)
+      i18n (~> 0.6.4)
+    nokogiri (1.6.6.2-java)
+    offsite_payments (2.0.1)
+      active_utils (~> 2.2.0)
+      activesupport (>= 3.2.14, < 5.0.0)
+      builder (>= 2.1.2, < 4.0.0)
+      i18n (~> 0.5)
+      json (~> 1.7)
+      money (< 7.0.0)
+      nokogiri (~> 1.4)
+    rack (1.5.2)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rake (10.4.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+    ruby-maven (3.0.4.1.4)
+      maven-tools (~> 0.32.3)
+      thor (>= 0.14.6, < 2.0)
+    sinatra (1.3.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
+    thor (0.19.1)
+    thread_safe (0.3.4-java)
+    tilt (1.4.1)
+    typhoeus (0.6.9)
+      ethon (>= 0.7.1)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  activerecord-jdbcsqlite3-adapter (~> 1.3.7)
+  jbundler (~> 0.4.1)
+  killbill-stripe!
+  rake (>= 10.0.0)
+  rspec (~> 2.12.0)

data/Jarfile

@@ -1,8 +1,9 @@
-jar 'org.kill-bill.billing:killbill-api', '0.10.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.8.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.8.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.8.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-retry', '0.8.1'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.8.2'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.12.0'
+jar 'org.kill-bill.billing:killbill-api', '0.12.4'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.8.3'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.8.3'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.8.3'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-retry', '0.8.3'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.8.3'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.13.4'
+jar 'org.mockito:mockito-all', '1.9.0'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/Jarfile.lock

@@ -0,0 +1,52 @@
+org.kill-bill.billing:killbill-api:jar:0.10.2
+com.fasterxml.jackson.core:jackson-annotations:jar:2.3.2
+joda-time:joda-time:jar:2.3
+org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.8.2
+org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.8.2
+org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.8.2
+org.kill-bill.billing.plugin:killbill-plugin-api-retry:jar:0.8.1
+org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.8.2
+org.kill-bill.billing:killbill-util:jar:tests:0.12.0
+com.codahale.metrics:metrics-core:jar:3.0.2
+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
+com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.3
+com.jolbox:bonecp:jar:0.8.0-rc3
+com.google.guava:guava:jar:15.0
+com.samskivert:jmustache:jar:1.5
+net.sf.ehcache:ehcache-core:jar:2.6.9
+org.antlr:stringtemplate:jar:3.2.1
+antlr:antlr:jar:2.7.7
+org.apache.commons:commons-email:jar:1.2
+javax.mail:mail:jar:1.4.1
+javax.activation:activation:jar:1.1
+org.apache.shiro:shiro-core:jar:1.2.3
+commons-beanutils:commons-beanutils:jar:1.8.3
+commons-logging:commons-logging:jar:1.1.1
+org.apache.shiro:shiro-ehcache:jar:1.2.3
+org.apache.shiro:shiro-guice:jar:1.2.3
+com.google.inject:guice:jar:3.0
+aopalliance:aopalliance:jar:1.0
+com.google.inject.extensions:guice-multibindings:jar:3.0
+org.jdbi:jdbi:jar:2.53
+com.google.code.findbugs:annotations:jar:2.0.2
+org.joda:joda-money:jar:0.9
+org.kill-bill.billing:killbill-internal-api:jar:0.12.0
+org.kill-bill.billing:killbill-platform-api:jar:0.1.0
+org.kill-bill.commons:killbill-clock:jar:0.2.28
+org.kill-bill.commons:killbill-concurrent:jar:0.2.28
+org.kill-bill.commons:killbill-embeddeddb-common:jar:0.2.28
+org.kill-bill.commons:killbill-jdbi:jar:0.2.28
+com.h2database:h2:jar:1.3.175
+javax.inject:javax.inject:jar:1
+org.kill-bill.commons:killbill-locker:jar:0.2.28
+org.kill-bill.commons:killbill-queue:jar:0.2.28
+org.kill-bill.commons:killbill-xmlloader:jar:0.2.28
+org.skife.config:config-magic:jar:0.14
+org.slf4j:jcl-over-slf4j:jar:1.7.6
+org.slf4j:slf4j-api:jar:1.7.6
+org.weakref:jmxutils:jar:1.12
+javax.servlet:javax.servlet-api:jar:3.0.1
+org.bouncycastle:bcpkix-jdk15on:jar:1.47
+org.bouncycastle:bcprov-jdk15on:jar:1.47

data/README.md

@@ -1,7 +1,14 @@
 killbill-stripe-plugin
 ======================
 
-Killbill payment plugin for Stripe.
+Plugin to use [Stripe](https://stripe.com/) as a gateway.
+
+Release builds are available on [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.kill-bill.billing.plugin.ruby%22%20AND%20a%3A%22stripe-plugin%22) with coordinates `org.kill-bill.billing.plugin.ruby:stripe-plugin`.
+
+Requirements
+------------
+
+The plugin needs a database. The latest version of the schema can be found here: https://raw.github.com/killbill/killbill-stripe-plugin/master/db/ddl.sql.
 
 Getting started
 ---------------

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/db/ddl.sql

@@ -89,7 +89,7 @@ CREATE TABLE `stripe_responses` (
   `params_card_address_line1_check` varchar(255) DEFAULT NULL,
   `params_card_address_zip_check` varchar(255) DEFAULT NULL,
   `params_captured` varchar(255) DEFAULT NULL,
-  `params_refunds` varchar(255) DEFAULT NULL,
+  `params_refunds` text DEFAULT NULL,
   `params_balance_transaction` varchar(255) DEFAULT NULL,
   `params_failure_message` varchar(255) DEFAULT NULL,
   `params_failure_code` varchar(255) DEFAULT NULL,
@@ -100,7 +100,7 @@ CREATE TABLE `stripe_responses` (
   `params_subscription` varchar(255) DEFAULT NULL,
   `params_discount` varchar(255) DEFAULT NULL,
   `params_account_balance` varchar(255) DEFAULT NULL,
-  `params_cards` varchar(255) DEFAULT NULL,
+  `params_cards` text DEFAULT NULL,
   `params_invoice` varchar(255) DEFAULT NULL,
   `params_description` varchar(255) DEFAULT NULL,
   `params_dispute` varchar(255) DEFAULT NULL,

data/db/schema.rb

@@ -90,7 +90,7 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.string   "params_card_address_line1_check"
     t.string   "params_card_address_zip_check"
     t.string   "params_captured"
-    t.string   "params_refunds"
+    t.text     "params_refunds"
     t.string   "params_balance_transaction"
     t.string   "params_failure_message"
     t.string   "params_failure_code"
@@ -101,7 +101,7 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.string   "params_subscription"
     t.string   "params_discount"
     t.string   "params_account_balance"
-    t.string   "params_cards"
+    t.text     "params_cards"
     t.string   "params_invoice"
     t.string   "params_description"
     t.string   "params_dispute"

data/killbill-stripe.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 3.1.12'
+  s.add_dependency 'killbill', '~> 3.2.4'
   s.add_dependency 'activemerchant', '~> 1.44.1'
   s.add_dependency 'offsite_payments', '~> 2.0.1'
   s.add_dependency 'activerecord', '~> 4.1.0'

data/lib/stripe/api.rb

@@ -123,11 +123,14 @@ module Killbill #:nodoc:
       end
 
       def set_default_payment_method(kb_account_id, kb_payment_method_id, properties, context)
-        pm                    = StripePaymentMethod.from_kb_payment_method_id(kb_payment_method_id, context.tenant_id)
+        pm                           = StripePaymentMethod.from_kb_payment_method_id(kb_payment_method_id, context.tenant_id)
 
         # Update the default payment method on the customer object
-        stripe_response       = gateway.update_customer(pm.stripe_customer_id, :default_card => pm.token)
-        response, transaction = save_response_and_transaction stripe_response, :set_default_payment_method, kb_account_id, context.tenant_id
+        options                      = properties_to_hash(properties)
+        payment_processor_account_id = options[:payment_processor_account_id] || :default
+        gateway                      = lookup_gateway(payment_processor_account_id)
+        stripe_response              = gateway.update_customer(pm.stripe_customer_id, :default_card => pm.token)
+        response, transaction        = save_response_and_transaction(stripe_response, :set_default_payment_method, kb_account_id, context.tenant_id, payment_processor_account_id)
 
         if response.success
           # TODO Update our records

data/lib/stripe/models/payment_method.rb

@@ -10,7 +10,7 @@ module Killbill #:nodoc:
           card_response     = response.responses.first.params
           customer_response = response.responses.last.params
         else
-          card_response     = response.params['cards']['data'][0]
+          card_response     = response.params['sources']['data'][0]
           customer_response = response.params
         end
 
@@ -25,7 +25,7 @@ module Killbill #:nodoc:
                   :token              => card_response['id'],
                   :cc_first_name      => card_response['name'],
                   :cc_last_name       => nil,
-                  :cc_type            => card_response['type'],
+                  :cc_type            => card_response['brand'],
                   :cc_exp_month       => card_response['exp_month'],
                   :cc_exp_year        => card_response['exp_year'],
                   :cc_last_4          => card_response['last4'],

data/lib/stripe/private_api.rb

@@ -3,11 +3,12 @@ module Killbill #:nodoc:
     class PrivatePaymentPlugin < ::Killbill::Plugin::ActiveMerchant::PrivatePaymentPlugin
 
       def add_payment_method(params)
-        stripe_customer_id = StripePaymentMethod.stripe_customer_id_from_kb_account_id(params[:kbAccountId], params[:kbTenantId])
+        payment_processor_account_id = params[:paymentProcessorAccountId] || :default
+        stripe_customer_id           = StripePaymentMethod.stripe_customer_id_from_kb_account_id(params[:kbAccountId], params[:kbTenantId])
 
         # This will either update the current customer if present, or create a new one
-        stripe_response    = gateway.store params[:stripeToken], {:description => params[:kbAccountId], :customer => stripe_customer_id}
-        response           = save_response stripe_response, :add_payment_method
+        stripe_response              = gateway(payment_processor_account_id).store(params[:stripeToken], {:description => params[:kbAccountId], :customer => stripe_customer_id})
+        response, _                  = save_response_and_transaction(stripe_response, :add_payment_method, params[:kbAccountId], params[:kbTenantId], payment_processor_account_id)
         raise response.message unless response.success
 
         # Create the payment method (not associated to a Kill Bill payment method yet)

data/pom.xml

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

data/spec/stripe/remote/integration_spec.rb

@@ -11,7 +11,8 @@ describe Killbill::Stripe::PaymentPlugin do
 
     @account_api    = ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaUserAccountApi.new
     @payment_api    = ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaPaymentApi.new
-    svcs            = {:account_user_api => @account_api, :payment_api => @payment_api}
+    @tenant_api     = ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaTenantUserApi.new({})
+    svcs            = {:account_user_api => @account_api, :payment_api => @payment_api, :tenant_user_api => @tenant_api}
     @plugin.kb_apis = Killbill::Plugin::KillbillApi.new('stripe', svcs)
 
     @call_context           = Killbill::Plugin::Model::CallContext.new
@@ -66,6 +67,13 @@ describe Killbill::Stripe::PaymentPlugin do
     pms.size.should == 2
     pms[0].external_payment_method_id.should == pm1.token
     pms[1].external_payment_method_id.should == pm2.token
+
+    # Update the default payment method in Stripe (we cannot easily verify the result unfortunately)
+    @plugin.set_default_payment_method(pm.kb_account_id, pm2.kb_payment_method_id, [], @call_context)
+    response = Killbill::Stripe::StripeResponse.last
+    response.api_call.should == 'set_default_payment_method'
+    response.message.should == 'Transaction approved'
+    response.success.should be_true
   end
 
   it 'should be able to charge a Credit Card directly' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-stripe
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2015-03-09 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.12
+        version: 3.2.4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.12
+        version: 3.2.4
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -243,7 +243,9 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- Gemfile.lock
 - Jarfile
+- Jarfile.lock
 - LICENSE
 - NEWS
 - README.md