paypal-express 0.3.0 → 0.3.1

data/README.rdoc

@@ -15,6 +15,7 @@ https://github.com/nov/paypal-express/wiki
 
 Play with Sample Rails App
 https://github.com/nov/paypal-express-sample
+https://paypal-express-sample.heroku.com
 
 == Note on Patches/Pull Requests
 
@@ -28,4 +29,4 @@ https://github.com/nov/paypal-express-sample
 
 == Copyright
 
-Copyright (c) 2011 nov matake. See LICENSE for details.
+Copyright (c) 2011 nov matake. See LICENSE for details.

data/Rakefile

@@ -9,12 +9,4 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov_opts = ['-Ilib -Ispec --exclude spec,gems']
 end
 
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "paypal-express #{File.read('VERSION')}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/paypal/express/request.rb

@@ -63,6 +63,18 @@ module Paypal
         response = self.request :ManageRecurringPaymentsProfileStatus, params
         Response.new response
       end
+      
+      def suspend!(profile_id, options = {})
+        renew!(profile_id, :Suspend, options)
+      end
+
+      def cancel!(profile_id, options = {})
+        renew!(profile_id, :Cancel, options)
+      end
+
+      def reactivate!(profile_id, options = {})
+        renew!(profile_id, :Reactivate, options)
+      end
 
       def refund!(transaction_id, options = {})
         params = {
@@ -86,4 +98,4 @@ module Paypal
 
     end
   end
-end
+end

data/lib/paypal/nvp/response.rb

@@ -15,7 +15,8 @@ module Paypal
         :NOTIFYURL => :notify_url,
         :TIMESTAMP => :timestamp,
         :TOKEN => :token,
-        :VERSION => :version
+        :VERSION => :version,
+        :BILLINGAGREEMENTID => :billing_agreement_id
       }
       attr_accessor *@@attribute_mapping.values
       attr_accessor :shipping_options_is_default, :success_page_redirect_requested, :insurance_option_selected

data/lib/paypal/payment/request.rb

@@ -1,7 +1,7 @@
 module Paypal
   module Payment
     class Request < Base
-      attr_optional :action, :currency_code, :description, :notify_url, :billing_type, :billing_agreement_description
+      attr_optional :action, :currency_code, :description, :notify_url, :billing_type, :billing_agreement_description, :reference_transactions_billing_type, :billing_agreement_id
       attr_accessor :amount, :items
 
       def initialize(attributes = {})
@@ -34,7 +34,8 @@ module Paypal
           #  recurring payment doesn't support dynamic notify_url.
           :"PAYMENTREQUEST_#{index}_NOTIFYURL" => self.notify_url,
           :"L_BILLINGTYPE#{index}" => self.billing_type,
-          :"L_BILLINGAGREEMENTDESCRIPTION#{index}" => self.billing_agreement_description
+          :"L_BILLINGAGREEMENTDESCRIPTION#{index}" => self.billing_agreement_description,
+          :"BILLINGTYPE" => self.reference_transactions_billing_type
         }.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
+      attr_accessor :amount, :ship_to, :description, :note, :items, :notify_url, :insurance_option_offered, :currency_code, :error_code, :transaction_id, :billing_agreement_id
 
       def initialize(attributes = {})
         attrs = attributes.dup
@@ -31,6 +31,7 @@ module Paypal
         @currency_code = attrs.delete(:CURRENCYCODE)
         @error_code = attrs.delete(:ERRORCODE)
         @transaction_id = attrs.delete(:TRANSACTIONID)
+        @billing_agreement_id = attrs.delete(:BILLINGAGREEMENTID)
 
         # items
         items = []

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", "< 0.9"
+  s.add_development_dependency "rake", ">= 0.8"
   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/DoExpressCheckoutPayment/success.txt

@@ -1 +1 @@
-TOKEN=EC-9E2743126S4330617&SUCCESSPAGEREDIRECTREQUESTED=false&TIMESTAMP=2011-02-08T03:23:55Z&CORRELATIONID=15b93874c358c&ACK=Success&VERSION=66.0&BUILD=1721431&INSURANCEOPTIONSELECTED=false&SHIPPINGOPTIONISDEFAULT=false&PAYMENTINFO_0_TRANSACTIONID=8NC65222871997739&PAYMENTINFO_0_TRANSACTIONTYPE=expresscheckout&PAYMENTINFO_0_PAYMENTTYPE=instant&PAYMENTINFO_0_ORDERTIME=2011-02-08T03:23:54Z&PAYMENTINFO_0_AMT=14.00&PAYMENTINFO_0_FEEAMT=0.85&PAYMENTINFO_0_TAXAMT=0.00&PAYMENTINFO_0_CURRENCYCODE=USD&PAYMENTINFO_0_PAYMENTSTATUS=Completed&PAYMENTINFO_0_PENDINGREASON=None&PAYMENTINFO_0_REASONCODE=None&PAYMENTINFO_0_PROTECTIONELIGIBILITY=Ineligible&PAYMENTINFO_0_PROTECTIONELIGIBILITYTYPE=None&PAYMENTINFO_0_ERRORCODE=0&PAYMENTINFO_0_ACK=Success
+TOKEN=EC-9E2743126S4330617&SUCCESSPAGEREDIRECTREQUESTED=false&TIMESTAMP=2011-02-08T03:23:55Z&CORRELATIONID=15b93874c358c&ACK=Success&VERSION=66.0&BUILD=1721431&INSURANCEOPTIONSELECTED=false&SHIPPINGOPTIONISDEFAULT=false&PAYMENTINFO_0_TRANSACTIONID=8NC65222871997739&PAYMENTINFO_0_TRANSACTIONTYPE=expresscheckout&PAYMENTINFO_0_PAYMENTTYPE=instant&PAYMENTINFO_0_ORDERTIME=2011-02-08T03:23:54Z&PAYMENTINFO_0_AMT=14.00&PAYMENTINFO_0_FEEAMT=0.85&PAYMENTINFO_0_TAXAMT=0.00&PAYMENTINFO_0_CURRENCYCODE=USD&PAYMENTINFO_0_PAYMENTSTATUS=Completed&PAYMENTINFO_0_PENDINGREASON=None&PAYMENTINFO_0_REASONCODE=None&PAYMENTINFO_0_PROTECTIONELIGIBILITY=Ineligible&PAYMENTINFO_0_PROTECTIONELIGIBILITYTYPE=None&PAYMENTINFO_0_ERRORCODE=0&BILLINGAGREEMENTID=B-1XR87946TC504770W&PAYMENTINFO_0_ACK=Success

data/spec/paypal/express/request_spec.rb

@@ -243,6 +243,63 @@ describe Paypal::Express::Request do
     end
   end
 
+  describe '#cancel!' do
+    it 'should return Paypal::Express::Response' do
+      fake_response 'ManageRecurringPaymentsProfileStatus/success'
+      response = instance.cancel! 'profile_id'
+      response.should be_instance_of(Paypal::Express::Response)
+    end
+
+    it 'should call ManageRecurringPaymentsProfileStatus' do
+      expect do
+        instance.cancel! 'profile_id'
+      end.should request_to nvp_endpoint, :post
+      instance._method_.should == :ManageRecurringPaymentsProfileStatus
+      instance._sent_params_.should == {
+        :ACTION => :Cancel,
+        :PROFILEID => 'profile_id'
+      }
+    end
+  end
+
+  describe '#suspend!' do
+    it 'should return Paypal::Express::Response' do
+      fake_response 'ManageRecurringPaymentsProfileStatus/success'
+      response = instance.cancel! 'profile_id'
+      response.should be_instance_of(Paypal::Express::Response)
+    end
+
+    it 'should call ManageRecurringPaymentsProfileStatus' do
+      expect do
+        instance.suspend! 'profile_id'
+      end.should request_to nvp_endpoint, :post
+      instance._method_.should == :ManageRecurringPaymentsProfileStatus
+      instance._sent_params_.should == {
+        :ACTION => :Suspend,
+        :PROFILEID => 'profile_id'
+      }
+    end
+  end
+
+  describe '#reactivate!' do
+    it 'should return Paypal::Express::Response' do
+      fake_response 'ManageRecurringPaymentsProfileStatus/success'
+      response = instance.cancel! 'profile_id'
+      response.should be_instance_of(Paypal::Express::Response)
+    end
+
+    it 'should call ManageRecurringPaymentsProfileStatus' do
+      expect do
+        instance.reactivate! 'profile_id'
+      end.should request_to nvp_endpoint, :post
+      instance._method_.should == :ManageRecurringPaymentsProfileStatus
+      instance._sent_params_.should == {
+        :ACTION => :Reactivate,
+        :PROFILEID => 'profile_id'
+      }
+    end
+  end
+
   describe '#refund!' do
     it 'should return Paypal::Express::Response' do
       fake_response 'RefundTransaction/full'
@@ -262,4 +319,4 @@ describe Paypal::Express::Request do
     end
   end
 
-end
+end

data/spec/paypal/nvp/response_spec.rb

@@ -79,6 +79,7 @@ describe Paypal::NVP::Response do
         response = request.checkout! 'token', 'payer_id', payment_request
         response.payment_responses.size.should == 0
         response.payment_info.size.should == 1
+        response.billing_agreement_id.should == 'B-1XR87946TC504770W'
         response.payment_info.first.should be_instance_of(Paypal::Payment::Response::Info)
       end
     end

data/spec/paypal/payment/request_spec.rb

@@ -31,6 +31,15 @@ describe Paypal::Payment::Request do
     )
   end
 
+  let :recurring_request_with_reference_transaction do
+    Paypal::Payment::Request.new(
+      :currency_code => :JPY,
+      :billing_type => :RecurringPayments,
+      :billing_agreement_description => 'Recurring Payment Request',
+      :reference_transactions_billing_type => :MerchantInitiatedBillingSingleAgreement
+    )
+  end
+
   describe '.new' do
     it 'should handle Instant Payment parameters' do
       instant_request.amount.total.should == 25.7
@@ -46,6 +55,12 @@ describe Paypal::Payment::Request do
       recurring_request.billing_type.should == :RecurringPayments
       recurring_request.billing_agreement_description.should == 'Recurring Payment Request'
     end
+
+    it 'should handle Recurring Payment parameters' do
+      recurring_request_with_reference_transaction.currency_code.should == :JPY
+      recurring_request_with_reference_transaction.billing_type.should == :RecurringPayments
+      recurring_request_with_reference_transaction.billing_agreement_description.should == 'Recurring Payment Request'
+    end
   end
 
   describe '#to_params' do
@@ -79,5 +94,17 @@ describe Paypal::Payment::Request do
         :L_BILLINGAGREEMENTDESCRIPTION0 => "Recurring Payment Request"
       }
     end
+
+    it 'should handle Recurring Payment with Reference Transactions parameters' do
+      recurring_request_with_reference_transaction.to_params.should == {
+        :PAYMENTREQUEST_0_AMT => "0.00",
+        :PAYMENTREQUEST_0_TAXAMT => "0.00",
+        :PAYMENTREQUEST_0_SHIPPINGAMT => "0.00",
+        :PAYMENTREQUEST_0_CURRENCYCODE => :JPY,
+        :L_BILLINGTYPE0 => :RecurringPayments,
+        :L_BILLINGAGREEMENTDESCRIPTION0 => "Recurring Payment Request",
+        :BILLINGTYPE => :MerchantInitiatedBillingSingleAgreement,
+      }
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paypal-express
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - nov matake
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 Z
+date: 2011-06-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -89,13 +89,6 @@ dependencies:
         - 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