paypal-express 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/paypal/express/request.rb

@@ -3,7 +3,7 @@ module Paypal
     class Request < NVP::Request
       attr_required :return_url, :cancel_url
 
-      def setup(payment_requests)
+      def setup(payment_requests, options = {})
         params = {
           :RETURNURL => self.return_url,
           :CANCELURL => self.cancel_url
@@ -12,7 +12,7 @@ module Paypal
           params.merge! payment_request.to_params(index)
         end
         response = self.request :SetExpressCheckout, params
-        Response.new response
+        Response.new response, options
       end
 
       def details(token)

data/lib/paypal/express/response.rb

@@ -1,14 +1,34 @@
 module Paypal
   module Express
     class Response < NVP::Response
+      attr_accessor :on_mobile, :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 = {
-          :cmd => '_express-checkout',
-          :token => self.token
-        }.to_query
+        endpoint.query = query.to_query
         endpoint.to_s
       end
+
+      private
+
+      def query
+        _query_ = {:token => self.token}
+        if self.on_mobile
+          _query_.merge!(:cmd => '_express-checkout-mobile')
+        else
+          _query_.merge!(:cmd => '_express-checkout')
+        end
+        if self.pay_on_paypal
+          _query_.merge!(:useraction => 'commit')
+        end
+        _query_
+      end
     end
   end
 end

data/spec/paypal/express/response_spec.rb

@@ -1,20 +1,45 @@
 require 'spec_helper.rb'
 
 describe Paypal::Express::Response do
-  let :instance do
-    request = Paypal::Express::Request.new(
+  let :request do
+    Paypal::Express::Request.new(
       :username => 'nov',
       :password => 'password',
       :signature => 'sig',
       :return_url => 'http://example.com/success',
       :cancel_url => 'http://example.com/cancel'
     )
-    request.setup Paypal::Payment::Request.new( 
+  end
+
+  let :payment_request do
+    Paypal::Payment::Request.new( 
       :billing_type => :RecurringPayments,
       :billing_agreement_description => 'Recurring Payment Request'
     )
   end
 
+  let :instance do
+    request.setup payment_request
+  end
+
+  describe '#initialize' do
+    before do
+      fake_response 'SetExpressCheckout/success'
+    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)[:cmd].should == '_express-checkout-mobile'
+    end
+
+    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)[:useraction].should == 'commit'
+    end
+  end
+
   describe '#redirect_uri' do
     it 'should return express-checkout redirect endpoint with token' do
       fake_response 'SetExpressCheckout/success'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paypal-express
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - nov matake
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +09:00
+date: 2011-02-14 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -242,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: PayPal Express Checkout API Client Supporting Both Instant and Recurring Payment