lib/teamster.rb in teamster-0.6.0 vs lib/teamster.rb in teamster-0.6.1
- old
+ new
@@ -7,11 +7,11 @@
require_relative 'teamster/login'
module Teamster
module Core
class App < Sinatra::Base
- @@adapters = []
+ @@adapters = []
@@views = []
@@title = 'TEAMSTER'
@@root = Dir.pwd
CORE_CONFIG = './conf/teamster.conf'
@@ -23,11 +23,11 @@
configure do
set :root, @@root
set :referrer, nil
@@views << "#{settings.root}/views"
- enable :sessions
+ enable :sessions, :logging
set :session_secret, 'THIS IS MY SESSION SECRET KEY'
set :core_opts, YAML.load_file("#{settings.root}/#{CORE_CONFIG}")
set_default_options_from settings.core_opts
use Login
end
@@ -54,10 +54,10 @@
@@root
end
def self.use_adapter(teamster_adapter)
if @@adapters.include? teamster_adapter
- puts "Adapter #{teamster_adapter} already registered!"
+ warn "Adapter #{teamster_adapter} already registered!"
else
@@adapters << teamster_adapter
@@views << teamster_adapter.views
end
teamster_adapter.helpers GeneralHelper