remit 0.0.5 → 0.0.6

data/lib/remit/ipn_request.rb

@@ -11,16 +11,18 @@ module Remit
     SIGNATURE_KEY = 'signature'
 
     # +params+ should be your controllers request parameters.
-    def initialize(params, secret_key)
+    def initialize(params, uri, access_key, secret_key)
       raise ArgumentError, "Expected the request params hash, received: #{params.inspect}" unless params.kind_of?(Hash)
       @params             = strip_keys_from(params, 'action', 'controller')
-      @supplied_signature = @params.delete(SIGNATURE_KEY)
-      @secret_key         = secret_key
+      @uri = URI.parse(uri)
+      @url_end_point = @uri.scheme + '://' + @uri.host + @uri.path
+      @access_key = access_key
+      @secret_key = secret_key
     end
 
     def valid?
-      return false unless @supplied_signature
-      generate_signature_for(@params) == @supplied_signature
+      utils = Amazon::FPS::SignatureUtilsForOutbound.new(@access_key, @secret_key);
+      utils.validate_request(:parameters => @params, :url_end_point => @url_end_point, :http_method => "GET")
     end
 
     def method_missing(method, *args) #:nodoc:
@@ -31,14 +33,6 @@ module Remit
       end
     end
 
-    def generate_signature_for(params)
-      query   = params.sort_by { |k,v| k.downcase }
-      digest  = OpenSSL::Digest::Digest.new('sha1')
-      hmac    = OpenSSL::HMAC.digest(digest, @secret_key, query.to_s)
-      encoded = Base64.encode64(hmac).chomp
-    end
-    private :generate_signature_for
-
     def strip_keys_from(params, *ignore_keys)
       parsed = params.dup
       ignore_keys.each { |key| parsed.delete(key) }

data/lib/remit/pipeline_response.rb

@@ -1,7 +1,10 @@
 module Remit
   class PipelineResponse
-    def initialize(uri, secret_key)
-      @uri        = URI.parse(uri)
+    def initialize(params, uri, access_key, secret_key)
+      @params = strip_keys_from(params, 'action', 'controller', 'id')
+      @uri = URI.parse(uri)
+      @url_end_point = @uri.scheme + '://' + @uri.host + @uri.path
+      @access_key = access_key
       @secret_key = secret_key
     end
 
@@ -12,8 +15,8 @@ module Remit
     # pulled from the request is filtered through the same method.
     #++
     def valid?
-      return false unless given_signature
-      Relax::Query.unescape_value(correct_signature) == given_signature
+      utils = Amazon::FPS::SignatureUtilsForOutbound.new(@access_key, @secret_key);
+      utils.validate_request(:parameters => @params, :url_end_point => @url_end_point, :http_method => "GET")
     end
 
     # Returns +true+ if the response returns a successful state.
@@ -39,14 +42,12 @@ module Remit
     end
     private :request_query
 
-    def given_signature
-      request_query[:awsSignature]
+    def strip_keys_from(params, *ignore_keys)
+      parsed = params.dup
+      ignore_keys.each { |key| parsed.delete(key) }
+      parsed
     end
-    private :given_signature
+    private :strip_keys_from
 
-    def correct_signature
-      Remit::SignedQuery.new(@uri.path, @secret_key, request_query).sign
-    end
-    private :correct_signature
   end
 end

data/spec/integrations/get_account_activity_spec.rb

@@ -21,8 +21,8 @@ describe 'a GetAccountActivity call' do
     transaction.date_completed.should_not be_nil
     transaction.date_received.should_not be_nil
     transaction.error_code.should be_empty
-    transaction.error_detail.should be_nil
-    transaction.error_message.should be_nil
+    transaction.error_detail.should be_empty
+    transaction.error_message.should be_empty
     transaction.fees.should_not be_nil
     transaction.operation.should_not be_empty
     transaction.recipient_name.should_not be_empty

data/spec/integrations/get_tokens_spec.rb

@@ -21,7 +21,6 @@ describe 'a GetTokens call' do
     token.caller_reference.should_not be_empty
     token.token_type.should_not be_empty
     token.old_token_id.should_not be_empty
-    token.payment_reason.should_not be_empty
   end
 
   it 'should have a token with a token ID' do

data/spec/integrations/ipn_request_spec.rb

@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/integrations_helper'
+
+describe 'an IPN request' do
+  before(:each) do
+    @request_params = {
+      "expiry"            => "10/2013",
+      "tokenID"           => "Q5IG5ETFCEBU8KBLTI4JHINQVL6VAJVHICBRR49AKLPIEZH1KB1S8C7VHAJJMLJ3",
+      "status"            => "SC",
+      "callerReference"   => "1253247023946cMcrTRrjtLjNrZGNKchWfDtUEIGuJfiOBAAJYPjbytBV",
+      "signatureMethod"   => "RSA-SHA1",
+      "signatureVersion"  => "2",
+      "certificateUrl"    => "https://fps.amazonaws.com/certs/090909/PKICert.pem",
+      "controller"        => "amazon_fps", # controller and action get deleted
+      "action"            => "index",
+      "signature"         => "H4NTAsp3YwAEiyQ86j5B53lksv2hwwEaEFxtdWFpy9xX764AZy/Dm0RLEykUUyPVLgqCOlMopay5" \
+                           + "Qxr/VDwhdYAzgQzA8VCV8x9Mn0caKsJT2HCU6tSLNa6bLwzg/ildCm2lHDho1Xt2yaBHMt+/Cn4q" \
+                           + "I5B+6PDrb8csuAWxW/mbUhk7AzazZMfQciJNjS5k+INlcvOOtQqoA/gVeBLsXK5jNsTh09cNa7pb" \
+                           + "gAvey+0DEjYnIRX+beJV6EMCPZxnXDGo0fA1PENLWXIHtAoIJAfLYEkVbT2lva2tZ0KBBWENnSjf" \
+                           + "26lMZVokypIo4huoGaZMp1IVkImFi3qC6ipCrw=="
+    }
+    @request = Remit::IpnRequest.new(@request_params, 'http://www.mysite.com/call_pay.jsp', ACCESS_KEY, SECRET_KEY)
+  end
+
+  it 'should be a valid request' do
+    @request.should be_valid
+  end
+
+  it 'should pass through access to given parameters' do
+    @request.status.should == 'SC'
+    @request.callerReference.should == '1253247023946cMcrTRrjtLjNrZGNKchWfDtUEIGuJfiOBAAJYPjbytBV'
+  end
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: remit
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  hash: 19
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Tyler Hunt
@@ -9,19 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 -05:00
+date: 2010-12-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: relax
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 0
+        - 7
         version: 0.0.7
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: tyler@tylerhunt.com
 executables: []
@@ -32,6 +44,9 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
+- lib/amazon/fps/ca-bundle.crt
+- lib/amazon/fps/signatureutils.rb
+- lib/amazon/fps/signatureutilsforoutbound.rb
 - lib/remit.rb
 - lib/remit/common.rb
 - lib/remit/data_types.rb
@@ -69,6 +84,15 @@ files:
 - lib/remit/pipeline_response.rb
 - LICENSE
 - README.markdown
+- spec/integrations/get_account_activity_spec.rb
+- spec/integrations/get_tokens_spec.rb
+- spec/integrations/ipn_request_spec.rb
+- spec/units/get_pipeline_spec.rb
+- spec/units/get_results_spec.rb
+- spec/units/pay_spec.rb
+- spec/integrations/integrations_helper.rb
+- spec/spec_helper.rb
+- spec/units/units_helper.rb
 has_rdoc: true
 homepage: http://github.com/tylerhunt/remit
 licenses: []
@@ -79,30 +103,36 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: remit
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: An API for using the Amazon Flexible Payment Service (FPS).
 test_files: 
 - spec/integrations/get_account_activity_spec.rb
 - spec/integrations/get_tokens_spec.rb
+- spec/integrations/ipn_request_spec.rb
 - spec/units/get_pipeline_spec.rb
 - spec/units/get_results_spec.rb
-- spec/units/ipn_request_spec.rb
 - spec/units/pay_spec.rb
 - spec/integrations/integrations_helper.rb
 - spec/spec_helper.rb

data/spec/units/ipn_request_spec.rb

@@ -1,32 +0,0 @@
-require File.dirname(__FILE__) + '/units_helper'
-
-describe 'an IPN request' do
-  before(:each) do
-    @request_params = {
-      "action"            => "notice",
-      "buyerName"         => "Fps Buyer",
-      "callerReference"   => "4-8-1-3.5",
-      "controller"        => "amazon_fps/ipn",
-      "operation"         => "PAY",
-      "paymentMethod"     => "CC",
-      "recipientEmail"    => "recipient@email.url",
-      "recipientName"     => "Fps Business",
-      "signature"         => "DA7ZbuQaBDt2/+Mty9XweJyqI1E=",
-      "status"            => "SUCCESS",
-      "transactionAmount" => "USD 3.50",
-      "transactionDate"   => "1224687134",
-      "transactionId"     => "13KIGL9RC25853BGPPOS2VSKBKF2JERR3HO"
-    }
-    @request = Remit::IpnRequest.new(@request_params, 'THISISMYTESTKEY')
-  end
-
-  it 'should be a valid request' do
-    @request.should be_valid
-  end
-
-  it 'should pass through access to given parameters' do
-    @request.status.should == 'SUCCESS'
-    @request.operation.should == 'PAY'
-    @request.transactionId.should == '13KIGL9RC25853BGPPOS2VSKBKF2JERR3HO'
-  end
-end