dot-properties 0.1.1 → 0.1.2

data/README.md

@@ -58,6 +58,7 @@ See the spec tests and fixture data for more examples.
 
 ## History
 
+- <b>0.1.2</b> - Improved escaping and Unicode (\uXXXX) support
 - <b>0.1.1</b> - Fix mishandled keys with leading whitespace (#1)
 - <b>0.1.0</b> - Initial release
 

data/lib/dot_properties.rb

@@ -111,7 +111,7 @@ class DotProperties
       if item[:value].nil? or item[:value].empty?
         escape(item[:key])
       else
-        "#{escape(item[:key])}#{item[:delimiter]}#{item[:value]}"
+        "#{escape(item[:key])}#{item[:delimiter]}#{encode(item[:value])}"
       end
     else
       item[:value]
@@ -125,7 +125,7 @@ class DotProperties
       { type: :blank, value: item }
     else
       key, delimiter, value = item.strip.split /(\s*(?<!\\)[\s:=]\s*)/, 2
-      { type: :value, key: unescape(key), delimiter: delimiter, value: value.to_s.gsub(/\\\n\s*/,'') }
+      { type: :value, key: unescape(decode(key)), delimiter: delimiter, value: unescape(decode(value.to_s.gsub(/\\\n\s*/,''))) }
     end
   end
 
@@ -133,12 +133,20 @@ class DotProperties
     @content.find { |item| item[:type] == :value and item[:key] == key }
   end
 
-  def escape(key)
-    key.gsub(/[\s:=]/) { |m| "\\#{m}" }
+  def encode(v)
+    v.gsub(/[\r\n]/) { |m| "\\u#{'%4.4X' % m.codepoints.to_a}" }.gsub(/\\/,'\\'*3)
   end
 
-  def unescape(key)
-    key.gsub(/\\/,'')
+  def decode(v)
+    v.gsub(/\\u([0-9A-Fa-f]{4})/) { |m| $1.hex.chr('UTF-8') }
+  end
+
+  def escape(v)
+    v.gsub(/[\s:=\\]/) { |m| "\\#{m}" }
+  end
+
+  def unescape(v)
+    v.gsub(/(?<!\\)\\/,'')
   end
 
 end

data/lib/dot_properties/version.rb

@@ -1,3 +1,3 @@
 class DotProperties
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/dot_properties_spec.rb

@@ -10,9 +10,9 @@ describe DotProperties do
   let(:propfile) { File.expand_path('../fixtures/sample.properties', __FILE__) }
   subject { DotProperties.load(propfile) }
 
-  let(:properties) { 19 }
-  let(:comments)   { 15 }
-  let(:blanks)     { 10 }
+  let(:properties) { 21 }
+  let(:comments)   { 16 }
+  let(:blanks)     { 11 }
 
   it { should be_an_instance_of(DotProperties) }
 
@@ -110,6 +110,16 @@ describe DotProperties do
     end
   end
 
+  describe "content escapes" do
+    it "should parse Java-escaped unicode" do
+      expect(subject['unicode']).to eq("Command\t\u2318\nOption\t\u2325")
+    end
+
+    it "should unescape escaped entities" do
+      expect(subject['key with:several=escapes']).to eq('value with#several\escapes')
+    end
+  end
+
   describe "additional methods" do
     it "#<<" do
       subject << ""

data/spec/fixtures/sample.properties

@@ -43,6 +43,10 @@ bar.empty=
 baz.empty:
 quux.empty =
 
+# Escapes
+unicode=Command\u0009\u2318\u000AOption\u0009\u2325
+key\ with\:several\=es\c\apes:value\ with\#several\\escapes
+
 # References
 present = This value contains two resolvable references, ${foo.normal} and ${bar.extraspace}
 missing = This value contains one resolvable reference, ${foo.normal}, and one unresolvable reference, ${quux.missing}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dot-properties
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: