Fix problem with windows file separator

hanami · Feb 4, 2016 · 6fc873b · 6fc873b
1 parent 7ce11e3
commit 6fc873b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/hanami/static.rb b/lib/hanami/static.rb
@@ -6,6 +6,10 @@ class Static < ::Rack::Static
     PATH_INFO        = 'PATH_INFO'.freeze
     PUBLIC_DIRECTORY = Hanami.public_directory.join('**', '*').to_s.freeze
 
+    # @since x.x.x
+    # @api private
+    URL_SEPARATOR       = '/'.freeze
+
     def initialize(app)
       super(app, root: Hanami.public_directory, header_rules: _header_rules)
       @sources = _sources_from_applications
@@ -31,8 +35,9 @@ def call(env)
     private
 
     def can_serve(path, original = nil)
+      file_path = path.gsub(URL_SEPARATOR, ::File::SEPARATOR)
       destination = Dir[PUBLIC_DIRECTORY].find do |file|
-        file.index("public#{path}").to_i > 0
+        file.index("public#{file_path}").to_i > 0
       end
 
       (super(path) || !!destination) && _fresh?(original, destination)

diff --git a/test/integration/static_assets/test_application.rb b/test/integration/static_assets/test_application.rb
@@ -97,7 +97,7 @@
 JS
       end
 
-      get '/assets/dashboard.js'
+      get 'assets/dashboard.js'
       response.body.must_include 'stale'
 
       sleep 1