paypal-express 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/paypal.rb

@@ -71,6 +71,7 @@ require 'paypal/payment/request'
 require 'paypal/payment/request/item'
 require 'paypal/payment/response'
 require 'paypal/payment/response/info'
+require 'paypal/payment/response/item'
 require 'paypal/payment/response/payer'
 require 'paypal/payment/response/ship_to'
 require 'paypal/payment/recurring'

data/lib/paypal/nvp/response.rb

@@ -11,13 +11,15 @@ module Paypal
         :CORRELATIONID => :colleration_id,
         :COUNTRYCODE => :country_code,
         :CURRENCYCODE => :currency_code,
+        :DESC => :description,
         :TIMESTAMP => :timestamp,
         :TOKEN => :token,
+        :NOTIFYURL => :notify_url,
         :VERSION => :version
       }
       attr_accessor *@@attribute_mapping.values
       attr_accessor :shipping_options_is_default, :success_page_redirect_requested, :insurance_option_selected
-      attr_accessor :amount, :ship_to, :payer, :recurring, :payment_responses, :payment_info
+      attr_accessor :amount, :description, :ship_to, :payer, :recurring, :payment_responses, :payment_info, :items
 
       def initialize(attributes = {})
         attrs = attributes.dup
@@ -29,6 +31,7 @@ module Paypal
         @insurance_option_selected = attrs.delete(:INSURANCEOPTIONSELECTED) == 'true'
         @amount = Payment::Common::Amount.new(
           :total => attrs.delete(:AMT),
+          :item => attrs.delete(:ITEMAMT),
           :handing => attrs.delete(:HANDLINGAMT),
           :insurance => attrs.delete(:INSURANCEAMT),
           :ship_disc => attrs.delete(:SHIPDISCAMT),
@@ -61,7 +64,7 @@ module Paypal
             # NOTE:
             #  CreateRecurringPaymentsProfile returns PROFILESTATUS
             #  GetRecurringPaymentsProfileDetails returns STATUS
-            :description => attrs.delete(:DESC),
+            :description => @description,
             :status => attrs.delete(:STATUS) || attrs.delete(:PROFILESTATUS),
             :start_date => attrs.delete(:PROFILESTARTDATE),
             :name => attrs.delete(:SUBSCRIBERNAME),
@@ -107,12 +110,16 @@ module Paypal
 
         # payment_responses
         payment_responses = []
-        attrs.keys.each do |attribute|
-          prefix, index, key = attribute.to_s.split('_')
-          case prefix
-          when 'PAYMENTREQUEST', 'PAYMENTREQUESTINFO'
+        attrs.keys.each do |_attr_|
+          prefix, index, key = case _attr_.to_s
+          when /^PAYMENTREQUEST/, /^PAYMENTREQUESTINFO/
+            _attr_.to_s.split('_')
+          when /^L_PAYMENTREQUEST/
+            _attr_.to_s.split('_')[1..-1]
+          end
+          if prefix
             payment_responses[index.to_i] ||= {}
-            payment_responses[index.to_i][key.to_sym] = attrs.delete(attribute)
+            payment_responses[index.to_i][key.to_sym] ||= attrs.delete(_attr_)
           end
         end
         @payment_responses = payment_responses.collect do |_attrs_|
@@ -132,6 +139,19 @@ module Paypal
           Payment::Response::Info.new _attrs_
         end
 
+        # payment_info
+        items = []
+        attrs.keys.each do |_attr_|
+          key, index = _attr_.to_s.scan(/^L_(.+)(\d)$/).flatten
+          if index
+            items[index.to_i] ||= {}
+            items[index.to_i][key.to_sym] = attrs.delete(_attr_)
+          end
+        end
+        @items = items.collect do |_attrs_|
+          Payment::Response::Item.new _attrs_
+        end
+
         # remove duplicated parameters
         attrs.delete(:SHIPTOCOUNTRY) # NOTE: Same with SHIPTOCOUNTRYCODE
 
@@ -142,4 +162,4 @@ module Paypal
       end
     end
   end
-end
+end

data/lib/paypal/payment/common/amount.rb

@@ -2,7 +2,7 @@ module Paypal
   module Payment
     module Common
       class Amount < Base
-        attr_optional :total, :fee, :handing, :insurance, :ship_disc, :shipping, :tax
+        attr_optional :total, :item, :fee, :handing, :insurance, :ship_disc, :shipping, :tax
 
         def numeric_attribute?(key)
           true

data/lib/paypal/payment/response.rb

@@ -1,12 +1,13 @@
 module Paypal
   module Payment
     class Response < Base
-      attr_accessor :amount, :ship_to, :insurance_option_offered, :currency_code, :error_code
+      attr_accessor :amount, :ship_to, :description, :items, :notify_url, :insurance_option_offered, :currency_code, :error_code
 
       def initialize(attributes = {})
         attrs = attributes.dup
         @amount = Common::Amount.new(
           :total => attrs.delete(:AMT),
+          :item => attrs.delete(:ITEMAMT),
           :handing => attrs.delete(:HANDLINGAMT),
           :insurance => attrs.delete(:INSURANCEAMT),
           :ship_disc => attrs.delete(:SHIPDISCAMT),
@@ -22,10 +23,25 @@ module Paypal
           :country_code => attrs.delete(:SHIPTOCOUNTRYCODE),
           :country_name => attrs.delete(:SHIPTOCOUNTRYNAME)
         )
+        @description = attrs.delete(:DESC)
+        @notify_url = attrs.delete(:NOTIFYURL)
         @insurance_option_offered = attrs.delete(:INSURANCEOPTIONOFFERED) == 'true'
         @currency_code = attrs.delete(:CURRENCYCODE)
         @error_code = attrs.delete(:ERRORCODE)
 
+        # items
+        items = []
+        attrs.keys.each do |_attr_|
+          key, index = _attr_.to_s.scan(/^(.+)(\d)$/).flatten
+          if index
+            items[index.to_i] ||= {}
+            items[index.to_i][key.to_sym] = attrs.delete(:"#{key}#{index}")
+          end
+        end 
+        @items = items.collect do |_attr_|
+          Item.new(_attr_)
+        end
+
         # warn ignored params
         attrs.each do |key, value|
           Paypal.log "Ignored Parameter (#{self.class}): #{key}=#{value}", :warn

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

@@ -0,0 +1,36 @@
+module Paypal
+  module Payment
+    class Response::Item < Base
+      cattr_reader :attribute_mapping
+      @@attribute_mapping = {
+        :NAME => :name,
+        :DESC => :description,
+        :QTY => :quantity,
+        :ITEMCATEGORY => :category,
+        :ITEMWIDTHVALUE => :width,
+        :ITEMHEIGHTVALUE => :height,
+        :ITEMLENGTHVALUE => :length,
+        :ITEMWEIGHTVALUE => :weight
+      }
+      attr_accessor *@@attribute_mapping.values
+      attr_accessor :amount
+
+      def initialize(attributes = {})
+        attrs = attributes.dup
+        @@attribute_mapping.each do |key, value|
+          self.send "#{value}=", attrs.delete(key)
+        end
+        @quantity = @quantity.to_i
+        @amount = Common::Amount.new(
+          :total => attrs.delete(:AMT),
+          :tax => attrs.delete(:TAXAMT)
+        )
+
+        # warn ignored params
+        attrs.each do |key, value|
+          Paypal.log "Ignored Parameter (#{self.class}): #{key}=#{value}", :warn
+        end
+      end
+    end
+  end
+end

data/spec/fake_response/GetExpressCheckoutDetails/success.txt

@@ -1 +1 @@
-TOKEN=EC%2d99G324856K8277846&CHECKOUTSTATUS=PaymentActionNotInitiated&TIMESTAMP=2011%2d02%2d08T07%3a14%3a29Z&CORRELATIONID=e4e63a7a94b02&ACK=Success&VERSION=66%2e0&BUILD=1721431&EMAIL=valid_1296805890_per%40matake%2ejp&PAYERID=PRT3TZ6MCBCNC&PAYERSTATUS=verified&FIRSTNAME=Test&LASTNAME=User&COUNTRYCODE=US&SHIPTONAME=Test%20User&SHIPTOSTREET=1%20Main%20St&SHIPTOCITY=San%20Jose&SHIPTOSTATE=CA&SHIPTOZIP=95131&SHIPTOCOUNTRYCODE=US&SHIPTOCOUNTRYNAME=United%20States&ADDRESSSTATUS=Confirmed&CURRENCYCODE=USD&AMT=14%2e00&SHIPPINGAMT=0%2e00&HANDLINGAMT=0%2e00&TAXAMT=0%2e00&INSURANCEAMT=0%2e00&SHIPDISCAMT=0%2e00&PAYMENTREQUEST_0_CURRENCYCODE=USD&PAYMENTREQUEST_0_AMT=14%2e00&PAYMENTREQUEST_0_SHIPPINGAMT=0%2e00&PAYMENTREQUEST_0_HANDLINGAMT=0%2e00&PAYMENTREQUEST_0_TAXAMT=0%2e00&PAYMENTREQUEST_0_INSURANCEAMT=0%2e00&PAYMENTREQUEST_0_SHIPDISCAMT=0%2e00&PAYMENTREQUEST_0_INSURANCEOPTIONOFFERED=false&PAYMENTREQUEST_0_SHIPTONAME=Test%20User&PAYMENTREQUEST_0_SHIPTOSTREET=1%20Main%20St&PAYMENTREQUEST_0_SHIPTOCITY=San%20Jose&PAYMENTREQUEST_0_SHIPTOSTATE=CA&PAYMENTREQUEST_0_SHIPTOZIP=95131&PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE=US&PAYMENTREQUEST_0_SHIPTOCOUNTRYNAME=United%20States&PAYMENTREQUESTINFO_0_ERRORCODE=0
+TOKEN=EC%2d7HG122968U843864S&CHECKOUTSTATUS=PaymentActionNotInitiated&TIMESTAMP=2011%2d04%2d12T03%3a51%3a58Z&CORRELATIONID=6a0a92ea79ac3&ACK=Success&VERSION=69%2e0&BUILD=1824201&EMAIL=buyer_1297999636_per%40cerego%2ecom&PAYERID=9RWDTMRKKHQ8S&PAYERSTATUS=verified&FIRSTNAME=Test&LASTNAME=User&COUNTRYCODE=US&CURRENCYCODE=JPY&AMT=10&ITEMAMT=10&SHIPPINGAMT=0&HANDLINGAMT=0&TAXAMT=0&DESC=Instant%20Payment%20Request&NOTIFYURL=http%3a%2f%2fmerchant%2eexample%2ecom%2fnotify&INSURANCEAMT=0&SHIPDISCAMT=0&L_NAME0=Item1&L_QTY0=1&L_TAXAMT0=0&L_AMT0=10&L_DESC0=Item1%20Desc&L_ITEMWEIGHTVALUE0=%20%20%200%2e00000&L_ITEMLENGTHVALUE0=%20%20%200%2e00000&L_ITEMWIDTHVALUE0=%20%20%200%2e00000&L_ITEMHEIGHTVALUE0=%20%20%200%2e00000&L_ITEMCATEGORY0=Digital&PAYMENTREQUEST_0_CURRENCYCODE=JPY&PAYMENTREQUEST_0_AMT=10&PAYMENTREQUEST_0_ITEMAMT=10&PAYMENTREQUEST_0_SHIPPINGAMT=0&PAYMENTREQUEST_0_HANDLINGAMT=0&PAYMENTREQUEST_0_TAXAMT=0&PAYMENTREQUEST_0_DESC=Instant%20Payment%20Request&PAYMENTREQUEST_0_NOTIFYURL=http%3a%2f%2fmerchant%2eexample%2ecom%2fnotify&PAYMENTREQUEST_0_INSURANCEAMT=0&PAYMENTREQUEST_0_SHIPDISCAMT=0&PAYMENTREQUEST_0_INSURANCEOPTIONOFFERED=false&L_PAYMENTREQUEST_0_NAME0=Item1&L_PAYMENTREQUEST_0_QTY0=1&L_PAYMENTREQUEST_0_TAXAMT0=0&L_PAYMENTREQUEST_0_AMT0=10&L_PAYMENTREQUEST_0_DESC0=Item1%20Desc&L_PAYMENTREQUEST_0_ITEMWEIGHTVALUE0=%20%20%200%2e00000&L_PAYMENTREQUEST_0_ITEMLENGTHVALUE0=%20%20%200%2e00000&L_PAYMENTREQUEST_0_ITEMWIDTHVALUE0=%20%20%200%2e00000&L_PAYMENTREQUEST_0_ITEMHEIGHTVALUE0=%20%20%200%2e00000&L_PAYMENTREQUEST_0_ITEMCATEGORY0=Digital&PAYMENTREQUESTINFO_0_ERRORCODE=0

data/spec/paypal/nvp/response_spec.rb

@@ -62,7 +62,7 @@ describe Paypal::NVP::Response do
       it 'should handle all attributes' do
         Paypal.logger.should_not_receive(:warn)
         response = request.details 'token'
-        response.payer.identifier.should == 'PRT3TZ6MCBCNC'
+        response.payer.identifier.should == '9RWDTMRKKHQ8S'
         response.payment_responses.size.should == 1
         response.payment_info.size.should == 0
         response.payment_responses.first.should be_instance_of(Paypal::Payment::Response)

data/spec/paypal/payment/request_spec.rb

@@ -3,18 +3,14 @@ require 'spec_helper.rb'
 describe Paypal::Payment::Request do
   let :instant_request do
     Paypal::Payment::Request.new(
-      :amount => 20.3,
+      :amount => 10.25,
       :currency_code => :JPY,
       :description => 'Instant Payment Request',
       :notify_url => 'http://merchant.example.com/notify',
       :items => [{
-        :name => 'Item0',
-        :description => 'Awesome Item!',
-        :amount => 10.25
-      }, {
         :name => 'Item1',
         :description => 'Awesome Item!',
-        :amount => 10.05
+        :amount => 10.25
       }]
     )
   end
@@ -29,7 +25,7 @@ describe Paypal::Payment::Request do
 
   describe '.new' do
     it 'should handle Instant Payment parameters' do
-      instant_request.amount.should == 20.3
+      instant_request.amount.should == 10.25
       instant_request.currency_code.should == :JPY
       instant_request.description.should == 'Instant Payment Request'
       instant_request.notify_url.should == 'http://merchant.example.com/notify'
@@ -45,19 +41,15 @@ describe Paypal::Payment::Request do
   describe '#to_params' do
     it 'should handle Instant Payment parameters' do
       instant_request.to_params.should == {
-        :PAYMENTREQUEST_0_AMT => "20.30",
+        :PAYMENTREQUEST_0_AMT => "10.25",
         :PAYMENTREQUEST_0_CURRENCYCODE => :JPY,
         :PAYMENTREQUEST_0_DESC => "Instant Payment Request", 
         :PAYMENTREQUEST_0_NOTIFYURL => "http://merchant.example.com/notify",
-        :PAYMENTREQUEST_0_ITEMAMT => "20.30",
-        :L_PAYMENTREQUEST_0_NAME0 => "Item0",
+        :PAYMENTREQUEST_0_ITEMAMT => "10.25",
+        :L_PAYMENTREQUEST_0_NAME0 => "Item1",
         :L_PAYMENTREQUEST_0_DESC0 => "Awesome Item!",
         :L_PAYMENTREQUEST_0_AMT0 => "10.25",
-        :L_PAYMENTREQUEST_0_QTY0 => 1,
-        :L_PAYMENTREQUEST_0_NAME1 => "Item1",
-        :L_PAYMENTREQUEST_0_DESC1 => "Awesome Item!",
-        :L_PAYMENTREQUEST_0_AMT1 => "10.05",
-        :L_PAYMENTREQUEST_0_QTY1 => 1
+        :L_PAYMENTREQUEST_0_QTY0 => 1
       }
     end
 
@@ -70,4 +62,4 @@ describe Paypal::Payment::Request do
       }
     end
   end
-end
+end

data/spec/paypal/payment/response/item_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper.rb'
+
+describe Paypal::Payment::Response::Info do
+  let :attributes do
+    {
+      :NAME => 'Item Name',
+      :DESC => 'Item Description',
+      :QTY => '1',
+      :ITEMCATEGORY => 'Digital',
+      :ITEMWIDTHVALUE => '1.0',
+      :ITEMHEIGHTVALUE => '2.0',
+      :ITEMLENGTHVALUE => '3.0',
+      :ITEMWEIGHTVALUE => '4.0'
+    }
+  end
+
+  describe '.new' do
+    subject { Paypal::Payment::Response::Item.new(attributes) }
+    its(:name) { should == 'Item Name' }
+    its(:description) { should == 'Item Description' }
+    its(:quantity) { should == 1 }
+    its(:category) { should == 'Digital' }
+    its(:width) { should == '1.0' }
+    its(:height) { should == '2.0' }
+    its(:length) { should == '3.0' }
+    its(:weight) { should == '4.0' }
+
+    context 'when non-supported attributes are given' do
+      it 'should ignore them and warn' do
+        _attr_ = attributes.merge(
+          :ignored => 'Ignore me!'
+        )
+        Paypal.logger.should_receive(:warn).with(
+          "Ignored Parameter (Paypal::Payment::Response::Item): ignored=Ignore me!"
+        )
+        Paypal::Payment::Response::Item.new _attr_
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paypal-express
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - nov matake
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 +09:00
+date: 2011-04-12 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -175,6 +175,7 @@ files:
 - lib/paypal/payment/request/item.rb
 - lib/paypal/payment/response.rb
 - lib/paypal/payment/response/info.rb
+- lib/paypal/payment/response/item.rb
 - lib/paypal/payment/response/payer.rb
 - lib/paypal/payment/response/ship_to.rb
 - lib/paypal/util.rb
@@ -207,6 +208,7 @@ files:
 - spec/paypal/payment/request/item_spec.rb
 - spec/paypal/payment/request_spec.rb
 - spec/paypal/payment/response/info_spec.rb
+- spec/paypal/payment/response/item_spec.rb
 - spec/paypal/payment/response/payer_spec.rb
 - spec/paypal/payment/response/ship_to_spec.rb
 - spec/paypal/payment/response_spec.rb
@@ -244,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: PayPal Express Checkout API Client for Instance, Recurring and Digital Goods Payment.
@@ -277,6 +279,7 @@ test_files:
 - spec/paypal/payment/request/item_spec.rb
 - spec/paypal/payment/request_spec.rb
 - spec/paypal/payment/response/info_spec.rb
+- spec/paypal/payment/response/item_spec.rb
 - spec/paypal/payment/response/payer_spec.rb
 - spec/paypal/payment/response/ship_to_spec.rb
 - spec/paypal/payment/response_spec.rb