diff --git a/.gitignore b/.gitignore index 98229e3..c6b0685 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.log blog.db +config/app_config.rb diff --git a/config/app_config.rb.default b/config/app_config.rb.default new file mode 100644 index 0000000..d95e8e5 --- /dev/null +++ b/config/app_config.rb.default @@ -0,0 +1,14 @@ +configure do + Sequel.connect(ENV['DATABASE_URL'] || 'sqlite://blog.db') + + require 'ostruct' + Blog = OpenStruct.new( + :title => 'a scanty blog', + :author => 'John Doe', + :url_base => 'http://localhost:4567/', + :admin_password => 'changeme', + :admin_cookie_key => 'scanty_admin', + :admin_cookie_value => '51d6d976913ace58', + :disqus_shortname => nil + ) +end \ No newline at end of file diff --git a/main.rb b/main.rb index d6bf13e..e6a26f4 100644 --- a/main.rb +++ b/main.rb @@ -1,23 +1,9 @@ require 'rubygems' require 'sinatra' - $LOAD_PATH.unshift File.dirname(__FILE__) + '/vendor/sequel' require 'sequel' +require 'config/app_config.rb' -configure do - Sequel.connect(ENV['DATABASE_URL'] || 'sqlite://blog.db') - - require 'ostruct' - Blog = OpenStruct.new( - :title => 'a scanty blog', - :author => 'John Doe', - :url_base => 'http://localhost:4567/', - :admin_password => 'changeme', - :admin_cookie_key => 'scanty_admin', - :admin_cookie_value => '51d6d976913ace58', - :disqus_shortname => nil - ) -end error do e = request.env['sinatra.error'] @@ -89,7 +75,7 @@ def auth end post '/auth' do - set_cookie(Blog.admin_cookie_key, Blog.admin_cookie_value) if params[:password] == Blog.admin_password + response.set_cookie(Blog.admin_cookie_key, Blog.admin_cookie_value) if params[:password] == Blog.admin_password redirect '/' end