tinycode 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e5a75ffceb25e155db277a905e940cbf22a3f43a666113aede98b5457176aca
-  data.tar.gz: f095520fdf8e46c939f7937957fb831951118d11ebef414a8d08bbee86b1a331
+  metadata.gz: 51316c829b7f063d80f30633476e3ce048309063f617b1b5f52112d1fdd7290a
+  data.tar.gz: 3228c7273c4a169a652cf0c6274137ad1ffc34c2474e6f5663f3e1810967199f
 SHA512:
-  metadata.gz: 5146523a4517a8effb28f426c6922cb0338ec6a66de0a545b75385551e9a2ed0158e5292f8af441f15c1888cff7deb99e6e9550e029f26e3e7e5a16519a80255
-  data.tar.gz: 0ad1a83f8c3f5d2a3ddbe5639d23e618a3dc4988825740d52ded2077188b5c373ce644b75b829be49fa0128fdad705fa690cc6b1107e4b0a0427361c3691bfa8
+  metadata.gz: f68d1910cfe364715c33008630506a9bc80145a9dee610032133c99ef7b608f2c95990ec5191e2b5098e0c2085efb357cfe82c65194f755a6a1286df675fbc0f
+  data.tar.gz: adfafe7da5332d5ebcbb264979095dcae55b67494778c0eb54ee5e81d2f225c8ea3059b1f8cb786228c6184a7e050dccfc13c0a691a3078b3b8b788f2803b5b5

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    tinycode (0.2.0)
+    tinycode (0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     docile (1.4.0)
     ffi (1.15.4)
     listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     parallel (1.21.0)
-    parser (3.0.3.1)
+    parser (3.0.3.2)
       ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (13.0.6)
@@ -38,20 +38,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
-    rubocop (1.23.0)
+    rubocop (1.24.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rubocop-ast (>= 1.15.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.14.0)
+    rubocop-ast (1.15.1)
       parser (>= 3.0.1.1)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.6.0)
+    rubocop-rspec (2.7.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     simplecov (0.21.2)
@@ -81,4 +81,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.2.31
+   2.2.32

data/lib/tinycode/module.rb

@@ -52,6 +52,7 @@ module Tinycode
       when /[\w \t\n]/ then load_id(tinycode)
       when '['         then load_array(tinycode)
       when '{'         then load_hash(tinycode)
+      when '@'         then load_binary_string(tinycode)
       when "'"         then load_string(tinycode)
       when ':'         then load_symbol(tinycode)
       when '-', '+'    then load_integer(tinycode)
@@ -101,7 +102,14 @@ module Tinycode
     end
 
     def dump_string(str, code: "'")
-      str = str.encode('UTF-8').b unless str.encoding == Encoding::ASCII_8BIT
+      if str.encoding == Encoding::BINARY
+        raise if code != "'"
+
+        code = '@'
+      else
+        str = str.encode('UTF-8').b
+      end
+
       if str =~ /\A[\w \t\n][^':]*\z/
         [str, code].pack('a*a')
       else
@@ -110,32 +118,53 @@ module Tinycode
     end
 
     def load_id(tinycode)
-      length = tinycode.index(/[':]/)
+      length = tinycode.index(/['@:]/)
       raise ParseError, 'Unexpected end of stream' if !length
 
-      value = tinycode[0...length].force_encoding('UTF-8')
-      raise ParseError, 'invalid byte sequence in UTF-8 string' if !value.valid_encoding?
+      value = tinycode[0...length]
+
+      case tinycode[length]
+      when "'"
+        value.force_encoding('UTF-8')
+        raise ParseError, 'invalid byte sequence in UTF-8 string' if !value.valid_encoding?
+      when '@'
+        # value is already binary
+      when ':'
+        value.force_encoding('UTF-8')
+        raise ParseError, 'invalid byte sequence in UTF-8 string' if !value.valid_encoding?
+
+        value = value.to_sym
+      else raise
+      end
 
-      value = value.to_sym if tinycode[length] == ':'
       [value, length + 1]
     end
 
-    def load_string(tinycode)
+    def load_binary_string(tinycode)
       str_length, offset = load_varint(tinycode[1..])
       raise ParseError, 'Unexpected end of stream' if tinycode.length < 1 + offset + str_length
 
-      str = tinycode[(1 + offset)...(1 + offset + str_length)].force_encoding('UTF-8')
-      raise ParseError, 'invalid byte sequence in UTF-8 string' if !str.valid_encoding?
+      str = tinycode[(1 + offset)...(1 + offset + str_length)]
 
       [str, 1 + offset + str_length]
     end
 
+    def load_string(tinycode)
+      value, offset = load_binary_string(tinycode)
+      value.force_encoding('UTF-8')
+      raise ParseError, 'invalid byte sequence in UTF-8 string' if !value.valid_encoding?
+
+      [value, offset]
+    end
+
     def dump_symbol(sym)
+      raise ArgumentError, "Symbol #{sym.inspect} must not be binary encoded" if sym.encoding == Encoding::BINARY
+
       dump_string(sym.to_s, code: ':')
     end
 
-    def load_symbol(sym)
-      value, offset = load_string(sym)
+    def load_symbol(tinycode)
+      value, offset = load_string(tinycode)
       [value.to_sym, offset]
     end
 

data/lib/tinycode/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tinycode
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinycode
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Alex Gittemeier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-05 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: An encoder and decoder for tinycode