sage_pay 0.2.8.2 → 0.2.9

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.9
+
+* Repeat transaction implementation.
+
 ## 0.2.8
 
 * Refund implementation

data/lib/sage_pay/server/refund_response.rb

@@ -1,11 +1,15 @@
 module SagePay
   module Server
     class RefundResponse < Response
+      attr_accessor_if_ok :vps_tx_id, :tx_auth_no
+
       self.key_converter = key_converter.merge({
         "VPSTxId"  => :vps_tx_id,
         "TxAuthNo" => :tx_auth_no
       })
 
+      self.value_converter[:status]["NOTAUTHED"] = :not_authed
+
       def vps_tx_id
         if ok?
           @vps_tx_id

data/lib/sage_pay/server/registration_response.rb

@@ -1,35 +1,13 @@
 module SagePay
   module Server
     class RegistrationResponse < Response
+      attr_accessor_if_ok :vps_tx_id, :security_key, :next_url
+
       self.key_converter = key_converter.merge({
         "VPSTxId"      => :vps_tx_id,
         "SecurityKey"  => :security_key,
         "NextURL"      => :next_url
       })
-
-      def vps_tx_id
-        if ok?
-          @vps_tx_id
-        else
-          raise RuntimeError, "Unable to retrieve the transaction id as the status was not OK."
-        end
-      end
-
-      def security_key
-        if ok?
-          @security_key
-        else
-          raise RuntimeError, "Unable to retrieve the security key as the status was not OK."
-        end
-      end
-
-      def next_url
-        if ok?
-          @next_url
-        else
-          raise RuntimeError, "Unable to retrieve the next URL as the status was not OK."
-        end
-      end
     end
   end
 end

data/lib/sage_pay/server/repeat.rb

@@ -0,0 +1,50 @@
+module SagePay
+  module Server
+    class Repeat < Command
+      attr_accessor :amount, :currency, :description, :related_transaction, :cv2
+
+      validates_presence_of :amount, :currency, :description, :related_transaction
+
+      validates_length_of :currency,    :is      => 3
+      validates_length_of :description, :maximum => 100
+
+      validates_inclusion_of :tx_type, :allow_blank => true, :in => [ :repeat ]
+
+      validates_true_for :amount, :key => :amount_minimum_value, :logic => lambda { amount.nil? || amount >= BigDecimal.new("0.01")   }, :message => "is less than the minimum value (0.01)"
+      validates_true_for :amount, :key => :amount_maximum_value, :logic => lambda { amount.nil? || amount <= BigDecimal.new("100000") }, :message => "is greater than the maximum value (100,000.00)"
+
+      def initialize(attributes = {})
+        @tx_type = :repeat
+        super
+      end
+
+      def post_params
+        params = super.merge({
+          "Amount"      => ("%.2f" % amount),
+          "Currency"    => currency,
+          "Description" => description
+        }).merge(related_transaction.post_params)
+
+        params["CV2"] = cv2 if cv2.present?
+
+        params
+      end
+
+      def amount=(value)
+        @amount = blank?(value) ? nil : BigDecimal.new(value.to_s)
+      end
+
+      def response_from_response_body(response_body)
+        RepeatResponse.from_response_body(response_body)
+      end
+
+      def live_service
+        "repeat"
+      end
+
+      def simulator_service
+        "VendorRepeatTx"
+      end
+    end
+  end
+end

data/lib/sage_pay/server/repeat_response.rb

@@ -0,0 +1,49 @@
+module SagePay
+  module Server
+    class RepeatResponse < Response
+      attr_accessor_if_ok :vps_tx_id, :tx_auth_no, :security_key,
+        :avs_cv2, :address_result, :post_code_result, :cv2_result
+
+
+      self.key_converter = key_converter.merge({
+        "VPSTxId"        => :vps_tx_id,
+        "TxAuthNo"       => :tx_auth_no,
+        "SecurityKey"    => :security_key,
+        "AVSCV2"         => :avs_cv2,
+        "AddressResult"  => :address_result,
+        "PostCodeResult" => :post_code_result,
+        "CV2Result"      => :cv2_result
+      })
+
+      self.value_converter[:status]["NOTAUTHED"] = :not_authed
+      self.value_converter = value_converter.merge({
+        :avs_cv2 => {
+          "ALL MATCH"                => :all_match,
+          "SECURITY CODE MATCH ONLY" => :security_code_match_only,
+          "ADDRESS MATCH ONLY"       => :address_match_only,
+          "NO DATA MATCHES"          => :no_data_matches,
+          "DATA NOT CHECKED"         => :data_not_checked
+        },
+        :address_result   => match_converter,
+        :post_code_result => match_converter,
+        :cv2_result       => match_converter,
+      })
+
+      def avs_cv2_matched?
+        avs_cv2 == :all_match
+      end
+
+      def address_matched?
+        address_result == :matched
+      end
+
+      def post_code_matched?
+        post_code_result == :matched
+      end
+
+      def cv2_matched?
+        cv2_result == :matched
+      end
+    end
+  end
+end

data/lib/sage_pay/server/response.rb

@@ -1,7 +1,7 @@
 module SagePay
   module Server
     class Response
-      class_inheritable_hash :key_converter, :value_converter, :instance_writer => false
+      class_inheritable_hash :key_converter, :value_converter, :match_converter, :instance_writer => false
 
       self.key_converter = {
         "VPSProtocol"  => :vps_protocol,
@@ -18,8 +18,27 @@ module SagePay
         }
       }
 
+      self.match_converter = {
+        "NOTPROVIDED" => :not_provided,
+        "NOTCHECKED"  => :not_checked,
+        "MATCHED"     => :matched,
+        "NOTMATCHED"  => :not_matched
+      }
+
       attr_reader :vps_protocol, :status, :status_detail
 
+      def self.attr_accessor_if_ok(*attrs)
+        attrs.each do |attr|
+          define_method(attr) do
+            if ok?
+              instance_variable_get("@#{attr}")
+            else
+              raise RuntimeError, "Unable to retrieve #{attr} as the status was #{status} (not OK)."
+            end
+          end
+        end
+      end
+
       def self.from_response_body(response_body)
         attributes = {}
 

data/lib/sage_pay/server.rb

@@ -18,7 +18,7 @@ module SagePay
     # The notification URL is only relevant to registration options, but the
     # rest are relevant to all requests.
     def self.default_options
-      @default_options ||= default_registration_options.except(:notification_url)
+      default_registration_options.except(:notification_url)
     end
 
     def self.related_transaction(attributes = {})
@@ -67,5 +67,13 @@ module SagePay
 
       SagePay::Server::Refund.new(defaults.merge(attributes))
     end
+
+    def self.repeat(attributes = {})
+      defaults = {
+        :vendor_tx_code => TransactionCode.random,
+      }.merge(default_options)
+
+      SagePay::Server::Repeat.new(defaults.merge(attributes))
+    end
   end
 end

data/lib/sage_pay.rb

@@ -7,7 +7,7 @@ require 'md5'
 require 'uuid'
 
 module SagePay
-  VERSION = '0.2.8.2'
+  VERSION = '0.2.9'
 end
 
 require 'validatable-ext'
@@ -27,4 +27,6 @@ require 'sage_pay/server/release'
 require 'sage_pay/server/abort'
 require 'sage_pay/server/refund'
 require 'sage_pay/server/refund_response'
+require 'sage_pay/server/repeat'
+require 'sage_pay/server/repeat_response'
 require 'sage_pay/server'

data/sage_pay.gemspec

@@ -7,7 +7,7 @@ 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.8.2'
+  s.version           = '0.2.9'
   s.date              = '2010-04-25'
   s.rubyforge_project = 'sage_pay'
 
@@ -67,6 +67,8 @@ gateway for accepting credit card payments through your web app.
     lib/sage_pay/server/registration_response.rb
     lib/sage_pay/server/related_transaction.rb
     lib/sage_pay/server/release.rb
+    lib/sage_pay/server/repeat.rb
+    lib/sage_pay/server/repeat_response.rb
     lib/sage_pay/server/response.rb
     lib/sage_pay/server/signature_verification_details.rb
     lib/sage_pay/server/transaction_code.rb

data/spec/sage_pay/server/registration_response_spec.rb

@@ -49,19 +49,19 @@ StatusDetail=4000 : The VendorName is invalid or the account is not active.
       it "should raise an error if we try to ask for the transaction id" do
         lambda {
           @response.vps_tx_id
-        }.should raise_error RuntimeError, "Unable to retrieve the transaction id as the status was not OK."
+        }.should raise_error RuntimeError, "Unable to retrieve vps_tx_id as the status was invalid (not OK)."
       end
 
       it "should raise an error if we try to ask for the security key" do
         lambda {
           @response.security_key
-        }.should raise_error RuntimeError, "Unable to retrieve the security key as the status was not OK."
+        }.should raise_error RuntimeError, "Unable to retrieve security_key as the status was invalid (not OK)."
       end
 
       it "should raise an error if we try to ask for the next URL" do
         lambda {
           @response.next_url
-        }.should raise_error RuntimeError, "Unable to retrieve the next URL as the status was not OK."
+        }.should raise_error RuntimeError, "Unable to retrieve next_url as the status was invalid (not OK)."
       end
     end
 
@@ -104,19 +104,19 @@ StatusDetail=5000 : Your request had too many toes.
       it "should raise an error if we try to ask for the transaction id" do
         lambda {
           @response.vps_tx_id
-        }.should raise_error RuntimeError, "Unable to retrieve the transaction id as the status was not OK."
+        }.should raise_error RuntimeError, "Unable to retrieve vps_tx_id as the status was malformed (not OK)."
       end
 
       it "should raise an error if we try to ask for the security key" do
         lambda {
           @response.security_key
-        }.should raise_error RuntimeError, "Unable to retrieve the security key as the status was not OK."
+        }.should raise_error RuntimeError, "Unable to retrieve security_key as the status was malformed (not OK)."
       end
 
       it "should raise an error if we try to ask for the next URL" do
         lambda {
           @response.next_url
-        }.should raise_error RuntimeError, "Unable to retrieve the next URL as the status was not OK."
+        }.should raise_error RuntimeError, "Unable to retrieve next_url as the status was malformed (not OK)."
       end
     end
 
@@ -159,19 +159,19 @@ StatusDetail=5000 : SagePay blew up.
       it "should raise an error if we try to ask for the transaction id" do
         lambda {
           @response.vps_tx_id
-        }.should raise_error RuntimeError, "Unable to retrieve the transaction id as the status was not OK."
+        }.should raise_error RuntimeError, "Unable to retrieve vps_tx_id as the status was error (not OK)."
       end
 
       it "should raise an error if we try to ask for the security key" do
         lambda {
           @response.security_key
-        }.should raise_error RuntimeError, "Unable to retrieve the security key as the status was not OK."
+        }.should raise_error RuntimeError, "Unable to retrieve security_key as the status was error (not OK)."
       end
 
       it "should raise an error if we try to ask for the next URL" do
         lambda {
           @response.next_url
-        }.should raise_error RuntimeError, "Unable to retrieve the next URL as the status was not OK."
+        }.should raise_error RuntimeError, "Unable to retrieve next_url as the status was error (not OK)."
       end
     end
 

data/spec/sage_pay_spec.rb

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

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 8
-  - 2
-  version: 0.2.8.2
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - Graeme Mathieson
@@ -89,6 +88,8 @@ files:
 - lib/sage_pay/server/registration_response.rb
 - lib/sage_pay/server/related_transaction.rb
 - lib/sage_pay/server/release.rb
+- lib/sage_pay/server/repeat.rb
+- lib/sage_pay/server/repeat_response.rb
 - lib/sage_pay/server/response.rb
 - lib/sage_pay/server/signature_verification_details.rb
 - lib/sage_pay/server/transaction_code.rb