killbill-paypal-express 1.0.10 → 1.0.11

data/README.md

@@ -29,7 +29,7 @@ curl -v \
      "http://$HOST:8080/plugins/killbill-paypal-express/1.0/setup-checkout"
 ```
 
-Kill Bill will return a 303 See Other on success. The customer should be redirected to the url specified in the Location header, e.g. https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=EC-20G53990M6953444J.
+Kill Bill will return a 302 Found on success. The customer should be redirected to the url specified in the Location header, e.g. https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=EC-20G53990M6953444J.
 
 Once the customer comes back from the PayPal flow, save the BAID in Kill Bill:
 

data/VERSION

@@ -1 +1 @@
-1.0.10
+1.0.11

data/killbill-paypal-express.gemspec

@@ -4,15 +4,15 @@ Gem::Specification.new do |s|
   s.name        = 'killbill-paypal-express'
   s.version     = version
   s.summary     = 'Plugin to use Express Checkout as a gateway.'
-  s.description = 'Killbill payment plugin for Paypal Express Checkout.'
+  s.description = 'Kill Bill payment plugin for Paypal Express Checkout.'
 
   s.required_ruby_version = '>= 1.9.3'
 
   s.license = 'Apache License (2.0)'
 
-  s.author   = 'Killbill core team'
+  s.author   = 'Kill Bill core team'
   s.email    = 'killbilling-users@googlegroups.com'
-  s.homepage = 'http://www.killbilling.org'
+  s.homepage = 'http://kill-bill.org'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 1.0.17'
+  s.add_dependency 'killbill', '~> 1.0.18'
   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

@@ -125,7 +125,7 @@ module Killbill::PaypalExpress
     end
 
     def get_payment_methods(kb_account_id, refresh_from_gateway, call_context, options = {})
-      PaypalExpressPaymentMethod.from_kb_account_id(kb_account_id.to_s).collect { |pm| pm.to_payment_method_response }
+      PaypalExpressPaymentMethod.from_kb_account_id(kb_account_id.to_s).collect { |pm| pm.to_payment_method_info_response }
     end
 
     def reset_payment_methods(kb_account_id, payment_methods)

data/lib/paypal_express/models/paypal_express_payment_method.rb

@@ -35,10 +35,21 @@ module Killbill::PaypalExpress
       external_payment_method_id = paypal_express_baid
       # No concept of default payment method in Paypal Express
       is_default = false
-      # We don't store extra information in Paypal Express
+
       properties = []
+      properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, "payerId", paypal_express_payer_id)
+      properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, "baid", paypal_express_baid)
+      properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, "token", paypal_express_token)
 
       Killbill::Plugin::Model::PaymentMethodPlugin.new(external_payment_method_id, is_default, properties, "PayPal", nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil)
     end
+
+    def to_payment_method_info_response
+      external_payment_method_id = paypal_express_baid
+      # No concept of default payment method in Paypal Express
+      is_default = false
+
+      Killbill::Plugin::Model::PaymentMethodInfoPlugin.new(kb_account_id, kb_payment_method_id, is_default, external_payment_method_id)
+    end
   end
 end

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.ning.killbill.ruby</groupId>
     <artifactId>paypal-express-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.10</version>
+    <version>1.0.11</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>

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: killbill-paypal-express
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
   prerelease:
 platform: ruby
 authors:
-- Killbill core team
+- Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -17,13 +17,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.17
+        version: 1.0.18
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.17
+        version: 1.0.18
     none: false
   prerelease: false
   type: :runtime
@@ -155,7 +155,7 @@ dependencies:
     none: false
   prerelease: false
   type: :development
-description: Killbill payment plugin for Paypal Express Checkout.
+description: Kill Bill payment plugin for Paypal Express Checkout.
 email: killbilling-users@googlegroups.com
 executables: []
 extensions: []
@@ -189,7 +189,7 @@ files:
 - spec/paypal_express/base_plugin_spec.rb
 - spec/paypal_express/remote/integration_spec.rb
 - spec/spec_helper.rb
-homepage: http://www.killbilling.org
+homepage: http://kill-bill.org
 licenses:
 - Apache License (2.0)
 post_install_message: