paypal_permissions 0.0.5.4 → 0.0.5.5

data/lib/paypal_permissions/paypal_permissions_gateway.rb

@@ -3,7 +3,6 @@ require 'active_merchant/billing'
 require 'active_merchant/billing/gateway'
 require 'paypal_permissions/parsers'
 require 'paypal_permissions/x_pp_authorization'
-require 'uri'
 require 'cgi'
 
 
@@ -36,9 +35,9 @@ module ActiveMerchant #:nodoc:
         get_access_token_headers = request_permissions_headers.dup
         get_basic_personal_data_headers = lambda { |access_token, access_token_verifier|
           {
-            'X-PAYPAL-SECURITY-USERID' => @login,
-            'X-PAYPAL-SECURITY-PASSWORD' => @password,
-            'X-PAYPAL-SECURITY-SIGNATURE' => @api_signature,
+            #'X-PAYPAL-SECURITY-USERID' => @login,
+            #'X-PAYPAL-SECURITY-PASSWORD' => @password,
+            #'X-PAYPAL-SECURITY-SIGNATURE' => @api_signature,
             'X-PAYPAL-APPLICATION-ID' => @app_id,
             'X-PAYPAL-REQUEST-DATA-FORMAT' => 'NV',
             'X-PAYPAL-RESPONSE-DATA-FORMAT' => 'NV',
@@ -46,9 +45,9 @@ module ActiveMerchant #:nodoc:
         }
         get_advanced_personal_data_headers = lambda { |access_token, access_token_verifier|
           {
-            'X-PAYPAL-SECURITY-USERID' => @login,
-            'X-PAYPAL-SECURITY-PASSWORD' => @password,
-            'X-PAYPAL-SECURITY-SIGNATURE' => @api_signature,
+            #'X-PAYPAL-SECURITY-USERID' => @login,
+            #'X-PAYPAL-SECURITY-PASSWORD' => @password,
+            #'X-PAYPAL-SECURITY-SIGNATURE' => @api_signature,
             'X-PAYPAL-APPLICATION-ID' => @app_id,
             'X-PAYPAL-REQUEST-DATA-FORMAT' => 'NV',
             'X-PAYPAL-RESPONSE-DATA-FORMAT' => 'NV',
@@ -163,7 +162,7 @@ module ActiveMerchant #:nodoc:
       private
       def build_request_permissions_query_string(callback_url, scope)
         scopes_query = build_scopes_query_string(scope)
-        "requestEnvelope.errorLanguage=en_US&#{scopes_query}&callback=#{URI.encode(callback_url)}"
+        "requestEnvelope.errorLanguage=en_US&#{scopes_query}&callback=#{CGI.escape(callback_url)}"
       end
 
       private
@@ -175,7 +174,13 @@ module ActiveMerchant #:nodoc:
         else
           scopes = []
         end
-        scopes.collect{ |s| "scope=#{URI.encode(s.to_s.strip.upcase)}" }.join("&")
+
+        scopes_str = ""
+        (0...scopes.length).each { |idx|
+          s = scopes[idx]
+          scopes_str += "&scope(#{idx})=#{CGI.escape(s.to_s.strip.upcase)}"
+        }
+        scopes_str[1..-1]
       end
 
       private
@@ -191,14 +196,6 @@ module ActiveMerchant #:nodoc:
         end
         body += "requestEnvelope.errorLanguage=en_US"
       end
-
-
-=begin
-      private
-      def setup_purchase(options)
-        commit('Pay', build_adaptive_payment_pay_request(options))
-      end
-=end
     end
   end
 end

data/lib/paypal_permissions/version.rb

@@ -1,3 +1,3 @@
 module PaypalPermissions
-  VERSION = "0.0.5.4"
+  VERSION = "0.0.5.5"
 end

data/lib/paypal_permissions/x_pp_authorization.rb

@@ -1,6 +1,16 @@
+require 'cgi'
 require 'openssl'
 require 'base64'
 
+
+class Hash
+  def to_paypal_permissions_query
+    collect do |key, value|
+      "#{key}=#{value}"
+    end.sort * '&'
+  end
+end
+
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module XPPAuthorization
@@ -8,7 +18,7 @@ module ActiveMerchant #:nodoc:
       def x_pp_authorization_header url, api_user_id, api_password, access_token, access_token_verifier
         timestamp = Time.now.to_i.to_s
         signature = x_pp_authorization_signature url, api_user_id, api_password, timestamp, access_token, access_token_verifier
-        { 'X-PP-AUTHORIZATION' => "token=#{access_token},signature=#{signature},timestamp=#{timestamp}" }
+        { 'X-PAYPAL-AUTHORIZATION' => "token=#{access_token},signature=#{signature},timestamp=#{timestamp}" }
       end
 
       public
@@ -16,8 +26,8 @@ module ActiveMerchant #:nodoc:
         # no query params, but if there were, this is where they'd go
         query_params = {}
         key = [
-          URI.encode(api_password),
-          URI.encode(access_token_verifier),
+          paypal_encode(api_password),
+          paypal_encode(access_token_verifier),
         ].join("&")
 
         params = query_params.dup.merge({
@@ -27,17 +37,29 @@ module ActiveMerchant #:nodoc:
           "oauth_token" => access_token,
           "oauth_timestamp" => timestamp,
         })
-        sorted_params = Hash[params.sort]
-        sorted_query_string = sorted_params.to_query
+        sorted_query_string = params.to_paypal_permissions_query
 
         base = [
           "POST",
-          URI.encode(url),
-          URI.encode(sorted_query_string)
+          paypal_encode(url),
+          paypal_encode(sorted_query_string)
         ].join("&")
+        base = base.gsub /%([0-9A-F])([0-9A-F])/ do
+          "%#{$1.downcase}#{$2.downcase}"  # hack to match PayPal Java SDK bit for bit
+        end
+
+        digest = OpenSSL::HMAC.digest('sha1', key, base)
+        Base64.encode64(digest).chomp
+      end
 
-        hexdigest = OpenSSL::HMAC.hexdigest('sha1', key, base)
-        Base64.encode64(hexdigest).chomp
+      # The PayPalURLEncoder java class percent encodes everything other than 'a-zA-Z0-9 _'.
+      # Then it converts ' ' to '+'.
+      # Ruby's CGI.encode takes care of the ' ' and '*' to satisfy PayPal
+      # (but beware, URI.encode percent encodes spaces, and does nothing with '*').
+      # Finally, CGI.encode does not encode '.-', which we need to do here.
+      def paypal_encode str
+        s = str.dup
+        CGI.escape(s).gsub('.', '%2E').gsub('-', '%2D')
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paypal_permissions
 version: !ruby/object:Gem::Version
-  version: 0.0.5.4
+  version: 0.0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000Z
+date: 2012-04-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160267820 !ruby/object:Gem::Requirement
+  requirement: &2152576900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160267820
+  version_requirements: *2152576900
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2160227600 !ruby/object:Gem::Requirement
+  requirement: &2152564420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.11'
   type: :development
   prerelease: false
-  version_requirements: *2160227600
+  version_requirements: *2152564420
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2160194320 !ruby/object:Gem::Requirement
+  requirement: &2152547180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160194320
+  version_requirements: *2152547180
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2160191500 !ruby/object:Gem::Requirement
+  requirement: &2152545360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160191500
+  version_requirements: *2152545360
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &2160189340 !ruby/object:Gem::Requirement
+  requirement: &2152544080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160189340
+  version_requirements: *2152544080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160187620 !ruby/object:Gem::Requirement
+  requirement: &2152541360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *2160187620
+  version_requirements: *2152541360
 description: ! '"A gem to support PayPal Permissions API for Rails applications using
   ActiveMerchant."'
 email:
@@ -188,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2469443869180468234
+      hash: -766692562047454680
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2469443869180468234
+      hash: -766692562047454680
 requirements: []
 rubyforge_project: paypal_permissions
 rubygems_version: 1.8.10