sxp 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 786d7c95c208d920e8d6d4f0658f8df3e018f5c3
-  data.tar.gz: bd480c067b8110b134d3bf43f72658163ce26c46
+SHA256:
+  metadata.gz: 1603515c0b80435ba91e2abe546d4d8ee49e0fcacfb5363dc4b2d4039101a772
+  data.tar.gz: 78ac18aeefd6096694d34e5553554c75cc2ed91691ebcac2ee1c846d5f7e3bb1
 SHA512:
-  metadata.gz: a4b8dad06e19896a7e9441620316e037e88868d73e4738fec95bff50c304492500416bc8415a7d355597a54625ee15b0a706fa981d74db75e2ec30d42de2f531
-  data.tar.gz: d132a4d1339f5e3fb181fb6d7c8278b3eb1bb0666ae32e46e765dfe1bf9678f31a992e9db645fd87e4e2bf50ea900a24132b65fd0e1c07c1816d8d3c911aff52
+  metadata.gz: d1c9687564b01f02f0386754eb292e28a42d4ad510de32803eb70fbe79223a92422506ea09047e15fb63a20f1c1f0b8314b06f014a2cc6c26333726e1e5c8b2e
+  data.tar.gz: 7d95e26602c6d1191be8e3562e3a1d53f1add4a66d29a8f82a1389ebc9d23d74965d8b1a813327871a6650be112ed368ee61d985d1d31e3212c3476fec7de940

data/README.md

@@ -10,7 +10,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.2.2, Rubinius >= 2.0, and JRuby 9+.
+* Compatible with Ruby >= 2.2.2, Rubinius >= 3.0, and JRuby 9+.
 
 ## Examples
 
@@ -75,7 +75,7 @@ Dependencies
 ------------
 
 * [Ruby](http://ruby-lang.org/) (>= 2.2.2)
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 2.0), only needed for SPARQL
+* [RDF.rb](http://rubygems.org/gems/rdf) (~> 3.0), only needed for SPARQL
   S-expressions
 
 Installation
@@ -91,25 +91,25 @@ Download
 
 To get a local working copy of the development repository, do:
 
-    % git clone git://github.com/bendiken/sxp-ruby.git
+    % git clone git://github.com/dryruby/sxp.rb.git
 
 Alternatively, you can download the latest development version as a tarball
 as follows:
 
-    % wget http://github.com/bendiken/sxp-ruby/tarball/master
+    % wget http://github.com/dryruby/sxp.rb/tarball/master
 
 Resources
 ---------
 
-* <http://rubydoc.info/gems/sxp>
-* <http://github.com/dryruby/sxp>
-* <http://rubygems.org/gems/sxp>
+* <http://rubydoc.info/gems/sxp.rb>
+* <http://github.com/dryruby/sxp.rb>
+* <http://rubygems.org/gems/sxp.rb>
 
 Authors
 -------
 
 * [Arto Bendiken](https://github.com/bendiken) - <http://ar.to/>
-* [Gregg Kellogg](http://github.com/gkellogg) - <http://kellogg-assoc.com/>
+* [Gregg Kellogg](http://github.com/gkellogg) - <http://greggkellogg.net/>
 
 Contributors
 ------------
@@ -125,4 +125,4 @@ information, see <http://unlicense.org/> or the accompanying UNLICENSE file.
 [S-expression]: http://en.wikipedia.org/wiki/S-expression
 [Scheme]:       http://scheme.info/
 [Common Lisp]:  http://en.wikipedia.org/wiki/Common_Lisp
-[SPARQL]:       http://openjena.org/wiki/SSE
+[SPARQL]:       https://jena.apache.org/documentation/notes/sse.html

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/sxp/reader.rb

@@ -22,9 +22,9 @@ module SXP
     # @param  [Hash{Symbol => Object}] options
     #   See {#read}
     # @return [Enumerable<Object>]
-    def self.read_url(url, options = {})
+    def self.read_url(url, **options)
       require 'open-uri'
-      open(url.to_s, 'rb', nil, options) { |io| read_all(io, options) }
+      open(url.to_s, 'rb', nil, **options) { |io| read_all(io, options) }
     end
 
     ##
@@ -51,8 +51,8 @@ module SXP
     # @param  [Hash{Symbol => Object}] options
     #   See {#read}
     # @return [Enumerable<Object>]
-    def self.read_file(filename, options = {})
-      File.open(filename.to_s, 'rb') { |io| read_all(io, options) }
+    def self.read_file(filename, **options)
+      File.open(filename.to_s, 'rb') { |io| read_all(io, **options) }
     end
 
     ##
@@ -62,8 +62,8 @@ module SXP
     # @param  [Hash{Symbol => Object}] options
     #   See {#read}
     # @return [Enumerable<Object>]
-    def self.read_all(input, options = {})
-      self.new(input, options).read_all
+    def self.read_all(input, **options)
+      self.new(input, **options).read_all
     end
 
     ##
@@ -73,8 +73,8 @@ module SXP
     # @param  [Hash{Symbol => Object}] options
     #   See {#read}
     # @return [Object]
-    def self.read(input, options = {})
-      self.new(input, options).read
+    def self.read(input, **options)
+      self.new(input, **options).read
     end
 
     ##
@@ -82,7 +82,7 @@ module SXP
     #
     # @param  [IO, StringIO, String]   input
     # @param  [Hash{Symbol => Object}] options
-    def initialize(input, options = {}, &block)
+    def initialize(input, **options, &block)
       @options = options.dup
 
       case
@@ -127,10 +127,10 @@ module SXP
     # @param  [Hash{Symbol => Object}] options
     #   See {#read}
     # @return [Array]
-    def read_all(options = {})
+    def read_all(**options)
       list = []
       catch (:eof) do
-        list << read(options.merge(eof: :throw)) until eof?
+        list << read(eof: :throw, **options) until eof?
       end
       list
     end
@@ -145,19 +145,19 @@ module SXP
     #   Expected list terminator; it's an error
     #   if another terminator is found
     # @return [Object]
-    def read(options = {})
+    def read(eof: nil, eol: nil, list_term: false, **options)
       skip_comments
       token, value = read_token
       case token
         when :eof
-          throw :eof if options[:eof] == :throw
+          throw :eof if eof == :throw
           raise EOF, "unexpected end of input"
         when :list
           if ndx = self.class.const_get(:LPARENS).index(value)
-            list_term = self.class.const_get(:RPARENS)[ndx]
-            read_list(list_term)
+            term = self.class.const_get(:RPARENS)[ndx]
+            read_list(term)
           else
-            throw :eol if options[:eol] == :throw && value == options[:list_term]
+            throw :eol if eol == :throw && value == list_term
             raise Error, "unexpected list terminator: ?#{value.chr}"
           end
         else value

data/lib/sxp/reader/scheme.rb

@@ -26,8 +26,8 @@ module SXP; class Reader
     # @param  [IO, StringIO, String]   input
     # @param  [Hash{Symbol => Object}] options
     # @option options [Symbol]         :version (:r4rs)
-    def initialize(input, options = {}, &block)
-      super(input, {version: :r4rs}.merge(options), &block)
+    def initialize(input, version: :r4rs, **options, &block)
+      super(input, version: version, **options, &block)
     end
 
     ##

data/lib/sxp/reader/sparql.rb

@@ -29,7 +29,11 @@ module SXP; class Reader
     # Distinguished variable
     VAR_ID    = /^\?(.*)/
     # Non-distinguished variable
-    ND_VAR   = /^\?(:?\?([0-9]+)?|(\.[0-9]+))/
+    ND_VAR   = /^\?(?:[\?\.])(.*)/
+    # Distinguished existential variable
+    EVAR_ID    = /^\$(.*)/
+    # Non-distinguished existential variable
+    ND_EVAR   = /^\$(?:[\$\.])(.*)/
     # A QName, subject to expansion to URIs using {PREFIX}
     PNAME     = /([^:]*):(.*)/
     
@@ -67,7 +71,7 @@ module SXP; class Reader
     #
     # @param  [IO, StringIO, String]   input
     # @param  [Hash{Symbol => Object}] options
-    def initialize(input, options = {}, &block)
+    def initialize(input, **options, &block)
       super { @prefixes = {}; @bnodes = {}; @list_depth = 0 }
 
       if block_given?
@@ -223,8 +227,10 @@ module SXP; class Reader
         when INTEGER   then RDF::Literal::Integer.new(buffer)
         when BNODE_ID  then @bnodes[$1] ||= RDF::Node($1)
         when BNODE_NEW then RDF::Node.new
-        when ND_VAR   then variable($1, false)
-        when VAR_ID    then variable($1, true)
+        when ND_VAR    then variable($1, distinguished: false)
+        when VAR_ID    then variable($1, distinguished: true)
+        when ND_EVAR   then variable($1, existential: true, distinguished: false)
+        when EVAR_ID   then variable($1, existential: true, distinguished: true)
         else buffer.to_sym
       end
     end
@@ -251,20 +257,16 @@ module SXP; class Reader
     # is a disinguished or non-distinguished variable. Non-distinguished
     # variables are effectively the same as BNodes.
     # @return [RDF::Query::Variable]
-    def variable(id, distinguished = true)
+    def variable(id, distinguished: true, existential: false)
       id = nil if id.to_s.empty?
       
       if id
         @vars ||= {}
         @vars[id] ||= begin
-          v = RDF::Query::Variable.new(id)
-          v.distinguished = distinguished
-          v
+          RDF::Query::Variable.new(id, distinguished: distinguished, existential: existential)
         end
       else
-        v = RDF::Query::Variable.new
-        v.distinguished = distinguished
-        v
+        RDF::Query::Variable.new(distinguished: distinguished, existential: existential)
       end
     end
   end # SPARQL

data/lib/sxp/writer.rb

@@ -107,8 +107,8 @@ class Float
   # @return [String]
   def to_sxp
     case
-      when nan? then 'nan.'
-      when infinite? then (infinite? > 0 ? '+inf.' : '-inf.')
+      when nan? then 'nan.0'
+      when infinite? then (infinite? > 0 ? '+inf.0' : '-inf.0')
       else to_s
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sxp
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Arto Bendiken
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -17,48 +17,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.18
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 description: Universal S-expression parser with specific support for Common Lisp,
   Scheme, and RDF/SPARQL
 email:
@@ -113,8 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sxp
-rubygems_version: 2.6.14
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A pure-Ruby implementation of a universal S-expression parser.