From c20819d502a5e8eef1c79e130de60eefb5a9bd00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 9 May 2012 13:27:36 +0200 Subject: Spot: raise exception if @name includes PATH_SEP --- lib/evendoors/spot.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/evendoors/spot.rb b/lib/evendoors/spot.rb index bf26761..72f5180 100644 --- a/lib/evendoors/spot.rb +++ b/lib/evendoors/spot.rb @@ -10,6 +10,7 @@ module EvenDoors @name = n # unique in it's room @parent = p # single direct parent @viewer = nil # particle going through that position will be sent there readonly + raise EvenDoors::Exception.new "Spot name #{name} is not valid" if @name.include? EvenDoors::PATH_SEP end # attr_reader :name @@ -17,8 +18,7 @@ module EvenDoors # def path return @path if @path - p = ( @parent ? @parent.path+'/' : '') + name - @path = p.sub(/^\/+/,'').sub(/\/+$/,'').gsub(/\/{2,}/,'/') + @path = ( @parent ? @parent.path+EvenDoors::PATH_SEP : '') + name end # end -- cgit v1.1-2-g2b99