s3_website 2.1.14 → 2.1.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a1968031f85b0c1d45d317a9763484a9d535d42b
4
- data.tar.gz: da89fe3f5d96568f7a110ca83bfd491bc2147aa1
3
+ metadata.gz: e0aa2ec3f293a6f73f76adf5c6509588438b47a6
4
+ data.tar.gz: 28eb160ca8aaaefaf627ca96e951b7b453a4bb40
5
5
  SHA512:
6
- metadata.gz: 605ea089be2257843179c8c9393a815ed28846d9d5e701d20d70d172ef84babf6d5f6c645437643b8cf25a69641c202da87e1e21cfb78800378b9250ab35819e
7
- data.tar.gz: 5e871bdacbc86a19acfed9bc220fdddeee87c366a9d34ca1a00f1a94ab918c54f887e5208036c424ca156c32a94af5fd6b2a7ae61fbf17545c0da87e0413bd3e
6
+ metadata.gz: 75dd879fea4dbc4edce2c5971f04645b0190d6cc7e219ce9440f4f25bfdc65c7094bd761d3c14ebb6337a34c13bf4eb6daa864e29d019c891b6bd82d02aec00c
7
+ data.tar.gz: d500de7ae40afadaad2b1307e653fff11db6928b1b8b2f05a5ba2f6b295163b5101d82f3d8dbf0573ec504f247b8dbd7ae1777c7f3e658922024acaf57e065d8
data/changelog.md CHANGED
@@ -2,9 +2,17 @@
2
2
 
3
3
  This project uses [Semantic Versioning](http://semver.org).
4
4
 
5
+ ## 2.1.15
6
+
7
+ * Support non-US-ASCII files when using `max_age`
8
+
9
+ Fixes https://github.com/laurilehmijoki/s3_website/issues/102
10
+
5
11
  ## 2.1.14
6
12
 
7
- * Fix https://github.com/laurilehmijoki/s3_website/issues/104
13
+ * Hide false AWS SDK alarms
14
+
15
+ Fixes https://github.com/laurilehmijoki/s3_website/issues/104
8
16
 
9
17
  ## 2.1.13
10
18
 
@@ -1,3 +1,3 @@
1
1
  module S3Website
2
- VERSION = '2.1.14'
2
+ VERSION = '2.1.15'
3
3
  end
@@ -158,7 +158,6 @@ object Config {
158
158
  val erbStringWithoutComments = erbString.replaceAll("^\\s*#.*", "")
159
159
  rubyRuntime.evalScriptlet(
160
160
  s"""
161
- |# encoding: utf-8
162
161
  |require 'erb'
163
162
  |
164
163
  |str = <<-ERBSTR
@@ -81,7 +81,9 @@ case class Upload(originalFile: File, uploadType: UploadType)(implicit site: Sit
81
81
  (seconds: Int) => Some(seconds),
82
82
  (globs: GlobsSeq) =>
83
83
  globs.find { globAndInt =>
84
- (rubyRuntime evalScriptlet s"File.fnmatch('${globAndInt._1}', '$s3Key')")
84
+ (rubyRuntime evalScriptlet
85
+ s"""|# encoding: utf-8
86
+ |File.fnmatch('${globAndInt._1}', '$s3Key')""".stripMargin)
85
87
  .toJava(classOf[Boolean])
86
88
  .asInstanceOf[Boolean]
87
89
  } map (_._2)
@@ -0,0 +1,15 @@
1
+ package s3.website
2
+
3
+ import com.amazonaws.http.AmazonHttpClient
4
+ import org.apache.commons.logging.LogFactory
5
+ import org.specs2.mutable.Specification
6
+
7
+ class AwsSdkSpec extends Specification {
8
+
9
+ "AWS SDK" should {
10
+ "not log INFO level messages" in {
11
+ // See https://github.com/laurilehmijoki/s3_website/issues/104 for discussion
12
+ LogFactory.getLog(classOf[AmazonHttpClient]).isInfoEnabled must beFalse
13
+ }
14
+ }
15
+ }
@@ -400,6 +400,15 @@ class S3WebsiteSpec extends Specification {
400
400
  push
401
401
  sentPutObjectRequest.getMetadata.getCacheControl must equalTo("no-cache; max-age=0")
402
402
  }
403
+
404
+ "support non-US-ASCII directory names" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
405
+ config = """
406
+ |max_age:
407
+ | "*": 21600
408
+ """.stripMargin
409
+ setLocalFile("tags/笔记/index.html")
410
+ push must equalTo(0)
411
+ }
403
412
  }
404
413
 
405
414
  "max-age in config" should {
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: s3_website
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.14
4
+ version: 2.1.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - Lauri Lehmijoki
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-06-29 00:00:00.000000000 Z
11
+ date: 2014-06-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -140,6 +140,7 @@ files:
140
140
  - src/main/scala/s3/website/model/push.scala
141
141
  - src/main/scala/s3/website/model/ssg.scala
142
142
  - src/main/scala/s3/website/package.scala
143
+ - src/test/scala/s3/website/AwsSdkSpec.scala
143
144
  - src/test/scala/s3/website/S3WebsiteSpec.scala
144
145
  - vagrant/Vagrantfile
145
146
  homepage: https://github.com/laurilehmijoki/s3_website
@@ -167,4 +168,5 @@ signing_key:
167
168
  specification_version: 4
168
169
  summary: Manage your S3 website
169
170
  test_files:
171
+ - src/test/scala/s3/website/AwsSdkSpec.scala
170
172
  - src/test/scala/s3/website/S3WebsiteSpec.scala