From 25d71087b3a449d0f0c03b8965514e6963417ba9 Mon Sep 17 00:00:00 2001
From: bry4n <bryan@ffiirree.com>
Date: Sat, 21 Nov 2009 19:27:14 -0600
Subject: [PATCH] Revert "test"

This reverts commit 094ce58db8eb4192b2b09937feda9adf56f69810.
---
 app.rb    | 22 +++++++++-------------
 config.ru |  3 +--
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/app.rb b/app.rb
index 3908dff..9c2d5c8 100644
--- a/app.rb
+++ b/app.rb
@@ -1,7 +1,7 @@
 require "yaml"
 
-$config = YAML.load_file("configs/config.yml")
-if $config["logging"] == true
+config = YAML.load_file("configs/config.yml")
+if config["logging"] == true
   log = File.new('log/sinatra.log', 'a+')
   $stderr.reopen(log)
 end
@@ -10,16 +10,14 @@
 require 'sinatra'
 require 'configs/deps'
 
-set :run, false
+set :environment, :"#{config['environment']}"
+set :server, config["server"]
+set :host, config["host"]
+set :port, config["port"].to_i
+set :views, 'app/views'
+set :public, 'public'
 
-class MVC < Sinatra::Base
-  set :environment, :"#{$config['environment']}"
-  set :server, $config["server"]
-  set :host, $config["host"]
-  set :port, $config["port"].to_i
-  set :views, 'app/views'
-  set :public, 'public'
-  enable :sessions, :logging, :dump_errors, :raise_errors, :static
+enable :sessions, :logging, :dump_errors, :raise_errors, :static
 
 load 'configs/configures.rb'
 
@@ -28,5 +26,3 @@ class MVC < Sinatra::Base
 Dir.glob("helpers/*.rb") {|file| load file}
 
 load "configs/routes.rb"
-
-end
\ No newline at end of file
diff --git a/config.ru b/config.ru
index 31ef5fb..0c0e579 100644
--- a/config.ru
+++ b/config.ru
@@ -2,5 +2,4 @@ require 'app'
 
 use Rack::ShowExceptions
 
-puts $config
-MVC.run! $config
+run Sinatra::Application