paypal-express 0.2.10 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.3.0

data/lib/paypal.rb

@@ -73,6 +73,7 @@ require 'paypal/payment/response'
 require 'paypal/payment/response/info'
 require 'paypal/payment/response/item'
 require 'paypal/payment/response/payer'
+require 'paypal/payment/response/refund'
 require 'paypal/payment/response/ship_to'
 require 'paypal/payment/recurring'
 require 'paypal/payment/recurring/activation'

data/lib/paypal/express/request.rb

@@ -1,12 +1,11 @@
 module Paypal
   module Express
     class Request < NVP::Request
-      attr_required :return_url, :cancel_url
 
-      def setup(payment_requests, options = {})
+      def setup(payment_requests, return_url, cancel_url, options = {})
         params = {
-          :RETURNURL => self.return_url,
-          :CANCELURL => self.cancel_url
+          :RETURNURL => return_url,
+          :CANCELURL => cancel_url
         }
         if options[:no_shipping]
           params[:REQCONFIRMSHIPPING] = 0
@@ -53,16 +52,38 @@ module Paypal
         Response.new response
       end
 
-      def renew!(profile_id, action, note = '')
+      def renew!(profile_id, action, options = {})
         params = {
           :PROFILEID => profile_id,
-          :ACTION => action,
-          :NOTE => note
+          :ACTION => action
         }
+        if options[:note]
+          params[:NOTE] = options[:note]
+        end
         response = self.request :ManageRecurringPaymentsProfileStatus, params
         Response.new response
       end
 
+      def refund!(transaction_id, options = {})
+        params = {
+          :TRANSACTIONID => transaction_id,
+          :REFUNDTYPE => :Full
+        }
+        if options[:invoice_id]
+          params[:INVOICEID] = options[:invoice_id]
+        end
+        if options[:type]
+          params[:REFUNDTYPE] = options[:type]
+          params[:AMT] = options[:amount]
+          params[:CURRENCYCODE] = options[:currency_code]
+        end
+        if options[:note]
+          params[:NOTE] = options[:note]
+        end
+        response = self.request :RefundTransaction, params
+        Response.new response
+      end
+
     end
   end
 end

data/lib/paypal/nvp/response.rb

@@ -12,14 +12,14 @@ module Paypal
         :COUNTRYCODE => :country_code,
         :CURRENCYCODE => :currency_code,
         :DESC => :description,
+        :NOTIFYURL => :notify_url,
         :TIMESTAMP => :timestamp,
         :TOKEN => :token,
-        :NOTIFYURL => :notify_url,
         :VERSION => :version
       }
       attr_accessor *@@attribute_mapping.values
       attr_accessor :shipping_options_is_default, :success_page_redirect_requested, :insurance_option_selected
-      attr_accessor :amount, :description, :ship_to, :payer, :recurring, :payment_responses, :payment_info, :items
+      attr_accessor :amount, :description, :ship_to, :payer, :recurring, :payment_responses, :payment_info, :items, :refund
 
       def initialize(attributes = {})
         attrs = attributes.dup
@@ -59,6 +59,17 @@ module Paypal
             :email => attrs.delete(:EMAIL)
           )
         end
+        if attrs[:REFUNDTRANSACTIONID]
+          @refund = Payment::Response::Refund.new(
+            :transaction_id => attrs.delete(:REFUNDTRANSACTIONID),
+            :amount => {
+              :total => attrs.delete(:TOTALREFUNDEDAMOUNT),
+              :fee => attrs.delete(:FEEREFUNDAMT),
+              :gross => attrs.delete(:GROSSREFUNDAMT),
+              :net => attrs.delete(:NETREFUNDAMT)
+            }
+          )
+        end
         if attrs[:PROFILEID]
           @recurring = Payment::Recurring.new(
             :identifier => attrs.delete(:PROFILEID),
@@ -120,7 +131,7 @@ module Paypal
           end
           if prefix
             payment_responses[index.to_i] ||= {}
-            payment_responses[index.to_i][key.to_sym] ||= attrs.delete(_attr_)
+            payment_responses[index.to_i][key.to_sym] = attrs.delete(_attr_)
           end
         end
         @payment_responses = payment_responses.collect do |_attrs_|

data/lib/paypal/payment/common/amount.rb

@@ -2,7 +2,7 @@ module Paypal
   module Payment
     module Common
       class Amount < Base
-        attr_optional :total, :item, :fee, :handing, :insurance, :ship_disc, :shipping, :tax
+        attr_optional :total, :item, :fee, :handing, :insurance, :ship_disc, :shipping, :tax, :gross, :net
 
         def numeric_attribute?(key)
           true
@@ -10,4 +10,4 @@ module Paypal
       end
     end
   end
-end
+end

data/lib/paypal/payment/response.rb

@@ -1,7 +1,7 @@
 module Paypal
   module Payment
     class Response < Base
-      attr_accessor :amount, :ship_to, :description, :note, :items, :notify_url, :insurance_option_offered, :currency_code, :error_code
+      attr_accessor :amount, :ship_to, :description, :note, :items, :notify_url, :insurance_option_offered, :currency_code, :error_code, :transaction_id
 
       def initialize(attributes = {})
         attrs = attributes.dup
@@ -30,6 +30,7 @@ module Paypal
         @insurance_option_offered = attrs.delete(:INSURANCEOPTIONOFFERED) == 'true'
         @currency_code = attrs.delete(:CURRENCYCODE)
         @error_code = attrs.delete(:ERRORCODE)
+        @transaction_id = attrs.delete(:TRANSACTIONID)
 
         # items
         items = []

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

@@ -13,9 +13,10 @@ module Paypal
         :PROTECTIONELIGIBILITY => :protection_eligibility,
         :PROTECTIONELIGIBILITYTYPE => :protection_eligibility_type,
         :REASONCODE => :reason_code,
+        :RECEIPTID => :receipt_id,
+        :SECUREMERCHANTACCOUNTID => :secure_merchant_account_id,
         :TRANSACTIONID => :transaction_id,
         :TRANSACTIONTYPE => :transaction_type,
-        :RECEIPTID => :receipt_id
       }
       attr_accessor *@@attribute_mapping.values
       attr_accessor :amount

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

@@ -0,0 +1,13 @@
+module Paypal
+  module Payment
+    class Response::Refund < Base
+      attr_optional :transaction_id
+      attr_accessor :amount
+
+      def initialize(attributes = {})
+        super
+        @amount = Common::Amount.new(attributes[:amount])
+      end
+    end
+  end
+end

data/paypal-express.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency "i18n"
   s.add_dependency "restclient_with_cert"
   s.add_dependency "attr_required", ">= 0.0.3"
-  s.add_development_dependency "rake", ">= 0.8"
+  s.add_development_dependency "rake", ">= 0.8", "< 0.9"
   s.add_development_dependency "rcov", ">= 0.9"
   s.add_development_dependency "rspec", ">= 2"
   s.add_development_dependency "fakeweb", ">= 1.3.0"

data/spec/fake_response/RefundTransaction/full.txt

@@ -0,0 +1 @@
+REFUNDTRANSACTIONID=6D456341FS516215S&FEEREFUNDAMT=0%2e50&GROSSREFUNDAMT=10%2e00&NETREFUNDAMT=9%2e50&CURRENCYCODE=USD&TOTALREFUNDEDAMOUNT=10%2e00&TIMESTAMP=2011%2d05%2d21T14%3a13%3a32Z&CORRELATIONID=862bfc523cca2&ACK=Success&VERSION=72%2e0&BUILD=1882144

data/spec/paypal/express/request_spec.rb

@@ -11,13 +11,14 @@ describe Paypal::Express::Request do
     alias_method_chain :post, :logging
   end
 
+  let(:return_url) { 'http://example.com/success' }
+  let(:cancel_url) { 'http://example.com/cancel' }
+  let(:nvp_endpoint) { Paypal::NVP::Request::ENDPOINT[:production] }
   let :attributes do
     {
       :username => 'nov',
       :password => 'password',
-      :signature => 'sig',
-      :return_url => 'http://example.com/success',
-      :cancel_url => 'http://example.com/cancel'
+      :signature => 'sig'
     }
   end
 
@@ -77,19 +78,19 @@ describe Paypal::Express::Request do
   describe '#setup' do
     it 'should return Paypal::Express::Response' do
       fake_response 'SetExpressCheckout/success'
-      response = instance.setup recurring_payment_request
+      response = instance.setup recurring_payment_request, return_url, cancel_url
       response.should be_instance_of(Paypal::Express::Response)
     end
 
     it 'should support no_shipping option' do
       expect do
-        instance.setup instant_payment_request, :no_shipping => true
-      end.should request_to 'https://api-3t.paypal.com/nvp', :post
+        instance.setup instant_payment_request, return_url, cancel_url, :no_shipping => true
+      end.should request_to nvp_endpoint, :post
       instance._method_.should == :SetExpressCheckout
       instance._sent_params_.should == {
         :PAYMENTREQUEST_0_DESC => 'Instant Payment Request',
-        :RETURNURL => 'http://example.com/success',
-        :CANCELURL => 'http://example.com/cancel',
+        :RETURNURL => return_url,
+        :CANCELURL => cancel_url,
         :PAYMENTREQUEST_0_AMT => '1000.00',
         :PAYMENTREQUEST_0_TAXAMT => "0.00",
         :PAYMENTREQUEST_0_SHIPPINGAMT => "0.00",
@@ -101,13 +102,13 @@ describe Paypal::Express::Request do
     context 'when instance payment request given' do
       it 'should call SetExpressCheckout' do
         expect do
-          instance.setup instant_payment_request
-        end.should request_to 'https://api-3t.paypal.com/nvp', :post
+          instance.setup instant_payment_request, return_url, cancel_url
+        end.should request_to nvp_endpoint, :post
         instance._method_.should == :SetExpressCheckout
         instance._sent_params_.should == {
           :PAYMENTREQUEST_0_DESC => 'Instant Payment Request',
-          :RETURNURL => 'http://example.com/success',
-          :CANCELURL => 'http://example.com/cancel',
+          :RETURNURL => return_url,
+          :CANCELURL => cancel_url,
           :PAYMENTREQUEST_0_AMT => '1000.00',
           :PAYMENTREQUEST_0_TAXAMT => "0.00",
           :PAYMENTREQUEST_0_SHIPPINGAMT => "0.00"
@@ -118,14 +119,14 @@ describe Paypal::Express::Request do
     context 'when recurring payment request given' do
       it 'should call SetExpressCheckout' do
         expect do
-          instance.setup recurring_payment_request
-        end.should request_to 'https://api-3t.paypal.com/nvp', :post
+          instance.setup recurring_payment_request, return_url, cancel_url
+        end.should request_to nvp_endpoint, :post
         instance._method_.should == :SetExpressCheckout
         instance._sent_params_.should == {
           :L_BILLINGTYPE0 => :RecurringPayments,
           :L_BILLINGAGREEMENTDESCRIPTION0 => 'Recurring Payment Request',
-          :RETURNURL => 'http://example.com/success',
-          :CANCELURL => 'http://example.com/cancel',
+          :RETURNURL => return_url,
+          :CANCELURL => cancel_url,
           :PAYMENTREQUEST_0_AMT => '0.00',
           :PAYMENTREQUEST_0_TAXAMT => "0.00",
           :PAYMENTREQUEST_0_SHIPPINGAMT => "0.00"
@@ -144,7 +145,7 @@ describe Paypal::Express::Request do
     it 'should call GetExpressCheckoutDetails' do
       expect do
         instance.details 'token'
-      end.should request_to 'https://api-3t.paypal.com/nvp', :post
+      end.should request_to nvp_endpoint, :post
       instance._method_.should == :GetExpressCheckoutDetails
       instance._sent_params_.should == {
         :TOKEN => 'token'
@@ -162,7 +163,7 @@ describe Paypal::Express::Request do
     it 'should call DoExpressCheckoutPayment' do
       expect do
         instance.checkout! 'token', 'payer_id', instant_payment_request
-      end.should request_to 'https://api-3t.paypal.com/nvp', :post
+      end.should request_to nvp_endpoint, :post
       instance._method_.should == :DoExpressCheckoutPayment
       instance._sent_params_.should == {
         :PAYERID => 'payer_id',
@@ -185,7 +186,7 @@ describe Paypal::Express::Request do
     it 'should call CreateRecurringPaymentsProfile' do
       expect do
         instance.subscribe! 'token', recurring_profile
-      end.should request_to 'https://api-3t.paypal.com/nvp', :post
+      end.should request_to nvp_endpoint, :post
       instance._method_.should == :CreateRecurringPaymentsProfile
       instance._sent_params_.should == {
         :DESC => 'Recurring Profile',
@@ -215,7 +216,7 @@ describe Paypal::Express::Request do
     it 'should call GetRecurringPaymentsProfileDetails' do
       expect do
         instance.subscription 'profile_id'
-      end.should request_to 'https://api-3t.paypal.com/nvp', :post
+      end.should request_to nvp_endpoint, :post
       instance._method_.should == :GetRecurringPaymentsProfileDetails
       instance._sent_params_.should == {
         :PROFILEID => 'profile_id'
@@ -233,12 +234,30 @@ describe Paypal::Express::Request do
     it 'should call ManageRecurringPaymentsProfileStatus' do
       expect do
         instance.renew! 'profile_id', :Cancel
-      end.should request_to 'https://api-3t.paypal.com/nvp', :post
+      end.should request_to nvp_endpoint, :post
       instance._method_.should == :ManageRecurringPaymentsProfileStatus
       instance._sent_params_.should == {
         :ACTION => :Cancel,
-        :PROFILEID => 'profile_id',
-        :NOTE => ''
+        :PROFILEID => 'profile_id'
+      }
+    end
+  end
+
+  describe '#refund!' do
+    it 'should return Paypal::Express::Response' do
+      fake_response 'RefundTransaction/full'
+      response = instance.refund! 'transaction_id'
+      response.should be_instance_of(Paypal::Express::Response)
+    end
+
+    it 'should call RefundTransaction' do
+      expect do
+        instance.refund! 'transaction_id'
+      end.should request_to nvp_endpoint, :post
+      instance._method_.should == :RefundTransaction
+      instance._sent_params_.should == {
+        :TRANSACTIONID => 'transaction_id',
+        :REFUNDTYPE => :Full
       }
     end
   end

data/spec/paypal/express/response_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper.rb'
 describe Paypal::Express::Response do
   before { fake_response 'SetExpressCheckout/success' }
 
+  let(:return_url) { 'http://example.com/success' }
+  let(:cancel_url) { 'http://example.com/cancel' }
   let :request do
     Paypal::Express::Request.new(
       :username => 'nov',
       :password => 'password',
-      :signature => 'sig',
-      :return_url => 'http://example.com/success',
-      :cancel_url => 'http://example.com/cancel'
+      :signature => 'sig'
     )
   end
   let :payment_request do
@@ -18,7 +18,7 @@ describe Paypal::Express::Response do
       :billing_agreement_description => 'Recurring Payment Request'
     )
   end
-  let(:response) { request.setup payment_request }
+  let(:response) { request.setup payment_request, return_url, cancel_url }
 
   describe '#redirect_uri' do
     subject { response.redirect_uri }
@@ -31,7 +31,7 @@ describe Paypal::Express::Response do
   end
 
   context 'when pay_on_paypal option is given' do
-    let(:response) { request.setup payment_request, :pay_on_paypal => true }
+    let(:response) { request.setup payment_request, return_url, cancel_url, :pay_on_paypal => true }
 
     subject { response }
     its(:pay_on_paypal) { should be_true }

data/spec/paypal/nvp/response_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper.rb'
 
 describe Paypal::NVP::Response do
+  let(:return_url) { 'http://example.com/success' }
+  let(:cancel_url) { 'http://example.com/cancel' }
   let :request do
     Paypal::Express::Request.new(
       :username => 'nov',
       :password => 'password',
-      :signature => 'sig',
-      :return_url => 'http://example.com/success',
-      :cancel_url => 'http://example.com/cancel'
+      :signature => 'sig'
     )
   end
 
@@ -49,7 +49,7 @@ describe Paypal::NVP::Response do
 
       it 'should handle all attributes' do
         Paypal.logger.should_not_receive(:warn)
-        response = request.setup payment_request
+        response = request.setup payment_request, return_url, cancel_url
         response.token.should == 'EC-5YJ90598G69065317'
       end
     end

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

@@ -22,7 +22,8 @@ describe Paypal::Payment::Response::Info do
       :AMT => '14.00',
       :FEEAMT => '0.85',
       :TAXAMT => '0.00',
-      :RECEIPTID => '12345'
+      :RECEIPTID => '12345',
+      :SECUREMERCHANTACCOUNTID => '123456789'
     }
   end
 

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paypal-express
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
-  version: 0.2.10
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - nov matake
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-21 00:00:00 Z
+date: 2011-05-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -20,6 +25,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
         version: "2.3"
   type: :runtime
   version_requirements: *id001
@@ -31,6 +40,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -42,6 +54,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -53,6 +68,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 0
+        - 3
         version: 0.0.3
   type: :runtime
   version_requirements: *id004
@@ -64,7 +84,18 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
         version: "0.8"
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -75,6 +106,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
         version: "0.9"
   type: :development
   version_requirements: *id006
@@ -86,6 +121,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
         version: "2"
   type: :development
   version_requirements: *id007
@@ -97,6 +135,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
   type: :development
   version_requirements: *id008
@@ -140,6 +183,7 @@ files:
 - lib/paypal/payment/response/info.rb
 - lib/paypal/payment/response/item.rb
 - lib/paypal/payment/response/payer.rb
+- lib/paypal/payment/response/refund.rb
 - lib/paypal/payment/response/ship_to.rb
 - lib/paypal/util.rb
 - paypal-express.gemspec
@@ -155,6 +199,7 @@ files:
 - spec/fake_response/IPN/valid.txt
 - spec/fake_response/ManageRecurringPaymentsProfileStatus/failure.txt
 - spec/fake_response/ManageRecurringPaymentsProfileStatus/success.txt
+- spec/fake_response/RefundTransaction/full.txt
 - spec/fake_response/SetExpressCheckout/failure.txt
 - spec/fake_response/SetExpressCheckout/success.txt
 - spec/helpers/fake_response_helper.rb
@@ -190,12 +235,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
 
@@ -217,6 +270,7 @@ test_files:
 - spec/fake_response/IPN/valid.txt
 - spec/fake_response/ManageRecurringPaymentsProfileStatus/failure.txt
 - spec/fake_response/ManageRecurringPaymentsProfileStatus/success.txt
+- spec/fake_response/RefundTransaction/full.txt
 - spec/fake_response/SetExpressCheckout/failure.txt
 - spec/fake_response/SetExpressCheckout/success.txt
 - spec/helpers/fake_response_helper.rb