summaryrefslogtreecommitdiffstats
path: root/registration.rb
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2015-10-30 19:29:42 +0100
committerHarald Eilertsen <haraldei@anduin.net>2015-10-30 19:30:31 +0100
commitb07dd0f4c49ed42e1dd005118630da56228e4c9c (patch)
tree3ef74344916e3f802a34af52417fe1aeabbc6881 /registration.rb
parent1b587d847f228eb474e1b33991b3fa5086725935 (diff)
downloadnorsk-urskog-registrations-b07dd0f4c49ed42e1dd005118630da56228e4c9c.tar.gz
norsk-urskog-registrations-b07dd0f4c49ed42e1dd005118630da56228e4c9c.tar.bz2
norsk-urskog-registrations-b07dd0f4c49ed42e1dd005118630da56228e4c9c.zip
Replace home grown config with sinatra-config-file
Diffstat (limited to 'registration.rb')
-rw-r--r--registration.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/registration.rb b/registration.rb
index 34baf84..6875e52 100644
--- a/registration.rb
+++ b/registration.rb
@@ -1,17 +1,18 @@
require 'sinatra/base'
require 'sinatra/url_for'
+require 'sinatra/config_file'
require 'tilt/erb'
require_relative 'lib/registration'
-require_relative 'lib/config'
class RegistrationApp < Sinatra::Base
+ register Sinatra::ConfigFile
helpers Sinatra::UrlForHelper
include ERB::Util
enable :sessions
+ config_file File.join(settings.root, 'config.yml')
get '/' do
- @config = Config.load
@band = Band.new
3.times { @band.songs << Song.new }
erb :index