rb_json5 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 594540a8d9f462882ebf6af4d8af297efc07c46be1d00c2c02dc2d4b134d8f79
-  data.tar.gz: 7c3ccdc8e41af153eb5af8ac6bf644dc998067e2a32b1f712091d797c834ef42
+  metadata.gz: 81546e53f09d625b4f122a5264f654797e25994cbb2f43a6ec295e2c254ec61d
+  data.tar.gz: acf65352e98ab217357718ede345a7574be7a8f84cf07063d5113d92346a69ed
 SHA512:
-  metadata.gz: 36cf35e8657d3a60e52afc012b2eba88f9fe19385f64eb56b9a18c8c514b7b54644a79b3893326136c863e8380290cc9e0b310f5609d8163a96aa1780adcaa14
-  data.tar.gz: 79eef5805af79907cce8fa20db34093dc3b9b57a5ef1f580c405c75ea0c9f28d761727764f02dffa5fc326d5b1f2cd879c1498210391eae93c6645bae381dc25
+  metadata.gz: 77a07e83d48962228590d106d33d294dbdc5c02cf8c9b5c08b01e8fc4dd01341a4a6cfc1c682f6ebcc78bf990b3aa404eecc6642fdde2818d1f9f82fe6ec5cf3
+  data.tar.gz: b8d9b1425211e63127d195fb191226577203fc543545b8add0afd8a896bdbb98f928884471ba4bc52bef647ccf2fca53ffdf9e7a627f2e204f1ab7d33b98c9e5

data/README.md

@@ -48,32 +48,34 @@ json5 = <<~'JSON5'
  }
 JSON5
 
-RbJSON5.parse(json5) # =>
-                     # {
-                     #   "unquoted"=>"and you can quote me on that",
-                     #   "singleQuotes"=>"I can use \"double quotes\" here",
-                     #   "lineBreaks"=>"Look, Mom! No \\n's!",
-                     #   "hexadecimal"=>912559,
-                     #   "leadingDecimalPoint"=>0.8675309,
-                     #   "andTrailing"=>8675309.0,
-                     #   "positiveSign"=>1,
-                     #   "trailingComma"=>"in objects",
-                     #   "andIn"=>["arrays"],
-                     #   "backwardsCompatible"=>"with JSON"
-                     # }
-RbJSON5.parse(json5, symbolize_names: true) # =>
-                                            # {
-                                            #   :unquoted=>"and you can quote me on that",
-                                            #   :singleQuotes=>"I can use \"double quotes\" here",
-                                            #   :lineBreaks=>"Look, Mom! No \\n's!",
-                                            #   :hexadecimal=>912559,
-                                            #   :leadingDecimalPoint=>0.8675309,
-                                            #   :andTrailing=>8675309.0,
-                                            #   :positiveSign=>1,
-                                            #   :trailingComma=>"in objects",
-                                            #   :andIn=>["arrays"],
-                                            #   :backwardsCompatible=>"with JSON"
-                                            # }
+RbJSON5.parse(json5)
+  # =>
+  # {
+  #   "unquoted"=>"and you can quote me on that",
+  #   "singleQuotes"=>"I can use \"double quotes\" here",
+  #   "lineBreaks"=>"Look, Mom! No \\n's!",
+  #   "hexadecimal"=>912559,
+  #   "leadingDecimalPoint"=>0.8675309,
+  #   "andTrailing"=>8675309.0,
+  #   "positiveSign"=>1,
+  #   "trailingComma"=>"in objects",
+  #   "andIn"=>["arrays"],
+  #   "backwardsCompatible"=>"with JSON"
+  # }
+RbJSON5.parse(json5, symbolize_names: true)
+  # =>
+  # {
+  #   :unquoted=>"and you can quote me on that",
+  #   :singleQuotes=>"I can use \"double quotes\" here",
+  #   :lineBreaks=>"Look, Mom! No \\n's!",
+  #   :hexadecimal=>912559,
+  #   :leadingDecimalPoint=>0.8675309,
+  #   :andTrailing=>8675309.0,
+  #   :positiveSign=>1,
+  #   :trailingComma=>"in objects",
+  #   :andIn=>["arrays"],
+  #   :backwardsCompatible=>"with JSON"
+  # }
 ```
 
 ## Contributing & Contact

data/lib/rb_json5.rb

@@ -18,16 +18,16 @@ require_relative 'rb_json5/parser/object'
 module RbJSON5
   # Parses a JSON5 string into its Ruby data structure
   #
-  # @param json5 [String]
-  #   JSON5 string
+  # @param string_or_io [String, #read]
+  #   JSON5 string itself or object like IO containing JSON5 string
   # @param symbolize_names [Boolean]
   #   If set to true, converts names (keys) in a JSON5 object into Symbol
   # @return [Object]
   #   Ruby data structure represented by the input
   #
   # @see RbJSON5.load_file
-  def self.parse(json5, symbolize_names: false)
-    Parser.new.parse(json5, symbolize_names)
+  def self.parse(string_or_io, symbolize_names: false)
+    Parser.new.parse(string_or_io, symbolize_names)
   end
 
   # Reads a JSON5 string from the given file and parses it into its Ruby data structure
@@ -41,8 +41,6 @@ module RbJSON5
   #
   # @see RbJSON5.parse
   def self.load_file(filename, symbolize_names: false)
-    File.open(filename, 'r') do |f|
-      parse(f.read, symbolize_names: symbolize_names)
-    end
+    File.open(filename, 'r') { |io| parse(io, symbolize_names: symbolize_names) }
   end
 end

data/lib/rb_json5/escape_sequence.rb

@@ -8,11 +8,16 @@ module RbJSON5
     #   escape sequence
     # @param valid_patterns [Array<Regexp>]
     #   list of patterns for valid unescaped character
-    # @param ifinvalid [Proc]
+    # @yield [character, sequence]
     #   call back block called when unespaced character is not matched
     #   with the given valid_patterns
+    # @yieldparam character [String]
+    #   character unescaped from the given escape sequence
+    # @yieldparam sequence [Parslet::Slice]
+    #   the given escape sequence
     def initialize(sequence, valid_patterns = [], &ifinvalid)
-      @character = unescape(sequence.to_s, valid_patterns, ifinvalid)
+      @character = unescape(sequence.to_s)
+      validate(@character, sequence, valid_patterns, ifinvalid)
     end
 
     # returns the character unescaped from the given escape sequence
@@ -32,15 +37,17 @@ module RbJSON5
       '0' => "\0"
     }.freeze
 
-    def unescape(sequence, valid_patterns, ifinvalid)
-      character =
-        if ['x', 'u'].include?(sequence[1])
-          instance_eval("\"#{sequence}\"", __FILE__, __LINE__)
-        else
-          ESCAPE_CHARACTERS[sequence[1]] || sequence[1]
-        end
-      valid_character?(character, valid_patterns) &&
-        character || ifinvalid.call(character)
+    def unescape(sequence)
+      if ['x', 'u'].include?(sequence[1])
+        instance_eval("\"#{sequence}\"", __FILE__, __LINE__)
+      else
+        ESCAPE_CHARACTERS[sequence[1]] || sequence[1]
+      end
+    end
+
+    def validate(character, sequence, valid_patterns, ifinvalid)
+      valid_character?(character, valid_patterns) ||
+        ifinvalid&.call(character, sequence)
     end
 
     def valid_character?(character, valid_patterns)

data/lib/rb_json5/parser.rb

@@ -54,8 +54,8 @@ module RbJSON5
     #
     # @see RbJSON5.parse
     # @see RbJSON5.load_file
-    def parse(json5, symbolize_names = false)
-      tree = parser.parse(json5)
+    def parse(string_or_io, symbolize_names = false)
+      tree = parser.parse(read_json5(string_or_io))
       transform.apply(tree, symbolize_names: symbolize_names)
     rescue Parslet::ParseFailed => e
       raise ParseError.new(e.message, e.parse_failure_cause)
@@ -63,6 +63,11 @@ module RbJSON5
 
     private
 
+    def read_json5(string_or_io)
+      string_or_io.respond_to?(:read) &&
+        string_or_io.read || string_or_io
+    end
+
     def parser
       parser = self.class.parser.new
       @root && parser.__send__(@root) || parser

data/lib/rb_json5/parser/object.rb

@@ -65,21 +65,21 @@ module RbJSON5
       empty_object | non_empty_object
     end
 
-    transform_rule(unicode_identifier_start: simple(:sequence)) do
-      EscapeSequence.new(sequence, IDENTIFIER_START_PATTERNS) do |character|
-        Parslet::Cause.format(
-          sequence.line_cache, sequence.position.bytepos,
-          "#{character.inspect} cannot be used for identifier"
-        ).raise
-      end
-    end
-
-    transform_rule(unicode_identifier_part: simple(:sequence)) do
-      EscapeSequence.new(sequence, IDENTIFIER_PART_PATTERNS) do |character|
-        Parslet::Cause.format(
-          sequence.line_cache, sequence.position.bytepos,
-          "#{character.inspect} cannot be used for identifier"
-        ).raise
+    # call back block called when character unescaped from Unicode escape sequence
+    # is not allowed for identifier
+    INVALID_CHARACTER_FOR_IDENTIFIER = lambda do |character, sequence|
+      Parslet::Cause.format(
+        sequence.line_cache, sequence.position.bytepos,
+        "#{character.inspect} cannot be used for identifier"
+      ).raise
+    end
+
+    {
+      unicode_identifier_start: IDENTIFIER_START_PATTERNS,
+      unicode_identifier_part: IDENTIFIER_START_PATTERNS
+    }.each do |rule, patterns|
+      transform_rule(rule => simple(:sequence)) do
+        EscapeSequence.new(sequence, patterns, &INVALID_CHARACTER_FOR_IDENTIFIER)
       end
     end
 

data/lib/rb_json5/version.rb

@@ -2,5 +2,5 @@
 
 module RbJSON5
   # Current version of RbJSON5
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rb_json5
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2020-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet