paypal-express 0.4.0.alpha → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.4.0.alpha
+0.4.0

data/lib/paypal/express/request.rb

@@ -68,7 +68,7 @@ module Paypal
         response = self.request :ManageRecurringPaymentsProfileStatus, params
         Response.new response
       end
-      
+
       def suspend!(profile_id, options = {})
         renew!(profile_id, :Suspend, options)
       end
@@ -95,6 +95,14 @@ module Paypal
         Response.new response
       end
 
+      def agreement(reference_id)
+        params = {
+          :REFERENCEID => reference_id,
+        }
+        response = self.request :BillAgreementUpdate, params
+        Response.new response
+      end
+
       def charge!(reference_id, amount, options = {})
         params = {
           :REFERENCEID => reference_id,
@@ -108,6 +116,15 @@ module Paypal
         Response.new response
       end
 
+      def revoke!(reference_id)
+        params = {
+          :REFERENCEID => reference_id,
+          :BillingAgreementStatus => :Canceled
+        }
+        response = self.request :BillAgreementUpdate, params
+        Response.new response
+      end
+
 
       # Refund Specific
 

data/lib/paypal/nvp/response.rb

@@ -6,6 +6,7 @@ module Paypal
         :ACK => :ack,
         :ADDRESSSTATUS => :address_status,
         :BUILD => :build,
+        :BILLINGAGREEMENTACCEPTEDSTATUS => :billing_agreement_accepted_status,
         :CHECKOUTSTATUS => :checkout_status,
         :CORRELATIONID => :colleration_id,
         :COUNTRYCODE => :country_code,
@@ -111,7 +112,9 @@ module Paypal
         end
         if attrs[:BILLINGAGREEMENTID]
           @billing_agreement = Payment::Response::Reference.new(
-            :identifier => attrs.delete(:BILLINGAGREEMENTID)
+            :identifier => attrs.delete(:BILLINGAGREEMENTID),
+            :description => attrs.delete(:BILLINGAGREEMENTDESCRIPTION),
+            :status => attrs.delete(:BILLINGAGREEMENTSTATUS)
           )
           billing_agreement_info = Payment::Response::Info.attribute_mapping.keys.inject({}) do |billing_agreement_info, key|
             billing_agreement_info.merge! key => attrs.delete(key)

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

@@ -2,6 +2,7 @@ module Paypal
   module Payment
     class Response::Reference < Base
       attr_required :identifier
+      attr_optional :description, :status
       attr_accessor :info
     end
   end

data/spec/fake_response/BillAgreementUpdate/fetch.txt

@@ -0,0 +1 @@
+BILLINGAGREEMENTID=B%2d8XW15926RT2253736&BILLINGAGREEMENTDESCRIPTION=Reference%20Payment%20Agreement&BILLINGAGREEMENTSTATUS=Canceled&TIMESTAMP=2011%2d08%2d06T09%3a47%3a41Z&CORRELATIONID=28e5a24b3ea98&ACK=Success&VERSION=78%2e0&BUILD=2020243&EMAIL=client_1305381804_per%40matake%2ejp&PAYERID=CMJLWADKVFQYJ&PAYERSTATUS=verified&FIRSTNAME=Test&LASTNAME=User&COUNTRYCODE=US

data/spec/fake_response/BillAgreementUpdate/revoke.txt

@@ -0,0 +1 @@
+BILLINGAGREEMENTID=B%2d8XW15926RT2253736&BILLINGAGREEMENTDESCRIPTION=Reference%20Payment%20Agreement&BILLINGAGREEMENTSTATUS=Canceled&TIMESTAMP=2011%2d08%2d06T09%3a47%3a41Z&CORRELATIONID=28e5a24b3ea98&ACK=Success&VERSION=78%2e0&BUILD=2020243&EMAIL=client_1305381804_per%40matake%2ejp&PAYERID=CMJLWADKVFQYJ&PAYERSTATUS=verified&FIRSTNAME=Test&LASTNAME=User&COUNTRYCODE=US

data/spec/fake_response/GetExpressCheckoutDetails/with_billing_accepted_status.txt

@@ -0,0 +1 @@
+TOKEN=EC%2d4D299105F9409730D&BILLINGAGREEMENTACCEPTEDSTATUS=1&CHECKOUTSTATUS=PaymentActionNotInitiated&TIMESTAMP=2011%2d08%2d08T01%3a56%3a13Z&CORRELATIONID=53a48e61dfca7&ACK=Success&VERSION=78%2e0&BUILD=2020243&EMAIL=client_1305381804_per%40matake%2ejp&PAYERID=CMJLWADKVFQYJ&PAYERSTATUS=verified&FIRSTNAME=Test&LASTNAME=User&COUNTRYCODE=US&CURRENCYCODE=JPY&AMT=0&SHIPPINGAMT=0&HANDLINGAMT=0&TAXAMT=0&INSURANCEAMT=0&SHIPDISCAMT=0&PAYMENTREQUEST_0_CURRENCYCODE=JPY&PAYMENTREQUEST_0_AMT=0&PAYMENTREQUEST_0_SHIPPINGAMT=0&PAYMENTREQUEST_0_HANDLINGAMT=0&PAYMENTREQUEST_0_TAXAMT=0&PAYMENTREQUEST_0_INSURANCEAMT=0&PAYMENTREQUEST_0_SHIPDISCAMT=0&PAYMENTREQUEST_0_INSURANCEOPTIONOFFERED=false&PAYMENTREQUESTINFO_0_ERRORCODE=0

data/spec/paypal/express/request_spec.rb

@@ -325,39 +325,38 @@ describe Paypal::Express::Request do
     end
   end
 
-  describe '#refund!' do
+  describe '#agree!' do
     it 'should return Paypal::Express::Response' do
-      fake_response 'RefundTransaction/full'
-      response = instance.refund! 'transaction_id'
+      fake_response 'CreateBillingAgreement/success'
+      response = instance.agree! 'token'
       response.should be_instance_of Paypal::Express::Response
     end
 
-    it 'should call RefundTransaction' do
+    it 'should call CreateBillingAgreement' do
       expect do
-        instance.refund! 'transaction_id'
+        instance.agree! 'token'
       end.should request_to nvp_endpoint, :post
-      instance._method_.should == :RefundTransaction
+      instance._method_.should == :CreateBillingAgreement
       instance._sent_params_.should == {
-        :TRANSACTIONID => 'transaction_id',
-        :REFUNDTYPE => :Full
+        :TOKEN => 'token'
       }
     end
   end
 
-  describe '#agree!' do
+  describe '#agreement' do
     it 'should return Paypal::Express::Response' do
-      fake_response 'CreateBillingAgreement/success'
-      response = instance.agree! 'token'
+      fake_response 'BillAgreementUpdate/fetch'
+      response = instance.agreement 'reference_id'
       response.should be_instance_of Paypal::Express::Response
     end
 
-    it 'should call CreateBillingAgreement' do
+    it 'should call BillAgreementUpdate' do
       expect do
-        instance.agree! 'token'
+        instance.agreement 'reference_id'
       end.should request_to nvp_endpoint, :post
-      instance._method_.should == :CreateBillingAgreement
+      instance._method_.should == :BillAgreementUpdate
       instance._sent_params_.should == {
-        :TOKEN => 'token'
+        :REFERENCEID => 'reference_id'
       }
     end
   end
@@ -383,4 +382,41 @@ describe Paypal::Express::Request do
     end
   end
 
+  describe '#revoke!' do
+    it 'should return Paypal::Express::Response' do
+      fake_response 'BillAgreementUpdate/revoke'
+      response = instance.revoke! 'reference_id'
+      response.should be_instance_of Paypal::Express::Response
+    end
+
+    it 'should call BillAgreementUpdate' do
+      expect do
+        instance.revoke! 'reference_id'
+      end.should request_to nvp_endpoint, :post
+      instance._method_.should == :BillAgreementUpdate
+      instance._sent_params_.should == {
+        :REFERENCEID => 'reference_id',
+        :BillingAgreementStatus => :Canceled
+      }
+    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
 end

data/spec/paypal/nvp/response_spec.rb

@@ -67,6 +67,17 @@ describe Paypal::NVP::Response do
         response.payment_info.size.should == 0
         response.payment_responses.first.should be_instance_of(Paypal::Payment::Response)
       end
+
+      context 'when BILLINGAGREEMENTACCEPTEDSTATUS included' do
+        before do
+          fake_response 'GetExpressCheckoutDetails/with_billing_accepted_status'
+        end
+
+        it 'should handle all attributes' do
+          Paypal.logger.should_not_receive(:warn)
+          response = request.details 'token'
+        end
+      end
     end
 
     context 'when DoExpressCheckoutPayment response given' do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: paypal-express
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 0.4.0.alpha
+  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors: 
 - nov matake
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-06 00:00:00 Z
+date: 2011-08-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -145,6 +145,8 @@ files:
 - lib/paypal/payment/response/ship_to.rb
 - lib/paypal/util.rb
 - paypal-express.gemspec
+- spec/fake_response/BillAgreementUpdate/fetch.txt
+- spec/fake_response/BillAgreementUpdate/revoke.txt
 - spec/fake_response/CreateBillingAgreement/success.txt
 - spec/fake_response/CreateRecurringPaymentsProfile/failure.txt
 - spec/fake_response/CreateRecurringPaymentsProfile/success.txt
@@ -155,6 +157,7 @@ files:
 - spec/fake_response/DoReferenceTransaction/success.txt
 - spec/fake_response/GetExpressCheckoutDetails/failure.txt
 - spec/fake_response/GetExpressCheckoutDetails/success.txt
+- spec/fake_response/GetExpressCheckoutDetails/with_billing_accepted_status.txt
 - spec/fake_response/GetRecurringPaymentsProfileDetails/failure.txt
 - spec/fake_response/GetRecurringPaymentsProfileDetails/success.txt
 - spec/fake_response/IPN/invalid.txt
@@ -212,6 +215,8 @@ signing_key:
 specification_version: 3
 summary: PayPal Express Checkout API Client for Instance, Recurring and Digital Goods Payment.
 test_files: 
+- spec/fake_response/BillAgreementUpdate/fetch.txt
+- spec/fake_response/BillAgreementUpdate/revoke.txt
 - spec/fake_response/CreateBillingAgreement/success.txt
 - spec/fake_response/CreateRecurringPaymentsProfile/failure.txt
 - spec/fake_response/CreateRecurringPaymentsProfile/success.txt
@@ -222,6 +227,7 @@ test_files:
 - spec/fake_response/DoReferenceTransaction/success.txt
 - spec/fake_response/GetExpressCheckoutDetails/failure.txt
 - spec/fake_response/GetExpressCheckoutDetails/success.txt
+- spec/fake_response/GetExpressCheckoutDetails/with_billing_accepted_status.txt
 - spec/fake_response/GetRecurringPaymentsProfileDetails/failure.txt
 - spec/fake_response/GetRecurringPaymentsProfileDetails/success.txt
 - spec/fake_response/IPN/invalid.txt