s3_website_monadic 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 486eca634309564e0eee312970f5b65e0886f848
-  data.tar.gz: 828bc8f2c6a316b7ec10b5987e5dd0138ecdd00b
+  metadata.gz: f86d4b06157085efd1c389f9a8ec15bdd019aa66
+  data.tar.gz: b4b461eb8fd319a95b87231430831ca5fc56e288
 SHA512:
-  metadata.gz: 824b5b8cf528ee55fe3e525c185344691918314766d25f6f6534dd27be57a00fd59d0ccf417b4c02a3d961f7c6764e71ada6150e3bf38dbe3c2c75562b6c1c7f
-  data.tar.gz: 603f6e64ed8d5a8764e137df3d66154e0f9445eafc7cf3709babab4477579ac0afebf29fc35bdc3a47c412256adcad6018ac489dc6d600552e144eb5ab3f1568
+  metadata.gz: 65805273617dcf99e2dedd7e32a7640fdc85fd40c055ecbe282be74bb050ab70d101cdbf5bb9c20cc703f6a1425f996c5d1a7ce972be8d203454c22682de9daf
+  data.tar.gz: 3f369bb8674f34540bdf5d39cff572542f93e9dced36a1aeab402213ebe1860e77f38ff058ad562a64f50fa1864718a2f90c19dd9a20a91fdf7d8108c0796ed3

data/s3_website.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "s3_website_monadic"
-  s.version     = "0.0.12"
+  s.version     = "0.0.13"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Lauri Lehmijoki"]
   s.email       = ["lauri.lehmijoki@iki.fi"]

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

@@ -104,7 +104,7 @@ object CloudFront {
 
 
   def needsInvalidation: PartialFunction[PushSuccessReport, Boolean] = {
-    case SuccessfulUpload(upload) => upload.uploadType match {
+    case SuccessfulUpload(upload, _) => upload.uploadType match {
       case Update => true
       case _ => false
     }

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

@@ -138,7 +138,7 @@ object Push {
       failureOrSuccess => failureOrSuccess.fold(
         (failureReport: PushFailureReport) => counts.copy(failures = counts.failures + 1),
         (successReport: PushSuccessReport) => successReport match {
-          case SuccessfulUpload(upload) => upload.uploadType match {
+          case SuccessfulUpload(upload, _) => upload.uploadType match {
             case NewFile  => counts.copy(newFiles = counts.newFiles + 1)
             case Update   => counts.copy(updates = counts.updates + 1)
             case Redirect => counts.copy(redirects = counts.redirects + 1)

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

@@ -21,8 +21,9 @@ class S3(implicit s3Settings: S3Settings, executor: ExecutionContextExecutor) {
 
   def upload(upload: Upload with UploadTypeResolved, a: Attempt = 1)(implicit config: Config): Future[Either[FailedUpload, SuccessfulUpload]] =
     Future {
-      s3Settings.s3Client(config) putObject toPutObjectRequest(upload)
-      val report = SuccessfulUpload(upload)
+      val putObjectRequest = toPutObjectRequest(upload)
+      s3Settings.s3Client(config) putObject putObjectRequest
+      val report = SuccessfulUpload(upload, putObjectRequest.getMetadata)
       info(report)
       Right(report)
     } recoverWith retry(a)(
@@ -136,11 +137,19 @@ object S3 {
     def s3Key: String
   }
 
-  case class SuccessfulUpload(upload: Upload with UploadTypeResolved) extends PushSuccessReport {
+  case class SuccessfulUpload(upload: Upload with UploadTypeResolved, metadata: ObjectMetadata) extends PushSuccessReport {
+    def metadataReport =
+      (metadata.getCacheControl :: metadata.getContentType :: metadata.getContentEncoding :: Nil)
+        .map(Option(_))
+        .collect {
+          case Some(metadatum) => metadatum
+        }
+        .mkString(" | ")
+
     def reportMessage =
       upload.uploadType match {
-        case NewFile  => s"Created ${upload.s3Key}"
-        case Update   => s"Updated ${upload.s3Key}"
+        case NewFile  => s"Created ${upload.s3Key} ($metadataReport)"
+        case Update   => s"Updated ${upload.s3Key} ($metadataReport)"
         case Redirect => s"Redirecting ${upload.essence.left.get.key} to ${upload.essence.left.get.redirectTarget}"
       }
 

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

@@ -85,7 +85,7 @@ class S3WebsiteSpec extends Specification {
     }
 
     "create a file if does not exist on S3" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFilesAndContent(localFilesWithContent = ("index.html", "<h1>hello</h1>") :: Nil)
+      implicit val site = siteWithFiles(localFiles = "index.html" :: Nil)
       Push.pushSite
       sentPutObjectRequest.getKey must equalTo("index.html")
     }
@@ -98,14 +98,14 @@ class S3WebsiteSpec extends Specification {
     }
 
     "try again if the upload fails" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFilesAndContent(localFilesWithContent = ("index.html", "<h1>hello</h1>") :: Nil)
+      implicit val site = siteWithFiles(localFiles = "index.html" :: Nil)
       uploadFailsAndThenSucceeds(howManyFailures = 5)
       Push.pushSite
       verify(amazonS3Client, times(6)).putObject(Matchers.any(classOf[PutObjectRequest]))
     }
 
     "not try again if the upload fails on because of invalid credentials" in new SiteDirectory with MockAWS {
-      implicit val site = siteWithFilesAndContent(localFilesWithContent = ("index.html", "<h1>hello</h1>") :: Nil)
+      implicit val site = siteWithFiles(localFiles = "index.html" :: Nil)
       when(amazonS3Client.putObject(Matchers.any(classOf[PutObjectRequest]))).thenThrow {
         val e = new AmazonServiceException("your credentials are incorrect")
         e.setStatusCode(403)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_website_monadic
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Lauri Lehmijoki