sage_pay 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -1,12 +1,17 @@
 # Changelog
 
-# 0.2.1
+## 0.2.2
+
+* Incorporate additional fields I'd missed from the notification. That'll make
+  it easier to find payments from the notification.
+
+## 0.2.1
 
 * [FIX] SagePay think it's OK to have curly braces in a URL query string.
   Ruby's URI library thinks otherwise. No matter who's right, one of these is
   easier to change than the other.
 
-# 0.2.0
+## 0.2.0
 
 * Initial release. This should support the full workflow for making payments,
   but the notification side hasn't been tested again SagePay in the wild so

data/lib/sage_pay.rb

@@ -6,7 +6,7 @@ require 'md5'
 require 'uuid'
 
 module SagePay
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end
 
 require 'validatable-ext'

data/lib/sage_pay/server/signature_verification_details.rb

@@ -1,13 +1,11 @@
 module SagePay
   module Server
     class SignatureVerificationDetails
-      attr_reader :vps_tx_id, :vendor_tx_code, :vendor, :security_key
+      attr_reader :vendor, :security_key
 
-      def initialize(transaction_registration, transaction_registration_response)
-        @vendor_tx_code = transaction_registration.vendor_tx_code
-        @vendor         = transaction_registration.vendor
-        @vps_tx_id      = transaction_registration_response.vps_tx_id
-        @security_key   = transaction_registration_response.security_key
+      def initialize(vendor, security_key)
+        @vendor         = vendor
+        @security_key   = security_key
       end
     end
   end

data/lib/sage_pay/server/transaction_notification.rb

@@ -1,14 +1,18 @@
 module SagePay
   module Server
     class TransactionNotification
-      attr_reader :vps_protocol, :status, :status_detail, :tx_auth_no,
-        :avs_cv2, :address_result, :post_code_result, :cv2_result, :gift_aid,
-        :threed_secure_status, :cavv, :address_status, :payer_status,
-        :card_type, :last_4_digits, :vps_signature
+      attr_reader :vps_protocol, :tx_type, :vendor_tx_code, :vps_tx_id,
+        :status, :status_detail, :tx_auth_no, :avs_cv2, :address_result,
+        :post_code_result, :cv2_result, :gift_aid, :threed_secure_status,
+        :cavv, :address_status, :payer_status,:card_type, :last_4_digits,
+        :vps_signature
 
       def self.from_params(params, signature_verification_details = nil)
         key_converter = {
           "VPSProtocol"    => :vps_protocol,
+          "TxType"         => :tx_type,
+          "VendorTxCode"   => :vendor_tx_code,
+          "VPSTxId"        => :vps_tx_id,
           "Status"         => :status,
           "StatusDetail"   => :status_detail,
           "TxAuthNo"       => :tx_auth_no,
@@ -39,6 +43,11 @@ module SagePay
         }
 
         value_converter = {
+          :tx_type => {
+            "PAYMENT"      => :payment,
+            "DEFERRED"     => :deferred,
+            "AUTHENTICATE" => :authenticate
+          },
           :status => {
             "OK"            => :ok,
             "NOTAUTHED"     => :not_authed,
@@ -105,8 +114,8 @@ module SagePay
           # We need to calculate the VPS signature from the values passed in as
           # additional params from the original registration and notification.
           fields_used_in_signature = [
-            signature_verification_details.vps_tx_id,
-            signature_verification_details.vendor_tx_code,
+            params["VPSTxId"],
+            params["VendorTxCode"],
             params["Status"],
             params["TxAuthNo"],
             signature_verification_details.vendor,

data/lib/sage_pay/server/transaction_registration.rb

@@ -59,7 +59,7 @@ module SagePay
         elsif @response.failed?
           raise RuntimeError, "Transaction registration failed"
         else
-          SignatureVerificationDetails.new(self, @response)
+          @signature_verification_details ||= SignatureVerificationDetails.new(vendor, @response.security_key)
         end
       end
 

data/sage_pay.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'sage_pay'
-  s.version           = '0.2.1'
-  s.date              = '2010-04-14'
+  s.version           = '0.2.2'
+  s.date              = '2010-04-25'
   s.rubyforge_project = 'sage_pay'
 
   ## Make sure your summary is short. The description may be as long

data/spec/integration/sage_pay/server_spec.rb

@@ -37,9 +37,14 @@ if run_integration_specs?
       end
 
       it "should allow us to follow the next URL and the response should be successful" do
-        pending "URI#parse claims that the URL SagePay hands us isn't a valid URI."
         registration = @payment.register!
         uri = URI.parse(registration.next_url)
+        request = Net::HTTP::Get.new(uri.request_uri)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true if uri.scheme == "https"
+        http.start { |http|
+          http.request(request)
+        }
       end
 
       it "should allow us to retrieve signature verification details" do
@@ -47,10 +52,8 @@ if run_integration_specs?
         sig_details = @payment.signature_verification_details
 
         sig_details.should_not                be_nil
-        sig_details.vps_tx_id.should_not      be_nil
         sig_details.security_key.should_not   be_nil
         sig_details.vendor.should_not         be_nil
-        sig_details.vendor_tx_code.should_not be_nil
       end
     end
   end

data/spec/sage_pay/server/signature_verification_details_spec.rb

@@ -3,23 +3,13 @@ require 'spec_helper'
 include SagePay::Server
 describe SignatureVerificationDetails do
   before(:each) do
-    transaction_registration          = mock("Transaction registration", :vendor_tx_code => "vendor transaction id", :vendor => "vendor")
-    transaction_registration_response = mock("Transaction registration response", :vps_tx_id => "sage pay transaction id", :security_key => "security key")
-    @sig_details = SignatureVerificationDetails.new(transaction_registration, transaction_registration_response)
-  end
-
-  it "should take the vendor_tx_code from the transaction registration" do
-    @sig_details.vendor_tx_code.should == "vendor transaction id"
+    @sig_details = SignatureVerificationDetails.new("vendor", "security key")
   end
 
   it "should take the vendor from the transaction registration" do
     @sig_details.vendor.should == "vendor"
   end
 
-  it "should take the vps_tx_id from the transaction registration response" do
-    @sig_details.vps_tx_id.should == "sage pay transaction id"
-  end
-
   it "should take the security_key from the transaction registration response" do
     @sig_details.security_key.should == "security key"
   end

data/spec/sage_pay/server/transaction_notification_spec.rb

@@ -13,8 +13,6 @@ describe TransactionNotification do
     context "with an OK status" do
       before(:each) do
         signature_verification_details = mock("Signature verification details",
-          :vps_tx_id      => "{728A5721-B45F-4570-937E-90A16B0A5000}",
-          :vendor_tx_code => "unique-tx-code",
           :vendor         => "rubaidh",
           :security_key   => "17F13DCBD8"
         )
@@ -22,6 +20,8 @@ describe TransactionNotification do
         @params = {
           "VPSProtocol"    => "2.23",
           "TxType"         => "PAYMENT",
+          "VendorTxCode"   => "unique-tx-code",
+          "VPSTxId"        => "{728A5721-B45F-4570-937E-90A16B0A5000}",
           "Status"         => "OK",
           "StatusDetail"   => "2000 : Card processed successfully.", # FIXME: Make this match reality
           "TxAuthNo"       => "1234567890",
@@ -54,6 +54,18 @@ describe TransactionNotification do
         @notification.vps_protocol.should == "2.23"
       end
 
+      it "should report the tx_type as :payment" do
+        @notification.tx_type.should == :payment
+      end
+
+      it "should report the vendor_tx_code as the vendor tx code supplied" do
+        @notification.vendor_tx_code.should == 'unique-tx-code'
+      end
+
+      it "should report the vps_tx_id as the vps_tx_id supplied" do
+        @notification.vps_tx_id.should == "{728A5721-B45F-4570-937E-90A16B0A5000}"
+      end
+
       it "should report the status as :ok" do
         @notification.status.should == :ok
       end

data/spec/sage_pay/server/transaction_registration_spec.rb

@@ -595,16 +595,6 @@ describe TransactionRegistration do
         @transaction_registration.register!
       end
 
-      it "should know the SagePay transaction id" do
-        sig_details = @transaction_registration.signature_verification_details
-        sig_details.vps_tx_id.should == "sage pay transaction id"
-      end
-
-      it "should know the vendor transaction id" do
-        sig_details = @transaction_registration.signature_verification_details
-        sig_details.vendor_tx_code.should == "vendor transaction id"
-      end
-
       it "should know the vendor" do
         sig_details = @transaction_registration.signature_verification_details
         sig_details.vendor.should == "vendor"

data/spec/sage_pay_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe SagePay do
-  it "should be version 0.2.0" do
-    SagePay::VERSION.should == '0.2.0'
+  it "should be version 0.2.2" do
+    SagePay::VERSION.should == '0.2.2'
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Graeme Mathieson
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-14 00:00:00 +01:00
+date: 2010-04-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency