sxp 1.0.0 → 1.2.0

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).first }
+      open(url.to_s, 'rb', nil, **options) { |io| read_all(io, **options) }
     end
 
     ##
@@ -33,7 +33,7 @@ module SXP
     # @overload read_files(*filenames)
     #   @param  [Enumerable<String>]     filenames
     #
-    # @overload read_files(*filenames, options)
+    # @overload read_files(*filenames, **options)
     #   @param  [Enumerable<String>]     filenames
     #   @param  [Hash{Symbol => Object}] options
     #     See {#read}
@@ -41,7 +41,7 @@ module SXP
     # @return [Enumerable<Object>]
     def read_files(*filenames)
       options = filenames.last.is_a?(Hash) ? filenames.pop : {}
-      filenames.map { |filename| read_file(filename, options) }.inject { |sxps, sxp| sxps + sxp }
+      filenames.map { |filename| read_file(filename, **options) }.inject { |sxps, sxp| sxps + sxp }
     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).first }
+    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.rb

@@ -1,23 +1,8 @@
 require 'rational'
 require 'stringio'
 
-if RUBY_VERSION < '1.8.7'
-  # @see http://rubygems.org/gems/backports
-  begin
-    require 'backports/1.8.7'
-  rescue LoadError
-    begin
-      require 'rubygems'
-      require 'backports/1.8.7'
-    rescue LoadError
-      abort "SXP.rb requires Ruby 1.8.7 or the Backports gem (hint: `gem install backports')."
-    end
-  end
-end
-
 require 'sxp/version'
 require 'sxp/extensions'
-require 'sxp/writer'
 
 module SXP
   autoload :Pair,      'sxp/pair'
@@ -32,8 +17,8 @@ module SXP
   # @param  [String, #to_s]          url
   # @param  [Hash{Symbol => Object}] options
   # @return [Enumerable<Object>]
-  def self.read_url(url, options = {})
-    Reader::Basic.read_url(url, options)
+  def self.read_url(url, **options)
+    Reader::Basic.read_url(url, **options)
   end
 
   ##
@@ -42,7 +27,7 @@ module SXP
   # @overload read_files(*filenames)
   #   @param  [Enumerable<String>]     filenames
   #
-  # @overload read_files(*filenames, options)
+  # @overload read_files(*filenames, **options)
   #   @param  [Enumerable<String>]     filenames
   #   @param  [Hash{Symbol => Object}] options
   #
@@ -57,8 +42,8 @@ module SXP
   # @param  [String, #to_s]          filename
   # @param  [Hash{Symbol => Object}] options
   # @return [Enumerable<Object>]
-  def self.read_file(filename, options = {})
-    Reader::Basic.read_file(filename, options)
+  def self.read_file(filename, **options)
+    Reader::Basic.read_file(filename, **options)
   end
 
   ##
@@ -67,8 +52,8 @@ module SXP
   # @param  [IO, StringIO, String]   input
   # @param  [Hash{Symbol => Object}] options
   # @return [Enumerable<Object>]
-  def self.read_all(input, options = {})
-    Reader::Basic.read_all(input, options)
+  def self.read_all(input, **options)
+    Reader::Basic.read_all(input, **options)
   end
 
   ##
@@ -77,8 +62,8 @@ module SXP
   # @param  [IO, StringIO, String]   input
   # @param  [Hash{Symbol => Object}] options
   # @return [Object]
-  def self.read(input, options = {})
-    Reader::Basic.read(input, options)
+  def self.read(input, **options)
+    Reader::Basic.read(input, **options)
   end
   
   ##

metadata

@@ -1,58 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: sxp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Arto Bendiken
 - Gregg Kellogg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: matrix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: amazing_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
-  name: rdf
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
+        version: '0.9'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.9'
 description: Universal S-expression parser with specific support for Common Lisp,
   Scheme, and RDF/SPARQL
 email:
@@ -87,12 +115,11 @@ files:
 - lib/sxp/reader/scheme.rb
 - lib/sxp/reader/sparql.rb
 - lib/sxp/version.rb
-- lib/sxp/writer.rb
-homepage: http://sxp.rubyforge.org/
+homepage: https://github.com/dryruby/sxp/
 licenses:
 - Unlicense
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -100,17 +127,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sxp
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: A pure-Ruby implementation of a universal S-expression parser.
 test_files: []
-has_rdoc: false

data/lib/sxp/writer.rb

@@ -1,216 +0,0 @@
-# -*- encoding: utf-8 -*-
-require 'bigdecimal'
-require 'time'
-
-##
-# Extensions for Ruby's `Object` class.
-class Object
-  ##
-  # Returns the SXP representation of this object.
-  #
-  # @return [String]
-  def to_sxp
-    to_s.to_json
-  end
-end
-
-##
-# Extensions for Ruby's `NilClass` class.
-class NilClass
-  ##
-  # Returns the SXP representation of this object.
-  #
-  # @return [String]
-  def to_sxp
-    '#n'
-  end
-end
-
-##
-# Extensions for Ruby's `FalseClass` class.
-class FalseClass
-  ##
-  # Returns the SXP representation of this object.
-  #
-  # @return [String]
-  def to_sxp
-    '#f'
-  end
-end
-
-##
-# Extensions for Ruby's `TrueClass` class.
-class TrueClass
-  ##
-  # Returns the SXP representation of this object.
-  #
-  # @return [String]
-  def to_sxp
-    '#t'
-  end
-end
-
-##
-# Extensions for Ruby's `String` class.
-class String
-  ##
-  # Returns the SXP representation of this object.
-  #
-  # @return [String]
-  def to_sxp
-    inspect
-  end
-end
-
-##
-# Extensions for Ruby's `Symbol` class.
-class Symbol
-  ##
-  # Returns the SXP representation of this object.
-  #
-  # @return [String]
-  def to_sxp
-    to_s
-  end
-end
-
-##
-# Extensions for Ruby's `Integer` class.
-class Integer
-  ##
-  # Returns the SXP representation of this object.
-  #
-  # @return [String]
-  def to_sxp
-    to_s
-  end
-end
-
-##
-# Extensions for Ruby's `BigDecimal` class.
-class BigDecimal
-  ##
-  # Returns the SXP representation of this object.
-  #
-  # @return [String]
-  def to_sxp
-    to_f.to_s
-  end
-end
-
-##
-# Extensions for Ruby's `Float` class.
-class Float
-  ##
-  # Returns the SXP representation of this object.
-  #
-  # @return [String]
-  def to_sxp
-    case
-      when nan? then 'nan.'
-      when infinite? then (infinite? > 0 ? '+inf.' : '-inf.')
-      else to_s
-    end
-  end
-end
-
-##
-# Extensions for Ruby's `Array` class.
-class Array
-  ##
-  # Returns the SXP representation of this object.
-  #
-  # @return [String]
-  def to_sxp
-    '(' << map { |x| x.to_sxp }.join(' ') << ')'
-  end
-end
-
-##
-# Extensions for Ruby's `Time` class.
-class Time
-  ##
-  # Returns the SXP representation of this object.
-  #
-  # @return [String]
-  def to_sxp
-    '#@' << (respond_to?(:xmlschema) ? xmlschema : to_i).to_s
-  end
-end
-
-##
-# Extensions for Ruby's `Regexp` class.
-class Regexp
-  ##
-  # Returns the SXP representation of this object.
-  #
-  # @return [String]
-  def to_sxp
-    '#' << inspect
-  end
-end
-
-begin
-  require 'rdf' # For SPARQL
-
-  class RDF::URI
-    ##
-    # Returns the SXP representation of this object.
-    #
-    # @return [String]
-    def to_sxp; lexical || "<#{self}>"; end
-  end
-
-  class RDF::Node
-    ##
-    # Returns the SXP representation of this object.
-    #
-    # @return [String]
-    def to_sxp; to_s; end
-  end
-
-  class RDF::Literal
-    ##
-    # Returns the SXP representation of a Literal.
-    #
-    # @return [String]
-    def to_sxp
-      case datatype
-      when RDF::XSD.boolean, RDF::XSD.integer, RDF::XSD.double, RDF::XSD.decimal, RDF::XSD.time
-        # Retain stated lexical form if possible
-        valid? ? to_s : object.to_sxp
-      else
-        text = value.dump
-        text << "@#{language}" if self.has_language?
-        text << "^^#{datatype.to_sxp}" if self.has_datatype?
-        text
-      end
-    end
-  end
-
-  class RDF::Query
-    # Transform Query into an Array form of an SXP
-    #
-    # If Query is named, it's treated as a GroupGraphPattern, otherwise, a BGP
-    #
-    # @return [Array]
-    def to_sxp
-      res = [:bgp] + patterns
-      (named? ? [:graph, graph_name, res] : res).to_sxp
-    end
-  end
-
-  class RDF::Query::Pattern
-    # Transform Query Pattern into an SXP
-    # @return [String]
-    def to_sxp
-      [:triple, subject, predicate, object].to_sxp
-    end
-  end
-
-  class RDF::Query::Variable
-    def to_sxp; to_s; end
-  end
-rescue LoadError => e
-  # Ignore if RDF not loaded
-end