ruby-saferpay 0.0.7 → 0.0.8

data/lib/ruby-saferpay.rb

@@ -355,17 +355,22 @@ private
 		# Sanity check on params
 		raise ArgumentError, "Bad parameters. Configuration path: \"#{conf_path}\", username: \"#{username}\", password: \"#{password}\", accountid: \"#{accountid}\"" if (username.nil? || password.nil? || accountid.nil?)
 		
-		account_directory	=	"#{conf_path}conf_for_#{accountid}"
+		account_directory	=	"#{conf_path}conf_for_#{accountid}/"
 		#logger.debug "#{self.class}.setup_account Will configure account in: \"#{account_directory}\""
 		
 		# Is really a new account?
 		if File.directory? conf_path
 			if File.directory? account_directory
-				if File.exist?( account_directory + 'config.xml' ) && File.directory?( account_directory + 'keys' )
-					raise ConfigError, "Account already exist."
+				if File.exist?( account_directory + 'config.xml' ) 
+					if File.directory?( account_directory + 'keys' )
+						logger.info "#{self.class}#setup_account Account already exist"
+						return false
+#						raise ConfigError, "Account already exist."
+					else
+						raise ConfigError, "Account config seems to be corrupt: missing 'keys' directory, but '#{account_directory}' exist"
+					end
 				else
-					#FileUtils.remove_dir account_directory
-					raise ConfigError, "Account seems to be corrupt (missing 'config.xml' and 'keys' directory)."
+					raise ConfigError, "Account config seems to be corrupt: missing 'config.xml', but '#{account_directory}' exist"
 				end
 			end
 		else
@@ -398,7 +403,7 @@ private
 	# TODO: write tests
 	def self.account_configured?( conf_path, accountid )
 		raise ArgumentError, "Saferpay.check_config Bad parameters. Configuration path: \"#{conf_path}\", accountid: \"#{accountid}\"" if (accountid.nil? || conf_path.nil?)
-		account_directory	=	"#{conf_path}conf_for_#{accountid}"
+		account_directory	=	"#{conf_path}conf_for_#{accountid}/"
 		
 		if File.directory? conf_path
 			if File.directory? account_directory

data/lib/ruby-saferpay/version.rb

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

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ruby-saferpay
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 date: 2007-08-21 00:00:00 +02:00
 summary: Ruby interface to the saferpay e-commerce payment provider
 require_paths: