ruby-saferpay 0.0.4 → 0.0.5

data/Manifest.txt

@@ -5,4 +5,5 @@ Rakefile
 bin/ruby-saferpay
 lib/ruby-saferpay.rb
 lib/ruby-saferpay/version.rb
+lib/log
 test/test_ruby-saferpay.rb

data/lib/ruby-saferpay.rb

@@ -99,11 +99,11 @@ class Saferpay
 		Saferpay.check_install
 		@current_request	=	nil
 		
-		@account_id	=	account_id.gsub(/[\s]/,'').chomp
-		@pan				=	pan.gsub(/[\s]/,'').chomp
-		@expiry_date=	expiry_date.gsub(/[\s]/,'').chomp
-		@cvc				=	cvc.gsub(/[\s]/,'').chomp
-		@name				=	name.chomp
+		@account_id	=	account_id
+		@pan				=	pan
+		@expiry_date=	expiry_date
+		@cvc				=	cvc.gsub(/[\s]/,'').chomp rescue ''
+		@name				=	name.chomp rescue ''
 		@tolerance	=	tolerance	# Amount tolerance in percent. The finally captured amount is AMOUNT + TOLERANCE
 	end
 	
@@ -112,8 +112,8 @@ class Saferpay
 	# 2. Capture
 	# 3. Get transacton details
 	# 4. Batch clear (needed/wanted? Probably not...) (not implemented)
-	def pay(amount, currency = 'EUR' )
-		reserve amount, currency
+	def pay(amount, currency = 'EUR', back_reference = nil )
+		reserve amount, currency, back_reference
 		capture
 		details
 	end
@@ -125,15 +125,15 @@ class Saferpay
 		do_direct_cc req.cmd
 	end
 	
-	def reserve( amount, currency )
+	def reserve( amount, currency, back_reference = nil )
 		check_params amount, currency
-		@current_request 	=	Request.new(:reserve, :amount => amount, :currency => currency, :accountid => @account_id, :pan => @pan, :exp => @expiry_date)
+		@current_request 	=	Request.new(:reserve, :amount => amount, :currency => currency, :accountid => @account_id, :pan => @pan, :exp => @expiry_date, :back_reference => back_reference)
 		do_direct_cc( @current_request.cmd )
 	end
 
-	def refund( amount, currency )
+	def refund( amount, currency, back_reference = nil )
 		check_params amount, currency
-		@current_request	=	Request.new(:refund, :amount => amount, :currency => currency, :accountid => @account_id, :pan => @pan, :exp => @expiry_date)
+		@current_request	=	Request.new(:refund, :amount => amount, :currency => currency, :accountid => @account_id, :pan => @pan, :exp => @expiry_date, :back_reference => back_reference)
 		do_direct_cc @current_request.cmd
 	end
 	
@@ -142,23 +142,23 @@ class Saferpay
 		refund_transaction @current_request.transaction_id
 	end
 	
-	def refund_transaction( transaction_id = nil )
+	def refund_transaction( transaction_id = nil, back_reference = nil )
 		raise ArgumentError, "Cannot refund without transaction_id" if transaction_id.nil?
-		@current_request	=	Request.new(:refund_transaction, :transaction_id => transaction_id)
+		@current_request	=	Request.new(:refund_transaction, :transaction_id => transaction_id, :back_reference => back_reference )
 		do_direct_cc @current_request.cmd
 	end	
 
 	# Capture the amount of the transaction with id transaction_id
 	# Defaults to capturing the current transaction's amount.
-	def capture( transaction_id = nil, token = nil, params = nil )
+	def capture( transaction_id = nil )
 	  transaction_id =  @current_request.transaction_id if transaction_id.nil?
 		@current_request	=	Request.new( :capture, :transaction_id => transaction_id )
 		do_direct_cc @current_request.cmd
 	end
 	
-	def cancel( transaction_id = nil, token = nil )
+	def cancel( transaction_id = nil )
 	  transaction_id  = @current_request.transaction_id if transaction_id.nil?
-	  token           = @current_request.token if token.nil?
+		raise ArgumentError, "Cancel failed. No transaction to cancel (transaction_id is nil)" if transaction_id.nil?
 		@current_request	=	Request.new( :cancel, :transaction_id => transaction_id )
 		do_direct_cc @current_request.cmd
 	end
@@ -167,13 +167,13 @@ class Saferpay
 	# This will always fail with the test account.
 	# Takes an account number (10 digits) and a mysterious 'BLZ' number (8 digits).
 	# This is a very common payment method in Germany and Austria
-	def debit_card_reserve( amount, currency, account_number, blz )
+	def debit_card_reserve( amount, currency, account_number, blz, back_reference = nil )
 		check_params amount, currency
 		raise AttributeError, "Account number is a ten digit number" unless account_number.length == 10
 		raise AttributeError, "BLZ is a eight digit number" unless blz.length == 8
 
 		track2	=	"\";59#{blz}=#{account_number}\""	# Weird, huh?
-		@current_request	=	Request.new(:debit_card_reserve, :amount => amount, :currency => currency, :accountid => @account_id, :track2 => track2 )
+		@current_request	=	Request.new(:debit_card_reserve, :amount => amount, :currency => currency, :accountid => @account_id, :track2 => track2, :back_reference => back_reference )
 		do_direct_cc @current_request.cmd
 	end
 	alias :lastschrift :debit_card_reserve
@@ -275,7 +275,7 @@ private
 					raise TransactionError.new(response)
   			end
   		else
-				response =	OpenStruct.new(:response => '0', 'success?' => true)
+				response =	OpenStruct.new(@current_request.to_hash.merge( {:response => '0', :success => true} ) )
 		  end
 		end
 		response
@@ -349,12 +349,11 @@ private
 	end
 
 	class Request
-		attr_reader :cmd, :type, :accountid, :account_id, :amount, :currency, :pan, :exp, :expiry_date, :cvc, :track2
+		attr_reader :cmd, :type, :accountid, :account_id, :amount, :currency, :pan, :exp, :expiry_date, :cvc, :track2, :back_reference
 		attr_accessor	:transaction_id, :token
+
 		def initialize(type = :authorization, args = {})
 			logger	=	Saferpay.logger
-			# logger.debug "#{self.class}#initialize ARGS: #{args.inspect}"
-			# logger.debug "#{self.class}#initialize #{type.to_s.capitalize}. Required attributes are:...."
 			opts	= nil
 			attrs	=	nil
 			mess	=	nil
@@ -394,9 +393,10 @@ private
 			# Check for missing values and complain; Compile attributes string
 			if attrs
 				attrs.each{|attr, value|
-					raise AttributeError, "Saferpay::Request#initialize #{type.to_s.capitalize}: missing required parameter \"#{attr}\"" if(value.nil? || value.to_s.empty? || (value.is_a?(Fixnum) && value == 0))
+					raise AttributeError, "Saferpay::Request#initialize #{type.to_s.capitalize}: missing required parameter \"#{attr}\" (args passed: #{args.inspect})" if(value.nil? || value.to_s.empty? || (value.is_a?(Fixnum) && value == 0))
 					}
-				attrs	=	'-a ' + attrs.map{|k,v| "#{k.to_s.upcase} #{v}"	}.join(" -a ")
+				attrs	=		'-a ' + attrs.map{|k,v| "#{k.to_s.upcase} #{v}"	}.join(" -a ")
+				attrs	+=	" -a ORDERID #{args[:back_reference]} " if args[:back_reference]	# Reference to calling app's record for this transaction
 			end
 			
 			# TODO: fill all ivars and class_eval them to be attr_reader-able
@@ -408,6 +408,7 @@ private
 			@track2					=	args[:track2]
 			@accountid			=	args[:accountid]; @account_id =	@accountid
 			@transaction_id	=	args[:transaction_id]
+			@back_reference	=	args[:back_reference]													# Reference to calling app's record for this transaction
 			@type	=	type
 			@cmd	=	"#{Saferpay::BASEDIR}#{Saferpay::EXECUTABLE} -#{op} -p #{Saferpay::CONFIG} #{message} #{opts} #{attrs}"
 		end

data/lib/ruby-saferpay/version.rb

@@ -2,7 +2,7 @@ module RubySaferpay #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_ruby-saferpay.rb

@@ -11,6 +11,11 @@ class SaferpayTest < Test::Unit::TestCase
 		@sfp	= Saferpay.new( @accountid, @pan, @exp )
 		@sfp2	= Saferpay.new( @accountid, @pan, @exp )
 	end
+	def test_pay
+		res	=	@sfp.pay( 4000 )
+		assert_is_inquiry_response res
+	end
+		
 	
 	def test_install
 		assert_nothing_raised { Saferpay.check_install }
@@ -32,6 +37,11 @@ class SaferpayTest < Test::Unit::TestCase
 			res	=	@sfp.reserve( 300, "USD" )
 			assert_is_authorization_response res
 		}
+		
+		assert_raise( Saferpay::TransactionError ) {
+			sfp	=	Saferpay.new(@accountid, @pan, "3233")
+			sfp.reserve( 12345, "EUR")
+		}		
 	end
 	
 	def test_reserve_with_bad_params
@@ -86,9 +96,21 @@ class SaferpayTest < Test::Unit::TestCase
 	end
 	
 	def test_cancel
-		@sfp.reserve( 600, 'EUR' )
-		@sfp.capture
-		assert @sfp.cancel
+		assert_nothing_raised{
+			@sfp.reserve( 600, 'EUR' )
+			@sfp.capture
+			assert @sfp.cancel
+		}
+		
+		assert_raise( ArgumentError ) {
+			sfp	=	Saferpay.new(@accountid, @pan, "1107")
+			sfp.reserve( 12345, "EUR")
+			sfp.capture
+			#puts "CAPTURE. sfp.current_request: #{sfp.current_request.inspect}"
+			sfp.current_request.transaction_id = nil
+			sfp.cancel
+		}		
+		
 	end
 	
 	def test_debit_card_reserve
@@ -119,10 +141,7 @@ class SaferpayTest < Test::Unit::TestCase
 		}		
 	end
 	
-	def test_pay
-		res	=	@sfp.pay( 4000 )
-		assert_is_inquiry_response res
-	end
+
 	
 	
 private

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ruby-saferpay
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 date: 2007-08-17 00:00:00 +02:00
 summary: Ruby interface to the saferpay e-commerce payment provider
 require_paths: 
@@ -36,6 +36,7 @@ files:
 - bin/ruby-saferpay
 - lib/ruby-saferpay.rb
 - lib/ruby-saferpay/version.rb
+- lib/log
 - test/test_ruby-saferpay.rb
 test_files: 
 - test/test_ruby-saferpay.rb