paypal-express 0.5.0 → 0.5.1

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
   - 1.8.7
   - 1.9.2
-  - 1.9.3
-  - jruby
+  - 1.9.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    paypal-express (0.5.0.alpha)
+    paypal-express (0.5.0)
       activesupport (>= 2.3)
       attr_required (>= 0.0.5)
       i18n
@@ -10,12 +10,12 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.3)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     attr_required (0.0.5)
     bouncy-castle-java (1.5.0146.1)
-    configatron (2.9.0)
+    configatron (2.9.1)
       yamler (>= 0.1.0)
     cover_me (1.2.0)
       configatron
@@ -23,24 +23,24 @@ GEM
     diff-lcs (1.1.3)
     fakeweb (1.3.0)
     hashie (1.2.0)
-    i18n (0.6.0)
-    jruby-openssl (0.7.6.1)
+    i18n (0.6.1)
+    jruby-openssl (0.7.7)
       bouncy-castle-java (>= 1.5.0146.1)
-    mime-types (1.18)
-    multi_json (1.3.2)
+    mime-types (1.19)
+    multi_json (1.3.6)
     rake (0.9.2.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     restclient_with_cert (0.0.8)
       rest-client (>= 1.6)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
+    rspec-mocks (2.11.2)
     yamler (0.1.0)
 
 PLATFORMS

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/paypal/nvp/request.rb

@@ -2,6 +2,7 @@ module Paypal
   module NVP
     class Request < Base
       attr_required :username, :password, :signature
+      attr_optional :subject
       attr_accessor :version
 
       ENDPOINT = {
@@ -27,6 +28,7 @@ module Paypal
           :USER => self.username,
           :PWD => self.password,
           :SIGNATURE => self.signature,
+          :SUBJECT => self.subject,
           :VERSION => self.version
         }
       end

data/spec/paypal/express/request_spec.rb

@@ -88,7 +88,7 @@ describe Paypal::Express::Request do
           end
           expect do
             Paypal::Express::Request.new insufficient_attributes
-          end.should raise_error AttrRequired::AttrMissing
+          end.to raise_error AttrRequired::AttrMissing
         end
       end
     end
@@ -97,7 +97,7 @@ describe Paypal::Express::Request do
       it 'should succeed' do
         expect do
           Paypal::Express::Request.new attributes
-        end.should_not raise_error AttrRequired::AttrMissing
+        end.not_to raise_error AttrRequired::AttrMissing
       end
     end
   end
@@ -112,7 +112,7 @@ describe Paypal::Express::Request do
     it 'should support no_shipping option' do
       expect do
         instance.setup instant_payment_request, return_url, cancel_url, :no_shipping => true
-      end.should request_to nvp_endpoint, :post
+      end.to request_to nvp_endpoint, :post
       instance._method_.should == :SetExpressCheckout
       instance._sent_params_.should == {
         :PAYMENTREQUEST_0_DESC => 'Instant Payment Request',
@@ -134,7 +134,7 @@ describe Paypal::Express::Request do
       it "should support #{option_key} option" do
         expect do
           instance.setup instant_payment_request, return_url, cancel_url, option_key => 'some value'
-        end.should request_to nvp_endpoint, :post
+        end.to request_to nvp_endpoint, :post
         instance._method_.should == :SetExpressCheckout
         instance._sent_params_.should include param_key
         instance._sent_params_[param_key].should == 'some value'
@@ -145,7 +145,7 @@ describe Paypal::Express::Request do
       it 'should call SetExpressCheckout' do
         expect do
           instance.setup instant_payment_request, return_url, cancel_url
-        end.should request_to nvp_endpoint, :post
+        end.to request_to nvp_endpoint, :post
         instance._method_.should == :SetExpressCheckout
         instance._sent_params_.should == {
           :PAYMENTREQUEST_0_DESC => 'Instant Payment Request',
@@ -162,7 +162,7 @@ describe Paypal::Express::Request do
       it 'should call SetExpressCheckout' do
         expect do
           instance.setup recurring_payment_request, return_url, cancel_url
-        end.should request_to nvp_endpoint, :post
+        end.to request_to nvp_endpoint, :post
         instance._method_.should == :SetExpressCheckout
         instance._sent_params_.should == {
           :L_BILLINGTYPE0 => :RecurringPayments,
@@ -180,7 +180,7 @@ describe Paypal::Express::Request do
       it 'should call SetExpressCheckout' do
         expect do
           instance.setup reference_transaction_request, return_url, cancel_url
-        end.should request_to nvp_endpoint, :post
+        end.to request_to nvp_endpoint, :post
         instance._method_.should == :SetExpressCheckout
         instance._sent_params_.should == {
           :L_BILLINGTYPE0 => :MerchantInitiatedBilling,
@@ -205,7 +205,7 @@ describe Paypal::Express::Request do
     it 'should call GetExpressCheckoutDetails' do
       expect do
         instance.details 'token'
-      end.should request_to nvp_endpoint, :post
+      end.to request_to nvp_endpoint, :post
       instance._method_.should == :GetExpressCheckoutDetails
       instance._sent_params_.should == {
         :TOKEN => 'token'
@@ -223,7 +223,7 @@ describe Paypal::Express::Request do
     it 'should call GetTransactionDetails' do
       expect do
         instance.transaction_details 'transaction_id'
-      end.should request_to nvp_endpoint, :post
+      end.to request_to nvp_endpoint, :post
       instance._method_.should == :GetTransactionDetails
       instance._sent_params_.should == {
         :TRANSACTIONID=> 'transaction_id'
@@ -234,7 +234,7 @@ describe Paypal::Express::Request do
       expect do
         fake_response 'GetTransactionDetails/failure'
         response = instance.transaction_details 'bad_transaction_id'
-      end.should raise_error(Paypal::Exception::APIError)
+      end.to raise_error(Paypal::Exception::APIError)
     end
     
     it 'should handle all attributes' do
@@ -254,7 +254,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 nvp_endpoint, :post
+      end.to request_to nvp_endpoint, :post
       instance._method_.should == :DoExpressCheckoutPayment
       instance._sent_params_.should == {
         :PAYERID => 'payer_id',
@@ -299,7 +299,7 @@ describe Paypal::Express::Request do
     it 'should call CreateRecurringPaymentsProfile' do
       expect do
         instance.subscribe! 'token', recurring_profile
-      end.should request_to nvp_endpoint, :post
+      end.to request_to nvp_endpoint, :post
       instance._method_.should == :CreateRecurringPaymentsProfile
       instance._sent_params_.should == {
         :DESC => 'Recurring Profile',
@@ -326,7 +326,7 @@ describe Paypal::Express::Request do
     it 'should call GetRecurringPaymentsProfileDetails' do
       expect do
         instance.subscription 'profile_id'
-      end.should request_to nvp_endpoint, :post
+      end.to request_to nvp_endpoint, :post
       instance._method_.should == :GetRecurringPaymentsProfileDetails
       instance._sent_params_.should == {
         :PROFILEID => 'profile_id'
@@ -344,7 +344,7 @@ describe Paypal::Express::Request do
     it 'should call ManageRecurringPaymentsProfileStatus' do
       expect do
         instance.renew! 'profile_id', :Cancel
-      end.should request_to nvp_endpoint, :post
+      end.to request_to nvp_endpoint, :post
       instance._method_.should == :ManageRecurringPaymentsProfileStatus
       instance._sent_params_.should == {
         :ACTION => :Cancel,
@@ -363,7 +363,7 @@ describe Paypal::Express::Request do
     it 'should call ManageRecurringPaymentsProfileStatus' do
       expect do
         instance.cancel! 'profile_id'
-      end.should request_to nvp_endpoint, :post
+      end.to request_to nvp_endpoint, :post
       instance._method_.should == :ManageRecurringPaymentsProfileStatus
       instance._sent_params_.should == {
         :ACTION => :Cancel,
@@ -382,7 +382,7 @@ describe Paypal::Express::Request do
     it 'should call ManageRecurringPaymentsProfileStatus' do
       expect do
         instance.suspend! 'profile_id'
-      end.should request_to nvp_endpoint, :post
+      end.to request_to nvp_endpoint, :post
       instance._method_.should == :ManageRecurringPaymentsProfileStatus
       instance._sent_params_.should == {
         :ACTION => :Suspend,
@@ -401,7 +401,7 @@ describe Paypal::Express::Request do
     it 'should call ManageRecurringPaymentsProfileStatus' do
       expect do
         instance.reactivate! 'profile_id'
-      end.should request_to nvp_endpoint, :post
+      end.to request_to nvp_endpoint, :post
       instance._method_.should == :ManageRecurringPaymentsProfileStatus
       instance._sent_params_.should == {
         :ACTION => :Reactivate,
@@ -420,7 +420,7 @@ describe Paypal::Express::Request do
     it 'should call CreateBillingAgreement' do
       expect do
         instance.agree! 'token'
-      end.should request_to nvp_endpoint, :post
+      end.to request_to nvp_endpoint, :post
       instance._method_.should == :CreateBillingAgreement
       instance._sent_params_.should == {
         :TOKEN => 'token'
@@ -438,7 +438,7 @@ describe Paypal::Express::Request do
     it 'should call BillAgreementUpdate' do
       expect do
         instance.agreement 'reference_id'
-      end.should request_to nvp_endpoint, :post
+      end.to request_to nvp_endpoint, :post
       instance._method_.should == :BillAgreementUpdate
       instance._sent_params_.should == {
         :REFERENCEID => 'reference_id'
@@ -456,7 +456,7 @@ describe Paypal::Express::Request do
     it 'should call DoReferenceTransaction' do
       expect do
         instance.charge! 'billing_agreement_id', 1000, :currency_code => :JPY
-      end.should request_to nvp_endpoint, :post
+      end.to request_to nvp_endpoint, :post
       instance._method_.should == :DoReferenceTransaction
       instance._sent_params_.should == {
         :REFERENCEID => 'billing_agreement_id',
@@ -477,7 +477,7 @@ describe Paypal::Express::Request do
     it 'should call BillAgreementUpdate' do
       expect do
         instance.revoke! 'reference_id'
-      end.should request_to nvp_endpoint, :post
+      end.to request_to nvp_endpoint, :post
       instance._method_.should == :BillAgreementUpdate
       instance._sent_params_.should == {
         :REFERENCEID => 'reference_id',
@@ -496,7 +496,7 @@ describe Paypal::Express::Request do
     it 'should call RefundTransaction' do
       expect do
         instance.refund! 'transaction_id'
-      end.should request_to nvp_endpoint, :post
+      end.to request_to nvp_endpoint, :post
       instance._method_.should == :RefundTransaction
       instance._sent_params_.should == {
         :TRANSACTIONID => 'transaction_id',

data/spec/paypal/ipn_spec.rb

@@ -12,7 +12,7 @@ describe Paypal::IPN do
       before { fake_response 'IPN/invalid', :IPN }
       subject {}
       it do
-        expect { Paypal::IPN.verify!('raw-post-body') }.should raise_error(Paypal::Exception::APIError)
+        expect { Paypal::IPN.verify!('raw-post-body') }.to raise_error(Paypal::Exception::APIError)
       end
     end
   end

data/spec/paypal/nvp/request_spec.rb

@@ -22,7 +22,7 @@ describe Paypal::NVP::Request do
           end
           expect do
             Paypal::NVP::Request.new insufficient_attributes
-          end.should raise_error AttrRequired::AttrMissing
+          end.to raise_error AttrRequired::AttrMissing
         end
       end
     end
@@ -31,7 +31,7 @@ describe Paypal::NVP::Request do
       it 'should succeed' do
         expect do
           Paypal::NVP::Request.new attributes
-        end.should_not raise_error AttrRequired::AttrMissing
+        end.not_to raise_error AttrRequired::AttrMissing
       end
 
       it 'should setup endpoint and version' do
@@ -47,13 +47,42 @@ describe Paypal::NVP::Request do
         end
       end
     end
+
+    context 'when optional parameters are given' do
+      let(:optional_attributes) do
+        { :subject => 'user@example.com' }
+      end
+
+      it 'should setup subject' do
+        client = Paypal::NVP::Request.new attributes.merge(optional_attributes)
+        client.subject.should == 'user@example.com'
+      end
+    end
+  end
+
+  describe '#common_params' do
+    {
+      :username => :USER,
+      :password => :PWD,
+      :signature => :SIGNATURE,
+      :subject => :SUBJECT,
+      :version => :VERSION
+    }.each do |option_key, param_key|
+      it "should include :#{param_key}" do
+        instance.common_params.should include(param_key)
+      end
+
+      it "should set :#{param_key} as #{option_key}" do
+        instance.common_params[param_key].should == instance.send(option_key)
+      end
+    end
   end
 
   describe '#request' do
     it 'should POST to NPV endpoint' do
       expect do
         instance.request :RPCMethod
-      end.should request_to Paypal::NVP::Request::ENDPOINT[:production], :post
+      end.to request_to Paypal::NVP::Request::ENDPOINT[:production], :post
     end
 
     context 'when got API error response' do
@@ -64,7 +93,7 @@ describe Paypal::NVP::Request do
       it 'should raise Paypal::Exception::APIError' do
         expect do
           instance.request :SetExpressCheckout
-        end.should raise_error(Paypal::Exception::APIError)
+        end.to raise_error(Paypal::Exception::APIError)
       end
     end
 
@@ -81,7 +110,7 @@ describe Paypal::NVP::Request do
       it 'should raise Paypal::Exception::APIError' do
         expect do
           instance.request :SetExpressCheckout
-        end.should raise_error(Paypal::Exception::HttpError)
+        end.to raise_error(Paypal::Exception::HttpError)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paypal-express
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70206563624920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70206563624920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70206563635180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206563635180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: restclient_with_cert
-  requirement: &70206563633560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206563633560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: attr_required
-  requirement: &70206563632080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70206563632080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70206563630660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70206563630660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &70206563629260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70206563629260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70206563644380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70206563644380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70206563639720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70206563639720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: PayPal Express Checkout API Client for Instance, Recurring and Digital
   Goods Payment.
 email: nov@matake.jp
@@ -211,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: PayPal Express Checkout API Client for Instance, Recurring and Digital Goods