no more link rewrite, introduced base tag

webgio · Feb 25, 2015 · 694b7b2 · 694b7b2
1 parent 5891a52
commit 694b7b2
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 8 deletions.
diff --git a/Rotativa.Demo/Content/csstest.css b/Rotativa.Demo/Content/csstest.css
@@ -0,0 +1,4 @@
+#cssRevealedContent {
+            display: block;
+        }
+
diff --git a/Rotativa.Demo/Controllers/CssTestsController.cs b/Rotativa.Demo/Controllers/CssTestsController.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+
+namespace Rotativa.Demo.Controllers
+{
+    public class CssTestsController : Controller
+    {
+        //
+        // GET: /CssTests/
+
+        public ActionResult Index()
+        {
+            return new ViewAsPdf();
+        }
+
+    }
+}
diff --git a/Rotativa.Demo/Rotativa.Demo.csproj b/Rotativa.Demo/Rotativa.Demo.csproj
@@ -65,6 +65,7 @@
   <ItemGroup>
     <Compile Include="Controllers\AccountController.cs" />
     <Compile Include="Controllers\AjaxTestsController.cs" />
+    <Compile Include="Controllers\CssTestsController.cs" />
     <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Controllers\TestController.cs" />
     <Compile Include="Global.asax.cs">
@@ -75,6 +76,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Content\csstest.css" />
     <Content Include="Content\themes\base\images\ui-bg_flat_0_aaaaaa_40x100.png" />
     <Content Include="Content\themes\base\images\ui-bg_flat_75_ffffff_40x100.png" />
     <Content Include="Content\themes\base\images\ui-bg_glass_55_fbf9ee_1x400.png" />
@@ -176,6 +178,9 @@
   <ItemGroup>
     <Content Include="Views\AjaxTests\Index.cshtml" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\CssTests\Index.cshtml" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

diff --git a/Rotativa.Demo/Views/AjaxTests/Index.cshtml b/Rotativa.Demo/Views/AjaxTests/Index.cshtml
@@ -3,7 +3,6 @@
 }
 @section head
 {
-    <base href="http://localhost:12237/">
 }
 
 <h2>Index</h2>

diff --git a/Rotativa.Demo/Views/CssTests/Index.cshtml b/Rotativa.Demo/Views/CssTests/Index.cshtml
@@ -0,0 +1,19 @@
+@{
+    ViewBag.Title = "Index";
+}
+
+@section head
+{
+    <style type="text/css">
+        #cssRevealedContent {
+            display: none;
+        }
+    </style>
+    <link href="/Content/csstest.css" rel="stylesheet" />
+}
+
+<h2>Index</h2>
+<div id="cssRevealedContent">
+    <p>Hi guys, this content shows up thanks to css file.</p>
+
+</div>
diff --git a/Rotativa.Demo/Views/Home/Index.cshtml b/Rotativa.Demo/Views/Home/Index.cshtml
@@ -18,6 +18,7 @@
                     <li>@Html.ActionLink("Error Test", "ErrorTest", "Home")</li>
                     <li>@Html.ActionLink("Binary Test", "BinaryTest", "Home")</li>
                     <li>@Html.ActionLink("Ajax Test", "Index", "AjaxTests")</li>
+                    <li>@Html.ActionLink("External CSS Test", "Index", "CssTests")</li>
                 </ul>
 
 </p>

diff --git a/Rotativa.Demo/Views/Shared/_Layout.cshtml b/Rotativa.Demo/Views/Shared/_Layout.cshtml
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
-<head>
+<HEAD>
     <meta charset="utf-8" />
     @RenderSection("head", required: false)
     <title>@ViewBag.Title</title>
     <link href="@Url.Content("~/Content/Site.css")" rel="stylesheet" type="text/css" />
     <script src="@Url.Content("~/Scripts/jquery-1.5.1.min.js")" type="text/javascript"></script>
     <script src="@Url.Content("~/Scripts/modernizr-1.7.min.js")" type="text/javascript"></script>
-</head>
+</HEAD>
 <body>
     <div class="page">
         <header>

diff --git a/Rotativa.Tests/RotativaTests.cs b/Rotativa.Tests/RotativaTests.cs
@@ -176,5 +176,21 @@ public void Can_print_pdf_from_page_with_content_from_ajax_request()
                 pdfTester.PdfContains(content).Should().Be.True();
             }
         }
+
+        [Test]
+        public void Can_print_pdf_from_page_with_external_css_file()
+        {
+            var testLink = selenium.FindElement(By.LinkText("External CSS Test"));
+            var pdfHref = testLink.GetAttribute("href");
+            var content = "Hi guys, this content shows up thanks to css file.";
+            using (var wc = new WebClient())
+            {
+                var pdfResult = wc.DownloadData(new Uri(pdfHref));
+                var pdfTester = new PdfTester();
+                pdfTester.LoadPdf(pdfResult);
+                pdfTester.PdfIsValid.Should().Be.True();
+                pdfTester.PdfContains(content).Should().Be.True();
+            }
+        }
     }
 }
diff --git a/Rotativa/ViewAsPdf.cs b/Rotativa/ViewAsPdf.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Web;
 using System.Web.Mvc;
 
@@ -98,14 +99,14 @@ protected override byte[] CallTheDriver(ControllerContext context)
                 var viewContext = new ViewContext(context, viewResult.View, context.Controller.ViewData, context.Controller.TempData, sw);
                 viewResult.View.Render(viewContext, sw);
 
-                StringBuilder html = sw.GetStringBuilder();
+                string html = sw.GetStringBuilder().ToString();
 
-                // replace href and src attributes with full URLs
+                // add base tag to the html doc, to allow wkhtmltopdf to resolve links etc.
                 string baseUrl = string.Format("{0}://{1}", HttpContext.Current.Request.Url.Scheme, HttpContext.Current.Request.Url.Authority);
-                html.Replace(" href=\"/", string.Format(" href=\"{0}/", baseUrl));
-                html.Replace(" src=\"/", string.Format(" src=\"{0}/", baseUrl));
+                html = Regex.Replace(html, "<head>", string.Format("<head><base href=\"{0}\" />", baseUrl),
+                              RegexOptions.IgnoreCase);
 
-                var fileContent = WkhtmltopdfDriver.ConvertHtml(WkhtmltopdfPath, GetConvertOptions(), html.ToString());
+                var fileContent = WkhtmltopdfDriver.ConvertHtml(WkhtmltopdfPath, GetConvertOptions(), html);
                 return fileContent;
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ @@
     }
     @section head
     {
-        <base href="http://localhost:12237/">
     }
     <h2>Index</h2>
@@ Expand Down @@