s3_website 2.1.15 → 2.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0aa2ec3f293a6f73f76adf5c6509588438b47a6
-  data.tar.gz: 28eb160ca8aaaefaf627ca96e951b7b453a4bb40
+  metadata.gz: ed15b1ca2ef35ae9db46ac7fb1fe4551ab935457
+  data.tar.gz: 2dd43e7bcf6708f25e6ebd178cf91d96777cf244
 SHA512:
-  metadata.gz: 75dd879fea4dbc4edce2c5971f04645b0190d6cc7e219ce9440f4f25bfdc65c7094bd761d3c14ebb6337a34c13bf4eb6daa864e29d019c891b6bd82d02aec00c
-  data.tar.gz: d500de7ae40afadaad2b1307e653fff11db6928b1b8b2f05a5ba2f6b295163b5101d82f3d8dbf0573ec504f247b8dbd7ae1777c7f3e658922024acaf57e065d8
+  metadata.gz: 9e94858d9c5de224370e6b91ec88f3eefa62e5662e084ff0ab3e3d8de9bc7162017f050ea7cd00d899265bec303f3d8875f4ad9d78a5bc8f78dde128a5e0dcaf
+  data.tar.gz: 99614f6a9649063480a9227a06429ed602eecc6bcedfbaa7eb0b695686a823bbc7c663a4298354a3f2fb4be438ed46359810d75722acbf0642d104d286f042df

data/changelog.md

@@ -2,6 +2,12 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.1.16
+
+* Support non-US-ASCII files when using `ignore_on_server`
+
+  Fixes https://github.com/laurilehmijoki/s3_website/issues/102
+
 ## 2.1.15
 
 * Support non-US-ASCII files when using `max_age`

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.1.15'
+  VERSION = '2.1.16'
 end

data/resources/s3_website.jar.md5

@@ -1 +1 @@
-d4d98d22a6c83995064859d4f0cc86ad
+10b4bf761facfdfd43d16cb3131f922b

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

@@ -3,10 +3,12 @@ package s3.website
 object Ruby {
   lazy val rubyRuntime = org.jruby.Ruby.newInstance() // Instantiate heavy object
 
-  def rubyRegexMatches(text: String, regex: String) =
-    rubyRuntime.evalScriptlet(
-      s"""
-         !!Regexp.new('$regex').match('$text') # Use !! to force a boolean conversion
-       """
-    ).toJava(classOf[Boolean]).asInstanceOf[Boolean]
+  def rubyRegexMatches(text: String, regex: String) = {
+    val z  = rubyRuntime.evalScriptlet(
+      s"""# encoding: utf-8
+          !!Regexp.new('$regex').match('$text')"""
+    )
+    z.toJava(classOf[Boolean]).asInstanceOf[Boolean]
+  }
+
 }

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

@@ -157,7 +157,7 @@ object Config {
   def erbEval(erbString: String, yamlConfigPath: String): Try[String] = Try {
     val erbStringWithoutComments = erbString.replaceAll("^\\s*#.*", "")
     rubyRuntime.evalScriptlet(
-      s"""
+      s"""|# encoding: utf-8
         |require 'erb'
         |
         |str = <<-ERBSTR

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

@@ -338,6 +338,13 @@ class S3WebsiteSpec extends Specification {
       push
       noDeletesOccurred must beTrue
     }
+
+    "support non-US-ASCII files"  in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+      setS3Files(S3File("tags/笔记/test.html", ""))
+      config = "ignore_on_server: tags/笔记/test.html"
+      push
+      noDeletesOccurred must beTrue
+    }
   }
 
   """
@@ -354,6 +361,16 @@ class S3WebsiteSpec extends Specification {
       push
       noDeletesOccurred must beTrue
     }
+
+    "support non-US-ASCII files"  in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+      setS3Files(S3File("tags/笔记/test.html", ""))
+      config = """
+                 |ignore_on_server:
+                 |  - tags/笔记/test.html
+               """.stripMargin
+      push
+      noDeletesOccurred must beTrue
+    }
   }
 
   "max-age in config" can {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.1.15
+  version: 2.1.16
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor