s3_website_monadic 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39f140d0639eb128178c9ec33176ea0f4a842904
-  data.tar.gz: 95e6aae697bf30b9134180521540948f49051b15
+  metadata.gz: 92e9b4b0029ead9d9f441f2a5fdb2687f535a729
+  data.tar.gz: ea74c668aa1f6accc39a1541e56af5b16781f507
 SHA512:
-  metadata.gz: 9779e122e2d5cef1d51e8e085e2ec41882d98f277b9bccabb9afeab065d8ecdc61380a0ac39fb7eb968d03a7d8d1631f45fbbb60c0e79a1264f9c1a65d1b9a60
-  data.tar.gz: 5f501c7f29b0b92d7949f465d965693e3a1ec7dd863dec2135eb7d667c67cbf9a3ed3cd11543e17d61c557af1a4f968fa49f08165fe2631707b0c0142b4eabbf
+  metadata.gz: 866b36966c21be8e2dd88748e9ca3955807668b3bd4efe9a33c70d1458c3d45ed4dc81d8a2b26b2399dfaf7c2a874ebd72006bc9324d7326a43f4457a2629415
+  data.tar.gz: 25613874bf0d7bc119f0307aabf6eecb70a958d010ab486a9ab931b2ae3b6183ebda195c888040f6a0c660b8c50be0cbf9aea5d22e90f3aa11dec2c7cf2a250a

data/s3_website.gemspec

@@ -3,11 +3,11 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "s3_website_monadic"
-  s.version     = "0.0.8"
+  s.version     = "0.0.9"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Lauri Lehmijoki"]
   s.email       = ["lauri.lehmijoki@iki.fi"]
-  s.homepage    = "https://github.com/laurilehmijoki/s3_website"
+  s.homepage    = "https://github.com/laurilehmijoki/s3_website/tree/s3_website_monadic"
   s.summary     = %q{Manage your S3 website}
   s.description = %q{
     Sync website files, set redirects, use HTTP performance optimisations, deliver via

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

@@ -65,7 +65,14 @@ class S3(implicit s3Settings: S3Settings, executor: ExecutionContextExecutor) {
         md setContentLength uploadBody.contentLength
         md setContentType uploadBody.contentType
         uploadBody.contentEncoding foreach md.setContentEncoding
-        uploadBody.maxAge foreach (seconds => md.setCacheControl(s"max-age=$seconds"))
+        uploadBody.maxAge foreach { seconds =>
+          md.setCacheControl(
+            if (seconds == 0)
+              s"no-cache; max-age=$seconds"
+            else
+              s"max-age=$seconds"
+          )
+        }
         val req = new PutObjectRequest(config.s3_bucket, upload.s3Key, uploadBody.openInputStream(), md)
         config.s3_reduced_redundancy.filter(_ == true) foreach (_ => req setStorageClass ReducedRedundancy)
         req

data/src/main/scala/s3/website/model/push.scala

@@ -76,17 +76,6 @@ object LocalFile {
     val md5 = using(fis(sourceFile)) { inputStream =>
       DigestUtils.md5Hex(inputStream)
     }
-    val maxAge = config.max_age.flatMap { maxAgeIntOrGlob =>
-      maxAgeIntOrGlob.fold(
-        (seconds: Int) => Some(seconds),
-        (globs2Ints: Map[String, Int]) =>
-          globs2Ints.find { globAndInt =>
-            (rubyRuntime evalScriptlet s"File.fnmatch('${globAndInt._1}', '${localFile.s3Key}')")
-              .toJava(classOf[Boolean])
-              .asInstanceOf[Boolean]
-          } map (_._2)
-      )
-    }
 
     Upload(
       s3Key = localFile.s3Key,
@@ -95,8 +84,8 @@ object LocalFile {
           md5 = md5,
           contentEncoding = localFile.encodingOnS3.map(_ => "gzip"),
           contentLength = sourceFile.length(),
-          maxAge = maxAge,
-          contentType = tika.detect(localFile.sourceFile),
+          maxAge = resolveMaxAge(localFile),
+          contentType = resolveContentType(localFile.sourceFile),
           openInputStream = () => new FileInputStream(sourceFile)
         )
       )
@@ -108,6 +97,33 @@ object LocalFile {
 
   lazy val tika = new Tika()
 
+  def resolveContentType(file: File) = {
+    val mimeType = tika.detect(file)
+    if (mimeType.startsWith("text/") || mimeType == "application/json")
+      mimeType + "; charset=utf-8"
+    else
+      mimeType
+  }
+
+  def resolveMaxAge(localFile: LocalFile)(implicit config: Config): Option[Int] = {
+    type GlobsMap = Map[String, Int]
+    config.max_age.flatMap { (intOrGlobs: Either[Int, GlobsMap]) =>
+      type GlobsSeq = Seq[(String, Int)]
+      def respectMostSpecific(globs: GlobsMap): GlobsSeq = globs.toSeq.sortBy(_._1).reverse
+      intOrGlobs
+        .right.map(respectMostSpecific)
+        .fold(
+          (seconds: Int) => Some(seconds),
+          (globs: GlobsSeq) =>
+            globs.find { globAndInt =>
+              (rubyRuntime evalScriptlet s"File.fnmatch('${globAndInt._1}', '${localFile.s3Key}')")
+                .toJava(classOf[Boolean])
+                .asInstanceOf[Boolean]
+            } map (_._2)
+        )
+    }
+  }
+
   def resolveLocalFiles(implicit site: Site): Either[ErrorReport, Seq[LocalFile]] = Try {
     val files = recursiveListFiles(new File(site.rootDirectory)).filterNot(_.isDirectory)
     files map { file =>

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

@@ -328,6 +328,27 @@ class S3WebsiteSpec extends Specification {
       Push.pushSite
       sentPutObjectRequest.getMetadata.getCacheControl must beNull
     }
+
+    "be used to disable caching" in new SiteDirectory with MockAWS {
+      implicit val site = siteWithFiles(defaultConfig.copy(max_age = Some(Left(0))), localFiles = "index.html" :: Nil)
+      Push.pushSite
+      sentPutObjectRequest.getMetadata.getCacheControl must equalTo("no-cache; max-age=0")
+    }
+  }
+
+  "max-age in config" should {
+    "respect the more specific glob" in new SiteDirectory with MockAWS {
+      implicit val site = siteWithFiles(
+        defaultConfig.copy(max_age = Some(Right(Map(
+          "**" -> 150,
+          "assets/**" -> 86400
+        )))),
+        localFiles = "index.html" :: "assets/picture.gif" :: Nil
+      )
+      Push.pushSite
+      sentPutObjectRequests.find(_.getKey == "index.html").get.getMetadata.getCacheControl must equalTo("max-age=150")
+      sentPutObjectRequests.find(_.getKey == "assets/picture.gif").get.getMetadata.getCacheControl must equalTo("max-age=86400")
+    }
   }
 
   "s3_reduced_redundancy: true in config" should {
@@ -379,6 +400,32 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequest.getKey must equalTo(".vimrc")
     }
   }
+
+  "content type inference" should {
+    "add charset=utf-8 to all html documents" in new SiteDirectory with MockAWS {
+      implicit val site = siteWithFiles(localFiles = "file.html" :: Nil)
+      Push.pushSite
+      sentPutObjectRequest.getMetadata.getContentType must equalTo("text/html; charset=utf-8")
+    }
+
+    "add charset=utf-8 to all text documents" in new SiteDirectory with MockAWS {
+      implicit val site = siteWithFiles(localFiles = "file.txt" :: Nil)
+      Push.pushSite
+      sentPutObjectRequest.getMetadata.getContentType must equalTo("text/plain; charset=utf-8")
+    }
+
+    "add charset=utf-8 to all json documents" in new SiteDirectory with MockAWS {
+      implicit val site = siteWithFiles(localFiles = "file.json" :: Nil)
+      Push.pushSite
+      sentPutObjectRequest.getMetadata.getContentType must equalTo("application/json; charset=utf-8")
+    }
+
+    "resolve the content type from file contents" in new SiteDirectory with MockAWS {
+      implicit val site = siteWithFilesAndContent(localFilesWithContent = ("index", "<html><body><h1>hi</h1></body></html>") :: Nil)
+      Push.pushSite
+      sentPutObjectRequest.getMetadata.getContentType must equalTo("text/html; charset=utf-8")
+    }
+  }
   
   trait MockAWS extends MockS3 with MockCloudFront with Scope
   
@@ -479,7 +526,7 @@ class S3WebsiteSpec extends Specification {
 
     def sentPutObjectRequests: Seq[PutObjectRequest] = {
       val req = ArgumentCaptor.forClass(classOf[PutObjectRequest])
-      verify(amazonS3Client).putObject(req.capture())
+      verify(amazonS3Client, Mockito.atLeast(1)).putObject(req.capture())
       req.getAllValues
     }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_website_monadic
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Lauri Lehmijoki
@@ -380,7 +380,7 @@ files:
 - src/main/scala/s3/website/model/push.scala
 - src/main/scala/s3/website/package.scala
 - src/test/scala/s3/website/S3WebsiteSpec.scala
-homepage: https://github.com/laurilehmijoki/s3_website
+homepage: https://github.com/laurilehmijoki/s3_website/tree/s3_website_monadic
 licenses:
 - MIT
 metadata: {}