s3_website 2.8.4 → 2.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eb61e148cba2a736188f4722ffe0f83c880c3e6
-  data.tar.gz: 18d990870b6d1f84c41517ee3fdc84e3cb2d8d8f
+  metadata.gz: 0c1c51a6d20fed9c16cb904e23ad86da4e64921f
+  data.tar.gz: a688890124a62db4d3aed8cb42c4b84d2ffd6aae
 SHA512:
-  metadata.gz: d9b477c47017a4c3d53c06201f473f595ece6bd1e656405907b3c4cbb1f79475e02c397ffae1d67c92a2b6770d7b68cf8e3eecbc2d7a9726e48ee974f4b8b41d
-  data.tar.gz: e97b944a26585749bef90578ec657d9dff4b40835cdfa1cdb177f937ef5cc0e029a9905ccc965111b78a42a7637e3f1e2e2f4d4f49dc4b4426f1c48cda81b9bf
+  metadata.gz: 51f58e37ce1eb9a3913deb8fe6b0d201d65d1e8a56cfec93c322379ad1b38f9917b4b287a73f1be7da30a70e659680b7d62cab26ab9483e9ea5fbf6c88ea0dcf
+  data.tar.gz: 6768b7634e1ebc228ae50b90e298d586c42125e22cb5b3f57af3c5d7152425966dd8daeb52ee0dea853bdfa9445ab77ab3c500a3aa5a33206c0c0ae1d6ca610b

data/README.md

@@ -214,6 +214,8 @@ When you run the command `s3_website cfg apply`, it will ask you whether you
 want to deliver your website via CloudFront. If you answer yes, the command will
 create a CloudFront distribution for you.
 
+If you do not want to receive this prompt, or if you are running the command in a non-interactive session, you can use `s3_website cfg apply --headless`.
+
 #### Using your existing CloudFront distribution
 
 If you already have a CloudFront distribution that serves data from your website
@@ -434,6 +436,7 @@ exist.
 Contributors (in alphabetical order)
 * Alan deLevie
 * Almir Sarajčić
+* Andrew T. Baker
 * Cory Kaufman-Schofield
 * Chris Kelly
 * Chris Moos

data/changelog.md

@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.8.5
+
+* URL encode (ä|ö|ü) in invalidation path
+
 ## 2.8.4
 
 * URL encude ' in invalidation path

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.8.4'
+  VERSION = '2.8.5'
 end

data/resources/s3_website.jar.md5

@@ -1 +1 @@
-27a71e14164456987612276f4e92bdad
+4e1ae1afeac51fc4390d05fcacf4fbe9

data/src/main/scala/s3/website/CloudFront.scala

@@ -117,9 +117,16 @@ object CloudFront {
   def toInvalidationPath(report: PushSuccessReport) = "/" + report.s3Key
 
   def encodeUnsafeChars(invalidationPath: String) =
-    new URI("http", "cloudfront", invalidationPath, "").toURL.getPath
+    new URI("http", "cloudfront", invalidationPath, "")
+      .toURL
+      .getPath
       .replaceAll("'", URLEncoder.encode("'", "UTF-8")) // CloudFront does not accept ' in invalidation path
-
+      .flatMap(chr => {
+        if (Seq("ä", "ö", "ü").contains(chr.toString.toLowerCase))
+          URLEncoder.encode(chr.toString, "UTF-8")
+        else
+          chr.toString
+      })
 
   def needsInvalidation: PartialFunction[PushSuccessReport, Boolean] = {
     case succ: SuccessfulUpload => succ.details.fold(_.uploadType, _.uploadType) == FileUpdate

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

@@ -207,6 +207,14 @@ class S3WebsiteSpec extends Specification {
       sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/articles/arnold%27s%20file.html" :: Nil).sorted)
     }
 
+    "encode unsafe characters in the keys" in new BasicSetup {
+      config = "cloudfront_distribution_id: EGM1J2JJX9Z"
+      setLocalFile("articles/Äöü.html")
+      setOutdatedS3Keys("articles/Äöü.html")
+      push()
+      sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/articles/%C3%84%C3%B6%C3%BC.html" :: Nil).sorted)
+    }
+
     "invalidate the root object '/' if a top-level object is updated or deleted" in new BasicSetup {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("maybe-index.html")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.8.4
+  version: 2.8.5
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-01 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor