sxp 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ac25f66cc3d44ef1ea0ee37141ce092c9740ada5d58e000472043ed0e53dec7
-  data.tar.gz: 3969e76131d5e12a512a182ba9f03de3f1dcc098b60cd067089f0d75443117ce
+  metadata.gz: 85a17ead97e988aff52b01d4c4d3754cacf3d4c62e835b796f22f7a6ef4dbceb
+  data.tar.gz: 775622b3f2e834e674b18dc6b85740bde1144e78a3f902c68dc661f50ed1833c
 SHA512:
-  metadata.gz: da0445f22b06f2ed5cb31a44dd37bc4c49a078205335f420857b1105b30f1d95296254e4d7f0ce80c5d4779862f0792c45e409758c893eb0131eced633df243c
-  data.tar.gz: f8018ae5ffb2740cf12e0ca28f67c4f3b92dd466b0a2a2db73ed896f6fdb801a4a3148daf3c575474890db74d278ad2cecd114336fd9f85e021555456ea7393b
+  metadata.gz: 5928470e0846c61c2e6b26652890046457005370ae51254fff3e1ebb2de210b1822625985d817e51227246fefd20d4f99542a99ed55768202775321131f94d07
+  data.tar.gz: 4633a81cfbf46cd5facfa20415b54b63c6a5d874c6d88fdb18757794414858b8ad7da3eac39c3f11d010139b6aa30d12a7a7e5b1cf3fd1cbc9b9742f385d871f

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/sxp/extensions.rb

@@ -55,11 +55,27 @@ end
 # Extensions for Ruby's `String` class.
 class String
   ##
-  # Returns the SXP representation of this object.
+  # Returns the SXP representation of this object. Uses SPARQL-like escaping.
   #
   # @return [String]
   def to_sxp(**options)
-    inspect
+    buffer = ""
+    each_char do |u|
+      buffer << case u.ord
+      when (0x00..0x07) then sprintf("\\u%04X", u.ord)
+      when (0x08)       then '\b'
+      when (0x09)       then '\t'
+      when (0x0A)       then '\n'
+      when (0x0C)       then '\f'
+      when (0x0D)       then '\r'
+      when (0x0E..0x1F) then sprintf("\\u%04X", u.ord)
+      when (0x22)       then '\"'
+      when (0x5C)       then '\\\\'
+      when (0x7F)       then sprintf("\\u%04X", u.ord)
+      else u.chr
+      end
+    end
+    '"' + buffer + '"'
   end
 end
 
@@ -229,7 +245,7 @@ begin
 
   class RDF::URI
     ##
-    # Returns the SXP representation of this a URI. Uses Lexical representation, if set, otherwise, any PName match, otherwise, the relativized version of the URI if a base_uri is given, otherwise just the URI.
+    # Returns the SXP representation of this URI. Uses Lexical representation, if set, otherwise, any PName match, otherwise, the relativized version of the URI if a base_uri is given, otherwise just the URI.
     #
     # @param [Hash{Symbol => RDF::URI}] prefixes(nil)
     # @param [RDF::URI] base_uri(nil)
@@ -268,7 +284,7 @@ begin
         # Retain stated lexical form if possible
         valid? ? to_s : object.to_sxp(**options)
       else
-        text = value.dump
+        text = value.to_sxp
         text << "@#{language}" if self.has_language?
         text << "^^#{datatype.to_sxp(**options)}" if self.has_datatype?
         text

data/lib/sxp/reader/basic.rb

@@ -35,7 +35,7 @@ module SXP; class Reader
     ##
     # @return [String]
     def read_string
-      buffer = String.new
+      buffer = ""
       skip_char # '"'
       until peek_char == ?" #"
         buffer <<
@@ -57,8 +57,8 @@ module SXP; class Reader
         when ?n  then ?\n
         when ?r  then ?\r
         when ?t  then ?\t
-        when ?u  then read_chars(4).to_i(16).chr
-        when ?U  then read_chars(8).to_i(16).chr
+        when ?u  then read_chars(4).to_i(16).chr(Encoding::UTF_8)
+        when ?U  then read_chars(8).to_i(16).chr(Encoding::UTF_8)
         when ?"  then char #"
         when ?\\ then char
         else char
@@ -69,7 +69,7 @@ module SXP; class Reader
     # @return [String]
     def read_literal
       grammar = self.class.const_get(:ATOM)
-      buffer = String.new
+      buffer = ""
       buffer << read_char while !eof? && peek_char.chr =~ grammar
       buffer
     end

data/lib/sxp/reader/common_lisp.rb

@@ -72,7 +72,7 @@ module SXP; class Reader
     ##
     # @return [Symbol]
     def read_symbol(delimiter = nil)
-      buffer = String.new
+      buffer = ""
       skip_char # '|'
       until delimiter === peek_char
         buffer <<

data/lib/sxp/reader/sparql.rb

@@ -171,7 +171,7 @@ module SXP; class Reader
     #
     # @return [RDF::URI]
     def read_rdf_uri
-      buffer = String.new
+      buffer = ""
       skip_char # '<'
       return :< if (char = peek_char).nil? || char.chr !~ ATOM # FIXME: nasty special case for the '< symbol
       return :<= if peek_char.chr.eql?(?=.chr) && read_char    # FIXME: nasty special case for the '<= symbol

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sxp
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Arto Bendiken
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2022-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf