s3_website 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 092f7440dce07a7188fa3c262eb670ee1ce3fcfa
-  data.tar.gz: f33f91a77cebaefdfd7cb37783184a210ab06222
+  metadata.gz: c6bd443ae587cab4726f6ed2e3f11051bb62f7c4
+  data.tar.gz: 4e7410d745fc3a59f26fdc83c16d182a0ba9396f
 SHA512:
-  metadata.gz: fb3f83a880087f6b7f71ac89fdfe356db8c53e28c9f8b899b8bf4da8d96d1f8df4f0001af67e487d8fbee995a9c7dd4a4a5bbaac2f2b3fadee804c80b287c3df
-  data.tar.gz: f25b7a9f0d394497adfd2af1b672fcefc1514d739547a2bba2b83ed68b34984cf837552b457abf293f85f61f6dec46d95e3763118c7675ffdf3ab209b47c4c1f
+  metadata.gz: 6672d992af55beb7954846d8b47652d6c3918ab71616a68b54b4559a59705957572a99d87b364d15f92c81202401173608f26b35acc54f03d8711d0d60358e3e
+  data.tar.gz: 4c2fed94893a54a957f895c3ca57d54f02de2517437a564cccf90320fb18ee7349b9dd37b84e9b1e308e67fe672d7b16f91e879cc2ab221ece55af3e947c040d

data/README.md

@@ -435,6 +435,7 @@ Contributors (in alphabetical order)
 * stanislas
 * Tate Johnson
 * Toby Marsden
+* Tom Bell
 * Trevor Fitzgerald
 * Zee Spencer
 

data/changelog.md

@@ -2,6 +2,12 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.6.1
+
+* Always invalidate the object */index.html* if the setting `cloudfront_invalidate_root` is on
+
+  See https://github.com/laurilehmijoki/s3_website/pull/130 for discussion
+
 ## 2.6.0
 
 * Support `--config-dir` in `cfg apply`

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.6.0'
+  VERSION = '2.6.1'
 end

data/resources/s3_website.jar.md5

@@ -1 +1 @@
-a5da7e6ad06239171fffe9c4822ca814
+7a47d1df31ffe3bb8093719149222afd

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

@@ -66,7 +66,7 @@ object CloudFront {
   }
 
   def awsCloudFrontClient(config: Config) = new AmazonCloudFrontClient(awsCredentials(config))
-  
+
   def toInvalidationBatches(pushSuccessReports: Seq[PushSuccessReport])(implicit config: Config): Seq[InvalidationBatch] = {
     val invalidationPaths: Seq[String] = {
       def withDefaultPathIfNeeded(paths: Seq[String]) = {
@@ -81,11 +81,14 @@ object CloudFront {
           )
         if (containsPotentialDefaultRootObject) paths :+ "/" else paths
       }
+      def withIndexPathIfNeeded(paths: Seq[String]) = {
+        if (config.cloudfront_invalidate_root.contains(true)) paths :+ "/index.html" else paths
+      }
       val paths = pushSuccessReports
         .filter(needsInvalidation) // Assume that redirect objects are never cached.
         .map(toInvalidationPath)
-        .map (applyInvalidateRootSetting)
-      withDefaultPathIfNeeded(paths)
+        .map(applyInvalidateRootSetting)
+      withIndexPathIfNeeded(withDefaultPathIfNeeded(paths))
     }
 
     invalidationPaths
@@ -99,7 +102,7 @@ object CloudFront {
   }
 
   def applyInvalidateRootSetting(path: String)(implicit config: Config) =
-    if (config.cloudfront_invalidate_root.exists(_ == true))
+    if (config.cloudfront_invalidate_root.contains(true))
       path.replaceFirst("/index.html$", "/")
     else
       path

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

@@ -215,7 +215,18 @@ class S3WebsiteSpec extends Specification {
       setLocalFile("articles/index.html")
       setOutdatedS3Keys("articles/index.html")
       push
-      sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/articles/" :: Nil).sorted)
+      sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq must contain("/articles/")
+    }
+
+    "always invalidate the root path" in new BasicSetup {
+      config = """
+        |cloudfront_distribution_id: EGM1J2JJX9Z
+        |cloudfront_invalidate_root: true
+      """.stripMargin
+      setLocalFile("articles/index.html")
+      setOutdatedS3Keys("articles/index.html")
+      push
+      sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq must contain("/index.html")
     }
   }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor