paypal-express 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/paypal/express/request.rb

@@ -8,6 +8,10 @@ module Paypal
           :RETURNURL => self.return_url,
           :CANCELURL => self.cancel_url
         }
+        if options[:no_shipping]
+          params[:REQCONFIRMSHIPPING] = 0
+          params[:NOSHIPPING] = 1
+        end
         Array(payment_requests).each_with_index do |payment_request, index|
           params.merge! payment_request.to_params(index)
         end

data/lib/paypal/express/response.rb

@@ -11,24 +11,29 @@ module Paypal
 
       def redirect_uri
         endpoint = URI.parse Paypal.endpoint
-        endpoint.query = query.to_query
+        endpoint.query = query(:redirect).to_query
         endpoint.to_s
       end
 
       def popup_uri
         endpoint = URI.parse Paypal.popup_endpoint
-        endpoint.query = {:token => self.token}.to_query
+        endpoint.query = query(:popup).to_query
         endpoint.to_s
       end
 
       private
 
-      def query
+      def query(mode)
         _query_ = {:token => self.token}
-        if self.on_mobile
-          _query_.merge!(:cmd => '_express-checkout-mobile')
-        else
-          _query_.merge!(:cmd => '_express-checkout')
+        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')

data/lib/paypal/payment/request.rb

@@ -27,8 +27,11 @@ module Paypal
         }.delete_if do |k, v|
           v.blank?
         end
-        self.items.each_with_index do |item, item_index|
-          params.merge! item.to_params(index, item_index)
+        if self.items.present?
+          params[:"PAYMENTREQUEST_#{index}_ITEMAMT"] = items.sum(&:amount)
+          self.items.each_with_index do |item, item_index|
+            params.merge! item.to_params(index, item_index)
+          end
         end
         params
       end

data/lib/paypal/payment/request/item.rb

@@ -3,6 +3,10 @@ module Paypal
     class Request::Item < Base
       attr_optional :name, :description, :amount, :quantity, :category
 
+      def initialize(attributes = {})
+        @quantity ||= 1
+      end
+
       def to_params(parent_index, index = 0)
         {
           :"L_PAYMENTREQUEST_#{parent_index}_NAME#{index}" => self.name,

data/spec/paypal/express/response_spec.rb

@@ -30,13 +30,14 @@ describe Paypal::Express::Response do
     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'
+      response.send(:query, :redirect)[: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'
+      response.send(:query, :popup)[:useraction].should == 'commit'
+      response.send(:query, :redirect)[:useraction].should == 'commit'
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paypal-express
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - nov matake