Merge pull request #13 from AndrewKvalheim/content-type

Prefixing fails when a proxy has removed the file extension.
middleman · Jan 30, 2015 · 0259f48 · 0259f48
2 parents 14ec7ab + 570acd4
commit 0259f48
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 8 deletions.
diff --git a/features/autoprefixer.feature b/features/autoprefixer.feature
@@ -55,3 +55,12 @@ Feature: Postprocessing stylesheets with Autoprefixer in different configuration
     When I go to "/stylesheets/nope.css"
     Then I should not see "-ms-border-radius"
     And I should see "border-radius"
+
+  Scenario: With arbitrary proxy paths
+    Given the Server is running at "proxy-app"
+    When I go to "/proxy"
+    Then I should not see "-ms-border-radius"
+    And I should see "border-radius"
+    When I go to "/proxy-inline"
+    Then I should not see "-ms-border-radius"
+    And I should see "border-radius"
diff --git a/fixtures/proxy-app/config.rb b/fixtures/proxy-app/config.rb
@@ -0,0 +1,4 @@
+activate :autoprefixer, inline: true
+
+proxy '/proxy', '/stylesheets/page.css', ignore: true
+proxy '/proxy-inline', '/index.html', ignore: true
diff --git a/fixtures/proxy-app/source/index.html b/fixtures/proxy-app/source/index.html
@@ -0,0 +1,12 @@
+<html>
+<head>
+</head>
+<body>
+<style>
+  input {
+    -ms-border-radius: 5px;
+    border-radius: 5px;
+  }
+</style>
+</body>
+</html>
diff --git a/fixtures/proxy-app/source/stylesheets/page.scss b/fixtures/proxy-app/source/stylesheets/page.scss
@@ -0,0 +1,4 @@
+input {
+  -ms-border-radius: 5px;
+  border-radius: 5px;
+}
diff --git a/lib/middleman-autoprefixer/extension.rb b/lib/middleman-autoprefixer/extension.rb
@@ -41,7 +41,11 @@ def initialize(app, options = {})
         # @return [Array]
         def call(env)
           status, headers, response = @app.call(env)
-          prefixed = process(response, env['PATH_INFO'])
+
+          type = headers['Content-Type'].split(';').first
+          path = env['PATH_INFO']
+
+          prefixed = process(response, type, path)
 
           if prefixed.is_a?(String)
             headers['Content-Length'] = ::Rack::Utils.bytesize(prefixed).to_s
@@ -53,10 +57,10 @@ def call(env)
 
         private
 
-        def process(response, path)
-          if standalone_css_content?(path)
+        def process(response, type, path)
+          if standalone_css_content?(type, path)
             prefix(extract_styles(response))
-          elsif inline_html_content?(path)
+          elsif inline_html_content?(type, path)
             prefix_inline_styles(extract_styles(response))
           else
             nil
@@ -81,12 +85,12 @@ def extract_styles(response)
           ::Middleman::Util.extract_response_text(response)
         end
 
-        def inline_html_content?(path)
-          (path.end_with?('.html') || path.end_with?('.php')) && @inline
+        def inline_html_content?(type, path)
+          (type == 'text/html' || path.end_with?('.php')) && @inline
         end
 
-        def standalone_css_content?(path)
-          path.end_with?('.css') && @ignore.none? { |ignore| ::Middleman::Util.path_match(ignore, path) }
+        def standalone_css_content?(type, path)
+          type == 'text/css' && @ignore.none? { |ignore| ::Middleman::Util.path_match(ignore, path) }
         end
       end
     end