sxp 1.2.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0def5550a64e4c23fadfa0255347b32d74e8d263116a9bc855d6ad8113f75a0
-  data.tar.gz: 837c79054b8cdd73faf80283dae018f8f10a8ec29665ab4742cce074e18a3d75
+  metadata.gz: '058a4a32d0bc8f49d4032efeeaa309d563d0309304c2c9baae1dc3bcec9e240b'
+  data.tar.gz: 6cf5ed0d766a7fe82bf01c888ed1453f4d4e03b0931963b8989a766c0e1f5959
 SHA512:
-  metadata.gz: 0fbc0c79aaef7f33b2cedb1bfe56293477a22838897dce9e17bf7f8fa4db1cd15e234109b58e473d711b5288eb0be340d34c6867d13ed183e51f46a1f4a5c06a
-  data.tar.gz: c68c05c3fb3e37327c686416867d3bd73dc054867f016dfde6e57e70a1e8e1645e253fa9e8b32ffbc4ce6baabf26b84b559307d63c7cb457b5cfc9a210d71498
+  metadata.gz: 1c9f61f82bbc7627edbdda238876e917149a5e6ca6818435f7f52f066ccb776474af0bd1718fe50ce6092fb6c1f16f1efe3610105561402abb656a46860e359b
+  data.tar.gz: bc47c210990f6ec08a0d134329d101e249669c61b6d354e4454cdaf9ecedeec99974c084356b7ba41b3a1c4f48dd3e5ff5c6caa9d1d5a9babea81e485e6f88c2

data/README.md

@@ -2,7 +2,7 @@
 
 This is a Ruby implementation of a universal [S-expression][] parser.
 
-[![Gem Version](https://badge.fury.io/rb/sxp.png)](https:/badge.fury.io/rb/sxp)
+[![Gem Version](https://badge.fury.io/rb/sxp.svg)](https:/badge.fury.io/rb/sxp)
 [![Build Status](https://github.com/dryruby/sxp.rb/workflows/CI/badge.svg?branch=develop)](https://github.com/dryruby/sxp.rb/actions?query=workflow%3ACI)
 [![Coverage Status](https://coveralls.io/repos/dryruby/sxp.rb/badge.svg?branch=develop)](https://coveralls.io/r/dryruby/sxp.rb?branch=develop)
 
@@ -11,7 +11,7 @@ This is a Ruby implementation of a universal [S-expression][] parser.
 * Parses S-expressions in universal, [Scheme][], [Common Lisp][], or
   [SPARQL][] syntax.
 * Adds a `#to_sxp` method to Ruby objects.
-* Compatible with Ruby >= 2.6, Rubinius >= 3.0, and JRuby 9+.
+* Compatible with Ruby >= 3.0, Rubinius >= 3.0, and JRuby 9+.
 
 ## Basic syntax
 
@@ -25,7 +25,7 @@ S-Expressions derive from LISP, and include some basic datatypes common to all v
   <dt>Symbols</dt>
   <dd>Of the form <code>with-hyphen ?@!$ a\ symbol\ with\ spaces</code></dd>
   <dt>Strings</dt>
-  <dd>Of the form <code>"Hello, world!"</code><br/>
+  <dd>Of the form <code>"Hello, world!"</code> or <code>'Hello, world!'</code><br/>
       Strings may include the following special characters:
       <ul>
         <li><code>\b</code> &mdash; Backspace</li>
@@ -36,6 +36,7 @@ S-Expressions derive from LISP, and include some basic datatypes common to all v
         <li><code>\u<i>xxxx</i></code> &mdash; 2-byte Unicode character escape</li>
         <li><code>\U<i>xxxxxxxx</i></code> &mdash; 4-byte Unicode character escape</li>
         <li><code>\"</code> &mdash; Double-quote character</li>
+        <li><code>\'</code> &mdash; Single-quote character</li>
         <li><code>\\</code> &mdash; Backspace</li>
       </ul>
       Additionally, any other character may follow <code>\</code>, representing the character itself.
@@ -124,6 +125,7 @@ In addition to the standard datatypes, the SPARQL dialect supports the following
   <dd>Strings are interpreted as an RDF Literal with datatype <code>xsd:string</code>. It can be followed by <code>@<i>lang</i></code> to create a language-tagged string, or <code>^^<i>IRI</i></code> to create a datatyped-literal. Examples:
     <ul>
       <li><code>"a plain literal"</code></li>
+      <li><code>'another plain literal'</code></li>
       <li><code>"a literal with a language"@en</code></li>
       <li><code>"a typed literal"^^&lt;http://example/></code></li>
       <li><code>"a typed literal with a PNAME"^^xsd:string</code></li>
@@ -224,8 +226,8 @@ In addition to the standard datatypes, the SPARQL dialect supports the following
 
 #  Dependencies
 
-* [Ruby](https:/ruby-lang.org/) (>= 2.6)
-* [RDF.rb](https:/rubygems.org/gems/rdf) (~> 3.2), only needed for SPARQL
+* [Ruby](https:/ruby-lang.org/) (>= 3.0)
+* [RDF.rb](https:/rubygems.org/gems/rdf) (~> 3.3), only needed for SPARQL
   S-expressions
 
 #  Installation
@@ -252,6 +254,10 @@ as follows:
 * <https://github.com/dryruby/sxp.rb>
 * <https://rubygems.org/gems/sxp.rb>
 
+## Change Log
+
+See [Release Notes on GitHub](https://github.com/dryruby/sxp.rb/releases)
+
 ## Authors
 
 * [Arto Bendiken](https://github.com/artob) - <https://ar.to/>
@@ -262,6 +268,7 @@ as follows:
 * [Ben Lavender](https://github.com/bhuga) - <https://bhuga.net/>
 
 ## Contributing
+
 This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration.
 
 * Do your best to adhere to the existing coding conventions and idioms.

data/VERSION

@@ -1 +1 @@
-1.2.4
+2.0.0

data/lib/sxp/extensions.rb

@@ -56,6 +56,7 @@ end
 class String
   ##
   # Returns the SXP representation of this object. Uses SPARQL-like escaping.
+  # Uses any recorded quote style from an originally parsed string.
   #
   # @return [String]
   def to_sxp(**options)
@@ -69,14 +70,29 @@ class String
       when (0x0C)       then '\f'
       when (0x0D)       then '\r'
       when (0x0E..0x1F) then sprintf("\\u%04X", u.ord)
-      when (0x22)       then '\"'
+      when (0x22)       then as_dquote? ? '\"' : '"'
+      when (0x27)       then as_squote? ? "\'" : "'"
       when (0x5C)       then '\\\\'
       when (0x7F)       then sprintf("\\u%04X", u.ord)
       else u.chr
       end
     end
-    '"' + buffer + '"'
+    if as_dquote?
+      '"' + buffer + '"'
+    else
+      "'" + buffer + "'"
+    end
   end
+
+  # Record quote style used when parsing
+  # @return [:dquote, :squote]
+  attr_accessor :quote_style
+
+  # Render string using double quotes
+  def as_squote?; quote_style == :squote; end
+
+  # Render string using single quotes
+  def as_dquote?; quote_style != :squote; end
 end
 
 ##

data/lib/sxp/reader/basic.rb

@@ -15,7 +15,7 @@ module SXP; class Reader
     def read_token
       case peek_char
         when ?(, ?) then [:list, read_char]
-        when ?"     then [:atom, read_string] #"
+        when ?", ?' then [:atom, read_string] #" or '
         else super
       end
     end
@@ -36,16 +36,18 @@ module SXP; class Reader
     # @return [String]
     def read_string
       buffer = ""
-      skip_char # '"'
-      until peek_char == ?" #"
+      quote_char = read_char
+      until peek_char == quote_char # " or '
         buffer <<
           case char = read_char
             when ?\\ then read_character
             else char
           end
       end
-      skip_char # '"'
-      buffer
+      skip_char # " or '
+
+      # Return string, annotating it with the quotation style used
+      buffer.tap {|s| s.quote_style = (quote_char == '"' ? :dquote : :squote)}
     end
 
     ##

data/lib/sxp/reader/common_lisp.rb

@@ -115,7 +115,7 @@ module SXP; class Reader
     # @return [Array]
     def read_quote
       skip_char # "'"
-      [options[:quote] || :quote, read]
+      [options[:quote] || :quote, read.tap {|s| s.quote_style = :squote if s.is_a?(String)}]
     end
 
     ##

data/lib/sxp/reader/sparql.rb

@@ -94,6 +94,7 @@ module SXP; class Reader
     def read_token
       case peek_char
       when ?" then [:atom, read_rdf_literal] # "
+      when ?' then [:atom, read_rdf_literal] # '
       when ?< then [:atom, read_rdf_uri]
       else
         tok = super
@@ -144,6 +145,7 @@ module SXP; class Reader
     #
     # @example
     #   "a plain literal"
+    #   'another plain literal'
     #   "a literal with a language"@en
     #   "a typed literal"^^<http://example/>
     #   "a typed literal with a PNAME"^^xsd:string

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sxp
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Arto Bendiken
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: matrix
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -133,14 +133,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: A pure-Ruby implementation of a universal S-expression parser.