paypal-express 0.5.2 → 0.5.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    paypal-express (0.5.2)
+    paypal-express (0.5.3)
       activesupport (>= 2.3)
       attr_required (>= 0.0.5)
       i18n
@@ -10,7 +10,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.9)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     attr_required (0.0.5)
@@ -40,7 +40,7 @@ GEM
     rspec-core (2.12.2)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    rspec-mocks (2.12.2)
     yamler (0.1.0)
 
 PLATFORMS

data/README.rdoc

@@ -4,6 +4,9 @@ Handle PayPal Express Checkout.
 Both Instance Payment and Recurring Payment are supported.
 Express Checkout for Digital Goods is also supported.
 
+{<img src="https://secure.travis-ci.org/nov/paypal-express.png" />}[http://travis-ci.org/nov/paypal-express]
+{<img src="http://www.pledgie.com/campaigns/19045.png?skin_name=chrome" />}[http://pledgie.com/campaigns/19045]
+
 == Installation
 
   gem install paypal-express

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/lib/paypal/express/request.rb

@@ -14,12 +14,11 @@ module Paypal
           params[:NOSHIPPING] = 1
         end
         {
-          :solution_type  => :SOLUTIONTYPE,
-          :landing_page   => :LANDINGPAGE,
-          :email          => :EMAIL,
-          :brand          => :BRANDNAME,
-          :locale         => :LOCALECODE,
-          :invoice_number => :INVNUM
+          :solution_type => :SOLUTIONTYPE,
+          :landing_page  => :LANDINGPAGE,
+          :email         => :EMAIL,
+          :brand         => :BRANDNAME,
+          :locale        => :LOCALECODE
         }.each do |option_key, param_key|
           params[param_key] = options[option_key] if options[option_key]
         end

data/lib/paypal/payment/request.rb

@@ -1,8 +1,8 @@
 module Paypal
   module Payment
     class Request < Base
-      attr_optional :action, :currency_code, :description, :notify_url, :billing_type, :billing_agreement_description, :billing_agreement_id, :request_id, :seller_id
-      attr_accessor :amount, :items
+      attr_optional :action, :currency_code, :description, :notify_url, :billing_type, :billing_agreement_description, :billing_agreement_id, :request_id, :seller_id, :invoice_number, :custom
+      attr_accessor :amount, :items, :custom_fields
 
       def initialize(attributes = {})
         @amount = if attributes[:amount].is_a?(Common::Amount)
@@ -18,6 +18,7 @@ module Paypal
         Array(attributes[:items]).each do |item_attrs|
           @items << Item.new(item_attrs)
         end
+        @custom_fields = attributes[:custom_fields] || {}
         super
       end
 
@@ -29,6 +30,8 @@ module Paypal
           :"PAYMENTREQUEST_#{index}_SHIPPINGAMT" => Util.formatted_amount(self.amount.shipping),
           :"PAYMENTREQUEST_#{index}_CURRENCYCODE" => self.currency_code,
           :"PAYMENTREQUEST_#{index}_DESC" => self.description,
+          :"PAYMENTREQUEST_#{index}_INVNUM" => self.invoice_number,
+          :"PAYMENTREQUEST_#{index}_CUSTOM" => self.custom,
           # NOTE:
           #  notify_url works only when DoExpressCheckoutPayment called.
           #  recurring payment doesn't support dynamic notify_url.
@@ -47,6 +50,10 @@ module Paypal
             params.merge! item.to_params(index, item_index)
           end
         end
+        self.custom_fields.each do |key, value|
+          field = key.to_s.upcase.gsub("{N}", index.to_s).to_sym
+          params[field] = value
+        end
         params
       end
 

data/lib/paypal/payment/response/info.rb

@@ -18,7 +18,8 @@ module Paypal
         :TRANSACTIONID => :transaction_id,
         :TRANSACTIONTYPE => :transaction_type,
         :PAYMENTREQUESTID => :request_id,
-        :SELLERPAYPALACCOUNTID => :seller_id
+        :SELLERPAYPALACCOUNTID => :seller_id,
+        :EXCHANGERATE => :exchange_rate
       }
       attr_accessor *@@attribute_mapping.values
       attr_accessor :amount
@@ -41,4 +42,4 @@ module Paypal
       end
     end
   end
-end
+end

data/spec/paypal/express/request_spec.rb

@@ -131,8 +131,7 @@ describe Paypal::Express::Request do
       :landing_page => :LANDINGPAGE,
       :email => :EMAIL,
       :brand => :BRANDNAME,
-      :locale => :LOCALECODE,
-      :invoice_number => :INVNUM
+      :locale => :LOCALECODE
     }.each do |option_key, param_key|
       it "should support #{option_key} option" do
         expect do

data/spec/paypal/payment/request_spec.rb

@@ -9,6 +9,8 @@ describe Paypal::Payment::Request do
       :currency_code => :JPY,
       :description => 'Instant Payment Request',
       :notify_url => 'http://merchant.example.com/notify',
+      :invoice_number => 'ABC123',
+      :custom => 'Custom',
       :items => [{
         :quantity => 2,
         :name => 'Item1',
@@ -19,7 +21,10 @@ describe Paypal::Payment::Request do
         :name => 'Item2',
         :description => 'Awesome Item 2!',
         :amount => 1.1
-      }]
+      }],
+      :custom_fields => {
+        "l_surveychoice{n}" => 'abcd' # The '{n}' will be replaced with the index
+      }
     )
   end
 
@@ -69,9 +74,11 @@ describe Paypal::Payment::Request do
         :PAYMENTREQUEST_0_TAXAMT => "0.40",
         :PAYMENTREQUEST_0_SHIPPINGAMT => "1.50",
         :PAYMENTREQUEST_0_CURRENCYCODE => :JPY,
-        :PAYMENTREQUEST_0_DESC => "Instant Payment Request", 
+        :PAYMENTREQUEST_0_DESC => "Instant Payment Request",
         :PAYMENTREQUEST_0_NOTIFYURL => "http://merchant.example.com/notify",
         :PAYMENTREQUEST_0_ITEMAMT => "23.80",
+        :PAYMENTREQUEST_0_INVNUM => "ABC123",
+        :PAYMENTREQUEST_0_CUSTOM => "Custom",
         :L_PAYMENTREQUEST_0_NAME0 => "Item1",
         :L_PAYMENTREQUEST_0_DESC0 => "Awesome Item 1!",
         :L_PAYMENTREQUEST_0_AMT0 => "10.25",
@@ -79,7 +86,8 @@ describe Paypal::Payment::Request do
         :L_PAYMENTREQUEST_0_NAME1 => "Item2",
         :L_PAYMENTREQUEST_0_DESC1 => "Awesome Item 2!",
         :L_PAYMENTREQUEST_0_AMT1 => "1.10",
-        :L_PAYMENTREQUEST_0_QTY1 => 3
+        :L_PAYMENTREQUEST_0_QTY1 => 3,
+        :L_SURVEYCHOICE0 => 'abcd' # Note the 'n' was replaced by the index
       }
     end
 

data/spec/paypal/payment/response/info_spec.rb

@@ -25,7 +25,8 @@ describe Paypal::Payment::Response::Info do
       :RECEIPTID => '12345',
       :SECUREMERCHANTACCOUNTID => '123456789',
       :PAYMENTREQUESTID => '12345',
-      :SELLERPAYPALACCOUNTID => 'seller@shop.example.com'
+      :SELLERPAYPALACCOUNTID => 'seller@shop.example.com',
+      :EXCHANGERATE => '0.811965'
     }
   end
 
@@ -89,4 +90,4 @@ describe Paypal::Payment::Response::Info do
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paypal-express
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -245,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2376280360694754319
+      hash: 2957452685464048552
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: