Skip to content

Commit

Permalink
construct self routing via config.builder
Browse files Browse the repository at this point in the history
  • Loading branch information
machu committed Jun 2, 2013
1 parent b8194ad commit 41b7eac
Showing 1 changed file with 28 additions and 26 deletions.
54 changes: 28 additions & 26 deletions tdiary/application.rb
Expand Up @@ -21,32 +21,6 @@ def initialize( base_dir = '/' )
Application.config.builder_procs.each do |builder_proc|
instance_eval &builder_proc
end

map Application.config.path[:index] do
use TDiary::Rack::HtmlAnchor
use TDiary::Rack::Static, "public"
use TDiary::Rack::ValidRequestPath
run TDiary::Dispatcher.index
end

map Application.config.path[:update] do
use TDiary::Rack::Auth::Basic, '.htpasswd'
run TDiary::Dispatcher.update
end

map Application.config.path[:assets] do
environment = Sprockets::Environment.new
Application.config.assets_paths.each do |path|
environment.append_path path
end

if Application.config.assets_precompile
require 'tdiary/rack/assets/precompile'
use TDiary::Rack::Assets::Precompile, environment
end

run environment
end
end
}
end
Expand All @@ -60,6 +34,34 @@ def call( env )
config.assets_paths.concat %w(js theme).map {|path|
File.join(TDiary.root, path)
}

config.builder do
map Application.config.path[:index] do
use TDiary::Rack::HtmlAnchor
use TDiary::Rack::Static, "public"
use TDiary::Rack::ValidRequestPath
run TDiary::Dispatcher.index
end

map Application.config.path[:update] do
use TDiary::Rack::Auth::Basic, '.htpasswd'
run TDiary::Dispatcher.update
end

map Application.config.path[:assets] do
environment = Sprockets::Environment.new
Application.config.assets_paths.each do |path|
environment.append_path path
end

if Application.config.assets_precompile
require 'tdiary/rack/assets/precompile'
use TDiary::Rack::Assets::Precompile, environment
end

run environment
end
end
end
end

Expand Down

0 comments on commit 41b7eac

Please sign in to comment.