From 98bfd0502409f5b41975aae224d05296c0ea173b Mon Sep 17 00:00:00 2001
From: tbuehlmann <tobias.buehlmann@gmx.de>
Date: Sun, 3 Feb 2013 09:30:16 +0100
Subject: Several things.

- Using Slim instead of Haml.
- Having a before filter for having flash functionality.
- Using Bundler.
---
 file_upload.rb | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'file_upload.rb')

diff --git a/file_upload.rb b/file_upload.rb
index 671abcb..ce2c65f 100644
--- a/file_upload.rb
+++ b/file_upload.rb
@@ -1,17 +1,17 @@
 # encoding: utf-8
 
-require 'rubygems'
-require 'haml'
 require 'sinatra/base'
+require 'slim'
 
 class FileUpload < Sinatra::Base
   configure do
     enable :static
     enable :sessions
 
-    set :views,  File.join(File.dirname(__FILE__), 'views')
+    set :views, File.join(File.dirname(__FILE__), 'views')
     set :public_folder, File.join(File.dirname(__FILE__), 'public')
-    set :files,  File.join(settings.public_folder, 'files')
+    set :files, File.join(settings.public_folder, 'files')
+    set :unallowed_paths, ['.', '..']
   end
 
   helpers do
@@ -20,21 +20,22 @@ class FileUpload < Sinatra::Base
     end
   end
 
+  before do
+    @flash = session.delete(:flash)
+  end
+
   not_found do
-    haml '404'
+    slim 'h1 404'
   end
 
   error do
-    haml "Error (#{request.env['sinatra.error']})"
+    slim "Error (#{request.env['sinatra.error']})"
   end
 
   get '/' do
-    @files = Dir.entries(settings.files) - ['.', '..']
+    @files = Dir.entries(settings.files) - settings.unallowed_paths
 
-    @flash = session[:flash]
-    session[:flash] = nil
-
-    haml :index
+    slim :index
   end
   
   post '/upload' do
@@ -42,9 +43,11 @@ class FileUpload < Sinatra::Base
       filename = params[:file][:filename]
       file = params[:file][:tempfile]
 
-      File.open(File.join(settings.files, filename), 'wb') {|f| f.write file.read }
+      File.open(File.join(settings.files, filename), 'wb') do |f|
+        f.write file.read
+      end
 
-      flash 'Uploaded successfully'
+      flash 'Upload successful'
     else
       flash 'You have to choose a file'
     end
@@ -52,4 +55,3 @@ class FileUpload < Sinatra::Base
     redirect '/'
   end
 end
-
-- 
cgit v1.2.3