escape_java_properties 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd225b2c845a7d716dc847b8e5b722d12d969477b972bfe8317e768cf64995b0
-  data.tar.gz: 35c294ad227d74d390240d1b50457e4fb4098de2c8a3aade4c7e8b83006c6360
+  metadata.gz: 5af913a6e35b72a5abb63b3e7d666663baef58504a2e418134acf45ee3313aa5
+  data.tar.gz: 42373d1e5aa1feeb38a2f7183397ec50c4bd42d07164b3a801054ded4f5e46e1
 SHA512:
-  metadata.gz: e92043fffcae2711238c80894d982c37685a3adf9b6410a6c8cdacf7d4cc9c4db4b2883a3da01de8c741ac47819bca90c5dce766662cd626d2700a142a26b9f6
-  data.tar.gz: e88c210c224526b2fe86afabdcfef4f7a19ed61414b27ae8677a445bb6b21c36efae4a23f4384705f8645775d188e9098390a4bbb765c007a6b138bb20ff5564
+  metadata.gz: 228e0c1281e44b543dad3dc262f47da663c0e40232165c8dd4d8b4beb2ea0c0138fd20feb27dc91402f98270cc7806fb98e1347986f23721486df44cfd7e190f
+  data.tar.gz: b39738f9a5e20e1643c957ba027a7143a4ede36a235ff080dc669d076c11aa4535230fd2c771fdd3d528e8b7dadf81cd5a537bc53cd71afd3da0eee18979e342

data/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_PATH: "vendor/bundle"

data/.gitignore

@@ -2,4 +2,5 @@
 .ruby-gemset
 Gemfile.lock
 coverage
-pkg
+pkg
+vendor/

data/lib/escape_java_properties/encoding/unicode.rb

@@ -46,13 +46,17 @@ module EscapeJavaProperties
       end
 
       def self.hex(codepoint)
-        hex  = codepoint.to_s(16)
-        size = hex.size
-        # padding the hex value for uneven digest
-        if (size % 2) == 1
-          "0#{hex}"
+        # For BMP codepoints produce a 4-digit hex (\uXXXX).
+        # For supplementary codepoints produce a surrogate pair
+        # encoded as "XXXX\\uYYYY" so callers that prepend
+        # the "\\u" marker produce "\\uXXXX\\uYYYY".
+        if codepoint <= 0xFFFF
+          format('%04x', codepoint)
         else
-          hex
+          cp = codepoint - 0x10000
+          high = 0xD800 + (cp >> 10)
+          low  = 0xDC00 + (cp & 0x3FF)
+          "#{format('%04x', high)}\\u#{format('%04x', low)}"
         end
       end
 

data/lib/escape_java_properties/parsing/normalizer.rb

@@ -54,9 +54,6 @@ module EscapeJavaProperties
       # Removes empty lines
       RULES << Rule.new(/^$(\r\n?|\n)/)
 
-      # Unescape double backslashes
-      RULES << Rule.new(/\\\\/, '\\')
-
       # Remove whitespace around delimiters and replace with =
       RULES << Rule.new(/^((?:(?:\\[=: \t])|[^=: \t])+)[ \t]*[=: \t][ \t]*/, '\1=')
 

data/lib/escape_java_properties/version.rb

@@ -1,3 +1,3 @@
 module EscapeJavaProperties
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/escape_java_properties.rb

@@ -31,7 +31,14 @@ module EscapeJavaProperties
   # @param allow_invalid_byte_sequence [Boolean]
   # @return [Properties]
   def self.load(path, encoding = 'UTF-8', allow_invalid_byte_sequence = true)
-      parse(File.read(path).encode(encoding, 'binary', allow_invalid_byte_sequence ? {invalid: :replace, undef: :replace} : {} ))
+      # Read as binary and then transcode to the desired encoding. Ruby 4 changed
+      # String#encode signature; use `encode` with keyword options when available.
+      content = File.binread(path)
+      if allow_invalid_byte_sequence
+        parse(content.encode(encoding, invalid: :replace, undef: :replace))
+      else
+        parse(content.encode(encoding))
+      end
   end
 
   # Generates a escape java properties file

data/spec/fixtures/test_normalized.properties

@@ -9,6 +9,6 @@ item7=line 1 line 2 line 3
 item8=line 1 #Not a Comment line 2 line 3
 item9=line 1 line 2 line 3
 item10=test\n\ttest\u0050 test\n\ttest test\n\ttest = test
-item11=line 1 \line 2 \\line 3 line 4
-item12=line 1\
+item11=line 1 \\line 2 \\\\line 3 line 4
+item12=line 1\\
 item13=line 1

data/spec/helper.rb

@@ -1,14 +1,14 @@
 require 'simplecov'
 require 'coveralls'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
   Coveralls::SimpleCov::Formatter,
   SimpleCov::Formatter::HTMLFormatter
-]
+])
 SimpleCov.start
 
 require 'minitest/autorun'
-require 'proper_properties'
+require 'escape_java_properties'
 
 class Minitest::Spec
 
@@ -17,3 +17,30 @@ class Minitest::Spec
   end
 
 end
+
+# Provide simple expectation methods for older spec-style tests when running
+# under newer Minitest/Ruby combinations.
+TEST_ASSERTIONS = Object.new
+TEST_ASSERTIONS.extend(Minitest::Assertions)
+def TEST_ASSERTIONS.assertions
+  @assertions ||= 0
+end
+def TEST_ASSERTIONS.assertions=(n)
+  @assertions = n
+end
+
+class Object
+  def must_equal(expected)
+    TEST_ASSERTIONS.assert_equal expected, self
+  end
+
+  def wont_be_nil
+    TEST_ASSERTIONS.refute_nil self
+  end
+end
+
+class Proc
+  def must_raise(*klasses)
+    TEST_ASSERTIONS.assert_raises(*klasses) { call }
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: escape_java_properties
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - trace-devops
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -74,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bundle/config"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -113,7 +113,6 @@ homepage: https://github.com/trace-devops/escape_java_properties
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -128,8 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Loader and writer for Java properties files
 test_files: