hocon 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f08e68888c20ee9e02810af3779cdda1b2609699
-  data.tar.gz: d9e7a5896f1b30153efe560693fca92666fc39a7
+  metadata.gz: 313f7a6dd2e038b4a470e80d8342bc3e7607ed0c
+  data.tar.gz: 945e4bbde03daafdb38cb99e412e7ce448ff7c81
 SHA512:
-  metadata.gz: 0926c1b330c0957878263c8e481c8a436b871605f3d50e0256867994d6c0f1c2301572b753b33975431288b74bf71774739a020ddb364e6681f73bb74ac809ce
-  data.tar.gz: db2b55336bf775f3b2595eb098550ffcfdd2ec23e692f3751f04de10cd56301e4bf49ff13966e04a9a1c8e79a3797145461b7fdc66b5e082bc8104af7dbbc39f
+  metadata.gz: 151f0721cb1d6a82951eb6811f4d841d64070a51073b4836c6f0e7ef7629444049f2d53a9286a4d29c6ee5f514d02285e7322c972ac1fd7275f7752a59c41bb1
+  data.tar.gz: 55c1486bccf6850ef061101d89c57df90757650b222d8f1824b013c589156b1ac644514cc39b280eba943c302402f477c8f429714b3fdd89ab0b540f80951bcc

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.1.2
+This is a bugfix release.
+
+* Fixed bug where Hocon::ConfigFactory.parse_file was not handling files with BOMs on Windows,
+  causing UTF-8 files to not load properly.
+
 ## 1.1.1
 This is a bugfix release.
 

data/lib/hocon/impl/parseable.rb

@@ -412,11 +412,11 @@ class Hocon::Impl::Parseable
     def open
       begin
         if block_given?
-          File.open(@input) do |f|
+          File.open(@input, :encoding => 'bom|utf-8') do |f|
             yield f
           end
         else
-          File.open(@input)
+          File.open(@input, :encoding => 'bom|utf-8')
         end
       rescue Errno::ENOENT
         if @initial_options.allow_missing?

data/spec/fixtures/test_utils/resources/utf8.conf

@@ -0,0 +1,2 @@
+#
+ᚠᛇᚻ = ᛫ᛒᛦᚦ᛫ᚠᚱᚩᚠᚢ

data/spec/fixtures/test_utils/resources//341/232/240/341/233/207/341/232/273.conf

@@ -0,0 +1,2 @@
+#
+ᚠᛇᚻ = ᛫ᛒᛦᚦ᛫ᚠᚱᚩᚠᚢ

data/spec/unit/typesafe/config/conf_parser_spec.rb

@@ -781,22 +781,32 @@ describe "Config Parser" do
   # Skipping 'includeURLHeuristically' because we don't support URLs
   # Skipping 'includeURLBasenameHeuristically' because we don't support URLs
 
-  it "acceptBOMStartingFile" do
-    skip("BOM not parsing properly yet; not fixing this now because it most likely only affects windows") do
-      # BOM at start of file should be ignored
-      conf = Hocon::ConfigFactory.parse_file(TestUtils.resource_file("bom.conf"))
-      expect(conf.get_string("foo")).to eq("bar")
+  it "shouldacceptUTF8FileNames" do
+    skip('UTF-8 filenames not currently supported') do
+      expect { Hocon::ConfigFactory.parse_file(TestUtils.resource_file("ᚠᛇᚻ.conf")) }.to raise_error
     end
   end
 
-  it "acceptBOMStartOfStringConfig" do
-    skip("BOM not parsing properly yet; not fixing this now because it most likely only affects windows") do
-      # BOM at start of file is just whitespace, so ignored
-      conf = Hocon::ConfigFactory.parse_string("\uFEFFfoo=bar")
-      expect(conf.get_string("foo")).to eq("bar")
+  it "acceptsUTF8FileContents" do
+    # utf8.conf is UTF-8 with no BOM
+    rune_utf8 = "\u16EB\u16D2\u16E6\u16A6\u16EB\u16A0\u16B1\u16A9\u16A0\u16A2"
+    conf = Hocon::ConfigFactory.parse_file(TestUtils.resource_file("utf8.conf"))
+    expect(conf.get_string("\u16A0\u16C7\u16BB")).to eq(rune_utf8)
+  end
+
+  it "shouldacceptUTF16FileContents" do
+    skip('supporting UTF-16 requires appropriate BOM detection during parsing') do
+      # utf16.conf is UTF-16LE with a BOM
+      expect { Hocon::ConfigFactory.parse_file(TestUtils.resource_file("utf16.conf")) }.to raise_error
     end
   end
 
+  it "acceptBOMStartingFile" do
+    # BOM at start of file should be ignored
+    conf = Hocon::ConfigFactory.parse_file(TestUtils.resource_file("bom.conf"))
+    expect(conf.get_string("foo")).to eq("bar")
+  end
+
   it "acceptBOMInStringValue" do
     # BOM inside quotes should be preserved, just as other whitespace would be
     conf = Hocon::ConfigFactory.parse_string("foo=\"\uFEFF\uFEFF\"")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hocon
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Chris Price
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,6 +162,9 @@ files:
 - spec/fixtures/test_utils/resources/test01.conf
 - spec/fixtures/test_utils/resources/test01.json
 - spec/fixtures/test_utils/resources/test03.conf
+- spec/fixtures/test_utils/resources/utf16.conf
+- spec/fixtures/test_utils/resources/utf8.conf
+- spec/fixtures/test_utils/resources/ᚠᛇᚻ.conf
 - spec/spec_helper.rb
 - spec/test_utils.rb
 - spec/unit/hocon/README.md