paypal-express 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/paypal/express/response.rb

@@ -1,43 +1,31 @@
 module Paypal
   module Express
     class Response < NVP::Response
-      attr_accessor :on_mobile, :pay_on_paypal
+      attr_accessor :pay_on_paypal
 
       def initialize(response, options = {})
         super response
-        @on_mobile = options[:on_mobile]
         @pay_on_paypal = options[:pay_on_paypal]
       end
 
       def redirect_uri
         endpoint = URI.parse Paypal.endpoint
-        endpoint.query = query(:redirect).to_query
+        endpoint.query = query(:with_cmd).to_query
         endpoint.to_s
       end
 
       def popup_uri
         endpoint = URI.parse Paypal.popup_endpoint
-        endpoint.query = query(:popup).to_query
+        endpoint.query = query.to_query
         endpoint.to_s
       end
 
       private
 
-      def query(mode)
+      def query(with_cmd = false)
         _query_ = {:token => self.token}
-        case mode
-        when :redirect
-          if self.on_mobile
-            _query_.merge!(:cmd => '_express-checkout-mobile')
-          else
-            _query_.merge!(:cmd => '_express-checkout')
-          end
-        when :popup
-          # No popup specific params for now
-        end
-        if self.pay_on_paypal
-          _query_.merge!(:useraction => 'commit')
-        end
+        _query_.merge!(:cmd => '_express-checkout') if with_cmd
+        _query_.merge!(:useraction => 'commit')     if pay_on_paypal
         _query_
       end
     end

data/spec/paypal/exception/api_error_spec.rb

@@ -1,73 +1,65 @@
 require 'spec_helper.rb'
 
 describe Paypal::Exception::APIError do
-  describe '.new' do
-    let :error do
-      Paypal::Exception::APIError.new response
-    end
-
-    context 'when Hash is given' do
-      let :response do
-        {
-          :VERSION=>"66.0",
-          :TIMESTAMP=>"2011-03-03T06:33:51Z",
-          :CORRELATIONID=>"758ebdc546b9c",
-          :L_SEVERITYCODE0=>"Error",
-          :L_ERRORCODE0=>"10411",
-          :L_LONGMESSAGE0=>"This Express Checkout session has expired.  Token value is no longer valid.",
-          :BUILD=>"1741654",
-          :ACK=>"Failure",
-          :L_SHORTMESSAGE0=>"This Express Checkout session has expired."
-        }
-      end
+  let(:error) { Paypal::Exception::APIError.new(params) }
 
-      it 'should have Paypal::Exception::APIError::Response as response' do
-        Paypal::Exception::APIError::Response.attribute_mapping.each do |key, value|
-          error.response.send(value).should == response[key]
-        end
-      end
-
-      it 'should have Paypal::Exception::APIError::Response::Detail as response.detail' do
-        detail = error.response.details.first
-        Paypal::Exception::APIError::Response::Detail.attribute_mapping.each do |key, value|
-          detail.send(value).should == response[:"L_#{key}0"]
-        end
-      end
+  context 'when Hash is given' do
+    let :params do
+      {
+        :VERSION=>"66.0",
+        :TIMESTAMP=>"2011-03-03T06:33:51Z",
+        :CORRELATIONID=>"758ebdc546b9c",
+        :L_SEVERITYCODE0=>"Error",
+        :L_ERRORCODE0=>"10411",
+        :L_LONGMESSAGE0=>"This Express Checkout session has expired.  Token value is no longer valid.",
+        :BUILD=>"1741654",
+        :ACK=>"Failure",
+        :L_SHORTMESSAGE0=>"This Express Checkout session has expired."
+      }
+    end
 
-      it 'should have raw response as response.raw' do
-        error.response.raw.should == response
+    describe '#subject' do
+      subject { error.response }
+      its(:raw) { should == params }
+      Paypal::Exception::APIError::Response.attribute_mapping.each do |key, attribute|
+        its(attribute) { should == params[key] }
       end
 
-      context 'when unknown params given' do
-        let :response do
-          {
-            :UNKNOWN => 'Unknown',
-            :L_UNKNOWN0 => 'Unknown Detail'
-          }
-        end
-
-        it 'should warn it and keep it only in response.raw' do
-          Paypal.logger.should_receive(:warn).with(
-            "Ignored Parameter (Paypal::Exception::APIError::Response): UNKNOWN=Unknown"
-          )
-          Paypal.logger.should_receive(:warn).with(
-            "Ignored Parameter (Paypal::Exception::APIError::Response::Detail): UNKNOWN=Unknown Detail"
-          )
-          error
+      describe '#details' do
+        subject { error.response.details.first }
+        Paypal::Exception::APIError::Response::Detail.attribute_mapping.each do |key, attribute|
+          its(attribute) { should == params[:"L_#{key}0"] }
         end
       end
     end
+  end
 
-    context 'otherwise' do
-      let :response do
-        'Failure'
-      end
+  context 'when unknown params given' do
+    let :params do
+      {
+        :UNKNOWN => 'Unknown',
+        :L_UNKNOWN0 => 'Unknown Detail'
+      }
+    end
 
-      it 'should store response in raw format' do
-        error = Paypal::Exception::APIError.new response
-        error.response.should == response
-      end
+    it 'should warn' do
+      Paypal.logger.should_receive(:warn).with(
+        "Ignored Parameter (Paypal::Exception::APIError::Response): UNKNOWN=Unknown"
+      )
+      Paypal.logger.should_receive(:warn).with(
+        "Ignored Parameter (Paypal::Exception::APIError::Response::Detail): UNKNOWN=Unknown Detail"
+      )
+      error
+    end
+    describe '#response' do
+      subject { error.response }
+      its(:raw) { should == params }
     end
   end
-  
+
+  context 'otherwise' do
+    subject { error }
+    let(:params) { 'Failure' }
+    its(:response) { should == params }
+  end
 end

data/spec/paypal/exception/http_error_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper.rb'
 
 describe Paypal::Exception::HttpError do
-  it 'should have code, message and body' do
-    error = Paypal::Exception::HttpError.new(400, 'BadRequest', 'You are bad man!')
-    error.code.should == 400
-    error.message.should == 'BadRequest'
-    error.body.should == 'You are bad man!'
-  end
+  subject { Paypal::Exception::HttpError.new(400, 'BadRequest', 'You are bad man!') }
+  its(:code)    { should == 400 }
+  its(:message) { should == 'BadRequest' }
+  its(:body)    { should == 'You are bad man!' }
 end

data/spec/paypal/express/request_spec.rb

@@ -58,7 +58,7 @@ describe Paypal::Express::Request do
           insufficient_attributes = attributes.reject do |key, value|
             key == missing_key
           end
-          lambda do
+          expect do
             Paypal::Express::Request.new insufficient_attributes
           end.should raise_error AttrRequired::AttrMissing
         end
@@ -67,7 +67,7 @@ describe Paypal::Express::Request do
 
     context 'when all required parameters are given' do
       it 'should succeed' do
-        lambda do
+        expect do
           Paypal::Express::Request.new attributes
         end.should_not raise_error AttrRequired::AttrMissing
       end
@@ -82,7 +82,7 @@ describe Paypal::Express::Request do
     end
 
     it 'should support no_shipping option' do
-      lambda do
+      expect do
         instance.setup instant_payment_request, :no_shipping => true
       end.should request_to 'https://api-3t.paypal.com/nvp', :post
       instance._method_.should == :SetExpressCheckout
@@ -98,7 +98,7 @@ describe Paypal::Express::Request do
 
     context 'when instance payment request given' do
       it 'should call SetExpressCheckout' do
-        lambda do
+        expect do
           instance.setup instant_payment_request
         end.should request_to 'https://api-3t.paypal.com/nvp', :post
         instance._method_.should == :SetExpressCheckout
@@ -113,7 +113,7 @@ describe Paypal::Express::Request do
 
     context 'when recurring payment request given' do
       it 'should call SetExpressCheckout' do
-        lambda do
+        expect do
           instance.setup recurring_payment_request
         end.should request_to 'https://api-3t.paypal.com/nvp', :post
         instance._method_.should == :SetExpressCheckout
@@ -136,7 +136,7 @@ describe Paypal::Express::Request do
     end
 
     it 'should call GetExpressCheckoutDetails' do
-      lambda do
+      expect do
         instance.details 'token'
       end.should request_to 'https://api-3t.paypal.com/nvp', :post
       instance._method_.should == :GetExpressCheckoutDetails
@@ -154,7 +154,7 @@ describe Paypal::Express::Request do
     end
 
     it 'should call DoExpressCheckoutPayment' do
-      lambda do
+      expect do
         instance.checkout! 'token', 'payer_id', instant_payment_request
       end.should request_to 'https://api-3t.paypal.com/nvp', :post
       instance._method_.should == :DoExpressCheckoutPayment
@@ -175,7 +175,7 @@ describe Paypal::Express::Request do
     end
 
     it 'should call CreateRecurringPaymentsProfile' do
-      lambda do
+      expect do
         instance.subscribe! 'token', recurring_profile
       end.should request_to 'https://api-3t.paypal.com/nvp', :post
       instance._method_.should == :CreateRecurringPaymentsProfile
@@ -205,7 +205,7 @@ describe Paypal::Express::Request do
     end
 
     it 'should call GetRecurringPaymentsProfileDetails' do
-      lambda do
+      expect do
         instance.subscription 'profile_id'
       end.should request_to 'https://api-3t.paypal.com/nvp', :post
       instance._method_.should == :GetRecurringPaymentsProfileDetails
@@ -223,7 +223,7 @@ describe Paypal::Express::Request do
     end
 
     it 'should call ManageRecurringPaymentsProfileStatus' do
-      lambda do
+      expect do
         instance.renew! 'profile_id', :Cancel
       end.should request_to 'https://api-3t.paypal.com/nvp', :post
       instance._method_.should == :ManageRecurringPaymentsProfileStatus

data/spec/paypal/express/response_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper.rb'
 
 describe Paypal::Express::Response do
+  before { fake_response 'SetExpressCheckout/success' }
+
   let :request do
     Paypal::Express::Request.new(
       :username => 'nov',
@@ -10,63 +12,57 @@ describe Paypal::Express::Response do
       :cancel_url => 'http://example.com/cancel'
     )
   end
-
   let :payment_request do
     Paypal::Payment::Request.new( 
       :billing_type => :RecurringPayments,
       :billing_agreement_description => 'Recurring Payment Request'
     )
   end
+  let(:response) { request.setup payment_request }
 
-  let :instance do
-    request.setup payment_request
+  describe '#redirect_uri' do
+    subject { response.redirect_uri }
+    it { should include 'https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=' }
   end
 
-  describe '#initialize' do
-    before do
-      fake_response 'SetExpressCheckout/success'
-    end
+  describe '#popup_uri' do
+    subject { response.popup_uri }
+    it { should include 'https://www.paypal.com/incontext?token=' }
+  end
 
-    it 'should support on_mobile option' do
-      response = request.setup payment_request, :on_mobile => true
-      response.on_mobile.should be_true
-      response.send(:query, :redirect)[:cmd].should == '_express-checkout-mobile'
-    end
+  context 'when pay_on_paypal option is given' do
+    let(:response) { request.setup payment_request, :pay_on_paypal => true }
 
-    it 'should support pay_on_paypal option' do
-      response = request.setup payment_request, :pay_on_paypal => true
-      response.pay_on_paypal.should be_true
-      response.send(:query, :popup)[:useraction].should == 'commit'
-      response.send(:query, :redirect)[:useraction].should == 'commit'
-    end
-  end
+    subject { response }
+    its(:pay_on_paypal) { should be_true }
+    its(:query) { should include(:useraction => 'commit') }
 
-  describe '#redirect_uri' do
-    it 'should return express-checkout redirect endpoint with token' do
-      fake_response 'SetExpressCheckout/success'
-      instance.redirect_uri.should == 'https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=EC-5YJ90598G69065317'
+    describe '#redirect_uri' do
+      subject { response.redirect_uri }
+      it { should include 'useraction=commit' }
     end
 
-    it 'should support sandbox mode' do
-      sandbox_mode do
-        fake_response 'SetExpressCheckout/success'
-        instance.redirect_uri.should == 'https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=EC-5YJ90598G69065317'
-      end
+    describe '#popup_uri' do
+      subject { response.popup_uri }
+      it { should include 'useraction=commit' }
     end
   end
 
-  describe '#popup_uri' do
-    it 'should return express-checkout popup endpoint with token' do
+  context 'when sandbox mode' do
+    before do
+      Paypal.sandbox!
       fake_response 'SetExpressCheckout/success'
-      instance.popup_uri.should == 'https://www.paypal.com/incontext?token=EC-5YJ90598G69065317'
     end
+    after { Paypal.sandbox = false }
 
-    it 'should support sandbox mode' do
-      sandbox_mode do
-        fake_response 'SetExpressCheckout/success'
-        instance.popup_uri.should == 'https://www.sandbox.paypal.com/incontext?token=EC-5YJ90598G69065317'
-      end
+    describe '#redirect_uri' do
+      subject { response.redirect_uri }
+      it { should include 'https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=' }
     end
-  end
 
+    describe '#popup_uri' do
+      subject { response.popup_uri }
+      it { should include 'https://www.sandbox.paypal.com/incontext?token=' }
+    end
+  end
 end

data/spec/paypal/ipn_spec.rb

@@ -3,24 +3,16 @@ require 'spec_helper'
 describe Paypal::IPN do
   describe '.verify!' do
     context 'when valid' do
-      before do
-        fake_response 'IPN/valid', :IPN
-      end
-
-      it 'should return true' do
-        Paypal::IPN.verify!("raw-post-body").should be_true
-      end
+      before { fake_response 'IPN/valid', :IPN }
+      subject { Paypal::IPN.verify!('raw-post-body') }
+      it { should be_true }
     end
 
     context 'when invalid' do
-      before do
-        fake_response 'IPN/invalid', :IPN
-      end
-
-      it 'should raise Paypal::Exception::APIError' do
-        lambda do
-          Paypal::IPN.verify!("raw-post-body")
-        end.should raise_error(Paypal::Exception::APIError)
+      before { fake_response 'IPN/invalid', :IPN }
+      subject {}
+      it do
+        expect { Paypal::IPN.verify!('raw-post-body') }.should raise_error(Paypal::Exception::APIError)
       end
     end
   end

data/spec/paypal/nvp/request_spec.rb

@@ -20,7 +20,7 @@ describe Paypal::NVP::Request do
           insufficient_attributes = attributes.reject do |key, value|
             key == missing_key
           end
-          lambda do
+          expect do
             Paypal::NVP::Request.new insufficient_attributes
           end.should raise_error AttrRequired::AttrMissing
         end
@@ -29,7 +29,7 @@ describe Paypal::NVP::Request do
 
     context 'when all required parameters are given' do
       it 'should succeed' do
-        lambda do
+        expect do
           Paypal::NVP::Request.new attributes
         end.should_not raise_error AttrRequired::AttrMissing
       end
@@ -51,7 +51,7 @@ describe Paypal::NVP::Request do
 
   describe '#request' do
     it 'should POST to NPV endpoint' do
-      lambda do
+      expect do
         instance.request :RPCMethod
       end.should request_to Paypal::NVP::Request::ENDPOINT[:production], :post
     end
@@ -62,7 +62,7 @@ describe Paypal::NVP::Request do
       end
 
       it 'should raise Paypal::Exception::APIError' do
-        lambda do
+        expect do
           instance.request :SetExpressCheckout
         end.should raise_error(Paypal::Exception::APIError)
       end
@@ -79,7 +79,7 @@ describe Paypal::NVP::Request do
       end
 
       it 'should raise Paypal::Exception::APIError' do
-        lambda do
+        expect do
           instance.request :SetExpressCheckout
         end.should raise_error(Paypal::Exception::HttpError)
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paypal-express
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - nov matake
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 +09:00
+date: 2011-03-04 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: PayPal Express Checkout API Client Supporting Both Instant and Recurring Payment