killbill 1.0.11 → 1.0.12

data/Jarfile

@@ -1,3 +1,3 @@
-jar 'com.ning.billing:killbill-api', '0.1.60'
-jar 'com.ning.billing:killbill-util:tests', '0.1.60'
+jar 'com.ning.billing:killbill-api', '0.1.61'
+jar 'com.ning.billing:killbill-util:tests', '0.1.61'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/VERSION

@@ -1 +1 @@
-1.0.11
+1.0.12

data/lib/killbill/jpayment.rb

@@ -33,11 +33,6 @@ module Killbill
         super(real_class_name, services)
       end
 
-      # TODO STEPH decide what to do the getName()
-      java_signature 'java.lang.String getName()'
-      def get_name
-      end
-
       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|
@@ -59,6 +54,17 @@ module Killbill
         end
       end
 
+      java_signature 'java.util.List  getRefundInfo(java.util.UUID, java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
+      def get_refund_info(*args)
+        do_call_handle_exception(__method__, *args) do |res|
+          array_res = java.util.ArrayList.new
+          res.each do |el|
+            array_res.add(JRefundResponse.new(el))
+          end
+          return array_res
+        end
+      end
+
       java_signature 'void addPaymentMethod(java.util.UUID, java.util.UUID, Java::com.ning.billing.payment.api.PaymentMethodPlugin, Java::boolean, Java::com.ning.billing.util.callcontext.CallContext)'
       def add_payment_method(*args)
         do_call_handle_exception(__method__, *args) do |res|
@@ -114,6 +120,8 @@ module Killbill
           yield(res)
         rescue Exception => e
           wrap_and_throw_exception(method_name, e)
+        ensure
+          @delegate_plugin.after_request
         end
       end
 
@@ -163,6 +171,9 @@ module Killbill
            nil
          end
         end
+        # Remove last argument if this is null (it means we passed a context)
+        args.delete_at(-1) if args[-1].nil?
+        args
       end
 
     end

data/lib/killbill/jresponse/jconverter.rb

@@ -17,7 +17,8 @@ module Killbill
         end
 
         def to_joda_date_time(time)
-          time.nil? ? nil : org.joda.time.DateTime.new(time.to_s, org.joda.time.DateTimeZone::UTC)
+          date_time = (time.kind_of? Time) ? DateTime.parse(time.to_s) : time
+          date_time.nil? ? nil : org.joda.time.DateTime.new(date_time.to_s, org.joda.time.DateTimeZone::UTC)
         end
 
         def to_string(str)

data/lib/killbill/jresponse/jpayment_method_response.rb

@@ -83,7 +83,66 @@ module Killbill
         nil
       end
 
-    end
+      java_signature 'java.lang.String getType()'
+      def get_type
+        get_value_string(PaymentMethodResponse::PROP_TYPE)
+      end
+
+      java_signature 'java.lang.String getCCName()'
+      def get_cc_name
+        get_value_string(PaymentMethodResponse::PROP_CC_NAME)
+      end
 
+      java_signature 'java.lang.String getCCType()'
+      def get_cc_type
+        get_value_string(PaymentMethodResponse::PROP_CC_TYPE)
+      end
+
+      java_signature 'java.lang.String getCCExprirationMonth()'
+      def get_cc_expiration_month
+        get_value_string(PaymentMethodResponse::PROP_CC_EXP_MONTH)
+      end
+
+      java_signature 'java.lang.String getCCExprirationYear()'
+      def get_cc_expiration_year
+        get_value_string(PaymentMethodResponse::PROP_CC_EXP_YEAR)
+      end
+
+      java_signature 'java.lang.String getCCLast4()'
+      def get_cc_last_4
+        get_value_string(PaymentMethodResponse::PROP_CC_LAST_4)
+      end
+
+      java_signature 'java.lang.String getAddress1()'
+      def get_address1
+        get_value_string(PaymentMethodResponse::PROP_ADDRESS1)
+      end
+
+      java_signature 'java.lang.String getAddress2()'
+      def get_address2
+        get_value_string(PaymentMethodResponse::PROP_ADDRESS2)
+      end
+
+      java_signature 'java.lang.String getCity()'
+      def get_city
+        get_value_string(PaymentMethodResponse::PROP_CITY)
+      end
+
+      java_signature 'java.lang.String getState()'
+      def get_state
+        get_value_string(PaymentMethodResponse::PROP_STATE)
+      end
+
+      java_signature 'java.lang.String getZip()'
+      def get_zip
+        get_value_string(PaymentMethodResponse::PROP_ZIP)
+      end
+
+      java_signature 'java.lang.String getCountry()'
+      def get_country
+        get_value_string(PaymentMethodResponse::PROP_COUNTRY)
+      end
+
+    end
   end
 end

data/lib/killbill/jresponse/jpayment_response.rb

@@ -14,7 +14,9 @@ module Killbill
                   :effective_date,
                   :status,
                   :gateway_error,
-                  :gateway_error_code
+                  :gateway_error_code,
+                  :first_payment_reference_id,
+                  :second_payment_reference_id
 
       def initialize(payment_response)
         @amount = JConverter.to_big_decimal(payment_response.amount_in_cents)
@@ -23,6 +25,8 @@ module Killbill
         @status = JConverter.to_payment_plugin_status(payment_response.status)
         @gateway_error = JConverter.to_string(payment_response.gateway_error)
         @gateway_error_code = JConverter.to_string(payment_response.gateway_error_code)
+        @first_payment_reference_id = JConverter.to_string(payment_response.first_payment_reference_id)
+        @second_payment_reference_id = JConverter.to_string(payment_response.second_payment_reference_id)
       end
 
       java_signature 'java.math.BigDecimal getAmount()'
@@ -54,6 +58,17 @@ module Killbill
       def get_gateway_error_code
         @gateway_error_code
       end
+
+      java_signature 'java.lang.String getFirstPaymentReferenceId()'
+      def get_first_payment_reference_id
+        @first_payment_reference_id
+      end
+
+      java_signature 'java.lang.String getSecondPaymentReferenceId()'
+      def get_second_payment_reference_id
+        @second_payment_reference_id
+      end
+
     end
   end
 end

data/lib/killbill/jresponse/jrefund_response.rb

@@ -14,7 +14,8 @@ module Killbill
                   :effective_date,
                   :status,
                   :gateway_error,
-                  :gateway_error_code
+                  :gateway_error_code,
+                  :reference_id
 
       def initialize(refund_response)
         @amount = JConverter.to_big_decimal(refund_response.amount_in_cents)
@@ -23,6 +24,7 @@ module Killbill
         @status = JConverter.to_refund_plugin_status(refund_response.status)
         @gateway_error = JConverter.to_string(refund_response.gateway_error)
         @gateway_error_code = JConverter.to_string(refund_response.gateway_error_code)
+        @reference_id = JConverter.to_string(refund_response.reference_id)
       end
 
 
@@ -55,6 +57,12 @@ module Killbill
       def get_gateway_error_code
         @gateway_error_code
       end
+
+      java_signature 'java.lang.String getReferenceId()'
+      def get_reference_id
+        @reference_id
+      end
+
    end
   end
 end

data/lib/killbill/payment.rb

@@ -12,10 +12,6 @@ module Killbill
       class OperationUnsupportedByGatewayError < NotImplementedError
       end
 
-      def get_name
-        raise OperationUnsupportedByGatewayError
-      end
-
       def process_payment(kb_account_id, kb_payment_id, kb_payment_method_id, amount_in_cents, currency, options = {})
         raise OperationUnsupportedByGatewayError
       end

data/lib/killbill/plugin.rb

@@ -68,6 +68,10 @@ module Killbill
         @logger ||= Logger.new(STDOUT)
       end
 
+      # Will be called by each thread before returning to Killbill
+      def after_request
+      end
+
       class APINotAvailableError < NotImplementedError
       end
 

data/lib/killbill/response/payment_method_response.rb

@@ -16,6 +16,19 @@ module Killbill
 
     class PaymentMethodResponse
 
+       PROP_TYPE = "type";
+       PROP_CC_NAME = "cc_name";
+       PROP_CC_TYPE = "cc_type";
+       PROP_CC_EXP_MONTH = "cc_exp_month";
+       PROP_CC_EXP_YEAR = "cc_exp_year";
+       PROP_CC_LAST_4 = "cc_last_4";
+       PROP_ADDRESS1 = "address1";
+       PROP_ADDRESS2 = "address2";
+       PROP_CITY = "city";
+       PROP_STATE = "state";
+       PROP_ZIP = "zip";
+       PROP_COUNTRY = "country";
+
        attr_reader :external_payment_method_id,
                    :is_default,
                    :properties

data/lib/killbill/response/payment_response.rb

@@ -7,15 +7,19 @@ module Killbill
                    :effective_date,
                    :status,
                    :gateway_error,
-                   :gateway_error_code
+                   :gateway_error_code,
+                   :first_payment_reference_id,
+                   :second_payment_reference_id
 
-      def initialize(amount_in_cents, created_date, effective_date, status, gateway_error=nil, gateway_error_code=nil)
+      def initialize(amount_in_cents, created_date, effective_date, status, gateway_error=nil, gateway_error_code=nil, first_payment_reference_id=nil, second_payment_reference_id=nil)
          @amount_in_cents = amount_in_cents
          @created_date = created_date
          @effective_date = effective_date
          @status = status
          @gateway_error = gateway_error
          @gateway_error_code = gateway_error_code
+         @first_payment_reference_id = first_payment_reference_id
+         @second_payment_reference_id = second_payment_reference_id
        end
      end
   end

data/lib/killbill/response/refund_response.rb

@@ -8,15 +8,17 @@ module Killbill
                    :effective_date,
                    :status,
                    :gateway_error,
-                   :gateway_error_code
+                   :gateway_error_code,
+                   :reference_id
 
-      def initialize(amount_in_cents, created_date, effective_date, status, gateway_error, gateway_error_code)
+      def initialize(amount_in_cents, created_date, effective_date, status, gateway_error=nil, gateway_error_code=nil, reference_id=nil)
          @amount_in_cents = amount_in_cents
          @created_date = created_date
          @effective_date = effective_date
          @status = status
          @gateway_error = gateway_error
          @gateway_error_code = gateway_error_code
+         @reference_id = reference_id
        end
      end
   end

data/spec/killbill/payment_test.rb

@@ -8,9 +8,6 @@ module Killbill
         @raise_exception = false
       end
 
-      def get_name
-      end
-
       def process_payment(kb_account_id, kb_payment_id, kb_payment_method_id, amount_in_cents, currency, options = {})
         if @raise_exception
           raise StandardError.new("Test exception")
@@ -75,6 +72,9 @@ module Killbill
         end
       end
 
+      def after_request
+      end
+
       def raise_exception_on_next_calls
         @raise_exception = true
       end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 1.0.11
   prerelease:
+  version: 1.0.12
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-04-11 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'