From c48c81cbbad55adc0e862e6869749e1ea541395e Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Mon, 26 Oct 2015 00:58:34 -0600 Subject: [PATCH] resolves #1656 don't mangle URL inside tag --- middleman-core/features/asset_host.feature | 2 ++ .../fixtures/asset-host-app/source/asset_host.html.erb | 2 ++ middleman-core/lib/middleman-core/util.rb | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/middleman-core/features/asset_host.feature b/middleman-core/features/asset_host.feature index 47ef143e..a8778d29 100644 --- a/middleman-core/features/asset_host.feature +++ b/middleman-core/features/asset_host.feature @@ -11,6 +11,7 @@ Feature: Alternate between multiple asset hosts Then I should see 'src="https://code.jquery.com/jquery-2.1.3.min.js"' Then I should see content matching %r{http://assets1.example.com/} Then I should not see content matching %r{http://assets1.example.com//} + Then I should see content matching %r{Angular.js} Then I should see content matching %r{'//www.example.com/script.js'} When I go to "/stylesheets/asset_host.css" Then I should see content matching %r{http://assets1.example.com/} @@ -29,6 +30,7 @@ Feature: Alternate between multiple asset hosts Then I should see 'src="https://code.jquery.com/jquery-2.1.3.min.js"' Then I should see content matching %r{http://assets1.example.com/} Then I should not see content matching %r{http://assets1.example.com//} + Then I should see content matching %r{Angular.js} Then I should see content matching %r{'//www.example.com/script.js'} When I go to "/stylesheets/asset_host.css" Then I should see content matching %r{http://assets1.example.com/} diff --git a/middleman-core/fixtures/asset-host-app/source/asset_host.html.erb b/middleman-core/fixtures/asset-host-app/source/asset_host.html.erb index a528d275..30843176 100755 --- a/middleman-core/fixtures/asset-host-app/source/asset_host.html.erb +++ b/middleman-core/fixtures/asset-host-app/source/asset_host.html.erb @@ -41,4 +41,6 @@ <%= image_tag "blank1033.gif" %> <%= image_tag "blank1034.gif" %> +Angular.js + diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb index b06593f0..8e9c0c41 100644 --- a/middleman-core/lib/middleman-core/util.rb +++ b/middleman-core/lib/middleman-core/util.rb @@ -328,7 +328,7 @@ module Middleman Contract String, String, ArrayOf[String], Proc => String def rewrite_paths(body, _path, exts, &_block) - body.dup.gsub(/([=\'\"\(,]\s*)([^\s\'\"\)]+(#{Regexp.union(exts)}))/) do |match| + body.dup.gsub(/([=\'\"\(,]\s*)([^\s\'\"\)>]+(#{Regexp.union(exts)}))/) do |match| opening_character = $1 asset_path = $2