killbill-paypal-express 1.2.0 → 1.3.0

data/Jarfile

@@ -1,5 +1,5 @@
-jar 'com.ning.billing:killbill-api', '0.3.0'
+jar 'com.ning.billing:killbill-api', '0.3.2'
 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.3.0'
+jar 'com.ning.billing:killbill-util:tests', '0.3.4'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/NEWS

@@ -1,3 +1,6 @@
+1.3.0
+    Update to latest killbill (1.3.0 version)
+
 1.2.0
     Update to killbill 1.2.0
 

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/killbill-paypal-express.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 1.2.0'
+  s.add_dependency 'killbill', '~> 1.3.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

@@ -169,6 +169,10 @@ module Killbill::PaypalExpress
       end
     end
 
+    def search(search_key, call_context = nil, options = {})
+      PaypalExpressPaymentMethod.search(search_key).map(&:to_payment_method_response)
+    end
+
     private
 
     def save_response_and_transaction(paypal_express_response, api_call, kb_payment_id=nil, amount_in_cents=0)

data/lib/paypal_express/models/paypal_express_payment_method.rb

@@ -33,6 +33,16 @@ module Killbill::PaypalExpress
       payment_method.save!
     end
 
+    def self.search(search_key)
+      search_columns = [
+                         :paypal_express_payer_id,
+                         :paypal_express_baid,
+                         :paypal_express_token
+                       ]
+      query = search_columns.map(&:to_s).join(' like ? or ') + ' like ?'
+      where(query, *search_columns.map { |e| "%#{search_key}%" })
+    end
+
     def to_payment_method_response
       properties = []
       properties << create_pm_kv_info('payerId', paypal_express_payer_id)

data/pom.xml

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

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Killbill::PaypalExpress::PaypalExpressPaymentMethod do
+  it 'should search all fields' do
+    Killbill::PaypalExpress::PaypalExpressPaymentMethod.search('foo').size.should == 0
+
+    pm = Killbill::PaypalExpress::PaypalExpressPaymentMethod.create :kb_account_id => '11-22-33-44',
+                                                                    :kb_payment_method_id => '55-66-77-88',
+                                                                    :paypal_express_payer_id => 38102343,
+                                                                    :paypal_express_baid => 'baid',
+                                                                    :paypal_express_token => 'token'
+
+    Killbill::PaypalExpress::PaypalExpressPaymentMethod.search('foo').size.should == 0
+    Killbill::PaypalExpress::PaypalExpressPaymentMethod.search(pm.paypal_express_payer_id).size.should == 1
+    Killbill::PaypalExpress::PaypalExpressPaymentMethod.search('baid').size.should == 1
+    Killbill::PaypalExpress::PaypalExpressPaymentMethod.search('token').size.should == 1
+    Killbill::PaypalExpress::PaypalExpressPaymentMethod.search(2343).size.should == 1
+
+    pm2 = Killbill::PaypalExpress::PaypalExpressPaymentMethod.create :kb_account_id => '22-33-44-55',
+                                                                     :kb_payment_method_id => '66-77-88-99',
+                                                                     :paypal_express_payer_id => 49384029302,
+                                                                     :paypal_express_baid => 'baid',
+                                                                     :paypal_express_token => 'token'
+
+    Killbill::PaypalExpress::PaypalExpressPaymentMethod.search('foo').size.should == 0
+    Killbill::PaypalExpress::PaypalExpressPaymentMethod.search(pm.paypal_express_payer_id).size.should == 1
+    Killbill::PaypalExpress::PaypalExpressPaymentMethod.search(pm2.paypal_express_payer_id).size.should == 1
+    Killbill::PaypalExpress::PaypalExpressPaymentMethod.search('baid').size.should == 2
+    Killbill::PaypalExpress::PaypalExpressPaymentMethod.search('token').size.should == 2
+    Killbill::PaypalExpress::PaypalExpressPaymentMethod.search(2343).size.should == 1
+  end
+end

data/spec/paypal_express/remote/integration_spec.rb

@@ -80,6 +80,10 @@ describe Killbill::PaypalExpress::PaymentPlugin do
     pm_details = @plugin.get_payment_method_detail(@pm.kb_account_id, @pm.kb_payment_method_id)
     pm_details.external_payment_method_id.should == @pm.paypal_express_baid
 
+    pms_found = @plugin.search @pm.paypal_express_baid
+    pms_found.size.should == 1
+    pms_found.first.external_payment_method_id.should == pm_details.external_payment_method_id
+
     @plugin.delete_payment_method @pm.kb_account_id, @pm.kb_payment_method_id
 
     @plugin.get_payment_methods(@pm.kb_account_id, false).size.should == 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill-paypal-express
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -17,13 +17,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
     none: false
   prerelease: false
   type: :runtime
@@ -188,6 +188,7 @@ files:
 - pom.xml
 - release.sh
 - spec/paypal_express/base_plugin_spec.rb
+- spec/paypal_express/paypal_express_payment_method_spec.rb
 - spec/paypal_express/remote/integration_spec.rb
 - spec/spec_helper.rb
 homepage: http://kill-bill.org
@@ -223,5 +224,6 @@ specification_version: 3
 summary: Plugin to use Express Checkout as a gateway.
 test_files:
 - spec/paypal_express/base_plugin_spec.rb
+- spec/paypal_express/paypal_express_payment_method_spec.rb
 - spec/paypal_express/remote/integration_spec.rb
 - spec/spec_helper.rb