ruby-saferpay 0.0.3 → 0.0.4

data/lib/ruby-saferpay.rb

@@ -87,7 +87,15 @@ class Saferpay
 	attr_accessor	:account_id
 	attr_reader	:current_request
 	
-	def initialize( account_id = "99867-94913159", pan = "9451123100000004", expiry_date = '1107', cvc = '', name = '', tolerance = 0 )
+	def valid_param?(param, conditions)
+		 true if param.is_a?( conditions[:class] ) && ( param =~ conditions[:rexp] )
+	end
+	
+#	def initialize( account_id = "99867-94913159", pan = "9451123100000004", expiry_date = '1107', cvc = '', name = '', tolerance = 0 )
+	def initialize( account_id, pan, expiry_date, cvc = '', name = '', tolerance = 0 )
+		raise ArgumentError, "Need a valid account_id; was: \"#{account_id}\" (class: #{account_id.class})" unless valid_param?(account_id, {:class => String, :rexp => /^[\d]{5}-[\d]{8}$/})
+		raise ArgumentError, "Need a valid card number; was: \"#{pan}\" (class: #{pan.class})" unless valid_param?(pan, {:class => String, :rexp => /^[\d]{16}$/})
+		raise ArgumentError, "Need a valid expiry_date; was: \"#{expiry_date}\" (class: #{expiry_date.class})" unless valid_param?(expiry_date, {:class => String, :rexp => /^[\d]{4}$/})
 		Saferpay.check_install
 		@current_request	=	nil
 		
@@ -102,7 +110,8 @@ class Saferpay
 	# Convenience method to:
 	# 1. Authorize (reserve)
 	# 2. Capture
-	# 3. Batch clear (needed/wanted? Probably not...)
+	# 3. Get transacton details
+	# 4. Batch clear (needed/wanted? Probably not...) (not implemented)
 	def pay(amount, currency = 'EUR' )
 		reserve amount, currency
 		capture
@@ -385,7 +394,7 @@ private
 			# Check for missing values and complain; Compile attributes string
 			if attrs
 				attrs.each{|attr, value|
-					raise ArgumentError, "#{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}\"" 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 ")
 			end

data/lib/ruby-saferpay/version.rb

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

data/test/test_ruby-saferpay.rb

@@ -16,6 +16,17 @@ class SaferpayTest < Test::Unit::TestCase
 		assert_nothing_raised { Saferpay.check_install }
 	end
 	
+	def test_initialize
+		assert_raise( ArgumentError )		{	sfp	=	Saferpay.new()		}
+		assert_raise( ArgumentError )		{	sfp	=	Saferpay.new('','','')		}
+		assert_raise( ArgumentError )		{	sfp	=	Saferpay.new('32332','32332','')		}
+		assert_raise( ArgumentError )		{	sfp	=	Saferpay.new('32332-12345678','1234567891234567','')		}
+		assert_raise( ArgumentError )		{	sfp	=	Saferpay.new('32332-12345678','1234567891234567','12345')		}
+		assert_raise( ArgumentError )		{	sfp	=	Saferpay.new('32332-12345678',1234567891234567,'1234')		}
+		assert_nothing_raised {	sfp	=	Saferpay.new('32332-12345678','1234567891234567','1212')		}
+	end
+	
+	
 	def test_reserve
 		assert_nothing_raised{
 			res	=	@sfp.reserve( 300, "USD" )
@@ -79,39 +90,39 @@ class SaferpayTest < Test::Unit::TestCase
 		@sfp.capture
 		assert @sfp.cancel
 	end
-	# 
-	# def test_debit_card_reserve
-	# 	assert_raise( ArgumentError ) { @sfp.debit_card_reserve	}
-	# 	assert_raise( Saferpay::TransactionError )	{ 
-	# 		@sfp.debit_card_reserve(100200, "EUR", "1234567890", "12345678")
-	# 		assert_is_authorization_response res
-	# 	}		
-	# end
-	# 
-	# def test_details
-	# 	assert_raise ( NoMethodError ) { @sfp.details }
-	# 	assert_nothing_raised{
-	# 		@sfp.reserve( 3000, "USD" )
-	# 		@sfp.capture
-	# 		@sfp.details
-	# 	}
-	# 	
-	# 	assert_nothing_raised{
-	# 		res	=	@sfp.reserve( 1000, "USD" )
-	# 		@sfp.capture
-	# 		
-	# 		res2 = @sfp.reserve( 1100, "USD" )
-	# 		@sfp.capture
-	# 		
-	# 		assert_not_equal @sfp.details( res.transaction_id ), @sfp.details( res2.transaction_id )
-	# 		assert_not_equal @sfp.details( res.transaction_id ), @sfp.details
-	# 	}		
-	# end
-	# 
-	# def test_pay
-	# 	res	=	@sfp.pay( 4000 )
-	# 	assert_is_inquiry_response res
-	# end
+	
+	def test_debit_card_reserve
+		assert_raise( ArgumentError ) { @sfp.debit_card_reserve	}
+		assert_raise( Saferpay::TransactionError )	{ 
+			@sfp.debit_card_reserve(100200, "EUR", "1234567890", "12345678")
+			assert_is_authorization_response res
+		}		
+	end
+	
+	def test_details
+		assert_raise ( NoMethodError ) { @sfp.details }
+		assert_nothing_raised{
+			@sfp.reserve( 3000, "USD" )
+			@sfp.capture
+			@sfp.details
+		}
+		
+		assert_nothing_raised{
+			res	=	@sfp.reserve( 1000, "USD" )
+			@sfp.capture
+			
+			res2 = @sfp.reserve( 1100, "USD" )
+			@sfp.capture
+			
+			assert_not_equal @sfp.details( res.transaction_id ), @sfp.details( res2.transaction_id )
+			assert_not_equal @sfp.details( res.transaction_id ), @sfp.details
+		}		
+	end
+	
+	def test_pay
+		res	=	@sfp.pay( 4000 )
+		assert_is_inquiry_response res
+	end
 	
 	
 private

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ruby-saferpay
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2007-08-15 00:00:00 +02:00
+  version: 0.0.4
+date: 2007-08-17 00:00:00 +02:00
 summary: Ruby interface to the saferpay e-commerce payment provider
 require_paths: 
 - lib