Refactor file system interactions

spec/ferver_spec.rb

@@ -3,7 +3,6 @@
 describe 'ferver' do
     include Webrat::Matchers # allow cool html matching
 
-    DEFAULT_FERVER_DIR = '/tmp'
 
     context 'given a request to the server root' do
 
@@ -36,7 +35,11 @@
 
         it 'will use default directory when none specified' do
 
-            Dir.expects(:foreach).with(DEFAULT_FERVER_DIR).returns([])
+            # hmmm... we have to stub this call too. This knows too much about the implementation.
+            #   this doesnt smell like the best idea. TODO
+            File.stubs(:expand_path).returns('/a/path/to/ferver')
+
+            Dir.expects(:foreach).with('/a/path/to/ferver').returns([])
             get '/files.html'
 
         end

src/ferver.rb

@@ -16,10 +16,8 @@ class Ferver < Sinatra::Base
 
   # Config
 
-  # The full path to the directory to be served
-  DEFAULT_FILE_SERVER_DIR_PATH = '/tmp'
-
-  @file_list = []
+  # By default, serve files from current location
+  DEFAULT_FILE_SERVER_DIR_PATH = './'
 
   # redirect to file list
   # /
@@ -66,7 +64,7 @@ class Ferver < Sinatra::Base
 
     if id < @file_list.size
 
-      file = "#{get_current_ferver_path}/#{@file_list[id]}" # todo: urgghh -> move this
+      file = get_path_for_file(get_current_ferver_path, @file_list[id])
 
       send_file(file, :disposition => 'attachment', :filename => File.basename(file))
 
@@ -90,26 +88,39 @@ class Ferver < Sinatra::Base
 
       next if file == '.' or file == '..'
 
-      @file_list.push(file) if File.file?(file)
+      file_path = get_path_for_file(current_directory, file)
+
+      @file_list.push(file) if File.file?(file_path)
 
     end
 
   end
 
   private
 
+  def get_path_for_file(directory, file_name)
+
+    File.join(directory, file_name)
+
+  end
+
+
   def get_current_ferver_path
 
+    path = nil
+
     if settings.respond_to?(:ferver_path) and settings.ferver_path
 
-      settings.ferver_path
+      path = settings.ferver_path
 
     else
 
-      DEFAULT_FILE_SERVER_DIR_PATH
+      path = DEFAULT_FILE_SERVER_DIR_PATH
 
     end
 
+    File.expand_path(path)
+
   end