killbill 1.0.9 → 1.0.10

data/VERSION

@@ -1 +1 @@
-1.0.9
+1.0.10

data/lib/killbill/jpayment.rb

@@ -38,21 +38,21 @@ module Killbill
       def get_name
       end
 
-      java_signature 'com.ning.billing.payment.plugin.api.PaymentInfoPlugin processPayment(java.util.UUID, java.util.UUID, java.lang.BigDecimal, com.ning.billing.util.callcontext.CallContext)'
+      java_signature 'com.ning.billing.payment.plugin.api.PaymentInfoPlugin processPayment(java.util.UUID, java.util.UUID, java.util.UUID, java.lang.BigDecimal, com.ning.billing.catalog.api.Currency, com.ning.billing.util.callcontext.CallContext)'
       def process_payment(*args)
         do_call_handle_exception(__method__, *args) do |res|
           return JPaymentResponse.new(res)
         end
       end
 
-      java_signature 'Java::com.ning.billing.payment.plugin.api.PaymentInfoPlugin getPaymentInfo(java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
+      java_signature 'Java::com.ning.billing.payment.plugin.api.PaymentInfoPlugin getPaymentInfo(java.util.UUID, java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
       def get_payment_info(*args)
         do_call_handle_exception(__method__, *args) do |res|
           return JPaymentResponse.new(res)
         end
       end
 
-      java_signature 'Java::com.ning.billing.payment.plugin.api.RefundInfoPlugin processRefund(java.util.UUID, java.lang.BigDecimal, Java::com.ning.billing.util.callcontext.CallContext)'
+      java_signature 'Java::com.ning.billing.payment.plugin.api.RefundInfoPlugin processRefund(java.util.UUID, java.util.UUID, java.lang.BigDecimal, com.ning.billing.catalog.api.Currency, Java::com.ning.billing.util.callcontext.CallContext)'
       def process_refund(*args)
         do_call_handle_exception(__method__, *args) do |res|
           return JRefundResponse.new(res)
@@ -66,7 +66,7 @@ module Killbill
         end
       end
 
-      java_signature 'void deletePaymentMethod(java.util.UUID, Java::com.ning.billing.util.callcontext.CallContext)'
+      java_signature 'void deletePaymentMethod(java.util.UUID, java.util.UUID, Java::com.ning.billing.util.callcontext.CallContext)'
       def delete_payment_method(*args)
         do_call_handle_exception(__method__, *args) do |res|
           return nil
@@ -80,14 +80,14 @@ module Killbill
         end
       end
 
-      java_signature 'void setDefaultPaymentMethod(java.util.UUID kbPaymentMethodId, Java::com.ning.billing.util.callcontext.CallContext)'
+      java_signature 'void setDefaultPaymentMethod(java.util.UUID, java.util.UUID, Java::com.ning.billing.util.callcontext.CallContext)'
       def set_default_payment_method(*args)
         do_call_handle_exception(__method__, *args) do |res|
           return nil
         end
       end
 
-      java_signature 'java.util.List getPaymentMethods(java.util.UUID, Java::boolean refreshFromGateway, Java::com.ning.billing.util.callcontext.CallContext)'
+      java_signature 'java.util.List getPaymentMethods(java.util.UUID, Java::boolean, Java::com.ning.billing.util.callcontext.CallContext)'
       def get_payment_methods(*args)
         do_call_handle_exception(__method__, *args) do |res|
           array_res = java.util.ArrayList.new
@@ -98,7 +98,7 @@ module Killbill
         end
       end
 
-      java_signature 'void resetPaymentMethods(java.util.List)'
+      java_signature 'void resetPaymentMethods(java.util.UUID, java.util.List)'
       def reset_payment_methods(*args)
         do_call_handle_exception(__method__, *args) do |res|
           return nil
@@ -130,6 +130,8 @@ module Killbill
            JConverter.from_uuid(a)
          elsif a.java_kind_of? java.math.BigDecimal
            JConverter.from_big_decimal(a)
+         elsif a.get_class.is_enum
+           a.nil? ? '' : a.to_string
          elsif a.java_kind_of? Java::com.ning.billing.payment.api.PaymentMethodPlugin
            JConverter.from_payment_method_plugin(a)
          elsif ((a.java_kind_of? Java::boolean) || (a.java_kind_of? java.lang.Boolean))

data/lib/killbill/payment.rb

@@ -16,15 +16,15 @@ module Killbill
         raise OperationUnsupportedByGatewayError
       end
 
-      def process_payment(kb_payment_id, kb_payment_method_id, amount_in_cents, options = {})
+      def process_payment(kb_account_id, kb_payment_id, kb_payment_method_id, amount_in_cents, currency, options = {})
         raise OperationUnsupportedByGatewayError
       end
 
-      def get_payment_info(kb_payment_id, options = {})
+      def get_payment_info(kb_account_id, kb_payment_id, options = {})
         raise OperationUnsupportedByGatewayError
       end
 
-      def process_refund(kb_payment_id, amount_in_cents, options = {})
+      def process_refund(kb_account_id, kb_payment_id, amount_in_cents, currency, options = {})
         raise OperationUnsupportedByGatewayError
       end
 
@@ -32,7 +32,7 @@ module Killbill
         raise OperationUnsupportedByGatewayError
       end
 
-      def delete_payment_method(kb_payment_method_id, options = {})
+      def delete_payment_method(kb_account_id, kb_payment_method_id, options = {})
         raise OperationUnsupportedByGatewayError
       end
 
@@ -40,7 +40,7 @@ module Killbill
         raise OperationUnsupportedByGatewayError
       end
 
-      def set_default_payment_method(kb_payment_method_id, options = {})
+      def set_default_payment_method(kb_account_id, kb_payment_method_id, options = {})
         raise OperationUnsupportedByGatewayError
       end
 
@@ -48,7 +48,7 @@ module Killbill
         raise OperationUnsupportedByGatewayError
       end
 
-      def reset_payment_methods(payment_methods)
+      def reset_payment_methods(kb_account_id, payment_methods)
         raise OperationUnsupportedByGatewayError
       end
     end

data/spec/killbill/payment_plugin_spec.rb

@@ -5,12 +5,13 @@ end
 
 describe Killbill::Plugin::Payment do
   before(:each) do
-    @external_account_key = SecureRandom.uuid
-    @killbill_payment_id = SecureRandom.uuid
+    @kb_account_id = SecureRandom.uuid
+    @kb_payment_id = SecureRandom.uuid
     @amount_in_cents = rand(100000)
+    @currency = 'USD'
 
     @payment_method = Hash.new(:credit_card => SecureRandom.uuid)
-    @external_payment_method_id = SecureRandom.uuid
+    @kb_payment_method_id = SecureRandom.uuid
 
     @payment_method_props = Hash.new
     @payment_methods = Hash.new
@@ -20,15 +21,15 @@ describe Killbill::Plugin::Payment do
   end
 
   it "should raise exceptions for unsupported operations" do
-    lambda { @plugin.process_payment(@external_account_key, @killbill_payment_id, @amount_in_cents) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
-    lambda { @plugin.process_refund(@external_account_key, @killbill_payment_id, @amount_in_cents) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
-    lambda { @plugin.get_payment_info(@killbill_payment_id) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
-    lambda { @plugin.add_payment_method(@external_account_key, @payment_method, @payment_method_props, true ) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
-    lambda { @plugin.delete_payment_method(@external_account_key, @external_payment_method_id) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
-    lambda { @plugin.set_default_payment_method(@external_account_key, @payment_method) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.process_payment(@kb_account_id, @kb_payment_id, @kb_payment_method_id, @amount_in_cents, @currency) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.process_refund(@kb_account_id, @kb_payment_id, @amount_in_cents, @currency) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.get_payment_info(@kb_account_id, @kb_payment_id) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.add_payment_method(@kb_account_id, @payment_method, @payment_method_props, true ) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.delete_payment_method(@kb_account_id, @kb_payment_method_id) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.set_default_payment_method(@kb_account_id, @payment_method) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
 
-    lambda { @plugin.get_payment_method_detail(@external_account_key, @payment_method) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
-    lambda { @plugin.get_payment_methods(@external_account_key, true) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
-    lambda { @plugin.reset_payment_methods(@payment_methods) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.get_payment_method_detail(@kb_account_id, @payment_method) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.get_payment_methods(@kb_account_id, true) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.reset_payment_methods(@kb_account_id, @payment_methods) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
+  version: 1.0.10
   prerelease:
-  version: 1.0.9
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.1
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.1
     none: false
@@ -31,13 +31,13 @@ dependencies:
   name: rack
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.2
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.2
     none: false
@@ -47,13 +47,13 @@ dependencies:
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
     none: false
@@ -63,13 +63,13 @@ dependencies:
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
     none: false
@@ -79,13 +79,13 @@ dependencies:
   name: sinatra
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.4
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.4
     none: false
@@ -97,8 +97,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - Jarfile
 - README.md
@@ -144,25 +144,25 @@ licenses:
 - Apache License (2.0)
 post_install_message:
 rdoc_options:
-- "--exclude"
-- "."
+- --exclude
+- .
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 2
       version: !binary |-
         MA==
+      hash: 2
   none: false
 requirements:
 - jar 'com.ning.billing:killbill-api'