s3_website 2.8.3 → 2.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ef96125c6a73593af5f5fad43964ec7f968511f
-  data.tar.gz: 883d27f9ee3ae528c4d3e76478740c66f56734c5
+  metadata.gz: 3eb61e148cba2a736188f4722ffe0f83c880c3e6
+  data.tar.gz: 18d990870b6d1f84c41517ee3fdc84e3cb2d8d8f
 SHA512:
-  metadata.gz: 183d2e3a0644fc60ca90b045bd74101601e5e6b182a348e5e55b68d3df6090ed81671cf921126e97659ee6fc81b6f384bd861cd160f4d9b1b82403d1e6b220e5
-  data.tar.gz: 2580cfc91f7a99ec584d826b1677b87afcb2f90407074a318b02568ae7ed55153849d35d554bb981fba4ea6fdc6ad04d0600cda235753ba7157da8e4af7f11ba
+  metadata.gz: d9b477c47017a4c3d53c06201f473f595ece6bd1e656405907b3c4cbb1f79475e02c397ffae1d67c92a2b6770d7b68cf8e3eecbc2d7a9726e48ee974f4b8b41d
+  data.tar.gz: e97b944a26585749bef90578ec657d9dff4b40835cdfa1cdb177f937ef5cc0e029a9905ccc965111b78a42a7637e3f1e2e2f4d4f49dc4b4426f1c48cda81b9bf

data/changelog.md

@@ -2,6 +2,14 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.8.4
+
+* URL encude ' in invalidation path
+
+  See <https://github.com/laurilehmijoki/s3_website/issues/63> for discussion.
+
+* Accept ' in `exclude_from_upload` and `ignore_on_server`
+
 ## 2.8.3
 
 * Fix bug where the setting `cloudfront_invalidate_root: true` resulted in a

data/lib/s3_website/version.rb

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

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

@@ -8,7 +8,7 @@ import scala.collection.JavaConversions._
 import scala.concurrent.duration._
 import s3.website.S3.{SuccessfulDelete, PushSuccessReport, SuccessfulUpload}
 import com.amazonaws.auth.BasicAWSCredentials
-import java.net.URI
+import java.net.{URLEncoder, URI}
 import scala.concurrent.{ExecutionContextExecutor, Future}
 import s3.website.model.Config.awsCredentials
 
@@ -68,29 +68,34 @@ object CloudFront {
   def awsCloudFrontClient(config: Config) = new AmazonCloudFrontClient(awsCredentials(config))
 
   def toInvalidationBatches(pushSuccessReports: Seq[PushSuccessReport])(implicit config: Config): Seq[InvalidationBatch] = {
+    def defaultPath(paths: Seq[String]): Option[String] = {
+      // This is how we support the Default Root Object @ CloudFront (http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DefaultRootObject.html)
+      // We could do this more accurately by fetching the distribution config (http://docs.aws.amazon.com/AmazonCloudFront/latest/APIReference/GetConfig.html)
+      // and reading the Default Root Object from there.
+      val containsPotentialDefaultRootObject = paths
+        .exists(
+          _
+            .replaceFirst("^/", "") // S3 keys do not begin with a slash
+            .contains("/") == false // See if the S3 key is a top-level key (i.e., it is not within a directory)
+        )
+      if (containsPotentialDefaultRootObject) Some("/") else None
+    }
+    val indexPath = config.cloudfront_invalidate_root collect {
+      case true if pushSuccessReports.nonEmpty => "/index.html"
+    }
+
     val invalidationPaths: Seq[String] = {
-      def withDefaultPathIfNeeded(paths: Seq[String]) = {
-        // This is how we support the Default Root Object @ CloudFront (http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DefaultRootObject.html)
-        // We do this more accurately by fetching the distribution config (http://docs.aws.amazon.com/AmazonCloudFront/latest/APIReference/GetConfig.html)
-        // and reading the Default Root Object from there.
-        val containsPotentialDefaultRootObject = paths
-          .exists(
-            _
-              .replaceFirst("^/", "") // S3 keys do not begin with a slash
-              .contains("/") == false // See if the S3 key is a top-level key (i.e., it is not within a directory)
-          )
-        if (containsPotentialDefaultRootObject) paths :+ "/" else paths
-      }
-      def withIndexPathIfNeeded(paths: Seq[String]) =
-        if (config.cloudfront_invalidate_root.contains(true) && pushSuccessReports.nonEmpty)
-          paths :+ "/index.html"
-        else
-          paths
       val paths = pushSuccessReports
-        .filter(needsInvalidation) // Assume that redirect objects are never cached.
+        .filter(needsInvalidation)
         .map(toInvalidationPath)
+        .map(encodeUnsafeChars)
         .map(applyInvalidateRootSetting)
-      withIndexPathIfNeeded(withDefaultPathIfNeeded(paths))
+
+      val extraPathItems = defaultPath(paths) :: indexPath :: Nil collect {
+        case Some(path) => path
+      }
+
+      paths ++ extraPathItems
     }
 
     invalidationPaths
@@ -109,17 +114,11 @@ object CloudFront {
     else
       path
 
-  def toInvalidationPath(report: PushSuccessReport) = {
-    def encodeUnsafeChars(path: String) =
-      new URI(
-        "http",
-        "cloudfront", // We want to use the encoder in the URI class. These must be passed in.
-        "/" + report.s3Key,  // CloudFront keys have the slash in front
-        path
-      ).toURL.getPath // The URL class encodes the unsafe characters
-    val invalidationPath = "/" + report.s3Key  // CloudFront keys have the slash in front
-    encodeUnsafeChars(invalidationPath)
-  }
+  def toInvalidationPath(report: PushSuccessReport) = "/" + report.s3Key
+
+  def encodeUnsafeChars(invalidationPath: String) =
+    new URI("http", "cloudfront", invalidationPath, "").toURL.getPath
+      .replaceAll("'", URLEncoder.encode("'", "UTF-8")) // CloudFront does not accept ' in invalidation path
 
 
   def needsInvalidation: PartialFunction[PushSuccessReport, Boolean] = {

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

@@ -6,7 +6,7 @@ object Ruby {
   def rubyRegexMatches(text: String, regex: String) = {
     val z  = rubyRuntime.evalScriptlet(
       s"""# encoding: utf-8
-          !!Regexp.new('$regex').match('$text')"""
+          !!Regexp.new("$regex").match("$text")"""
     )
     z.toJava(classOf[Boolean]).asInstanceOf[Boolean]
   }

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

@@ -204,7 +204,7 @@ class S3WebsiteSpec extends Specification {
       setLocalFile("articles/arnold's file.html")
       setOutdatedS3Keys("articles/arnold's file.html")
       push()
-      sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/articles/arnold's%20file.html" :: Nil).sorted)
+      sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/articles/arnold%27s%20file.html" :: Nil).sorted)
     }
 
     "invalidate the root object '/' if a top-level object is updated or deleted" in new BasicSetup {

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

@@ -0,0 +1,11 @@
+package s3.website
+
+import org.specs2.mutable.Specification
+
+class UnitTest extends Specification {
+  "rubyRegexMatches" should {
+    "accept valid URL characters" in {
+      Ruby.rubyRegexMatches("arnold's file.txt", ".txt") must beTrue
+    }
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.8.3
+  version: 2.8.4
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2015-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -142,6 +142,7 @@ files:
 - src/main/scala/s3/website/package.scala
 - src/test/scala/s3/website/AwsSdkSpec.scala
 - src/test/scala/s3/website/S3WebsiteSpec.scala
+- src/test/scala/s3/website/UnitTest.scala
 - vagrant/Vagrantfile
 homepage: https://github.com/laurilehmijoki/s3_website
 licenses:
@@ -170,3 +171,4 @@ summary: Manage your S3 website
 test_files:
 - src/test/scala/s3/website/AwsSdkSpec.scala
 - src/test/scala/s3/website/S3WebsiteSpec.scala
+- src/test/scala/s3/website/UnitTest.scala