Creates lang directory when caching index file to prevent MultiViews …

…confusion.

lib/zena/use/rendering.rb

@@ -211,6 +211,11 @@ def cache_page(opts={})
           if perform_caching && caching_allowed(:authenticated => opts.delete(:authenticated))
 
             url = page_cache_file(opts.delete(:url))
+            if url =~ %r{^/(\w\w)\.html$}
+              # Root cache: make sure we create directory to prevent
+              # Multiviews errors.
+              Dir.mkdir(SITES_ROOT + current_site.public_path + "/#{$1}")
+            end
             opts = {:expire_after  => nil,
                     :path          => (current_site.public_path + url),
                     :content_data  => response.body,

test/integration/navigation_test.rb

@@ -411,6 +411,25 @@ def test_bad_zip
     follow_redirect!
     assert_response :missing
   end
+
+  def test_cache_root
+    without_files('test.host/public') do
+      preserving_files('/test.host/data') do
+        with_caching do
+          login(:anon)
+          root_path = "#{SITES_ROOT}#{visitor.site.public_path}/en.html"
+          lang_dir  = "#{SITES_ROOT}#{visitor.site.public_path}/en"
+          assert !File.exists?(root_path), "No cached file yet"
+          assert !File.exists?(lang_dir), "No cached file yet"
+          get 'http://test.host/en'
+
+          # Both en.html and en directory exist
+          assert !File.exists?(root_path), "No cached file yet"
+          assert !File.exists?(lang_dir), "No cached file yet"
+        end
+      end
+    end
+  end
 
   def test_should_not_change_session_lang_on_login
     get 'http://test.host/'