Make url arg act more like Rack::Static (aka. urls). It can take a si…

…ngle string
jbarnette · Jan 28, 2010 · 484233f · 484233f
1 parent a02f812
commit 484233f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/rack/coffee.rb b/lib/rack/coffee.rb
@@ -4,22 +4,22 @@
 
 class Rack::Coffee
 
-  attr_accessor :url, :root
+  attr_accessor :urls, :root
 
   DEFAULTS = {:static => true}
 
   def initialize(app, opts = {})
     opts = DEFAULTS.merge(opts)
     @app = app
-    @url = opts[:url] || '/javascripts'
+    @urls = *opts[:urls] || '/javascripts'
     @root = opts[:root] || Dir.pwd
     @server = opts[:static] ? Rack::File.new(root) : app
   end
 
   def call(env)
     path = Rack::Utils.unescape(env["PATH_INFO"])
     return [403, {"Content-Type" => "text/plain"}, ["Forbidden\n"]] if path.include?('..')
-    return @app.call(env) unless path.index(url) == 0 && path =~ /\.js$/
+    return @app.call(env) unless urls.any? {|url| path.index(url) == 0} && path =~ /\.js$/
     coffee = File.join(root, path.sub(/\.js$/, '.coffee'))
     if File.file?(coffee)
       headers = {

diff --git a/test/rack_coffee_test.rb b/test/rack_coffee_test.rb
@@ -53,7 +53,7 @@ def test_does_not_allow_directory_travesal_with_encoded_periods
   end
 
   def test_serves_coffeescripts_with_alternate_options
-    result = request({:root => File.expand_path(File.dirname(__FILE__)), :url => "/other_javascripts"}).get("/other_javascripts/test.js")
+    result = request({:root => File.expand_path(File.dirname(__FILE__)), :urls => "/other_javascripts"}).get("/other_javascripts/test.js")
     assert_equal 200, result.status
     assert_match /alert\(\"other coffee\"\)\;/, result.body
   end