killbill-stripe 0.2.3 → 1.0.0

data/VERSION

@@ -1 +1 @@
-0.2.3
+1.0.0

data/db/ddl.sql

@@ -6,10 +6,10 @@ CREATE TABLE `stripe_payment_methods` (
   `cc_first_name` varchar(255) DEFAULT NULL,
   `cc_last_name` varchar(255) DEFAULT NULL,
   `cc_type` varchar(255) DEFAULT NULL,
-  `cc_exp_month` int(11) DEFAULT NULL,
-  `cc_exp_year` int(11) DEFAULT NULL,
-  `cc_number` int(11) DEFAULT NULL,
-  `cc_last_4` int(11) DEFAULT NULL,
+  `cc_exp_month` varchar(255) DEFAULT NULL,
+  `cc_exp_year` varchar(255) DEFAULT NULL,
+  `cc_number` varchar(255) DEFAULT NULL,
+  `cc_last_4` varchar(255) DEFAULT NULL,
   `cc_start_month` varchar(255) DEFAULT NULL,
   `cc_start_year` varchar(255) DEFAULT NULL,
   `cc_issue_number` varchar(255) DEFAULT NULL,

data/db/schema.rb

@@ -8,15 +8,15 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.string   "cc_first_name"
     t.string   "cc_last_name"
     t.string   "cc_type"
-    t.integer  "cc_exp_month"
-    t.integer  "cc_exp_year"
-    t.integer  "cc_number"
-    t.integer  "cc_last_4"
-    t.integer  "cc_start_month"
-    t.integer  "cc_start_year"
-    t.integer  "cc_issue_number"
-    t.integer  "cc_verification_value"
-    t.integer  "cc_track_data"
+    t.string   "cc_exp_month"
+    t.string   "cc_exp_year"
+    t.string   "cc_number"
+    t.string   "cc_last_4"
+    t.string   "cc_start_month"
+    t.string   "cc_start_year"
+    t.string   "cc_issue_number"
+    t.string   "cc_verification_value"
+    t.string   "cc_track_data"
     t.string   "address1"
     t.string   "address2"
     t.string   "city"

data/killbill-stripe.gemspec

@@ -12,38 +12,40 @@ Gem::Specification.new do |s|
 
   s.author   = 'Kill Bill core team'
   s.email    = 'killbilling-users@googlegroups.com'
-  s.homepage = 'http://kill-bill.org'
+  s.homepage = 'http://killbill.io'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.bindir        = 'bin'
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 3.2.4'
+  s.add_dependency 'killbill', '~> 4.0.0'
+
+  s.add_dependency 'sinatra', '~> 1.3.4'
   s.add_dependency 'thread_safe', '~> 0.3.4'
-  s.add_dependency 'activemerchant', '~> 1.44.1'
-  s.add_dependency 'offsite_payments', '~> 2.0.1'
   s.add_dependency 'activerecord', '~> 4.1.0'
-  s.add_dependency 'actionpack', '~> 4.1.0'
-  s.add_dependency 'actionview', '~> 4.1.0'
-  s.add_dependency 'activesupport', '~> 4.1.0'
-  s.add_dependency 'money', '~> 6.1.1'
-  s.add_dependency 'monetize', '~> 0.3.0'
-  s.add_dependency 'sinatra', '~> 1.3.4'
   if defined?(JRUBY_VERSION)
-    s.add_dependency 'activerecord-jdbcmysql-adapter', '~> 1.3.7'
+    s.add_dependency 'activerecord-bogacs', '~> 0.3'
+    s.add_dependency 'activerecord-jdbc-adapter', '~> 1.3'
     # Required to avoid errors like java.lang.NoClassDefFoundError: org/bouncycastle/asn1/DERBoolean
-    s.add_dependency 'jruby-openssl', '~> 0.9.4'
+    s.add_dependency 'jruby-openssl', '~> 0.9.6'
   end
+  s.add_dependency 'actionpack', '~> 4.1.0'
+  s.add_dependency 'actionview', '~> 4.1.0'
+  s.add_dependency 'activemerchant', '~> 1.48.0'
+  s.add_dependency 'offsite_payments', '~> 2.1.0'
+  s.add_dependency 'monetize', '~> 1.1.0'
+  s.add_dependency 'money', '~> 6.5.1'
 
-  s.add_development_dependency 'jbundler', '~> 0.4.1'
+  s.add_development_dependency 'jbundler', '~> 0.4.3'
   s.add_development_dependency 'rake', '>= 10.0.0'
   s.add_development_dependency 'rspec', '~> 2.12.0'
   if defined?(JRUBY_VERSION)
-    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter', '~> 1.3.7'
+    s.add_development_dependency 'jdbc-sqlite3', '~> 3.7'
+    s.add_development_dependency 'jdbc-mariadb', '~> 1.1'
   else
     s.add_development_dependency 'sqlite3', '~> 1.3.7'
   end

data/lib/stripe.rb

@@ -22,4 +22,3 @@ require 'stripe/private_api'
 require 'stripe/models/payment_method'
 require 'stripe/models/response'
 require 'stripe/models/transaction'
-

data/lib/stripe/api.rb

@@ -14,6 +14,14 @@ module Killbill #:nodoc:
               ::Killbill::Stripe::StripeResponse)
       end
 
+      def on_event(event)
+        # Require to deal with per tenant configuration invalidation
+        super(event)
+        #
+        # Custom event logic could be added below...
+        #
+      end
+
       def authorize_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
         pm = @payment_method_model.from_kb_payment_method_id(kb_payment_method_id, context.tenant_id)
 
@@ -92,6 +100,7 @@ module Killbill #:nodoc:
 
         # Pass extra parameters for the gateway here
         options = {
+            :email => @kb_apis.account_user_api.get_account_by_id(kb_account_id, @kb_apis.create_context(context.tenant_id)).email,
             # This will either update the current customer if present, or create a new one
             :customer => stripe_customer_id,
             # Magic field, see also private_api.rb (works only when creating an account)
@@ -186,6 +195,13 @@ module Killbill #:nodoc:
           # gw_notification.entity =
         end
       end
+
+      private
+
+      def get_payment_source(kb_payment_method_id, properties, options, context)
+        return nil if options[:customer_id]
+        super(kb_payment_method_id, properties, options, context)
+      end
     end
   end
 end

data/lib/stripe/application.rb

@@ -18,11 +18,7 @@ end
 
 helpers do
   def plugin(session = {})
-    ::Killbill::Stripe::PrivatePaymentPlugin.new(:stripe,
-                                                 ::Killbill::Stripe::StripePaymentMethod,
-                                                 ::Killbill::Stripe::StripeTransaction,
-                                                 ::Killbill::Stripe::StripeResponse,
-                                                 session)
+    ::Killbill::Stripe::PrivatePaymentPlugin.new(session)
   end
 end
 
@@ -31,36 +27,35 @@ get '/plugins/killbill-stripe' do
   kb_account_id = request.GET['kb_account_id']
   required_parameter! :kb_account_id, kb_account_id
 
+  kb_tenant_id = request.GET['kb_tenant_id']
+  kb_tenant = request.env['killbill_tenant']
+  kb_tenant_id ||= kb_tenant.id.to_s unless kb_tenant.nil?
+
   # URL to Stripe.js
-  stripejs_url = config[:stripe][:stripejs_url] || 'https://js.stripe.com/v2/'
+  stripejs_url = config(kb_tenant_id)[:stripe][:stripejs_url] || 'https://js.stripe.com/v2/'
   required_parameter! :stripejs_url, stripejs_url, 'is not configured'
 
   # Public API key
-  publishable_key = config[:stripe][:api_publishable_key]
+  publishable_key = config(kb_tenant_id)[:stripe][:api_publishable_key]
   required_parameter! :publishable_key, publishable_key, 'is not configured'
 
-  # Redirect
-  success_page = params[:successPage] || '/plugins/killbill-stripe'
-  required_parameter! :success_page, success_page, 'is not specified'
+  # Skip redirect? Useful for testing the flow with Kill Bill
+  no_redirect = request.GET['no_redirect'] == '1'
 
   locals = {
       :stripejs_url    => stripejs_url,
       :publishable_key => publishable_key,
       :kb_account_id   => kb_account_id,
-      :success_page    => success_page
+      :kb_tenant_id    => kb_tenant_id,
+      :no_redirect     => no_redirect
   }
   erb :stripejs, :locals => locals
 end
 
 # This is mainly for testing. Your application should redirect from the Stripe.js checkout above
 # to a custom endpoint where you call the Kill Bill add payment method JAX-RS API.
-# If you really want to use this endpoint, you'll have to call the Kill Bill refresh payment methods API
-# to get a Kill Bill payment method id assigned.
-post '/plugins/killbill-stripe' do
-  pm = plugin.add_payment_method params
-
-  status 201
-  redirect '/plugins/killbill-stripe/1.0/pms/' + pm.id.to_s
+post '/plugins/killbill-stripe', :provides => 'json' do
+  params.to_json
 end
 
 # curl -v http://127.0.0.1:9292/plugins/killbill-stripe/1.0/pms/1
@@ -88,4 +83,4 @@ get '/plugins/killbill-stripe/1.0/responses/:id', :provides => 'json' do
   else
     status 404
   end
-end
+end

data/lib/stripe/models/payment_method.rb

@@ -6,12 +6,15 @@ module Killbill #:nodoc:
 
       def self.from_response(kb_account_id, kb_payment_method_id, kb_tenant_id, cc_or_token, response, options, extra_params = {}, model = ::Killbill::Stripe::StripePaymentMethod)
         stripe_customer_id = self.stripe_customer_id_from_kb_account_id(kb_account_id, kb_tenant_id)
-        unless stripe_customer_id.blank?
+        if !stripe_customer_id.blank? && response.respond_to?(:responses)
           card_response     = response.responses.first.params
           customer_response = response.responses.last.params
-        else
+        elsif response.params['sources']
           card_response     = response.params['sources']['data'][0]
           customer_response = response.params
+        else
+          card_response = {}
+          customer_response = {}
         end
 
         super(kb_account_id,
@@ -50,7 +53,7 @@ module Killbill #:nodoc:
         stripe_customer_ids = Set.new
         pms.each { |pm| stripe_customer_ids << pm.stripe_customer_id }
         raise "No Stripe customer id found for account #{kb_account_id}" if stripe_customer_ids.empty?
-        raise "Kill Bill account #{kb_account_id} mapping to multiple Stripe customers: #{stripe_customer_ids}" if stripe_customer_ids.size > 1
+        raise "Kill Bill account #{kb_account_id} mapping to multiple Stripe customers: #{stripe_customer_ids.to_a}" if stripe_customer_ids.size > 1
         stripe_customer_ids.first
       end
     end

data/lib/stripe/private_api.rb

@@ -1,34 +1,12 @@
 module Killbill #:nodoc:
   module Stripe #:nodoc:
     class PrivatePaymentPlugin < ::Killbill::Plugin::ActiveMerchant::PrivatePaymentPlugin
-
-      def add_payment_method(params)
-        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(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)
-        Killbill::Stripe::StripePaymentMethod.create! :kb_account_id        => params[:kbAccountId],
-                                                      :kb_payment_method_id => nil,
-                                                      :kb_tenant_id         => params[:kbTenantId],
-                                                      :stripe_customer_id   => stripe_customer_id,
-                                                      :token                => params[:stripeToken],
-                                                      :cc_first_name        => params[:stripeCardName],
-                                                      :cc_last_name         => nil,
-                                                      :cc_type              => params[:stripeCardType],
-                                                      :cc_exp_month         => params[:stripeCardExpMonth],
-                                                      :cc_exp_year          => params[:stripeCardExpYear],
-                                                      :cc_last_4            => params[:stripeCardLast4],
-                                                      :address1             => params[:stripeCardAddressLine1],
-                                                      :address2             => params[:stripeCardAddressLine2],
-                                                      :city                 => params[:stripeCardAddressCity],
-                                                      :state                => params[:stripeCardAddressState],
-                                                      :zip                  => params[:stripeCardAddressZip],
-                                                      :country              => params[:stripeCardAddressCountry] || params[:stripeCardCountry]
+      def initialize(session = {})
+        super(:stripe,
+              ::Killbill::Stripe::StripePaymentMethod,
+              ::Killbill::Stripe::StripeTransaction,
+              ::Killbill::Stripe::StripeResponse,
+              session)
       end
     end
   end

data/lib/stripe/views/stripejs.erb

@@ -38,8 +38,12 @@
           $form.append($('<input type="hidden" name="stripeType" />').val(response.type));
           $form.append($('<input type="hidden" name="stripeObject" />').val(response.object));
           $form.append($('<input type="hidden" name="stripeUsed" />').val(response.used));
-          // and re-submit
-          $form.get(0).submit();
+          <% if no_redirect %>
+            console.log(response);
+          <% else %>
+           // and re-submit
+            $form.get(0).submit();
+          <% end %>
         }
       };
 
@@ -62,6 +66,7 @@
     <form method="post" id="payment-form" action="">
       <span class='payment-errors'></span>
       <input type="hidden" name="kbAccountId" value="<%= kb_account_id %>" />
+      <input type="hidden" name="kbTenantId" value="<%= kb_tenant_id %>" />
       <div class="form-row">
         <label>
           <span>Card Number</span>

data/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-~ Copyright 2014 The Billing Project, LLC
+~ Copyright 2014-2015 The Billing Project, LLC
 ~
 ~  The Billing Project 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 +25,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>stripe-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>0.2.3</version>
+    <version>1.0.0</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/release.sh

@@ -1,5 +1,8 @@
 set -e
 
+BUNDLE=${BUNDLE-"bundle exec"}
+MVN=${MVN-"mvn"}
+
 if [ 'GNU' != "$(tar --help | grep GNU | head -1 | awk '{print $1}')" ]; then
   echo 'Unable to release: make sure to use GNU tar'
   exit 1
@@ -14,28 +17,45 @@ else
 fi
 
 VERSION=`grep -E '<version>([0-9]+\.[0-9]+\.[0-9]+)</version>' pom.xml | sed 's/[\t \n]*<version>\(.*\)<\/version>[\t \n]*/\1/'`
-if [ "$VERSION" != "$(cat $PWD/VERSION)" ]; then
+if [[ -z "$NO_RELEASE" && "$VERSION" != "$(cat $PWD/VERSION)" ]]; then
   echo 'Unable to release: make sure the versions in pom.xml and VERSION match'
   exit 1
 fi
 
 echo 'Cleaning up'
-rake killbill:clean ; rake build
+$BUNDLE rake killbill:clean
+
+echo 'Building gem'
+$BUNDLE rake build
 
-echo 'Pushing the gem to Rubygems'
-rake release
+if [[ -z "$NO_RELEASE" ]]; then
+  echo 'Pushing the gem to Rubygems'
+  $BUNDLE rake release
+fi
 
 echo 'Building artifact'
-rake killbill:package
+$BUNDLE rake killbill:package
 
 ARTIFACT="$PWD/pkg/killbill-stripe-$VERSION.tar.gz"
 echo "Pushing $ARTIFACT to Maven Central"
-mvn gpg:sign-and-deploy-file \
-    -DgroupId=org.kill-bill.billing.plugin.ruby \
-    -DartifactId=stripe-plugin \
-    -Dversion=$VERSION \
-    -Dpackaging=tar.gz \
-    -DrepositoryId=ossrh-releases \
-    -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ \
-    -Dfile=$ARTIFACT \
-    -DpomFile=pom.xml
+
+if [[ -z "$NO_RELEASE" ]]; then
+  GOAL=gpg:sign-and-deploy-file
+  REPOSITORY_ID=ossrh-releases
+  URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
+else
+  GOAL=deploy:deploy-file
+  REPOSITORY_ID=sonatype-nexus-snapshots
+  URL=https://oss.sonatype.org/content/repositories/snapshots/
+  VERSION="$VERSION-SNAPSHOT"
+fi
+
+$MVN $GOAL \
+     -DgroupId=org.kill-bill.billing.plugin.ruby \
+     -DartifactId=stripe-plugin \
+     -Dversion=$VERSION \
+     -Dpackaging=tar.gz \
+     -DrepositoryId=$REPOSITORY_ID \
+     -Durl=$URL \
+     -Dfile=$ARTIFACT \
+     -DpomFile=pom.xml

data/spec/stripe/base_plugin_spec.rb

@@ -1,9 +1,12 @@
 require 'spec_helper'
 
 describe Killbill::Stripe::PaymentPlugin do
+
+  include ::Killbill::Plugin::ActiveMerchant::RSpec
+
   before(:each) do
     Dir.mktmpdir do |dir|
-      file = File.new(File.join(dir, 'stripe.yml'), "w+")
+      file = File.new(File.join(dir, 'stripe.yml'), 'w+')
       file.write(<<-eos)
 :stripe:
   :api_secret_key: 'j2lkb12'
@@ -14,12 +17,7 @@ describe Killbill::Stripe::PaymentPlugin do
       eos
       file.close
 
-      @plugin              = Killbill::Stripe::PaymentPlugin.new
-      @plugin.logger       = Logger.new(STDOUT)
-      @plugin.logger.level = Logger::INFO
-      @plugin.conf_dir     = File.dirname(file)
-      @account_api         = ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaUserAccountApi.new
-      @plugin.kb_apis      = Killbill::Plugin::KillbillApi.new('stripe', {})
+      @plugin = build_plugin(::Killbill::Stripe::PaymentPlugin, 'stripe', File.dirname(file))
 
       # Start the plugin here - since the config file will be deleted
       @plugin.start_plugin
@@ -39,10 +37,12 @@ describe Killbill::Stripe::PaymentPlugin do
     verify_pms kb_account_id, 0, context
 
     # Create a pm with a kb_payment_method_id
-    Killbill::Stripe::StripePaymentMethod.create :kb_account_id        => kb_account_id,
+    Killbill::Stripe::StripePaymentMethod.create(:kb_account_id        => kb_account_id,
                                                  :kb_tenant_id         => kb_tenant_id,
                                                  :kb_payment_method_id => 'kb-1',
-                                                 :token                => 'stripe-1'
+                                                 :token                => 'stripe-1',
+                                                 :created_at           => Time.now.utc,
+                                                 :updated_at           => Time.now.utc)
     verify_pms kb_account_id, 1, context
 
     # Add some in KillBill and reset
@@ -55,9 +55,11 @@ describe Killbill::Stripe::PaymentPlugin do
     verify_pms kb_account_id, 4, context
 
     # Add a payment method without a kb_payment_method_id
-    Killbill::Stripe::StripePaymentMethod.create :kb_account_id => kb_account_id,
+    Killbill::Stripe::StripePaymentMethod.create(:kb_account_id => kb_account_id,
                                                  :kb_tenant_id  => kb_tenant_id,
-                                                 :token         => 'stripe-5'
+                                                 :token         => 'stripe-5',
+                                                 :created_at    => Time.now.utc,
+                                                 :updated_at    => Time.now.utc)
     @plugin.get_payment_methods(kb_account_id, false, nil, context).size.should == 5
 
     # Verify we can match it