paypal-express 0.2.6 → 0.2.7

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/lib/paypal/payment/request.rb

@@ -1,10 +1,19 @@
 module Paypal
   module Payment
     class Request < Base
-      attr_optional :amount, :action, :currency_code, :description, :notify_url, :billing_type, :billing_agreement_description
-      attr_accessor :items
+      attr_optional :action, :currency_code, :description, :notify_url, :billing_type, :billing_agreement_description
+      attr_accessor :amount, :items
 
       def initialize(attributes = {})
+        @amount = if attributes[:amount].is_a?(Common::Amount)
+          attributes[:amount]
+        else
+          Common::Amount.new(
+            :total => attributes[:amount],
+            :tax => attributes[:tax_amount],
+            :shipping => attributes[:shipping_amount]
+          )
+        end
         @items = []
         Array(attributes[:items]).each do |item_attrs|
           @items << Item.new(item_attrs)
@@ -15,7 +24,9 @@ module Paypal
       def to_params(index = 0)
         params = {
           :"PAYMENTREQUEST_#{index}_PAYMENTACTION" => self.action,
-          :"PAYMENTREQUEST_#{index}_AMT" => Util.formatted_amount(self.amount),
+          :"PAYMENTREQUEST_#{index}_AMT" => Util.formatted_amount(self.amount.total),
+          :"PAYMENTREQUEST_#{index}_TAXAMT" => Util.formatted_amount(self.amount.tax),
+          :"PAYMENTREQUEST_#{index}_SHIPPINGAMT" => Util.formatted_amount(self.amount.shipping),
           :"PAYMENTREQUEST_#{index}_CURRENCYCODE" => self.currency_code,
           :"PAYMENTREQUEST_#{index}_DESC" => self.description,
           # NOTE:

data/spec/paypal/express/request_spec.rb

@@ -91,6 +91,8 @@ describe Paypal::Express::Request do
         :RETURNURL => 'http://example.com/success',
         :CANCELURL => 'http://example.com/cancel',
         :PAYMENTREQUEST_0_AMT => '1000.00',
+        :PAYMENTREQUEST_0_TAXAMT => "0.00",
+        :PAYMENTREQUEST_0_SHIPPINGAMT => "0.00",
         :REQCONFIRMSHIPPING => 0,
         :NOSHIPPING => 1
       }
@@ -106,7 +108,9 @@ describe Paypal::Express::Request do
           :PAYMENTREQUEST_0_DESC => 'Instant Payment Request',
           :RETURNURL => 'http://example.com/success',
           :CANCELURL => 'http://example.com/cancel',
-          :PAYMENTREQUEST_0_AMT => '1000.00'
+          :PAYMENTREQUEST_0_AMT => '1000.00',
+          :PAYMENTREQUEST_0_TAXAMT => "0.00",
+          :PAYMENTREQUEST_0_SHIPPINGAMT => "0.00"
         }
       end
     end
@@ -122,7 +126,9 @@ describe Paypal::Express::Request do
           :L_BILLINGAGREEMENTDESCRIPTION0 => 'Recurring Payment Request',
           :RETURNURL => 'http://example.com/success',
           :CANCELURL => 'http://example.com/cancel',
-          :PAYMENTREQUEST_0_AMT => '0.00'
+          :PAYMENTREQUEST_0_AMT => '0.00',
+          :PAYMENTREQUEST_0_TAXAMT => "0.00",
+          :PAYMENTREQUEST_0_SHIPPINGAMT => "0.00"
         }
       end
     end
@@ -162,7 +168,9 @@ describe Paypal::Express::Request do
         :PAYERID => 'payer_id',
         :TOKEN => 'token',
         :PAYMENTREQUEST_0_DESC => 'Instant Payment Request',
-        :PAYMENTREQUEST_0_AMT => '1000.00'
+        :PAYMENTREQUEST_0_AMT => '1000.00',
+        :PAYMENTREQUEST_0_TAXAMT => "0.00",
+        :PAYMENTREQUEST_0_SHIPPINGAMT => "0.00"
       }
     end
   end

data/spec/paypal/payment/request_spec.rb

@@ -3,7 +3,9 @@ require 'spec_helper.rb'
 describe Paypal::Payment::Request do
   let :instant_request do
     Paypal::Payment::Request.new(
-      :amount => 23.8,
+      :amount => 25.7,
+      :tax_amount => 0.4,
+      :shipping_amount => 1.5,
       :currency_code => :JPY,
       :description => 'Instant Payment Request',
       :notify_url => 'http://merchant.example.com/notify',
@@ -16,7 +18,7 @@ describe Paypal::Payment::Request do
         :quantity => 3,
         :name => 'Item2',
         :description => 'Awesome Item 2!',
-        :amount => 1.1        
+        :amount => 1.1
       }]
     )
   end
@@ -31,7 +33,9 @@ describe Paypal::Payment::Request do
 
   describe '.new' do
     it 'should handle Instant Payment parameters' do
-      instant_request.amount.should == 23.8
+      instant_request.amount.total.should == 25.7
+      instant_request.amount.tax.should == 0.4
+      instant_request.amount.shipping.should == 1.5
       instant_request.currency_code.should == :JPY
       instant_request.description.should == 'Instant Payment Request'
       instant_request.notify_url.should == 'http://merchant.example.com/notify'
@@ -47,7 +51,9 @@ describe Paypal::Payment::Request do
   describe '#to_params' do
     it 'should handle Instant Payment parameters' do
       instant_request.to_params.should == {
-        :PAYMENTREQUEST_0_AMT => "23.80",
+        :PAYMENTREQUEST_0_AMT => "25.70",
+        :PAYMENTREQUEST_0_TAXAMT => "0.40",
+        :PAYMENTREQUEST_0_SHIPPINGAMT => "1.50",
         :PAYMENTREQUEST_0_CURRENCYCODE => :JPY,
         :PAYMENTREQUEST_0_DESC => "Instant Payment Request", 
         :PAYMENTREQUEST_0_NOTIFYURL => "http://merchant.example.com/notify",
@@ -66,6 +72,8 @@ describe Paypal::Payment::Request do
     it 'should handle Recurring Payment parameters' do
       recurring_request.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"

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: paypal-express
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 6
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - nov matake
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 +09:00
-default_executable: 
+date: 2011-04-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -26,10 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
         version: "2.3"
   type: :runtime
   version_requirements: *id001
@@ -41,9 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -55,9 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -69,11 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 0
-        - 3
         version: 0.0.3
   type: :runtime
   version_requirements: *id004
@@ -85,10 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
         version: "0.8"
   type: :development
   version_requirements: *id005
@@ -100,10 +75,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
         version: "0.9"
   type: :development
   version_requirements: *id006
@@ -115,9 +86,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
         version: "2"
   type: :development
   version_requirements: *id007
@@ -129,11 +97,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
         version: 1.3.0
   type: :development
   version_requirements: *id008
@@ -214,7 +177,6 @@ files:
 - spec/paypal/payment/response_spec.rb
 - spec/paypal/util_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/nov/paypal-express
 licenses: []
 
@@ -228,25 +190,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: PayPal Express Checkout API Client for Instance, Recurring and Digital Goods Payment.