paypal-express 0.4.4 → 0.4.5

data/Rakefile

@@ -5,9 +5,15 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 if RUBY_VERSION >= '1.9'
-  require 'cover_me'
-  CoverMe.config do |c|
-    c.file_pattern = /(#{CoverMe.config.project.root}\/lib\/.+\.rb)/i
+  namespace :cover_me do
+    desc "Generates and opens code coverage report."
+    task :report do
+      require 'cover_me'
+      CoverMe.complete!
+    end
+  end
+  task :spec do
+    Rake::Task['cover_me:report'].invoke
   end
 else
   RSpec::Core::RakeTask.new(:rcov) do |spec|

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/lib/paypal/express/request.rb

@@ -25,6 +25,11 @@ module Paypal
         Response.new response
       end
 
+      def transaction_details( transaction_id )
+        response = self.request :GetTransactionDetails, {:TRANSACTIONID=> transaction_id}
+        Response.new response
+      end
+
       def checkout!(token, payer_id, payment_requests)
         params = {
           :TOKEN => token,

data/lib/paypal/nvp/response.rb

@@ -15,7 +15,26 @@ module Paypal
         :NOTIFYURL => :notify_url,
         :TIMESTAMP => :timestamp,
         :TOKEN => :token,
-        :VERSION => :version
+        :VERSION => :version,
+        # Some of the attributes below are duplicates of what
+        # exists in the payment response, but paypal doesn't
+        # prefix these with PAYMENTREQUEST when issuing a
+        # GetTransactionDetails response.
+        :RECEIVEREMAIL => :receiver_email,
+        :RECEIVERID => :receiver_id,
+        :ADDRESSOWNER => :address_owner,
+        :SUBJECT => :subject,
+        :TRANSACTIONID => :transaction_id,
+        :TRANSACTIONTYPE => :transaction_type,
+        :PAYMENTTYPE => :payment_type,
+        :ORDERTIME => :order_time,
+        :PAYMENTSTATUS => :payment_status,
+        :PENDINGREASON => :pending_reason,
+        :REASONCODE => :reason_code,
+        :PROTECTIONELIGIBILITY => :protection_eligibility,
+        :PROTECTIONELIGIBILITYTYPE => :protection_eligibility_type,
+        :ADDRESSOWNER => :address_owner,
+        :ADDRESSSTATUS => :address_status
       }
       attr_accessor *@@attribute_mapping.values
       attr_accessor :shipping_options_is_default, :success_page_redirect_requested, :insurance_option_selected
@@ -189,6 +208,7 @@ module Paypal
 
         # remove duplicated parameters
         attrs.delete(:SHIPTOCOUNTRY) # NOTE: Same with SHIPTOCOUNTRYCODE
+        attrs.delete(:SALESTAX) # Same as TAXAMT
 
         # warn ignored attrs
         attrs.each do |key, value|

data/lib/paypal/payment/request/item.rb

@@ -1,7 +1,7 @@
 module Paypal
   module Payment
     class Request::Item < Base
-      attr_optional :name, :description, :amount, :quantity, :category
+      attr_optional :name, :description, :amount, :number, :quantity, :category, :url
 
       def initialize(attributes = {})
         super
@@ -13,8 +13,10 @@ module Paypal
           :"L_PAYMENTREQUEST_#{parent_index}_NAME#{index}" => self.name,
           :"L_PAYMENTREQUEST_#{parent_index}_DESC#{index}" => self.description,
           :"L_PAYMENTREQUEST_#{parent_index}_AMT#{index}" => Util.formatted_amount(self.amount),
+          :"L_PAYMENTREQUEST_#{parent_index}_NUMBER#{index}" => self.number,
           :"L_PAYMENTREQUEST_#{parent_index}_QTY#{index}" => self.quantity,
-          :"L_PAYMENTREQUEST_#{parent_index}_ITEMCATEGORY#{index}" => self.category
+          :"L_PAYMENTREQUEST_#{parent_index}_ITEMCATEGORY#{index}" => self.category,
+          :"L_PAYMENTREQUEST_#{parent_index}_ITEMURL#{index}" => self.url
         }.delete_if do |k, v|
           v.blank?
         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, :transaction_id, :billing_agreement_id
+      attr_accessor :amount, :ship_to, :description, :note, :items, :notify_url, :insurance_option_offered, :currency_code, :short_message, :long_message, :error_code, :severity_code, :ack, :transaction_id, :billing_agreement_id
 
       def initialize(attributes = {})
         attrs = attributes.dup
@@ -29,7 +29,11 @@ module Paypal
         @notify_url = attrs.delete(:NOTIFYURL)
         @insurance_option_offered = attrs.delete(:INSURANCEOPTIONOFFERED) == 'true'
         @currency_code = attrs.delete(:CURRENCYCODE)
+        @short_message = attrs.delete(:SHORTMESSAGE)
+        @long_message = attrs.delete(:LONGMESSAGE)
         @error_code = attrs.delete(:ERRORCODE)
+        @severity_code = attrs.delete(:SEVERITYCODE)
+        @ack = attrs.delete(:ACK)
         @transaction_id = attrs.delete(:TRANSACTIONID)
         @billing_agreement_id = attrs.delete(:BILLINGAGREEMENTID)
 

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

@@ -6,11 +6,16 @@ module Paypal
         :NAME => :name,
         :DESC => :description,
         :QTY => :quantity,
+        :NUMBER => :number,
         :ITEMCATEGORY => :category,
         :ITEMWIDTHVALUE => :width,
         :ITEMHEIGHTVALUE => :height,
         :ITEMLENGTHVALUE => :length,
-        :ITEMWEIGHTVALUE => :weight
+        :ITEMWEIGHTVALUE => :weight,
+        :SHIPPINGAMT => :shipping,
+        :HANDLINGAMT => :handling,
+        :CURRENCYCODE => :currency
+        
       }
       attr_accessor *@@attribute_mapping.values
       attr_accessor :amount

data/spec/fake_response/GetTransactionDetails/failure.txt

@@ -0,0 +1 @@
+ADDRESSOWNER=PayPal&ADDRESSSTATUS=None&TIMESTAMP=2012%2d02%2d23T21%3a07%3a22Z&CORRELATIONID=4e18d75a23953&ACK=Failure&VERSION=78%2e0&BUILD=2571254&L_ERRORCODE0=10004&L_SHORTMESSAGE0=Transaction%20refused%20because%20of%20an%20invalid%20argument%2e%20See%20additional%20error%20messages%20for%20details%2e&L_LONGMESSAGE0=The%20transaction%20id%20is%20not%20valid&L_SEVERITYCODE0=Error&PENDINGREASON=None&REASONCODE=None

data/spec/fake_response/GetTransactionDetails/success.txt

@@ -0,0 +1 @@
+RECEIVEREMAIL=test%40email%2ecom&RECEIVERID=ABCDEFG12345&EMAIL=test%40email%2ecom&PAYERID=12345ABCDEFG&PAYERSTATUS=verified&COUNTRYCODE=US&SHIPTONAME=Billy%20Bob&SHIPTOSTREET=1%20Main%20St&SHIPTOCITY=San%20Jose&SHIPTOSTATE=CA&SHIPTOCOUNTRYCODE=US&SHIPTOCOUNTRYNAME=United%20States&SHIPTOZIP=95131&ADDRESSOWNER=PayPal&ADDRESSSTATUS=Confirmed&SALESTAX=0%2e00&SUBJECT=Test%20Subject&TIMESTAMP=2012%2d02%2d23T20%3a51%3a29Z&CORRELATIONID=4fc0a06cbaec7&ACK=Success&VERSION=78%2e0&BUILD=2571254&FIRSTNAME=Billy&LASTNAME=Bob&TRANSACTIONID=123456789ABCD&TRANSACTIONTYPE=cart&PAYMENTTYPE=instant&ORDERTIME=2012%2d02%2d13T23%3a09%3a46Z&AMT=740%2e43&FEEAMT=21%2e77&TAXAMT=0%2e00&SHIPPINGAMT=0%2e00&HANDLINGAMT=0%2e00&CURRENCYCODE=USD&PAYMENTSTATUS=Completed&PENDINGREASON=None&REASONCODE=None&PROTECTIONELIGIBILITY=Eligible&PROTECTIONELIGIBILITYTYPE=ItemNotReceivedEligible%2cUnauthorizedPaymentEligible&L_NAME0=Item%201&L_NAME1=Item%202&L_QTY0=1&L_QTY1=1&L_SHIPPINGAMT0=0%2e00&L_SHIPPINGAMT1=0%2e00&L_HANDLINGAMT0=0%2e00&L_HANDLINGAMT1=0%2e00&L_CURRENCYCODE0=USD&L_CURRENCYCODE1=USD&L_AMT0=687%2e93&L_AMT1=52%2e50

data/spec/paypal/express/request_spec.rb

@@ -198,6 +198,37 @@ describe Paypal::Express::Request do
     end
   end
 
+  describe '#transaction_details' do
+    it 'should return Paypal::Express::Response' do
+      fake_response 'GetTransactionDetails/success'
+      response = instance.transaction_details 'transaction_id'
+      response.should be_instance_of Paypal::Express::Response
+    end
+    
+    it 'should call GetTransactionDetails' do
+      expect do
+        instance.transaction_details 'transaction_id'
+      end.should request_to nvp_endpoint, :post
+      instance._method_.should == :GetTransactionDetails
+      instance._sent_params_.should == {
+        :TRANSACTIONID=> 'transaction_id'
+      }
+    end
+    
+    it 'should fail with bad transaction id' do
+      expect do
+        fake_response 'GetTransactionDetails/failure'
+        response = instance.transaction_details 'bad_transaction_id'
+      end.should raise_error(Paypal::Exception::APIError)
+    end
+    
+    it 'should handle all attributes' do
+      Paypal.logger.should_not_receive(:warn)
+      fake_response 'GetTransactionDetails/success'
+      response = instance.transaction_details 'transaction_id'
+    end
+  end
+  
   describe '#checkout!' do
     it 'should return Paypal::Express::Response' do
       fake_response 'DoExpressCheckoutPayment/success'
@@ -222,23 +253,23 @@ describe Paypal::Express::Request do
 
     context "with many items" do
       before do
-	fake_response 'DoExpressCheckoutPayment/success_with_many_items'
+        fake_response 'DoExpressCheckoutPayment/success_with_many_items'
       end
 
       it 'should handle all attributes' do
-	Paypal.logger.should_not_receive(:warn)
-	response = instance.checkout! 'token', 'payer_id', instant_payment_request_with_many_items
+        Paypal.logger.should_not_receive(:warn)
+        response = instance.checkout! 'token', 'payer_id', instant_payment_request_with_many_items
       end
 
       it 'should return Paypal::Express::Response' do
-	response = instance.checkout! 'token', 'payer_id', instant_payment_request_with_many_items
-	response.should be_instance_of Paypal::Express::Response
+        response = instance.checkout! 'token', 'payer_id', instant_payment_request_with_many_items
+        response.should be_instance_of Paypal::Express::Response
       end
 
       it 'should return twenty items' do
-	response = instance.checkout! 'token', 'payer_id', instant_payment_request_with_many_items
-	instance._method_.should == :DoExpressCheckoutPayment
-	response.items.count.should == 20
+        response = instance.checkout! 'token', 'payer_id', instant_payment_request_with_many_items
+        instance._method_.should == :DoExpressCheckoutPayment
+        response.items.count.should == 20
       end
     end
   end

data/spec/paypal/payment/request/item_spec.rb

@@ -7,7 +7,8 @@ describe Paypal::Payment::Request::Item do
       :description => 'Description',
       :amount => 10,
       :quantity => 5,
-      :category => :Digital
+      :category => :Digital,
+      :number => '1'
     )
   end
 
@@ -18,7 +19,8 @@ describe Paypal::Payment::Request::Item do
         :L_PAYMENTREQUEST_1_DESC0 => 'Description',
         :L_PAYMENTREQUEST_1_AMT0 => '10.00',
         :L_PAYMENTREQUEST_1_QTY0 => 5,
-        :L_PAYMENTREQUEST_1_ITEMCATEGORY0 => :Digital
+        :L_PAYMENTREQUEST_1_ITEMCATEGORY0 => :Digital,
+        :L_PAYMENTREQUEST_1_NUMBER0 => '1'
       }
     end
   end

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

@@ -6,6 +6,7 @@ describe Paypal::Payment::Response::Info do
       :NAME => 'Item Name',
       :DESC => 'Item Description',
       :QTY => '1',
+      :NUMBER => '1',
       :ITEMCATEGORY => 'Digital',
       :ITEMWIDTHVALUE => '1.0',
       :ITEMHEIGHTVALUE => '2.0',
@@ -24,6 +25,7 @@ describe Paypal::Payment::Response::Info do
     its(:height) { should == '2.0' }
     its(:length) { should == '3.0' }
     its(:weight) { should == '4.0' }
+    its(:number) { should == '1' }
 
     context 'when non-supported attributes are given' do
       it 'should ignore them and warn' do

data/spec/spec_helper.rb

@@ -1,8 +1,5 @@
 if RUBY_VERSION >= '1.9'
   require 'cover_me'
-  at_exit do
-    CoverMe.complete!
-  end
 end
 
 require 'paypal'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paypal-express
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000Z
+date: 2012-02-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70106710751280 !ruby/object:Gem::Requirement
+  requirement: &70190063841760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70106710751280
+  version_requirements: *70190063841760
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70106710750880 !ruby/object:Gem::Requirement
+  requirement: &70190063841120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106710750880
+  version_requirements: *70190063841120
 - !ruby/object:Gem::Dependency
   name: restclient_with_cert
-  requirement: &70106710750400 !ruby/object:Gem::Requirement
+  requirement: &70190063840100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106710750400
+  version_requirements: *70190063840100
 - !ruby/object:Gem::Dependency
   name: attr_required
-  requirement: &70106710749900 !ruby/object:Gem::Requirement
+  requirement: &70190063829120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70106710749900
+  version_requirements: *70190063829120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70106710749400 !ruby/object:Gem::Requirement
+  requirement: &70190063827760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70106710749400
+  version_requirements: *70190063827760
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &70106710748880 !ruby/object:Gem::Requirement
+  requirement: &70190063826720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70106710748880
+  version_requirements: *70190063826720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70106710748120 !ruby/object:Gem::Requirement
+  requirement: &70190063826000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70106710748120
+  version_requirements: *70190063826000
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70106710747340 !ruby/object:Gem::Requirement
+  requirement: &70190063823880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70106710747340
+  version_requirements: *70190063823880
 description: PayPal Express Checkout API Client for Instance, Recurring and Digital
   Goods Payment.
 email: nov@matake.jp
@@ -161,6 +161,8 @@ files:
 - spec/fake_response/GetExpressCheckoutDetails/with_billing_accepted_status.txt
 - spec/fake_response/GetRecurringPaymentsProfileDetails/failure.txt
 - spec/fake_response/GetRecurringPaymentsProfileDetails/success.txt
+- spec/fake_response/GetTransactionDetails/failure.txt
+- spec/fake_response/GetTransactionDetails/success.txt
 - spec/fake_response/IPN/invalid.txt
 - spec/fake_response/IPN/valid.txt
 - spec/fake_response/ManageRecurringPaymentsProfileStatus/failure.txt
@@ -231,6 +233,8 @@ test_files:
 - spec/fake_response/GetExpressCheckoutDetails/with_billing_accepted_status.txt
 - spec/fake_response/GetRecurringPaymentsProfileDetails/failure.txt
 - spec/fake_response/GetRecurringPaymentsProfileDetails/success.txt
+- spec/fake_response/GetTransactionDetails/failure.txt
+- spec/fake_response/GetTransactionDetails/success.txt
 - spec/fake_response/IPN/invalid.txt
 - spec/fake_response/IPN/valid.txt
 - spec/fake_response/ManageRecurringPaymentsProfileStatus/failure.txt