sbsm 1.3.0 → 1.3.1

data/test/suite.rb

@@ -3,8 +3,11 @@
 require 'simplecov'
 
 $: << File.dirname(File.expand_path(__FILE__))
-SimpleCov.start
-
+SimpleCov.start do
+  add_filter "/test/"
+  add_filter "/gems/"
+end
+require 'sbsm/logger'
 Dir.foreach(File.dirname(__FILE__)) do |file|
   if /^test_.*\.rb$/o.match(file)
     require file

data/test/test_application.rb

@@ -0,0 +1,122 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+$: << File.dirname(__FILE__)
+$:.unshift File.expand_path('../lib', File.dirname(__FILE__))
+
+ENV['RACK_ENV'] = 'test'
+ENV['REQUEST_METHOD'] = 'GET'
+
+require 'minitest/autorun'
+require 'rack/test'
+require 'sbsm/app'
+require 'simple_sbsm'
+require 'nokogiri'
+begin
+  require 'pry'
+rescue LoadError
+end
+
+class MyTest < MiniTest::Unit::TestCase
+  include Rack::Test::Methods
+
+  def setup
+    SBSM.info msg = "Starting #{SERVER_URI}"
+    DRb.start_service(SERVER_URI, Demo::SimpleSBSM.new)
+    sleep(0.1)
+  end
+  def teardown
+    DRb.stop_service
+  end
+  def app
+    Demo::SimpleSBSM.new
+  end
+  def test_post_feedback
+    get '/de/page' do # needed to set cookie
+        last_response.set_cookie SBSM::App::PERSISTENT_COOKIE_NAME, :value => "demo_cookie"
+    end
+    get '/de/page/feedback' do
+        last_response.set_cookie SBSM::App::PERSISTENT_COOKIE_NAME, :value => "second_cookie"
+    end
+    assert last_response.ok?
+    skip 'We must add here an input form or we cannot continue testing'
+    assert_match FEEDBACK_HTML_CONTENT, last_response.body
+    page = Nokogiri::HTML(last_response.body)
+    x = page.css('div')
+    assert  page.css('input').find{|x| x.attributes['name'].value.eql?('state_id') }.attributes['value'].value
+    state_id = page.css('input').find{|x| x.attributes['name'].value.eql?('state_id') }.attributes['value'].value.to_i
+    assert state_id > 0
+    post '/de/page/feedback', { 'anrede' => 'Herr', 'msg' => 'SBSM rocks!' , 'state_id' => '1245'}
+    assert last_response.ok?
+    assert last_response.headers['Content-Length'].to_s.length > 0
+    assert_match CONFIRM_HTML_CONTENT, last_response.body
+    post '/de/page/feedback', { 'confirm' => 'true', 'anrede' => 'Herr', 'msg' => 'SBSM rocks!' }
+    assert last_response.ok?
+    assert_match CONFIRM_DONE_HTML_CONTENT, last_response.body
+  end
+  if false
+  def test_session_home
+    get '/home'
+    assert last_response.ok?
+    assert_match /^request_path is \/home$/, last_response.body
+    assert_match HOME_HTML_CONTENT, last_response.body
+    assert_match /utf-8/i, last_response.headers['Content-Type']
+  end
+  def test_css_file
+    css_content = "html { max-width: 960px; margin: 0 auto; }"
+    css_file = File.join('doc/sbsm.css')
+    FileUtils.makedirs(File.dirname(css_file))
+    unless File.exist?(css_file)
+      File.open(css_file, 'w+') do |file|
+        file.puts css_content
+      end
+    end
+    get '/sbsm.css'
+    assert last_response.ok?
+    assert_match css_content, last_response.body
+  end
+  def test_session_about_then_home
+    get '/de/page/about'
+    assert last_response.ok?
+    assert_match /^About SBSM: TDD ist great!/, last_response.body
+    get '/home'
+    assert last_response.ok?
+    assert_match HOME_HTML_CONTENT, last_response.body
+  end
+  def test_default_content_from_home
+    test_path = '/default_if_no_such_path'
+    get test_path
+    assert last_response.ok?
+    assert_match /^#{HOME_HTML_CONTENT}/, last_response.body
+    assert_match HOME_HTML_CONTENT, last_response.body
+    assert_match /^request_path is /, last_response.body
+    assert_match test_path, last_response.body
+  end
+  def test_session_id_is_maintained
+    get '/'
+    assert last_response.ok?
+    body = last_response.body.clone
+    assert_match /^request_path is \/$/, body
+    assert_match /member_counter is 1$/, body
+    assert_match HOME_HTML_CONTENT, body
+    m = /class_counter is (\d+)$/.match(body)
+    counter = m[1]
+    assert_match /class_counter is (\d+)$/, body
+    # Getting the request a second time must increment the class, but not the member counter
+    get '/'
+    assert last_response.ok?
+    body = last_response.body.clone
+    assert_match /^request_path is \/$/, body
+    assert_match /member_counter is 1$/, body
+    assert_match /class_counter is #{counter.to_i+1}$/, body
+  end
+  def test_session_home_then_fr_about
+    get '/home'
+    assert last_response.ok?
+    assert_match /^request_path is \/home$/, last_response.body
+    assert_match HOME_HTML_CONTENT, last_response.body
+    get '/fr/page/about'
+    assert last_response.ok?
+    assert_match ABOUT_HTML_CONTENT, last_response.body
+  end
+  end
+end

data/test/test_logger.rb

@@ -0,0 +1,121 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+#--
+#
+# State Based Session Management
+# Copyright (C) 2004 Hannes Wyss
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zürich, Switzerland
+# hwyss@ywesee.com
+#
+# TestSession -- sbsm -- 22.10.2002 -- hwyss@ywesee.com 
+#++
+
+require 'minitest/autorun'
+require 'fileutils'
+require 'sbsm/logger'
+begin
+  require 'pry'
+rescue LoadError
+end
+class TestLogger < Minitest::Test
+  def setup
+    @saved_loger = SBSM.logger.clone
+    @default_name = Time.now.strftime("/tmp/sbsm_#{SBSM::VERSION}.log.%Y%m%d")
+    FileUtils.rm_f(@default_name)
+    # we reload the logger class as it initializes the logger to a default value
+    load 'sbsm/logger.rb'
+    assert(File.exist?(@default_name))
+  end
+  def teardown
+    SBSM.logger= @saved_loger
+  end
+
+  def test_default_levels
+    saved_length = File.size(@default_name)
+    SBSM.debug("debug #{__LINE__}")
+    assert_equal(saved_length, File.size(@default_name))
+    SBSM.info("info #{__LINE__}")
+    assert_equal(saved_length, File.size(@default_name))
+
+    SBSM.logger.level = :info
+    SBSM.info("info #{__LINE__}")
+    assert(saved_length < File.size(@default_name))
+    saved_length = File.size(@default_name)
+    SBSM.debug("debug #{__LINE__}")
+    saved_length = File.size(@default_name)
+
+    SBSM.logger.level = :debug
+    SBSM.info("info #{__LINE__}")
+    assert(saved_length < File.size(@default_name))
+    saved_length = File.size(@default_name)
+    SBSM.debug("debug #{__LINE__}")
+    assert(saved_length < File.size(@default_name))
+
+    saved_length = File.size(@default_name)
+    SBSM.logger.level = :warn
+    SBSM.info("info #{__LINE__}")
+    SBSM.debug("debug #{__LINE__}")
+    assert_equal(saved_length, File.size(@default_name))
+  end
+
+  def test_change_logger
+    new_name = '/tmp/sbsm_test_log'
+    FileUtils.rm_f(new_name)
+    assert_equal(false, File.exist?(new_name))
+    SBSM.logger= Logger.new(new_name)
+    assert_equal(true, File.exist?(new_name))
+    saved_length = File.size(new_name)
+
+    default_saved_length = File.size(@default_name)
+    SBSM.debug("debug #{__LINE__}")
+    SBSM.info("info #{__LINE__}")
+    assert_equal(default_saved_length, File.size(@default_name))
+    assert_equal(true, File.exist?(new_name))
+
+    SBSM.logger.level = :info
+    SBSM.info("info #{__LINE__}")
+    assert(saved_length < File.size(new_name))
+    saved_length = File.size(new_name)
+    SBSM.debug("debug #{__LINE__}")
+    saved_length = File.size(new_name)
+
+    SBSM.logger.level = :debug
+    SBSM.info("info #{__LINE__}")
+    assert(saved_length < File.size(new_name))
+    saved_length = File.size(new_name)
+    SBSM.debug("debug #{__LINE__}")
+    assert(saved_length < File.size(new_name))
+
+    saved_length = File.size(new_name)
+    SBSM.logger.level = :warn
+    SBSM.info("info #{__LINE__}")
+    SBSM.debug("debug #{__LINE__}")
+    assert_equal(saved_length, File.size(new_name))
+    assert_equal(default_saved_length, File.size(@default_name))
+  end
+
+  def test_nil_logger
+    default_saved_length = File.size(@default_name)
+    SBSM.logger= nil
+    assert_equal(default_saved_length, File.size(@default_name))
+    SBSM.debug("debug #{__LINE__}")
+    SBSM.info("info #{__LINE__}")
+    assert_equal(default_saved_length, File.size(@default_name))
+  end
+
+end

data/test/test_session.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
+#--
 #
 # State Based Session Management
 # Copyright (C) 2004 Hannes Wyss
@@ -22,10 +23,12 @@
 # hwyss@ywesee.com
 #
 # TestSession -- sbsm -- 22.10.2002 -- hwyss@ywesee.com 
+#++
 
 require 'minitest/autorun'
 require 'sbsm/session'
-#require 'htmlgrid/component'
+require 'rack'
+require 'rack/test'
 
 class StubSessionUnknownUser
 end
@@ -54,16 +57,9 @@ class StubSessionValidator
 		false
 	end
 end
-class StubSessionRequest < Hash
-	attr_accessor :unparsed_uri
-	def params
-		self
-	end
-	def cookies
-		{}
-	end
-  def request_method
-    'GET'
+class StubSessionRequest < Rack::Request
+  def initialize(path='')
+    super(Rack::MockRequest.env_for("http://example.com:8080/#{path}", {}))
   end
 end
 class StubSessionView 
@@ -131,11 +127,24 @@ class StubSessionSession < SBSM::Session
 end
 
 class TestSession < Minitest::Test
+  include Rack::Test::Methods
 	def setup
 		@session = Session.new("test", StubSessionApp.new, StubSessionValidator.new)
 		@request = StubSessionRequest.new
 		@state = StubSessionState.new(@session, nil)
 	end
+  def test_user_input_hash
+    @request["hash[1]"] = "4"
+    @request["hash[2]"] = "5"
+    @request["hash[3]"] = "6"
+    @session.process(@request)
+    hash = @session.user_input(:hash)
+    assert_equal(Hash, hash.class)
+    assert_equal(3, hash.size)
+    assert_equal("4", hash["1"])
+    assert_equal("5", hash["2"])
+    assert_equal("6", hash["3"])
+  end
 	def test_attended_states_store
 		@session.process(@request)
 		state = @session.state
@@ -206,7 +215,7 @@ class TestSession < Minitest::Test
 			state.object_id =>	state,
 		}
 		@session.active_state = @state
-		@request.store('state_id', state.object_id.next)
+		# @request.params.store('state_id', state.object_id.next)
 		@session.process(@request)
 		assert_equal(@state, @session.active_state)
 	end
@@ -221,7 +230,7 @@ class TestSession < Minitest::Test
 			state.object_id =>	state,
 		}
 		@session.state = @state
-		@request.store('state_id', state.object_id)
+		@request.params.store('state_id', state.object_id)
 		@session.process(@request)
 		assert_equal(state, @session.active_state)
 	end
@@ -231,12 +240,12 @@ class TestSession < Minitest::Test
 		state.volatile = volatile
 		@session.active_state = state
 		@session.state = state
-		@request.store('event', :volatile)
+		@request.params.store('event', :volatile)
 		newstate = @session.process(@request)
 		assert_equal(:volatile, @session.event)
 		assert_equal(volatile, @session.state)
 		assert_equal(state, @session.active_state)
-		@request.store('event', :foo)
+		@request.params.store('event', :foo)
 		newstate = @session.process(@request)
 		assert_equal(state.foo, @session.state)
 		assert_equal(state.foo, @session.active_state)
@@ -321,8 +330,8 @@ class TestSession < Minitest::Test
 		}
 		@session.state = @state
 		expected = state.foo
-		@request.store('state_id', state.object_id)
-		@request.store('event', :foo)
+		@request.params.store('state_id', state.object_id)
+		@request.params.store('event', :foo)
 		@session.process(@request)
 		assert_equal(expected, @session.state) 
 		assert_equal(expected, @session.attended_states[expected.object_id])

data/test/test_trans_handler.rb

@@ -6,434 +6,215 @@ $: << File.dirname(__FILE__)
 $:.unshift File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'minitest/autorun'
+require 'rack/request'
 require 'sbsm/trans_handler'
+require 'sbsm/logger'
 require 'cgi'
 require 'fileutils'
 
-module Apache
-	DECLINED = 0
+def fake_request_for_path(path='/')
+  Rack::Request.new(Rack::MockRequest.env_for("http://example.com:8080#{path}", {}))
 end
+
 module SBSM
-	class TestTransHandler < Minitest::Test
-		class RequestStub
-			attr_accessor :uri, :notes, :server
-		end
-		class ServerStub 
-			attr_accessor :document_root
-			def log_notice(fmt, *args)
-			end
-      def log_warn(*args)
-        warn(args.join(' - '))
-      end
-		end
-		class NotesStub < Hash
-			alias :add :store
-		end
-		def setup
-			@doc_root = File.expand_path('data/htdoc', File.dirname(__FILE__))
-			@etc_path = File.expand_path('../etc', @doc_root)
-			@doc_root.taint
-		end
-		def teardown
-			FileUtils.rm_r(@etc_path) if(File.exist?(@etc_path))
-		end
-		def test_parser_name
-			assert_equal('uri', TransHandler.instance.parser_name)
-		end
-		def test_translate_uri
-			request = RequestStub.new
-			request.server = ServerStub.new
 
-			request.uri = '/'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			assert_equal({}, request.notes)
-			assert_equal('/index.rbx', request.uri)
+  class TestTransHandler < Minitest::Test
+    def setup
+      @config_file = File.expand_path('../etc/trans_handler.yml', File.dirname(__FILE__))
+    end
+    def teardown
+      FileUtils.rm_f(@config_file) if File.exist?(@config_file)
+    end
+    def test_parser_name
+      assert_equal('uri', TransHandler.instance.parser_name)
+    end
+    def test_translate_uri
+      request = fake_request_for_path  '/'
+      TransHandler.instance.translate_uri(request)
+      assert_equal({}, request.params)
+      assert_equal('/index.rbx', request.uri)
 
-			request.uri = '/fr'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			assert_equal({'language' => 'fr'}, request.notes)
-			assert_equal('/index.rbx', request.uri)
+      request = fake_request_for_path  '/fr'
+      TransHandler.instance.translate_uri(request)
+      assert_equal({'language' => 'fr'}, request.params)
+      assert_equal('/index.rbx', request.uri)
 
-			request.uri = '/en/'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			assert_equal({'language' => 'en'}, request.notes)
-			assert_equal('/index.rbx', request.uri)
+      request = fake_request_for_path  '/en/'
+      TransHandler.instance.translate_uri(request)
+      assert_equal({'language' => 'en'}, request.params)
+      assert_equal('/index.rbx', request.uri)
 
-			request.uri = '/de/search/state_id/407422388/search_query/ponstan'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			expected = {
-				'language'		=>	'de',
+      request = fake_request_for_path  '/de/search/state_id/407422388/search_query/ponstan'
+      TransHandler.instance.translate_uri(request)
+      expected = {
+        'language'		=>	'de',
         'flavor'       =>  'search',
         'event'       =>  'state_id',
         "407422388"=>"search_query",
         'ponstan'=> '',
-			}
-      assert_equal(expected, request.notes)
-			assert_equal('/index.rbx', request.uri)
+      }
+      assert_equal(expected, request.params)
+      assert_equal('/index.rbx', request.uri)
 
-			request.uri = '/de/search/state_id/407422388/search_query/ponstan/page/4'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			expected = {
-				'language'		=>	'de',
+      request = fake_request_for_path  '/de/search/state_id/407422388/search_query/ponstan/page/4'
+      TransHandler.instance.translate_uri(request)
+      expected = {
+        'language'		=>	'de',
         'flavor'       =>  'search',
         'event'       =>  'state_id',
         "407422388"=>"search_query",
         'ponstan'=> 'page',
-				'4'				=>	'',
-			}
-			assert_equal(expected, request.notes)
-			assert_equal('/index.rbx', request.uri)
+        '4'				=>	'',
+      }
+      assert_equal(expected, request.params)
+      assert_equal('/index.rbx', request.uri)
 
-			request.uri = '/de/search/pretty//state_id/407422388/search_query/ponstan/page/4'
-			request.notes = NotesStub.new
-			expected = '/index.rbx?language=de&event=search&pretty=&state_id=407422388&search_query=ponstan&page=4'
-			TransHandler.instance.translate_uri(request)
-			expected = {
-				'language'		=>	'de',
+      request = fake_request_for_path  '/de/search/pretty//state_id/407422388/search_query/ponstan/page/4'
+      expected = '/index.rbx?language=de&event=search&pretty=&state_id=407422388&search_query=ponstan&page=4'
+      TransHandler.instance.translate_uri(request)
+      expected = {
+        'language'		=>	'de',
         'flavor'       =>  'search',
         'event'       =>  'pretty',
         ""=>"state_id",
         "407422388"=>"search_query",
         'ponstan'=> 'page',
         '4'       =>  '',
-			}
-			assert_equal(expected, request.notes)
-			assert_equal('/index.rbx', request.uri)
-
-			request.uri = '/de/search/search_query/'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			expected = {
-				'language'		=>	'de',
-        'flavor'       =>  'search',
-				'event'				=>	'search_query',
-			}
-			assert_equal(expected, request.notes)
-			assert_equal('/index.rbx', request.uri)
-		end
-		def test_translate_uri__shortcut
-			request = RequestStub.new
-			request.server = ServerStub.new
-			request.server.document_root = @doc_root
+      }
+      assert_equal(expected, request.params)
+      assert_equal('/index.rbx', request.uri)
 
-			request.uri = '/shortcut'
-			request.notes = NotesStub.new
+      request = fake_request_for_path '/de/search/search_query/'
       TransHandler.instance.translate_uri(request)
-			assert_equal({}, request.notes)
-			assert_equal('/shortcut', request.uri)
-			
-			FileUtils.mkdir_p(@etc_path)
-			shortcut = File.join(@etc_path, 'trans_handler.yml')
-			File.open(shortcut, 'w') { |fh|
-        fh.puts <<-EOS
---- 
-shortcut:
-  /somewhere: 
-    over: the rainbow
-    goodbye: yellow brick road
-  /shortcut: 
-    shortcut: variables
-        EOS
+      expected = {
+        'language'		=>	'de',
+        'flavor'       =>  'search',
+        'event'				=>	'search_query',
       }
-			
-			request.uri = '/shortcut'
-			request.notes = NotesStub.new
-				# run in safe-mode
-				Thread.new {
-					$SAFE = 1
-					TransHandler.instance.translate_uri(request)
-				}.join
-			assert_equal({'shortcut' => 'variables'}, request.notes)
-			assert_equal('/index.rbx', request.uri)
-
-			request.uri = '/somewhere'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			expected = {
-				'over'		=>	'the rainbow',
-				'goodbye'	=>	'yellow brick road',
-			}
-			assert_equal(expected, request.notes)
-			assert_equal('/index.rbx', request.uri)
-		end
-	end
-	class TestTransHandler < Minitest::Test
-		class RequestStub
-			attr_accessor :uri, :notes, :server
-		end
-		class ServerStub 
-			attr_accessor :document_root
-			def log_notice(fmt, *args)
-			end
-      def log_warn(*args)
-        warn(args.join(' - '))
-      end
-		end
-		class NotesStub < Hash
-			alias :add :store
-		end
-		def setup
-			@doc_root = File.expand_path('data/htdoc', File.dirname(__FILE__))
-			@etc_path = File.expand_path('../etc', @doc_root)
-			@doc_root.taint
-		end
-		def teardown
-			FileUtils.rm_r(@etc_path) if(File.exist?(@etc_path))
-		end
-		def test_translate_uri
-			request = RequestStub.new
-			request.server = ServerStub.new
-
-			request.uri = '/'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			assert_equal({}, request.notes)
-			assert_equal('/index.rbx', request.uri)
-
-			request.uri = '/fr'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			assert_equal({'language' => 'fr'}, request.notes)
-			assert_equal('/index.rbx', request.uri)
-
-			request.uri = '/en/'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			assert_equal({'language' => 'en'}, request.notes)
-			assert_equal('/index.rbx', request.uri)
-
-			request.uri = '/en/flavor'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			expected = {
-				'language'=>	'en',
-				'flavor'	=>	'flavor',
-			}
-			assert_equal(expected, request.notes)
-			assert_equal('/index.rbx', request.uri)
-
-			request.uri = '/en/other'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			expected = {
-				'language'=>	'en',
-				'flavor'	=>	'other',
-			}
-			assert_equal(expected, request.notes)
-			assert_equal('/index.rbx', request.uri)
-
-			request.uri = '/de/gcc/search/state_id/407422388/search_query/ponstan'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			expected = {
-				'language'		=>	'de',
-				'flavor'			=>	'gcc',
-				'event'				=>	'search',
-				'state_id'		=>	'407422388',
-				'search_query'=>	'ponstan',
-			}
-			assert_equal(expected, request.notes)
-			assert_equal('/index.rbx', request.uri)
-
-			request.uri = '/de/gcc/search/state_id/407422388/search_query/ponstan/page/4'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			expected = {
-				'language'		=>	'de',
-				'flavor'			=>	'gcc',
-				'event'				=>	'search',
-				'state_id'		=>	'407422388',
-				'search_query'=>	'ponstan',
-				'page'				=>	'4',
-			}
-			assert_equal(expected, request.notes)
-			assert_equal('/index.rbx', request.uri)
-
-			request.uri = '/de/gcc/search/pretty//state_id/407422388/search_query/ponstan/page/4'
-			request.notes = NotesStub.new
-			expected = '/index.rbx?language=de&flavor=gcc&event=search&pretty=&state_id=407422388&search_query=ponstan&page=4'
-			TransHandler.instance.translate_uri(request)
-			expected = {
-				'language'		=>	'de',
-				'flavor'			=>	'gcc',
-				'event'				=>	'search',
-				'pretty'			=>	'',
-				'state_id'		=>	'407422388',
-				'search_query'=>	'ponstan',
-				'page'				=>	'4',
-			}
-			assert_equal(expected, request.notes)
-			assert_equal('/index.rbx', request.uri)
-
-			request.uri = '/de/gcc/search/search_query/'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			expected = {
-				'language'		=>	'de',
-				'flavor'			=>	'gcc',
-				'event'				=>	'search',
-				'search_query'=>	'',
-			}
-			assert_equal(expected, request.notes)
-			assert_equal('/index.rbx', request.uri)
-		end
-		def test_translate_uri__shortcut
-			request = RequestStub.new
-			request.server = ServerStub.new
-			request.server.document_root = @doc_root
-
-			request.uri = '/shortcut'
-			request.notes = NotesStub.new
+      assert_equal(expected, request.params)
+      assert_equal('/index.rbx', request.uri)
+    end
+    def test_translate_uri__shortcut
+      assert_equal false, File.exist?(@config_file)
+      request = fake_request_for_path  '/shortcut'
       TransHandler.instance.translate_uri(request)
-			assert_equal({}, request.notes)
-			assert_equal('/shortcut', request.uri)
+      assert_equal({}, request.params)
+      assert_equal('/shortcut', request.uri)
 
-			FileUtils.mkdir_p(@etc_path)
-			shortcut = File.join(@etc_path, 'trans_handler.yml')
-			File.open(shortcut, 'w') { |fh|
+      FileUtils.mkdir_p(File.dirname(@config_file))
+      File.open(@config_file, 'w') do |fh|
         fh.puts <<-EOS
---- 
+---
 shortcut:
-  /somewhere: 
+  /somewhere:
     over: the rainbow
     goodbye: yellow brick road
-  /shortcut: 
+  /shortcut:
     shortcut: variables
-        EOS
-      }
-			
-			request.uri = '/shortcut'
-			request.notes = NotesStub.new
-				# run in safe-mode
-				Thread.new {
-					$SAFE = 1
-					TransHandler.instance.translate_uri(request)
-				}.join
-			assert_equal({'shortcut' => 'variables'}, request.notes)
-			assert_equal('/index.rbx', request.uri)
-
-			request.uri = '/somewhere'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			expected = {
-				'over'		=>	'the rainbow',
-				'goodbye'	=>	'yellow brick road',
-			}
-			assert_equal(expected, request.notes)
-			assert_equal('/index.rbx', request.uri)
-		end
-	end
-	class TestTransHandler < Minitest::Test
-		class RequestStub
-			attr_accessor :uri, :notes, :server
-		end
-		class ServerStub 
-			attr_accessor :document_root
-			def log_notice(fmt, *args)
-			end
-      def log_warn(*args)
-        warn(args.join(' - '))
+EOS
       end
-		end
-		class NotesStub < Hash
-			alias :add :store
-		end
-		def setup
-			@doc_root = File.expand_path('data/htdoc', File.dirname(__FILE__))
-			@etc_path = File.expand_path('../etc', @doc_root)
-			@doc_root.taint
-		end
-		def teardown
-			FileUtils.rm_r(@etc_path) if(File.exist?(@etc_path))
-		end
-		def test_translate_uri
-			request = RequestStub.new
-			request.server = ServerStub.new
-
-			request.uri = '/'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			assert_equal({}, request.notes)
-			assert_equal('/index.rbx', request.uri)
+      assert_equal true, File.exist?(@config_file)
+      request = fake_request_for_path  '/shortcut'
+        # run in safe-mode
+        Thread.new {
+          $SAFE = 1
+          TransHandler.instance.translate_uri(request)
+        }.join
+      assert_equal({'shortcut' => 'variables'}, request.params)
+      assert_equal('/index.rbx', request.uri)
+
+      request = fake_request_for_path  '/somewhere'
+      TransHandler.instance.translate_uri(request)
+      expected = {
+        'over'		=>	'the rainbow',
+        'goodbye'	=>	'yellow brick road',
+      }
+      assert_equal(expected, request.params)
+      assert_equal('/index.rbx', request.uri)
+    end
+    def test_translate_uri_paths
+      request = fake_request_for_path  '/'
+      TransHandler.instance.translate_uri(request)
+      assert_equal({}, request.params)
+      assert_equal('/index.rbx', request.uri)
 
-			request.uri = '/fr'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			assert_equal({'language' => 'fr'}, request.notes)
-			assert_equal('/index.rbx', request.uri)
+      request = fake_request_for_path  '/fr'
+      TransHandler.instance.translate_uri(request)
+      assert_equal({'language' => 'fr'}, request.params)
+      assert_equal('/index.rbx', request.uri)
 
-			request.uri = '/en/'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			assert_equal({'language' => 'en'}, request.notes)
-			assert_equal('/index.rbx', request.uri)
+      request = fake_request_for_path  '/en/'
+      TransHandler.instance.translate_uri(request)
+      assert_equal({'language' => 'en'}, request.params)
+      assert_equal('/index.rbx', request.uri)
 
-			request.uri = '/en/zone'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			expected = {
-				'language'=>	'en',
-				'flavor'	=>	'zone',
-			}
-			assert_equal(expected, request.notes)
-			assert_equal('/index.rbx', request.uri)
+      request = fake_request_for_path  '/en/flavor'
+      TransHandler.instance.translate_uri(request)
+      expected = {
+        'language'=>	'en',
+        'flavor'	=>	'flavor',
+      }
+      assert_equal(expected, request.params)
+      assert_equal('/index.rbx', request.uri)
 
-			request.uri = '/en/other'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			expected = {
-				'language'=>	'en',
-				'flavor'	=>	'other',
-			}
-			assert_equal(expected, request.notes)
-			assert_equal('/index.rbx', request.uri)
+      request = fake_request_for_path  '/en/other'
+      TransHandler.instance.translate_uri(request)
+      expected = {
+        'language'=>	'en',
+        'flavor'	=>	'other',
+      }
+      assert_equal(expected, request.params)
+      assert_equal('/index.rbx', request.uri)
 
-			request.uri = '/de/gcc/search/state_id/407422388/search_query/ponstan/page/4'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			expected = {
-				'language'		=>	'de',
-				'flavor'				=>	'gcc',
-				'event'				=>	'search',
-				'state_id'		=>	'407422388',
-				'search_query'=>	'ponstan',
-				'page'				=>	'4',
-			}
-			assert_equal(expected, request.notes)
-			assert_equal('/index.rbx', request.uri)
+      request = fake_request_for_path  '/de/gcc/search/state_id/407422388/search_query/ponstan'
+      TransHandler.instance.translate_uri(request)
+      expected = {
+        'language'		=>	'de',
+        'flavor'			=>	'gcc',
+        'event'				=>	'search',
+        'state_id'		=>	'407422388',
+        'search_query'=>	'ponstan',
+      }
+      assert_equal(expected, request.params)
+      assert_equal('/index.rbx', request.uri)
+      request = fake_request_for_path  '/de/gcc/search/state_id/407422388/search_query/ponstan/page/4'
+      TransHandler.instance.translate_uri(request)
+      expected = {
+        'language'		=>	'de',
+        'flavor'			=>	'gcc',
+        'event'				=>	'search',
+        'state_id'		=>	'407422388',
+        'search_query'=>	'ponstan',
+        'page'				=>	'4',
+      }
+      assert_equal(expected, request.params)
+      assert_equal('/index.rbx', request.uri)
 
-			request.uri = '/de/gcc/search/pretty//state_id/407422388/search_query/ponstan/page/4'
-			request.notes = NotesStub.new
-			expected = '/index.rbx?language=de&zone=gcc&event=search&detail=objid&pretty=&state_id=407422388&search_query=ponstan&page=4'
-			TransHandler.instance.translate_uri(request)
-			expected = {
-				'language'		=>	'de',
-				'flavor'				=>	'gcc',
-				'event'				=>	'search',
-				'pretty'			=>	'',
-				'state_id'		=>	'407422388',
-				'search_query'=>	'ponstan',
-				'page'				=>	'4',
-			}
-			assert_equal(expected, request.notes)
-			assert_equal('/index.rbx', request.uri)
+      request = fake_request_for_path  '/de/gcc/search/pretty//state_id/407422388/search_query/ponstan/page/4'
+      expected = '/index.rbx?language=de&flavor=gcc&event=search&pretty=&state_id=407422388&search_query=ponstan&page=4'
+      TransHandler.instance.translate_uri(request)
+      expected = {
+        'language'		=>	'de',
+        'flavor'			=>	'gcc',
+        'event'				=>	'search',
+        'pretty'			=>	'',
+        'state_id'		=>	'407422388',
+        'search_query'=>	'ponstan',
+        'page'				=>	'4',
+      }
+      assert_equal(expected, request.params)
+      assert_equal('/index.rbx', request.uri)
 
-			request.uri = '/de/gcc/search/search_query/'
-			request.notes = NotesStub.new
-			TransHandler.instance.translate_uri(request)
-			expected = {
-				'language'		=>	'de',
-				'flavor'				=>	'gcc',
-				'event'				=>	'search',
-				'search_query'=>	'',
-			}
-			assert_equal(expected, request.notes)
-			assert_equal('/index.rbx', request.uri)
-		end
-	end
+      request = fake_request_for_path  '/de/gcc/search/search_query/'
+      TransHandler.instance.translate_uri(request)
+      expected = {
+        'language'		=>	'de',
+        'flavor'			=>	'gcc',
+        'event'				=>	'search',
+        'search_query'=>	'',
+      }
+      assert_equal(expected, request.params)
+      assert_equal('/index.rbx', request.uri)
+    end
+  end
 end