s3_website 2.8.5 → 2.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c1c51a6d20fed9c16cb904e23ad86da4e64921f
-  data.tar.gz: a688890124a62db4d3aed8cb42c4b84d2ffd6aae
+  metadata.gz: 147c1079964479122eef8b8c049d8c14795b7605
+  data.tar.gz: 4fac5c7fe84796797d2a242656f504be508caa52
 SHA512:
-  metadata.gz: 51f58e37ce1eb9a3913deb8fe6b0d201d65d1e8a56cfec93c322379ad1b38f9917b4b287a73f1be7da30a70e659680b7d62cab26ab9483e9ea5fbf6c88ea0dcf
-  data.tar.gz: 6768b7634e1ebc228ae50b90e298d586c42125e22cb5b3f57af3c5d7152425966dd8daeb52ee0dea853bdfa9445ab77ab3c500a3aa5a33206c0c0ae1d6ca610b
+  metadata.gz: df826a2926ecb33997c516c8dcf4f9a8af7f92a05cd0f1af5c18b7b8c860781a784c160ad139d5f7c927a23820e3bf72bd6235d74ce62c13b59cef445594c85e
+  data.tar.gz: 796902606cb3a9c1aec1fb69a76decdbf6919b8bcfde45708444dc23dbefa964133b9b12d247dc2969bac9691375c9553fc65c561ddeadc21a0852d365055b20

data/changelog.md

@@ -2,13 +2,19 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.8.6
+
+* Detect changed file even though the file has the same contents with another file on the S3 bucket
+
+  See <https://github.com/laurilehmijoki/s3_website/issues/156> for discussion.
+
 ## 2.8.5
 
 * URL encode (ä|ö|ü) in invalidation path
 
 ## 2.8.4
 
-* URL encude ' in invalidation path
+* URL encode ' in invalidation path
 
   See <https://github.com/laurilehmijoki/s3_website/issues/63> for discussion.
 

data/lib/s3_website/version.rb

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

data/resources/s3_website.jar.md5

@@ -1 +1 @@
-4e1ae1afeac51fc4390d05fcacf4fbe9
+a5dff84ae39e23dae2a6fd3edfa51823

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

@@ -24,10 +24,10 @@ object UploadHelper {
       errorOrS3Files.right.flatMap { s3Files =>
         Try {
           val s3KeyIndex = s3Files.map(_.s3Key).toSet
-          val s3Md5Index = s3Files.map(_.md5).toSet
+          val s3Md5Index = s3Files.map(s3File => (s3File.s3Key, s3File.md5)).toSet
           val siteFiles = listSiteFiles
           val existsOnS3 = (f: File) => s3KeyIndex contains site.resolveS3Key(f)
-          val isChangedOnS3 = (upload: Upload) => !(s3Md5Index contains upload.md5.get)
+          val isChangedOnS3 = (upload: Upload) => !(s3Md5Index contains (upload.s3Key, upload.md5.get))
           val newUploads = siteFiles collect {
             case file if !existsOnS3(file) => Upload(file, NewFile)
           }

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

@@ -83,6 +83,14 @@ class S3WebsiteSpec extends Specification {
       noUploadsOccurred must beTrue
     }
 
+    "detect a changed file even though another file has the same contents as the changed file" in new BasicSetup {
+      setLocalFilesWithContent(("1.txt", "foo"), ("2.txt", "foo"))
+      setS3File("1.txt", md5Hex("bar"))
+      setS3File("2.txt", md5Hex("foo"))
+      push()
+      sentPutObjectRequest.getKey must equalTo("1.txt")
+    }
+
     "update a file if it has changed" in new BasicSetup {
       setLocalFileWithContent(("index.html", "<h1>old text</h1>"))
       setS3File("index.html", md5Hex("<h1>new text</h1>"))

metadata

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