Simplify Scriptum::Config

drewreeve · Jan 18, 2013 · 622cf0b · 622cf0b
1 parent d620db9
commit 622cf0b
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/lib/configuration.rb b/lib/configuration.rb
@@ -5,17 +5,13 @@ module Config
 
     def self.[](key)
       unless @config
-        root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-        @config = begin
-          YAML.load(File.read(root+"/config/settings.yml"))[ENV['RACK_ENV']||'development']
-        rescue Errno::ENOENT
-          YAML.load(File.read(root+"/config/settings.default.yml"))[ENV['RACK_ENV']||'development']
-        end
+        root = File.expand_path('..', File.dirname(__FILE__))
+        environment = ENV['RACK_ENV'] || 'development'
+        @config = YAML.load(File.read(root + '/config/settings.yml'))[environment]
       end
 
       @config[key.to_s]
     end
-    
+
   end
-end
+end