s3_website 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfec8ac2ce1c72f5738bfc30b25a351b2bb48f2a
-  data.tar.gz: 4e0baba6c1728328f1433dc53c2e0c11c71c4933
+  metadata.gz: 07675e2836114a62d64ba9c4f3cb1d468979def7
+  data.tar.gz: 79ec43e71d28fa9eb6852883f3845a91c71adba5
 SHA512:
-  metadata.gz: 26cb367f6797262c1e5b31a23fc85606321e9d9a98e368674bd2b3970042eb56f244e09201233402980112f97a16183db602edcef131b41ac20ed3a84cc569dd
-  data.tar.gz: 555ba6e52cbdfb53ab70f385a59d6177b14b995ed76e2e09f3e44d38dc7e3ea82b684d9b0096edf2766ebe1b04a5bd9ddbaa6fd2f3610a9390308a3e6964e38d
+  metadata.gz: 5b8da0a144df3b8e6a9af48457927f54e9991afd9d81a7eb00ab215c754d72905727dc14298bbeade33190b2a88c14f27fca0e2b28cfbc11bdaaa13e8d60124c
+  data.tar.gz: 83b3cc06196da7997bcd5f0d051c70e08b7ccc0d224c04070adc14e675788fc15c5e90c2d503489d46f854057373c5757969a579315c37059380bff5d9d267f2

data/README.md

@@ -279,7 +279,7 @@ as key-value pairs under the `redirects` configuration option:
 ```yaml
 redirects:
   index.php: /
-  about.php: about.html
+  about.php: /about.html
   music-files/promo.mp4: http://www.youtube.com/watch?v=dQw4w9WgXcQ
 ```
 

data/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

data/lib/s3_website/version.rb

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

data/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)

data/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:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Lauri Lehmijoki