diff options
author | Piotr Sarnacki <drogus@gmail.com> | 2010-07-29 14:12:25 +0200 |
---|---|---|
committer | Piotr Sarnacki <drogus@gmail.com> | 2010-09-03 22:59:09 +0200 |
commit | 401cd97923fb52c8f8c458b8cb276b338e0b20f3 (patch) | |
tree | a91a7125b739914fb9064a1a6418856e9972c3dd | |
parent | 5b6553ebb57037efc171e67b0f4b662f74bcb9a0 (diff) | |
download | rails-401cd97923fb52c8f8c458b8cb276b338e0b20f3.tar.gz rails-401cd97923fb52c8f8c458b8cb276b338e0b20f3.tar.bz2 rails-401cd97923fb52c8f8c458b8cb276b338e0b20f3.zip |
Modified ActionDispatch::Static to allow passing multiple roots
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/static.rb | 60 | ||||
-rw-r--r-- | actionpack/test/dispatch/static_test.rb | 61 | ||||
-rw-r--r-- | actionpack/test/fixtures/blog_public/.gitignore | 1 | ||||
-rw-r--r-- | actionpack/test/fixtures/blog_public/blog.html | 1 | ||||
-rw-r--r-- | actionpack/test/fixtures/blog_public/index.html | 1 | ||||
-rw-r--r-- | actionpack/test/fixtures/blog_public/subdir/index.html | 1 |
6 files changed, 104 insertions, 21 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb index d7e88a54e4..c2d686f514 100644 --- a/actionpack/lib/action_dispatch/middleware/static.rb +++ b/actionpack/lib/action_dispatch/middleware/static.rb @@ -2,11 +2,43 @@ require 'rack/utils' module ActionDispatch class Static + class FileHandler + def initialize(at, root) + @at = at.chomp("/") + @file_server = ::Rack::File.new(root) + end + + def file_exist?(path) + (path = full_readable_path(path)) && File.file?(path) + end + + def directory_exist?(path) + (path = full_readable_path(path)) && File.directory?(path) + end + + def call(env) + env["PATH_INFO"].gsub!(/^#{@at}/, "") + @file_server.call(env) + end + + private + def includes_path?(path) + @at == "" || path =~ /^#{@at}/ + end + + def full_readable_path(path) + return unless includes_path?(path) + path = path.gsub(/^#{@at}/, "") + File.join(@file_server.root, ::Rack::Utils.unescape(path)) + end + end + FILE_METHODS = %w(GET HEAD).freeze - def initialize(app, root) + def initialize(app, roots) @app = app - @file_server = ::Rack::File.new(root) + roots = normalize_roots(roots) + @file_handlers = file_handlers(roots) end def call(env) @@ -14,15 +46,15 @@ module ActionDispatch method = env['REQUEST_METHOD'] if FILE_METHODS.include?(method) - if file_exist?(path) - return @file_server.call(env) + if file_handler = file_exist?(path) + return file_handler.call(env) else cached_path = directory_exist?(path) ? "#{path}/index" : path cached_path += ::ActionController::Base.page_cache_extension - if file_exist?(cached_path) + if file_handler = file_exist?(cached_path) env['PATH_INFO'] = cached_path - return @file_server.call(env) + return file_handler.call(env) end end end @@ -32,13 +64,21 @@ module ActionDispatch private def file_exist?(path) - full_path = File.join(@file_server.root, ::Rack::Utils.unescape(path)) - File.file?(full_path) && File.readable?(full_path) + @file_handlers.detect { |f| f.file_exist?(path) } end def directory_exist?(path) - full_path = File.join(@file_server.root, ::Rack::Utils.unescape(path)) - File.directory?(full_path) && File.readable?(full_path) + @file_handlers.detect { |f| f.directory_exist?(path) } + end + + def normalize_roots(roots) + roots.is_a?(Hash) ? roots : { "/" => roots.chomp("/") } + end + + def file_handlers(roots) + roots.map do |at, root| + FileHandler.new(at, root) + end end end end diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb index e6957bb0ea..2eb82fc5d8 100644 --- a/actionpack/test/dispatch/static_test.rb +++ b/actionpack/test/dispatch/static_test.rb @@ -1,28 +1,23 @@ require 'abstract_unit' -class StaticTest < ActiveSupport::TestCase - DummyApp = lambda { |env| - [200, {"Content-Type" => "text/plain"}, ["Hello, World!"]] - } - App = ActionDispatch::Static.new(DummyApp, "#{FIXTURE_LOAD_PATH}/public") - - test "serves dynamic content" do +module StaticTests + def test_serves_dynamic_content assert_equal "Hello, World!", get("/nofile") end - test "serves static index at root" do + def test_serves_static_index_at_root assert_equal "/index.html", get("/index.html") assert_equal "/index.html", get("/index") assert_equal "/index.html", get("/") end - test "serves static file in directory" do + def test_serves_static_file_in_directory assert_equal "/foo/bar.html", get("/foo/bar.html") assert_equal "/foo/bar.html", get("/foo/bar/") assert_equal "/foo/bar.html", get("/foo/bar") end - test "serves static index file in directory" do + def test_serves_static_index_file_in_directory assert_equal "/foo/index.html", get("/foo/index.html") assert_equal "/foo/index.html", get("/foo/") assert_equal "/foo/index.html", get("/foo") @@ -30,6 +25,50 @@ class StaticTest < ActiveSupport::TestCase private def get(path) - Rack::MockRequest.new(App).request("GET", path).body + Rack::MockRequest.new(@app).request("GET", path).body end end + +class StaticTest < ActiveSupport::TestCase + DummyApp = lambda { |env| + [200, {"Content-Type" => "text/plain"}, ["Hello, World!"]] + } + App = ActionDispatch::Static.new(DummyApp, "#{FIXTURE_LOAD_PATH}/public") + + def setup + @app = App + end + + include StaticTests +end + +class MultipleDirectorisStaticTest < ActiveSupport::TestCase + DummyApp = lambda { |env| + [200, {"Content-Type" => "text/plain"}, ["Hello, World!"]] + } + App = ActionDispatch::Static.new(DummyApp, + { "/" => "#{FIXTURE_LOAD_PATH}/public", + "/blog" => "#{FIXTURE_LOAD_PATH}/blog_public", + "/foo" => "#{FIXTURE_LOAD_PATH}/non_existing_dir" + }) + + def setup + @app = App + end + + include StaticTests + + test "serves files from other mounted directories" do + assert_equal "/blog/index.html", get("/blog/index.html") + assert_equal "/blog/index.html", get("/blog/index") + assert_equal "/blog/index.html", get("/blog/") + + assert_equal "/blog/blog.html", get("/blog/blog/") + assert_equal "/blog/blog.html", get("/blog/blog.html") + assert_equal "/blog/blog.html", get("/blog/blog") + + assert_equal "/blog/subdir/index.html", get("/blog/subdir/index.html") + assert_equal "/blog/subdir/index.html", get("/blog/subdir/") + assert_equal "/blog/subdir/index.html", get("/blog/subdir") + end +end diff --git a/actionpack/test/fixtures/blog_public/.gitignore b/actionpack/test/fixtures/blog_public/.gitignore new file mode 100644 index 0000000000..312e635ee6 --- /dev/null +++ b/actionpack/test/fixtures/blog_public/.gitignore @@ -0,0 +1 @@ +absolute/* diff --git a/actionpack/test/fixtures/blog_public/blog.html b/actionpack/test/fixtures/blog_public/blog.html new file mode 100644 index 0000000000..79ad44c010 --- /dev/null +++ b/actionpack/test/fixtures/blog_public/blog.html @@ -0,0 +1 @@ +/blog/blog.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/blog_public/index.html b/actionpack/test/fixtures/blog_public/index.html new file mode 100644 index 0000000000..2de3825481 --- /dev/null +++ b/actionpack/test/fixtures/blog_public/index.html @@ -0,0 +1 @@ +/blog/index.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/blog_public/subdir/index.html b/actionpack/test/fixtures/blog_public/subdir/index.html new file mode 100644 index 0000000000..517bded335 --- /dev/null +++ b/actionpack/test/fixtures/blog_public/subdir/index.html @@ -0,0 +1 @@ +/blog/subdir/index.html
\ No newline at end of file |