killbill-payment-test 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3080611d0a9f39e203c26b3340dbae6b7acf13e1
-  data.tar.gz: e772f5e0762bf06f13b3c262a7152b93164660b2
+  metadata.gz: 81c83f34d421ac0ee2080a4cc8c3b03da740fb3c
+  data.tar.gz: 4294e879508dd24843eae7ae36c49574a22bbdba
 SHA512:
-  metadata.gz: f45845d8bbfe954ef1e93fe818aed27ca0cd2351d29d24cef4d1a911c6be5d5ad77afb37eccaf4ad2e3bba40b38c3ed0f71c1d31a5d4fef9f729d58e6af925f1
-  data.tar.gz: 846a7c125570289b9002a33626926edb91bc05541a0125e514314a2c1c06ebccb9388d20f91868d356b80ceebdf15ef39a56d4d62ec22db3ea377ffff5e762a4
+  metadata.gz: 62d65926c520616bf3294cde6e8d176bb1d25a85fca004e26f5125661430a6476f92f8847d5fafdf25e73cb011b16545fa1ee8cd08269db9370c6c2e0bb102e5
+  data.tar.gz: 2ddc372d6fc8f40397dee86fcc6b9a7f27ad1aa1e6d306562008da20e51d102b9fc9ed7392248005d2cff6d430b9dff7d218a51695bcf57d42edbcd30a845eab

data/Gemfile.lock

@@ -1,25 +1,74 @@
 PATH
   remote: .
   specs:
-    killbill-payment-test (3.0.0)
+    killbill-payment-test (3.1.0)
+      actionpack (~> 4.1.0)
+      actionview (~> 4.1.0)
+      activemerchant (~> 1.53.0)
+      activerecord (~> 4.1.0)
+      activerecord-bogacs (~> 0.3)
+      activerecord-jdbc-adapter (~> 1.3)
+      jruby-openssl (~> 0.9.6)
       killbill (~> 7.0)
+      monetize (~> 1.1.0)
+      money (~> 6.5.1)
+      offsite_payments (~> 2.1.0)
+      sinatra (~> 1.3.4)
+      thread_safe (~> 0.3.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    actionpack (4.1.14)
+      actionview (= 4.1.14)
+      activesupport (= 4.1.14)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.14)
+      activesupport (= 4.1.14)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    active_utils (3.0.0)
+      activesupport (>= 3.2)
+      i18n
+    activemerchant (1.53.0)
+      activesupport (>= 3.2.14, < 5.0.0)
+      builder (>= 2.1.2, < 4.0.0)
+      i18n (>= 0.6.9)
+      nokogiri (~> 1.4)
+    activemodel (4.1.14)
+      activesupport (= 4.1.14)
+      builder (~> 3.1)
+    activerecord (4.1.14)
+      activemodel (= 4.1.14)
+      activesupport (= 4.1.14)
+      arel (~> 5.0.0)
+    activerecord-bogacs (0.4.1)
+    activerecord-jdbc-adapter (1.3.19)
+      activerecord (>= 2.2)
+    activesupport (4.1.14)
+      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)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    builder (3.2.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.1.3)
     equalizer (0.0.11)
+    erubis (2.7.0)
     ethon (0.8.0)
       ffi (>= 1.3.0)
     ffi (1.9.10-java)
+    i18n (0.7.0)
     ice_nine (0.11.1)
     jar-dependencies (0.3.1)
     jbundler (0.9.2)
@@ -27,6 +76,10 @@ GEM
       jar-dependencies (~> 0.2)
       maven-tools (~> 1.0.10)
       ruby-maven (~> 3.3, >= 3.3.3)
+    jdbc-mariadb (1.2.3)
+    jdbc-sqlite3 (3.8.11.2)
+    jruby-openssl (0.9.12-java)
+    json (1.8.3-java)
     killbill (7.0.0)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
@@ -34,9 +87,25 @@ GEM
       tzinfo (~> 1.2.0)
     maven-tools (1.0.13)
       virtus (~> 1.0)
-    rack (1.6.4)
+    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.7.1-java)
+    offsite_payments (2.1.0)
+      actionpack (>= 3.2.20, < 5.0.0)
+      active_utils (~> 3.0.0)
+      activesupport (>= 3.2.14, < 5.0.0)
+      builder (>= 2.1.2, < 4.0.0)
+      i18n (~> 0.5)
+      money (>= 5.0.0, < 7.0.0)
+      nokogiri (~> 1.4)
+    rack (1.5.5)
     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)
@@ -70,6 +139,8 @@ PLATFORMS
 
 DEPENDENCIES
   jbundler (~> 0.9.2)
+  jdbc-mariadb (~> 1.1)
+  jdbc-sqlite3 (~> 3.7)
   killbill-payment-test!
   rake (>= 10.0.0)
   rspec (~> 2.12.0)

data/VERSION

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

data/config.ru

@@ -0,0 +1,4 @@
+require 'payment_test'
+require 'payment_test/application'
+
+run Sinatra::Application

data/killbill-payment-test.gemspec

@@ -24,7 +24,29 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'killbill', '~> 7.0'
 
+  s.add_dependency 'sinatra', '~> 1.3.4'
+  s.add_dependency 'thread_safe', '~> 0.3.4'
+  s.add_dependency 'activerecord', '~> 4.1.0'
+  if defined?(JRUBY_VERSION)
+    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.6'
+  end
+  s.add_dependency 'actionpack', '~> 4.1.0'
+  s.add_dependency 'actionview', '~> 4.1.0'
+  s.add_dependency 'activemerchant', '~> 1.53.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.9.2'
   s.add_development_dependency 'rake', '>= 10.0.0'
   s.add_development_dependency 'rspec', '~> 2.12.0'
+  if defined?(JRUBY_VERSION)
+    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
 end

data/lib/payment_test/api.rb

@@ -1,10 +1,13 @@
 require 'payment_test/api_beatrix'
 require 'payment_test/api_control'
 require 'payment_test/plugin_property_utils'
+require 'payment_test/state'
 
 module PaymentTest
 
   class PaymentPlugin < Killbill::Plugin::Payment
+
+
     attr_reader :api_beatrix, :api_control
 
     #
@@ -33,6 +36,8 @@ module PaymentTest
       super
       @api_beatrix = PaymentPluginBeatrix.new(self)
       @api_control = PaymentPluginControl.new(self)
+
+      @state = PaymentTest::State.instance
     end
 
 
@@ -43,29 +48,37 @@ module PaymentTest
       # Let's be cautious..
       PluginPropertyUtils.validate_properties(properties)
 
-      # Extract TEST_MODE property if it exists
-      test_prop = PluginPropertyUtils::get_property_or_nil(properties, 'TEST_MODE')
-
-      # Default to Beatrix (nil properties, no key specified, or explicit key)
-      if test_prop.nil? ||
-          test_prop.value == 'BEATRIX'
+      if is_beatrix_call(properties)
         @api_beatrix.send method, *args
       else
         # Check if we need to throw
-        @api_control.throw_exception_if_required(properties)
+        @api_control.throw_exception_if_required(properties, @state.always_throw(method))
 
         # Check if we should return nil
-        if @api_control.should_return_nil(properties)
+        if @api_control.should_return_nil(properties, @state.always_return_nil(method))
           return nil
         end
 
         # Check if we need to sleep
-        @api_control.sleep_if_required(properties)
+        @api_control.sleep_if_required(properties, @state.sleep_time_sec(method))
 
         # Finally make the call
         @api_control.send method, *args
       end
     end
 
+
+
+    private
+
+    def is_beatrix_call(properties)
+      test_prop = PluginPropertyUtils::get_property_or_nil(properties, 'TEST_MODE')
+      # If a prop has been specified and is not BEATRIX
+      return false if test_prop && test_prop.value != 'BEATRIX'
+      # Default use case for backward compatible beatrix tests
+      return @state.is_clear
+    end
+
+
   end
 end

data/lib/payment_test/api_control.rb

@@ -50,7 +50,7 @@ module PaymentTest
     end
 
     def get_payment_info(kb_account_id, kb_payment_id, properties, context)
-      @payments[kb_payment_id].transactions
+      @payments[kb_payment_id] ? @payments[kb_payment_id].transactions : nil
     end
 
     def search_payments(search_key, offset, limit, properties, context)
@@ -96,21 +96,22 @@ module PaymentTest
       # Noop
     end
 
-    def throw_exception_if_required(properties)
+    def throw_exception_if_required(properties, force_exception)
       exception = PluginPropertyUtils::get_property_or_nil(properties, 'THROW_EXCEPTION')
-      if exception
-        raise RuntimeError.new("throwing cause #{exception.value}")
+      if force_exception || exception
+        raise RuntimeError.new("throwing exception}")
       end
     end
 
-    def should_return_nil(properties)
-      PluginPropertyUtils::get_property_or_nil(properties, 'RETURN_NIL')
+    def should_return_nil(properties, force_nil)
+      force_nil || PluginPropertyUtils::get_property_or_nil(properties, 'RETURN_NIL')
     end
 
-    def sleep_if_required(properties)
+    def sleep_if_required(properties, force_sleep_sec)
       sleep_prop = PluginPropertyUtils::get_property_or_nil(properties, 'SLEEP_TIME_SEC')
-      if sleep_prop
-        sleep_time = sleep_prop.value.to_f
+      resolved_sleep_sec = force_sleep_sec || sleep_prop
+      if resolved_sleep_sec
+        sleep_time = resolved_sleep_sec.value.to_f
         @parent.logger.info "PaymentPluginControl sleeping #{sleep_time}"
         sleep sleep_time
       end

data/lib/payment_test/application.rb

@@ -0,0 +1,44 @@
+# -- encoding : utf-8 --
+
+#include Killbill::Plugin::ActiveMerchant::Sinatra
+
+require 'sinatra'
+
+configure do
+end
+
+helpers do
+  def state
+    PaymentTest::State.instance
+  end
+end
+
+
+
+post '/plugins/killbill-payment-test/configure', :provides => 'json' do
+
+
+  begin
+    data = JSON.parse request.body.read
+  rescue JSON::ParserError => e
+    halt 400, {'Content-Type' => 'text/plain'}, "Invalid payload: #{e}"
+  end
+
+  action = data['CONFIGURE_ACTION']
+  if action.nil?
+    halt 400, {'Content-Type' => 'text/plain'}, "Invalid json, need to specify one CONFIGURE_ACTION={ACTION_THROW_EXCEPTION|ACTION_RETURN_NIL|ACTION_SLEEP|ACTION_RESET}"
+  end
+
+
+  if action == 'ACTION_THROW_EXCEPTION'
+    state.configure_always_throw(data['METHODS'])
+  elsif action == 'ACTION_RETURN_NIL'
+    state.configure_return_nil(data['METHODS'])
+  elsif action == 'ACTION_SLEEP'
+    state.configure_sleep_time(data['SLEEP_TIME_SEC'], data['METHODS'])
+  else
+    state.reset_configuration
+  end
+  status 200
+end
+

data/lib/payment_test/state.rb

@@ -0,0 +1,72 @@
+require 'singleton'
+
+module PaymentTest
+  class State
+
+    include Singleton
+
+    def initialize
+      reset_configuration
+    end
+
+    def configure_always_throw(methods=nil)
+      configure_methods(methods)
+      @always_throw = true
+      log_current_state
+    end
+
+    def configure_return_nil(methods=nil)
+      configure_methods(methods)
+      @always_return_nil = true
+      log_current_state
+    end
+
+    def configure_sleep_time(sleep_time_sec, methods=nil)
+      configure_methods(methods)
+      @sleep_time_sec = sleep_time_sec
+      log_current_state
+    end
+
+    def reset_configuration
+      @always_throw = false
+      @always_return_nil = false
+      @sleep_time_sec = nil
+      @methods = nil
+      log_current_state
+    end
+
+    def always_throw(method)
+      @always_throw && is_for_method(method)
+    end
+
+    def always_return_nil(method)
+      @always_return_nil && is_for_method(method)
+    end
+
+    def sleep_time_sec(method)
+      return @sleep_time_sec if @sleep_time_sec && is_for_method(method)
+      nil
+    end
+
+    def is_clear
+      return !@always_throw && !@always_return_nil && @sleep_time_sec.nil?
+    end
+
+    def log_current_state
+      puts "PaymentTest:State : @always_throw = #{@always_throw}, @always_return_nil = #{@always_return_nil}, @sleep_time_sec = #{@sleep_time_sec}, @methods=#{@methods}"
+    end
+
+    private
+
+    def configure_methods(methods=nil)
+      @methods = methods.split(",")
+    end
+
+    def is_for_method(method)
+      # If no methods were configured, this apply to all of them
+      return true if @methods.nil?
+
+      @methods.include? method.to_s
+    end
+  end
+end

data/lib/payment_test.rb

@@ -1,2 +1,19 @@
+require 'openssl'
+require 'action_controller'
+require 'active_record'
+require 'action_view'
+require 'active_merchant'
+require 'active_support'
+require 'bigdecimal'
+require 'money'
+require 'monetize'
+require 'offsite_payments'
+require 'pathname'
+require 'sinatra'
+require 'singleton'
+require 'yaml'
+
 require 'killbill'
+require 'killbill/helpers/active_merchant'
+
 require 'payment_test/api'

data/pom.xml

@@ -27,7 +27,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>payment-test-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.0</version>
+    <version>3.1.0</version>
     <name>payment-test-plugin</name>
     <description></description>
     <scm>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-payment-test
 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-12-18 00:00:00.000000000 Z
+date: 2015-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -24,6 +24,174 @@ dependencies:
         version: '7.0'
   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
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+  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
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.4
+  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
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+  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'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  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'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  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
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+  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
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+  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
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: activemerchant
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.53.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.53.0
+  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
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  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
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  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
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 6.5.1
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: jbundler
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +234,34 @@ dependencies:
         version: 2.12.0
   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'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.7'
+  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'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  prerelease: false
+  type: :development
 description: Kill Bill Plugin to test the payment plugin api.
 email: killbilling-users@googlegroups.com
 executables: []
@@ -82,13 +278,16 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- config.ru
 - killbill-payment-test.gemspec
 - killbill.properties
 - lib/payment_test.rb
 - lib/payment_test/api.rb
 - lib/payment_test/api_beatrix.rb
 - lib/payment_test/api_control.rb
+- lib/payment_test/application.rb
 - lib/payment_test/plugin_property_utils.rb
+- lib/payment_test/state.rb
 - pom.xml
 - release.sh
 - spec/payment_test/base_plugin_spec.rb
@@ -115,8 +314,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.6
 signing_key:
 specification_version: 4
 summary: Plugin to test the payment plugin api.
-test_files: []
+test_files:
+- spec/payment_test/base_plugin_spec.rb
+- spec/spec_helper.rb