Automatically add slash to redirects if needed

changelog.md

@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.1.6
+
+* Automatically add slash to redirects if needed
+
 ## 2.1.5
 
 * Target JVM 1.6 in build.sbt

lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.1.5'
+  VERSION = '2.1.6'
 end

src/main/scala/s3/website/model/push.scala

@@ -155,9 +155,18 @@ object Redirect {
     config.redirects.fold(Nil: Seq[Redirect]) { sourcesToTargets =>
       sourcesToTargets.foldLeft(Seq(): Seq[Redirect]) {
         (redirects, sourceToTarget) =>
-          redirects :+ Redirect(sourceToTarget._1, sourceToTarget._2)
+          redirects :+ Redirect(sourceToTarget._1, applySlashIfNeeded(sourceToTarget._2))
       }
   }
+
+  private def applySlashIfNeeded(redirectTarget: String) = {
+    val isExternalRedirect = redirectTarget.matches("https?:\\/\\/.*")
+    val isInSiteRedirect = redirectTarget.startsWith("/")
+    if (isInSiteRedirect || isExternalRedirect)
+      redirectTarget
+    else
+      "/" + redirectTarget // let the user have redirect settings like "index.php: index.html" in s3_website.ml
+  }
 }
 
 case class S3File(s3Key: String, md5: MD5)

src/test/scala/s3/website/S3WebsiteSpec.scala

@@ -444,6 +444,33 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequest.getRedirectLocation must equalTo("/index.html")
     }
 
+    "add slash to the redirect target" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+      config = """
+                 |redirects:
+                 |  index.php: index.html
+               """.stripMargin
+      push
+      sentPutObjectRequest.getRedirectLocation must equalTo("/index.html")
+    }
+
+    "support external redirects" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+      config = """
+                 |redirects:
+                 |  index.php: http://www.youtube.com/watch?v=dQw4w9WgXcQ
+               """.stripMargin
+      push
+      sentPutObjectRequest.getRedirectLocation must equalTo("http://www.youtube.com/watch?v=dQw4w9WgXcQ")
+    }
+
+    "support external redirects that point to an HTTPS target" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+      config = """
+                 |redirects:
+                 |  index.php: https://www.youtube.com/watch?v=dQw4w9WgXcQ
+               """.stripMargin
+      push
+      sentPutObjectRequest.getRedirectLocation must equalTo("https://www.youtube.com/watch?v=dQw4w9WgXcQ")
+    }
+
     "result in max-age=0 Cache-Control header on the object" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = """
         |redirects: