paypal-express 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/paypal.rb

@@ -11,6 +11,10 @@ module Paypal
     :production => 'https://www.paypal.com/cgi-bin/webscr',
     :sandbox => 'https://www.sandbox.paypal.com/cgi-bin/webscr'
   }
+  POPUP_ENDPOINT = {
+    :production => 'https://www.paypal.com/incontext',
+    :sandbox => 'https://www.sandbox.paypal.com/incontext'
+  }
 
   def self.endpoint
     if sandbox?
@@ -19,6 +23,13 @@ module Paypal
       Paypal::ENDPOINT[:production]
     end
   end
+  def self.popup_endpoint
+    if sandbox?
+      Paypal::POPUP_ENDPOINT[:sandbox]
+    else
+      Paypal::POPUP_ENDPOINT[:production]
+    end
+  end
 
   def self.log(message, mode = :info)
     self.logger.send mode, message
@@ -51,11 +62,12 @@ require 'paypal/base'
 require 'paypal/ipn'
 require 'paypal/nvp/request'
 require 'paypal/nvp/response'
+require 'paypal/payment/common/amount'
 require 'paypal/express/request'
 require 'paypal/express/response'
 require 'paypal/payment/request'
+require 'paypal/payment/request/item'
 require 'paypal/payment/response'
-require 'paypal/payment/response/amount'
 require 'paypal/payment/response/info'
 require 'paypal/payment/response/payer'
 require 'paypal/payment/response/ship_to'

data/lib/paypal/express/response.rb

@@ -15,6 +15,12 @@ module Paypal
         endpoint.to_s
       end
 
+      def popup_uri
+        endpoint = URI.parse Paypal.popup_endpoint
+        endpoint.query = {:token => self.token}.to_query
+        endpoint.to_s
+      end
+
       private
 
       def query

data/lib/paypal/nvp/response.rb

@@ -27,7 +27,7 @@ module Paypal
         @shipping_options_is_default = attrs.delete(:SHIPPINGOPTIONISDEFAULT) == 'true'
         @success_page_redirect_requested = attrs.delete(:SUCCESSPAGEREDIRECTREQUESTED) == 'true'
         @insurance_option_selected = attrs.delete(:INSURANCEOPTIONSELECTED) == 'true'
-        @amount = Payment::Response::Amount.new(
+        @amount = Payment::Common::Amount.new(
           :total => attrs.delete(:AMT),
           :handing => attrs.delete(:HANDLINGAMT),
           :insurance => attrs.delete(:INSURANCEAMT),

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

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

data/lib/paypal/payment/recurring/billing.rb

@@ -5,10 +5,10 @@ module Paypal
       attr_accessor :amount
 
       def initialize(attributes = {})
-        @amount = if attributes[:amount].is_a?(Response::Amount)
+        @amount = if attributes[:amount].is_a?(Common::Amount)
           attributes[:amount]
         else
-          Response::Amount.new(
+          Common::Amount.new(
             :total => attributes[:amount],
             :tax => attributes[:tax_amount],
             :shipping => attributes[:shipping_amount]

data/lib/paypal/payment/request.rb

@@ -2,9 +2,18 @@ module Paypal
   module Payment
     class Request < Base
       attr_optional :amount, :action, :currency_code, :description, :notify_url, :billing_type, :billing_agreement_description
+      attr_accessor :items
+
+      def initialize(attributes = {})
+        @items = []
+        Array(attributes[:items]).each do |item_attrs|
+          @items << Item.new(item_attrs)
+        end
+        super
+      end
 
       def to_params(index = 0)
-        {
+        params = {
           :"PAYMENTREQUEST_#{index}_PAYMENTACTION" => self.action,
           :"PAYMENTREQUEST_#{index}_AMT" => Util.formatted_amount(self.amount),
           :"PAYMENTREQUEST_#{index}_CURRENCYCODE" => self.currency_code,
@@ -18,6 +27,10 @@ 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)
+        end
+        params
       end
     end
   end

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

@@ -0,0 +1,19 @@
+module Paypal
+  module Payment
+    class Request::Item < Base
+      attr_optional :name, :description, :amount, :quantity, :category
+
+      def to_params(parent_index, index = 0)
+        {
+          :"L_PAYMENTREQUEST_#{parent_index}_NAME#{index}" => self.name,
+          :"L_PAYMENTREQUEST_#{parent_index}_DESC#{index}" => self.description,
+          :"L_PAYMENTREQUEST_#{parent_index}_AMT#{index}" => Util.formatted_amount(self.amount),
+          :"L_PAYMENTREQUEST_#{parent_index}_QTY#{index}" => self.quantity,
+          :"L_PAYMENTREQUEST_#{parent_index}_ITEMCATEGORY#{index}" => self.category
+        }.delete_if do |k, v|
+          v.blank?
+        end
+      end
+    end
+  end
+end

data/lib/paypal/payment/response.rb

@@ -5,7 +5,7 @@ module Paypal
 
       def initialize(attributes = {})
         attrs = attributes.dup
-        @amount = Amount.new(
+        @amount = Common::Amount.new(
           :total => attrs.delete(:AMT),
           :handing => attrs.delete(:HANDLINGAMT),
           :insurance => attrs.delete(:INSURANCEAMT),

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

@@ -24,7 +24,7 @@ module Paypal
         @@attribute_mapping.each do |key, value|
           self.send "#{value}=", attrs.delete(key)
         end
-        @amount = Response::Amount.new(
+        @amount = Common::Amount.new(
           :total => attrs.delete(:AMT),
           :fee => attrs.delete(:FEEAMT),
           :tax => attrs.delete(:TAXAMT)

data/spec/paypal/express/response_spec.rb

@@ -53,4 +53,19 @@ describe Paypal::Express::Response do
       end
     end
   end
+
+  describe '#popup_uri' do
+    it 'should return express-checkout popup endpoint with token' do
+      fake_response 'SetExpressCheckout/success'
+      instance.popup_uri.should == 'https://www.paypal.com/incontext?token=EC-5YJ90598G69065317'
+    end
+
+    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
+    end
+  end
+
 end

data/spec/paypal/payment/{response → common}/amount_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper.rb'
 
-describe Paypal::Payment::Response::Amount do
+describe Paypal::Payment::Common::Amount do
   let :keys do
-    Paypal::Payment::Response::Amount.optional_attributes
+    Paypal::Payment::Common::Amount.optional_attributes
   end
 
   describe '.new' do
     it 'should not allow nil for attributes' do
-      amount = Paypal::Payment::Response::Amount.new
+      amount = Paypal::Payment::Common::Amount.new
       keys.each do |key|
         amount.send(key).should == 0
       end
@@ -18,7 +18,7 @@ describe Paypal::Payment::Response::Amount do
       attributes = keys.inject({}) do |attributes, key|
         attributes.merge!(key => "100")
       end
-      amount = Paypal::Payment::Response::Amount.new attributes
+      amount = Paypal::Payment::Common::Amount.new attributes
       keys.each do |key|
         amount.send(key).should == 100
       end
@@ -27,7 +27,7 @@ describe Paypal::Payment::Response::Amount do
       attributes = keys.inject({}) do |attributes, key|
         attributes.merge!(key => "10.25")
       end
-      amount = Paypal::Payment::Response::Amount.new attributes
+      amount = Paypal::Payment::Common::Amount.new attributes
       keys.each do |key|
         amount.send(key).should == 10.25
       end

data/spec/paypal/payment/recurring_spec.rb

@@ -18,7 +18,7 @@ describe Paypal::Payment::Recurring do
       :aggregate_optional_amount => '0',
       :final_payment_date => '1970-01-01T00:00:00Z',
       :billing => {
-        :amount => Paypal::Payment::Response::Amount.new(
+        :amount => Paypal::Payment::Common::Amount.new(
           :total => '1000',
           :shipping => '0',
           :tax => '0'

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

@@ -0,0 +1,25 @@
+require 'spec_helper.rb'
+
+describe Paypal::Payment::Request::Item do
+  let :instance do
+    Paypal::Payment::Request::Item.new(
+      :name => 'Name',
+      :description => 'Description',
+      :amount => 10,
+      :quantity => 5,
+      :category => :Digital
+    )
+  end
+
+  describe '#to_params' do
+    it 'should handle Recurring Profile activation parameters' do
+      instance.to_params(1).should == {
+        :L_PAYMENTREQUEST_1_NAME0 => 'Name',
+        :L_PAYMENTREQUEST_1_DESC0 => 'Description',
+        :L_PAYMENTREQUEST_1_AMT0 => '10.00',
+        :L_PAYMENTREQUEST_1_QTY0 => 5,
+        :L_PAYMENTREQUEST_1_ITEMCATEGORY0 => :Digital
+      }
+    end
+  end
+end

data/spec/paypal/payment/request_spec.rb

@@ -6,7 +6,12 @@ describe Paypal::Payment::Request do
       :amount => 10,
       :currency_code => :JPY,
       :description => 'Instant Payment Request',
-      :notify_url => 'http://merchant.example.com/notify'
+      :notify_url => 'http://merchant.example.com/notify',
+      :items => [{
+        :name => 'Item1',
+        :description => 'Awesome Item!',
+        :amount => 10
+      }]
     )
   end
 
@@ -39,7 +44,10 @@ describe Paypal::Payment::Request do
         :PAYMENTREQUEST_0_AMT => "10.00",
         :PAYMENTREQUEST_0_CURRENCYCODE => :JPY,
         :PAYMENTREQUEST_0_DESC => "Instant Payment Request", 
-        :PAYMENTREQUEST_0_NOTIFYURL => "http://merchant.example.com/notify"
+        :PAYMENTREQUEST_0_NOTIFYURL => "http://merchant.example.com/notify",
+        :L_PAYMENTREQUEST_0_NAME0 => "Item1",
+        :L_PAYMENTREQUEST_0_DESC0 => "Awesome Item!",
+        :L_PAYMENTREQUEST_0_AMT0 => "10.00"
       }
     end
 

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

@@ -33,7 +33,7 @@ describe Paypal::Payment::Response::Info do
         attribute_mapping.values.each do |key|
           from_symbol_uppercase.send(key).should_not be_nil
         end
-        from_symbol_uppercase.amount.should == Paypal::Payment::Response::Amount.new(
+        from_symbol_uppercase.amount.should == Paypal::Payment::Common::Amount.new(
           :total => 14,
           :fee => 0.85
         )
@@ -54,7 +54,7 @@ describe Paypal::Payment::Response::Info do
         attribute_mapping.values.each do |key|
           from_symbol_lowercase.send(key).should be_nil
         end
-        from_symbol_lowercase.amount.should == Paypal::Payment::Response::Amount.new
+        from_symbol_lowercase.amount.should == Paypal::Payment::Common::Amount.new
       end
     end
 
@@ -69,7 +69,7 @@ describe Paypal::Payment::Response::Info do
         attribute_mapping.values.each do |key|
           from_string.send(key).should be_nil
         end
-        from_string.amount.should == Paypal::Payment::Response::Amount.new
+        from_string.amount.should == Paypal::Payment::Common::Amount.new
       end
     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
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - nov matake
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 +09:00
+date: 2011-02-24 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -166,13 +166,14 @@ files:
 - lib/paypal/ipn.rb
 - lib/paypal/nvp/request.rb
 - lib/paypal/nvp/response.rb
+- lib/paypal/payment/common/amount.rb
 - lib/paypal/payment/recurring.rb
 - lib/paypal/payment/recurring/activation.rb
 - lib/paypal/payment/recurring/billing.rb
 - lib/paypal/payment/recurring/summary.rb
 - lib/paypal/payment/request.rb
+- lib/paypal/payment/request/item.rb
 - lib/paypal/payment/response.rb
-- lib/paypal/payment/response/amount.rb
 - lib/paypal/payment/response/info.rb
 - lib/paypal/payment/response/payer.rb
 - lib/paypal/payment/response/ship_to.rb
@@ -200,10 +201,11 @@ files:
 - spec/paypal/ipn_spec.rb
 - spec/paypal/nvp/request_spec.rb
 - spec/paypal/nvp/response_spec.rb
+- spec/paypal/payment/common/amount_spec.rb
 - spec/paypal/payment/recurring/activation_spec.rb
 - spec/paypal/payment/recurring_spec.rb
+- spec/paypal/payment/request/item_spec.rb
 - spec/paypal/payment/request_spec.rb
-- spec/paypal/payment/response/amount_spec.rb
 - spec/paypal/payment/response/info_spec.rb
 - spec/paypal/payment/response/payer_spec.rb
 - spec/paypal/payment/response/ship_to_spec.rb
@@ -268,10 +270,11 @@ test_files:
 - spec/paypal/ipn_spec.rb
 - spec/paypal/nvp/request_spec.rb
 - spec/paypal/nvp/response_spec.rb
+- spec/paypal/payment/common/amount_spec.rb
 - spec/paypal/payment/recurring/activation_spec.rb
 - spec/paypal/payment/recurring_spec.rb
+- spec/paypal/payment/request/item_spec.rb
 - spec/paypal/payment/request_spec.rb
-- spec/paypal/payment/response/amount_spec.rb
 - spec/paypal/payment/response/info_spec.rb
 - spec/paypal/payment/response/payer_spec.rb
 - spec/paypal/payment/response/ship_to_spec.rb

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

@@ -1,11 +0,0 @@
-module Paypal
-  module Payment
-    class Response::Amount < Base
-      attr_optional :total, :fee, :handing, :insurance, :ship_disc, :shipping, :tax
-
-      def numeric_attribute?(key)
-        true
-      end
-    end
-  end
-end