killbill-payment-test 1.8.4 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d15b07f1b2de9e55be2aa7410ef913d44efc7560
-  data.tar.gz: dd473f58c669eef5749980bd8a4b7ceb877ed6e5
+  metadata.gz: 3dd0f0101a16fc924301d9374f79579b7e426323
+  data.tar.gz: 94beb0af3d84929338750441545b4294c4d45588
 SHA512:
-  metadata.gz: e5d2781cd1fb3da583cae4d285d52989e9f540f0d40fbc3109e8ce457c5cff9df63053f51a6fcf584ab8d077faf0ada3a67f47816364f45415b15f703cdcc341
-  data.tar.gz: 2d59e5316912603f004a9d83a9153e520654918c6717a1eeea3f346b8c4fe29c16aaf975cff8c24bbc2cbf671380f8814fd81931e7e78bfccca1fda12fae67e0
+  metadata.gz: 7c89ef3f1707be0df53f962fa8d2d600a42b3648fb7f5aff34dd419539f15d76442956c251bb4bdbf87a54bfa838a795f741e1e1ed6b384011889401a945de50
+  data.tar.gz: 843f10490a329c0d055d6ea469cce41b70bf4c2a8a8e6a0607a062df04097a0e90993dc9f2cdac9c51015d7f7ab32b5022ee01d2cc55422ebc4e36e4e6d213e4

data/VERSION

@@ -1 +1 @@
-1.8.4
+1.8.5

data/lib/payment_test/api.rb

@@ -1,16 +1,34 @@
 require 'payment_test/api_beatrix'
 require 'payment_test/api_control'
+require 'payment_test/plugin_property_utils'
 
 module PaymentTest
 
-  #
-  # Note we don't inherit Killbill::Plugin::Payment < Killbill::Plugin::PluginBase, but we inherit straight Killbill::Plugin::PluginBase
-  # to bypass the definition of all the APIs, which by default raise OperationUnsupportedByGatewayError. That way, any API call
-  # goes straight into method_missing, and the correct delegate dispatching can happen.
-  #
-  class PaymentPlugin < Killbill::Plugin::PluginBase
+  class PaymentPlugin < Killbill::Plugin::Payment
     attr_reader :api_beatrix, :api_control
 
+    #
+    # undef all methods defined in Killbill::Plugin::Payment that throw by default OperationUnsupportedByGatewayError
+    # so we get directed straight to the method_missing handler
+    #
+    undef_method :authorize_payment
+    undef_method :capture_payment
+    undef_method :purchase_payment
+    undef_method :void_payment
+    undef_method :credit_payment
+    undef_method :refund_payment
+    undef_method :get_payment_info
+    undef_method :search_payments
+    undef_method :add_payment_method
+    undef_method :delete_payment_method
+    undef_method :get_payment_method_detail
+    undef_method :set_default_payment_method
+    undef_method :get_payment_methods
+    undef_method :search_payment_methods
+    undef_method :reset_payment_methods
+    undef_method :build_form_descriptor
+    undef_method :process_notification
+
     def initialize
       super
       @api_beatrix = PaymentPluginBeatrix.new(self)
@@ -22,19 +40,21 @@ module PaymentTest
       # properties is always the second last argument right before context
       properties = args[args.length - 2]
 
-      if  properties && (!properties.is_a? Hash)
-        raise ArgumentError.new "properties should be a Hash"
-      end
+      # 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 properties.nil? ||
-          (!properties.has_key? 'TEST_MODE') ||
-          properties['TEST_MODE'] == 'BEATRIX'
+      if test_prop.nil? ||
+          test_prop.value == 'BEATRIX'
         @api_beatrix.send method, *args
       else
         @api_control.sleep_if_required properties
         @api_control.send method, *args
       end
     end
+
   end
 end

data/lib/payment_test/api_control.rb

@@ -1,3 +1,5 @@
+require 'payment_test/plugin_property_utils'
+
 module PaymentTest
   class PaymentPluginControl
 
@@ -96,14 +98,12 @@ module PaymentTest
 
 
     def sleep_if_required(properties)
-      if properties.nil? ||
-          (!properties.has_key? 'SLEEP_TIME_SEC')
-        return
+      sleep_prop = PluginPropertyUtils::get_property_or_nil(properties, 'SLEEP_TIME_SEC')
+      if sleep_prop
+        sleep_time = sleep_prop.value.to_f
+        @parent.logger.info "PaymentPluginControl sleeping #{sleep_time}"
+        sleep sleep_time
       end
-
-      sleep_time = properties['SLEEP_TIME_SEC']
-      @parent.logger "PaymentPluginControl sleeping #{sleep_time}"
-      sleep sleep_time
     end
 
     private
@@ -135,12 +135,8 @@ module PaymentTest
 
 
     def status_from_properties(properties)
-      if properties.nil? ||
-          (!properties.has_key? 'TRANSACTION_STATUS')
-        return :PROCESSED
-      else
-        properties['TRANSACTION_STATUS'].to_sym
-      end
+      status_prop = PluginPropertyUtils::get_property_or_nil(properties, 'TRANSACTION_STATUS')
+      status_prop.nil? ? :PROCESSED : status_prop.value.to_sym
     end
   end
 end

data/lib/payment_test/plugin_property_utils.rb

@@ -0,0 +1,30 @@
+module PaymentTest
+
+  class PluginPropertyUtils
+
+    def self.get_property_or_nil(properties, key_name)
+      test_props = (properties || []).select { |e| e.key == key_name }
+      if test_props.size > 1
+        raise ArgumentError.new "multiple property with key #{key_name} is not allowed"
+      end
+      test_props.size == 1 ? test_props[0] : nil
+    end
+
+    def self.validate_properties(properties)
+      if properties.nil?
+        return
+      end
+
+      if !properties.is_a? Array
+        raise ArgumentError.new "properties should be an Array"
+      end
+
+      properties.each do |p|
+        if !p.is_a? Killbill::Plugin::Model::PluginProperty
+          raise ArgumentError.new "Each property should be of type Killbill::Plugin::Model::PluginProperty"
+        end
+      end
+    end
+
+  end
+end

data/pom.xml

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

data/spec/payment_test/base_plugin_spec.rb

@@ -38,8 +38,13 @@ describe PaymentTest::PaymentPlugin do
   end
 
   it "should test control api" do
-    properties = Hash.new
-    properties['TEST_MODE'] = 'CONTROL'
+
+    properties = []
+    prop_test_mode = Killbill::Plugin::Model::PluginProperty.new
+    prop_test_mode.key = 'TEST_MODE'
+    prop_test_mode.value = 'CONTROL'
+    properties << prop_test_mode
+
     transaction1 = @plugin.authorize_payment(@kb_account_id, @kb_payment_id, @kb_payment_transaction_id, @kb_payment_method_id, @amount_in_cents, @currency, properties, @call_context)
 
     transaction1.should be_an_instance_of Killbill::Plugin::Model::PaymentTransactionInfoPlugin
@@ -50,7 +55,10 @@ describe PaymentTest::PaymentPlugin do
     transaction1.transaction_type.should == :AUTHORIZE
     transaction1.status.should == :PROCESSED
 
-    properties['TRANSACTION_STATUS'] = 'ERROR'
+    prop_status = Killbill::Plugin::Model::PluginProperty.new
+    prop_status.key = 'TRANSACTION_STATUS'
+    prop_status.value = 'ERROR'
+    properties << prop_status
 
     transaction2 = @plugin.capture_payment(@kb_account_id, @kb_payment_id, @kb_payment_transaction_id, @kb_payment_method_id, @amount_in_cents, @currency, properties, @call_context)
     transaction2.kb_payment_id.should == @kb_payment_id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-payment-test
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -85,6 +85,7 @@ files:
 - lib/payment_test/api.rb
 - lib/payment_test/api_beatrix.rb
 - lib/payment_test/api_control.rb
+- lib/payment_test/plugin_property_utils.rb
 - pom.xml
 - release.sh
 - spec/payment_test/base_plugin_spec.rb