killbill-paypal-express 1.1.0 → 1.2.0

data/Jarfile

@@ -1,5 +1,5 @@
 jar 'com.ning.billing:killbill-api', '0.3.0'
 jar 'com.ning.billing.plugin:killbill-plugin-api-notification', '0.2.4'
 jar 'com.ning.billing.plugin:killbill-plugin-api-payment', '0.2.4'
-jar 'com.ning.billing:killbill-util:tests', '0.2.6-SNAPSHOT'
+jar 'com.ning.billing:killbill-util:tests', '0.3.0'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/NEWS

@@ -1,2 +1,5 @@
+1.2.0
+    Update to killbill 1.2.0
+
 1.1.0
     Update to killbill 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/killbill-paypal-express.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 1.1.2'
+  s.add_dependency 'killbill', '~> 1.2.0'
   s.add_dependency 'activemerchant', '~> 2.0.0'
   s.add_dependency 'activerecord', '~> 3.2.1'
   s.add_dependency 'sinatra', '~> 1.3.4'

data/lib/paypal_express/api.rb

@@ -16,7 +16,9 @@ module Killbill::PaypalExpress
       ActiveRecord::Base.connection.close
     end
 
-    def process_payment(kb_account_id, kb_payment_id, kb_payment_method_id, amount_in_cents, currency, call_context = nil, options = {})
+    def process_payment(kb_account_id, kb_payment_id, kb_payment_method_id, amount, currency, call_context = nil, options = {})
+      amount_in_cents = (amount * 100).to_i
+
       # If the payment was already made, just return the status
       paypal_express_transaction = PaypalExpressTransaction.from_kb_payment_id(kb_payment_id) rescue nil
       return paypal_express_transaction.paypal_express_response.to_payment_response unless paypal_express_transaction.nil?
@@ -52,7 +54,9 @@ module Killbill::PaypalExpress
       end
     end
 
-    def process_refund(kb_account_id, kb_payment_id, amount_in_cents, currency, call_context = nil, options = {})
+    def process_refund(kb_account_id, kb_payment_id, amount, currency, call_context = nil, options = {})
+      amount_in_cents = (amount * 100).to_i
+
       paypal_express_transaction = PaypalExpressTransaction.find_candidate_transaction_for_refund(kb_payment_id, amount_in_cents)
 
       options[:currency] ||= currency.to_s

data/lib/paypal_express/models/paypal_express_response.rb

@@ -147,7 +147,7 @@ module Killbill::PaypalExpress
 
       if type == :payment
         p_info_plugin = Killbill::Plugin::Model::PaymentInfoPlugin.new
-        p_info_plugin.amount = amount_in_cents
+        p_info_plugin.amount = BigDecimal.new(amount_in_cents.to_s) / 100.0 if amount_in_cents
         p_info_plugin.created_date = created_date
         p_info_plugin.effective_date = effective_date
         p_info_plugin.status = (success ? :PROCESSED : :ERROR)
@@ -158,7 +158,7 @@ module Killbill::PaypalExpress
         p_info_plugin
       else
         r_info_plugin = Killbill::Plugin::Model::RefundInfoPlugin.new
-        r_info_plugin.amount = amount_in_cents
+        r_info_plugin.amount = BigDecimal.new(amount_in_cents.to_s) / 100.0 if amount_in_cents
         r_info_plugin.created_date = created_date
         r_info_plugin.effective_date = effective_date
         r_info_plugin.status = (success ? :PROCESSED : :ERROR)

data/lib/paypal_express.rb

@@ -1,5 +1,6 @@
 require 'active_record'
 require 'activemerchant'
+require 'bigdecimal'
 require 'pathname'
 require 'sinatra'
 require 'singleton'

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.ning.killbill.ruby</groupId>
     <artifactId>paypal-express-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
     <name>paypal-express-plugin</name>
     <url>http://github.com/killbill/killbill-paypal-express-plugin</url>
     <description>Plugin for accessing paypal as a payment gateway</description>

data/spec/paypal_express/remote/integration_spec.rb

@@ -22,12 +22,12 @@ describe Killbill::PaypalExpress::PaymentPlugin do
   end
 
   it 'should be able to charge and refund' do
-    amount_in_cents = 10000
+    amount = 100
     currency = 'USD'
     kb_payment_id = SecureRandom.uuid
 
-    payment_response = @plugin.process_payment @pm.kb_account_id, kb_payment_id, @pm.kb_payment_method_id, amount_in_cents, currency
-    payment_response.amount.should == amount_in_cents
+    payment_response = @plugin.process_payment @pm.kb_account_id, kb_payment_id, @pm.kb_payment_method_id, amount, currency
+    payment_response.amount.should == amount
     payment_response.status.should == :PROCESSED
 
     # Verify our table directly
@@ -38,14 +38,14 @@ describe Killbill::PaypalExpress::PaymentPlugin do
 
     # Check we can retrieve the payment
     payment_response = @plugin.get_payment_info @pm.kb_account_id, kb_payment_id
-    payment_response.amount.should == amount_in_cents
+    payment_response.amount.should == amount
     payment_response.status.should == :PROCESSED
 
     # Check we cannot refund an amount greater than the original charge
-    lambda { @plugin.process_refund @pm.kb_account_id, kb_payment_id, amount_in_cents + 1, currency }.should raise_error RuntimeError
+    lambda { @plugin.process_refund @pm.kb_account_id, kb_payment_id, amount + 1, currency }.should raise_error RuntimeError
 
-    refund_response = @plugin.process_refund @pm.kb_account_id, kb_payment_id, amount_in_cents, currency
-    refund_response.amount.should == amount_in_cents
+    refund_response = @plugin.process_refund @pm.kb_account_id, kb_payment_id, amount, currency
+    refund_response.amount.should == amount
     refund_response.status.should == :PROCESSED
 
     # Verify our table directly
@@ -55,19 +55,19 @@ describe Killbill::PaypalExpress::PaymentPlugin do
 
     # Check we can retrieve the refund
     refund_response = @plugin.get_refund_info @pm.kb_account_id, kb_payment_id
-    refund_response.amount.should == (-1 * amount_in_cents)
+    refund_response.amount.should == (-1 * amount)
     refund_response.status.should == :PROCESSED
 
     # Try another payment to verify the BAID
-    second_amount_in_cents = 9423
+    second_amount = 94.23
     second_kb_payment_id = SecureRandom.uuid
-    payment_response = @plugin.process_payment @pm.kb_account_id, second_kb_payment_id, @pm.kb_payment_method_id, second_amount_in_cents, currency
-    payment_response.amount.should == second_amount_in_cents
+    payment_response = @plugin.process_payment @pm.kb_account_id, second_kb_payment_id, @pm.kb_payment_method_id, second_amount, currency
+    payment_response.amount.should == second_amount
     payment_response.status.should == :PROCESSED
 
     # Check we can refund it as well
-    refund_response = @plugin.process_refund @pm.kb_account_id, second_kb_payment_id, second_amount_in_cents, currency
-    refund_response.amount.should == second_amount_in_cents
+    refund_response = @plugin.process_refund @pm.kb_account_id, second_kb_payment_id, second_amount, currency
+    refund_response.amount.should == second_amount
     refund_response.status.should == :PROCESSED
 
     # it "should be able to create and retrieve payment methods"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill-paypal-express
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -17,13 +17,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
     none: false
   prerelease: false
   type: :runtime