s3_website 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2174b1c721a918280814791eb070431f786d3f8
-  data.tar.gz: 1c965e16df25da900f98ee321e89ad861226537b
+  metadata.gz: 0d697820d3714dc4f00c997a1424c199d8786691
+  data.tar.gz: 9929b4a2e0d951b8bb58556b0aebca80ee36a82c
 SHA512:
-  metadata.gz: 7c706f2591058b084e13850a9015a21ecea00e7d7fd67b65a9fbf9c0245b9bbfd0f80289d057b175bee0a11d85214780dba4a8938952a753ebc1dfc9292403da
-  data.tar.gz: 7a8b141930c0048a0c04c37c3efa2481552bd9fbcc030e74ff7867d0ef4d45e216c28959dfaf7b3b81aa8e0bbbbf908f2fee4b47483deaab610230c1ee300dcd
+  metadata.gz: f8c31db585bdc5d527b90dba36a21e73ec8520eb074feab11ba19aef1a6e01dc7b3faba1c209e720dc7cf0b2768c5cebeb1b97fff8314c8e3675ca3f4ea28766
+  data.tar.gz: 9057ccc704fcd6a31348b4acb36d85cb7f4e23c5236b5e22f2ae63689b4ba5e2c379ddbb0d5595ca1e1caab2b8a055f885a0d1c9317539cc639aea4b73f21bc3

data/changelog.md

@@ -2,6 +2,12 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.7.3
+
+* Support valid URI characters in max_age glob
+
+  See <https://github.com/laurilehmijoki/s3_website/issues/140> for discussion.
+
 ## 2.7.2
 
 * Fix Windows issue

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.7.2'
+  VERSION = '2.7.3'
 end

data/resources/s3_website.jar.md5

@@ -1 +1 @@
-4e379aae6d75790acc76afed21f335cb
+41d397d8e99913ad389d18409f14dc64

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

@@ -80,14 +80,16 @@ case class Upload(originalFile: File, uploadType: UploadType)(implicit site: Sit
         .right.map(respectMostSpecific)
         .fold(
           (seconds: Int) => Some(seconds),
-          (globs: GlobsSeq) =>
-            globs.find { globAndInt =>
-              (rubyRuntime evalScriptlet
+          (globs: GlobsSeq) => {
+            val matchingMaxAge = (glob: String, maxAge: Int) =>
+              rubyRuntime.evalScriptlet(
                 s"""|# encoding: utf-8
-                    |File.fnmatch('${globAndInt._1}', '$s3Key')""".stripMargin)
+                    |File.fnmatch('$glob', "$s3Key")""".stripMargin)
                 .toJava(classOf[Boolean])
                 .asInstanceOf[Boolean]
-            } map (_._2)
+            val fileGlobMatch = globs find Function.tupled(matchingMaxAge)
+            fileGlobMatch map (_._2)
+          }
         )
     }
   }

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

@@ -429,7 +429,7 @@ class S3WebsiteSpec extends Specification {
     }
   }
 
-  "max-age in config" can {
+  "max_age in config" can {
     "be applied to all files" in new BasicSetup {
       config = "max_age: 60"
       setLocalFile("index.html")
@@ -437,6 +437,17 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=60")
     }
 
+    "supports all valid URI characters in the glob setting" in new BasicSetup {
+      config = """
+        |max_age:
+        |  "*.html": 90
+      """.stripMargin
+      val allValidUrlCharacters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~:/?#[]@!$&'()*+,;=" // See http://stackoverflow.com/a/1547940/990356 for discussion
+      setLocalFile(s"$allValidUrlCharacters.html")
+      push
+      sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=90")
+    }
+
     "be applied to files that match the glob" in new BasicSetup {
       config = """
         |max_age:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor