Merge pull request #62 from heroku/clean_urls_conflict

Fix #57. Clean URLs clean even if there's a directory

scripts/config/templates/nginx.conf.erb

@@ -46,7 +46,7 @@ http {
       mruby_post_read_handler /app/bin/config/lib/ngx_mruby/headers.rb cache;
       mruby_set $fallback /app/bin/config/lib/ngx_mruby/routes_fallback.rb cache;
     <% if clean_urls %>
-      try_files $uri $uri/ $uri.html $fallback;
+      try_files $uri.html $uri $uri/ $fallback;
     <% else %>
       try_files $uri $uri/ $fallback;
     <% end %>
@@ -70,7 +70,7 @@ http {
       mruby_set $path /app/bin/config/lib/ngx_mruby/routes_path.rb cache;
       mruby_set $fallback /app/bin/config/lib/ngx_mruby/routes_fallback.rb cache;
     <% if clean_urls %>
-      try_files $uri $uri/ /$uri.html $path $fallback;
+      try_files $uri.html $uri $uri/ $path $fallback;
     <% else %>
       try_files $uri $path $fallback;
     <% end %>

spec/fixtures/clean_urls_conflict/public_html/foo.html

+foobar

spec/fixtures/clean_urls_conflict/public_html/foo/bar.html

+bar

spec/fixtures/clean_urls_conflict/static.json

+{
+  "clean_urls": true
+}

spec/fixtures/ordering_clean_urls/public_html/foo.html

+foo

spec/fixtures/ordering_clean_urls/public_html/foo/bar.html

+foobar

spec/simple_spec.rb

@@ -68,6 +68,23 @@ RSpec.describe "Simple" do
         expect(response.body.chomp).to eq("bar")
       end
     end
+
+    context "when there is a conflict" do
+      let(:name) { "clean_urls_conflict" }
+
+
+      it "should be able to handle when a directory and .html file share the same name" do
+        app.run do
+          response = app.get("/foo/bar")
+          expect(response.code).to eq("200")
+          expect(response.body.chomp).to eq("bar")
+
+          response = app.get("/foo")
+          expect(response.code).to eq("200")
+          expect(response.body.chomp).to eq("foobar")
+        end
+      end
+    end
   end
 
   describe "routes" do
@@ -548,9 +565,13 @@ STATIC_JSON
           expect(response.code).to eq("302")
           expect(app.get(response["location"]).body.chomp).to eq("goodbye")
 
-          response = app.get("/foo")
+          response = app.get("/hello")
           expect(response.code).to eq("200")
           expect(response.body.chomp).to eq("hello world")
+
+          response = app.get("/foo")
+          expect(response.code).to eq("200")
+          expect(response.body.chomp).to eq("foo")
         end
       end
     end