sxp 0.1.0 → 0.1.2

data/AUTHORS

@@ -1 +1,2 @@
 * Arto Bendiken <arto@bendiken.net>
+* Gregg Kellogg <gregg@kellogg-assoc.com>

data/CREDITS

@@ -1,2 +1 @@
 * Ben Lavender <blavender@gmail.com>
-* Gregg Kellogg <gregg@kellogg-assoc.com>

data/README

@@ -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 1.8.7+, Ruby 1.9.x, and JRuby 1.4/1.5.
+* Compatible with Ruby 1.8.7+, Ruby 1.9.x, Ruby 2.0.x, and JRuby 1.4/1.5.
 
 ##Examples
 
@@ -75,7 +75,7 @@ Dependencies
 ------------
 
 * [Ruby](http://ruby-lang.org/) (>= 1.8.7) or (>= 1.8.1 with [Backports][])
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.2.0), only needed for SPARQL
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.0.0), only needed for SPARQL
   S-expressions
 
 Installation
@@ -112,12 +112,12 @@ Author
 ------
 
 * [Arto Bendiken](https://github.com/bendiken) - <http://ar.to/>
+* [Gregg Kellogg](http://github.com/gkellogg) - <http://kellogg-assoc.com/>
 
 Contributors
 ------------
 
 * [Ben Lavender](https://github.com/bhuga) - <http://bhuga.net/>
-* [Gregg Kellogg](http://github.com/gkellogg) - <http://kellogg-assoc.com/>
 
 License
 -------

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/lib/sxp/extensions.rb

@@ -1,5 +1,3 @@
-require 'rdf'
-
 ##
 # Extensions for Ruby's `Symbol` class.
 class Symbol
@@ -12,11 +10,17 @@ class Symbol
   end
 end
 
-##
-# Extensions for RDF::URI
-class RDF::URI
-  # Original lexical value of this URI to allow for round-trip serialization.
-  def lexical=(value); @lexical = value; end
-  def lexical; @lexical; end
-end
+# Update RDF::URI if RDF is loaded
+begin
+  require 'rdf'
 
+  ##
+  # Extensions for RDF::URI
+  class RDF::URI
+    # Original lexical value of this URI to allow for round-trip serialization.
+    def lexical=(value); @lexical = value; end
+    def lexical; @lexical; end
+  end
+rescue LoadError
+  # Ignore
+end

data/lib/sxp/generator.rb

@@ -8,7 +8,7 @@ module SXP
     # A basic block containing constituent
     # objects, either blocks or strings.
     class Block
-      BLOCK_MIN_LENGTH = 40
+      BLOCK_MIN_LENGTH = 80
 
       # @attr [Integer] amount of indent applied to this block
       attr_reader :indent
@@ -55,27 +55,30 @@ module SXP
       end
 
       ##
-      # Output block applying indent recursively
-      # @param [#write] io
-      def write(io)
+      # Format block
+      # @return [String]
+      def formatted
         # Output individual block elements on separate lines
+        buffer = ""
+
         if sxp? && length > BLOCK_MIN_LENGTH
-          io.write(do_indent + '(')
+          buffer += do_indent + '('
           first, *elems = @elements
           unless first.sxp?
             # It's atomic, write out after paren
-            io.puts(first.to_sxp)
+            buffer += first.to_sxp + "\n"
           else
-            io.write("\n")
+            buffer += "\n"
             elems.unshift(first)
           end
           elems.each do |e|
-            e.write(io)
+            buffer += e.formatted
           end
-          io.puts(do_indent + ")\n")
+          buffer += do_indent + ")\n"
         else
-          io.puts(do_indent + @elements.to_sxp)
+          buffer += do_indent + @elements.to_sxp + "\n"
         end
+        buffer
       end
       
       private
@@ -140,7 +143,26 @@ module SXP
     def render(sexp)
       block = Block.new(sexp, 0)
       if block.length > 40
-        block.write(@output)
+        buffer = block.formatted
+
+        # Attempt to fold symbols and strings onto proceeding line
+        output = ""
+        prev_length = 0
+        buffer.lines.each do |line|
+          if (stripped = line.strip)[0,1] != '(' &&
+            prev_length + stripped.length + 1 < Block::BLOCK_MIN_LENGTH
+
+            # Append to previous line
+            start, match, rem = output.rpartition(/\S/)
+            output = start + match + " " + stripped + rem
+            prev_length += stripped.length + 1
+          else
+            # Terminate line and append this line
+            output += line
+            prev_length = line.length - 1
+          end
+        end
+        @output.write output.gsub(/\)\s+\)/, '))')
       else
         @output.puts(block.to_sxp)
       end

data/lib/sxp/reader.rb

@@ -19,6 +19,7 @@ module SXP
     #
     # @param  [String, #to_s]          url
     # @param  [Hash{Symbol => Object}] options
+    #   See {#read}
     # @return [Enumerable<Object>]
     def self.read_url(url, options = {})
       require 'open-uri'
@@ -34,6 +35,7 @@ module SXP
     # @overload read_files(*filenames, options)
     #   @param  [Enumerable<String>]     filenames
     #   @param  [Hash{Symbol => Object}] options
+    #     See {#read}
     #
     # @return [Enumerable<Object>]
     def read_files(*filenames)
@@ -46,6 +48,7 @@ module SXP
     #
     # @param  [String, #to_s]          filename
     # @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 }
@@ -56,6 +59,7 @@ module SXP
     #
     # @param  [IO, StringIO, String]   input
     # @param  [Hash{Symbol => Object}] options
+    #   See {#read}
     # @return [Enumerable<Object>]
     def self.read_all(input, options = {})
       self.new(input, options).read_all
@@ -66,6 +70,7 @@ module SXP
     #
     # @param  [IO, StringIO, String]   input
     # @param  [Hash{Symbol => Object}] options
+    #   See {#read}
     # @return [Object]
     def self.read(input, options = {})
       self.new(input, options).read
@@ -118,6 +123,7 @@ module SXP
 
     ##
     # @param  [Hash{Symbol => Object}] options
+    #   See {#read}
     # @return [Array]
     def read_all(options = {})
       list = []
@@ -129,6 +135,13 @@ module SXP
 
     ##
     # @param  [Hash{Symbol => Object}] options
+    # @option options [:throw] :eof
+    #   If `:throw`, throw `:eof` on end of file.
+    # @option options [:throw] :eol
+    #   If `:throw`, throw `:eol` on end of line.
+    # @option options [String] :list_term
+    #   Expected list terminator; it's an error
+    #   if another terminator is found
     # @return [Object]
     def read(options = {})
       skip_comments
@@ -138,10 +151,11 @@ module SXP
           throw :eof if options[:eof] == :throw
           raise EOF, "unexpected end of input"
         when :list
-          if self.class.const_get(:LPARENS).include?(value)
-            read_list
+          if ndx = self.class.const_get(:LPARENS).index(value)
+            list_term = self.class.const_get(:RPARENS)[ndx]
+            read_list(list_term)
           else
-            throw :eol if options[:eol] == :throw # end of list
+            throw :eol if options[:eol] == :throw && value == options[:list_term]
             raise Error, "unexpected list terminator: ?#{value.chr}"
           end
         else value
@@ -151,11 +165,13 @@ module SXP
     alias_method :skip, :read
 
     ##
-    # @param [Array]
-    def read_list
+    # @param [String] list_term (nil)
+    #   String expected to terminate the list
+    # @return [Array]
+    def read_list(list_term = nil)
       list = []
       catch (:eol) do
-        list << read(:eol => :throw) while true
+        list << read(:eol => :throw, :list_term => list_term) while true
       end
       list
     end
@@ -258,6 +274,13 @@ module SXP
       char
     end
 
+    ##
+    # Unread the string, putting back into the input stream
+    # @param [String] string
+    def unread(string)
+      string.reverse.each_char {|c| @input.ungetc(c)}
+    end
+
     ##
     # @return [Boolean]
     def eof?

data/lib/sxp/reader/common_lisp.rb

@@ -13,6 +13,8 @@ module SXP; class Reader
     INTEGER_BASE_16 = /^[+-]?[\da-z]+$/i
     RATIONAL        = /^([+-]?\d+)\/(\d+)$/
 
+    # Escape characters, used in the form `#\Backspace`. Case is treated
+    # insensitively
     # @see http://www.cs.cmu.edu/Groups/AI/html/cltl/clm/node22.html
     CHARACTERS = {
       'newline'   => "\n",
@@ -106,10 +108,21 @@ module SXP; class Reader
     end
 
     ##
+    # Read characters sequences like `#\backspace`. Otherwise,
+    # reads a single character. Requires the ability to put
+    # eroneously read characters back in the input stream
+    #
     # @return [String]
     # @see    http://www.cs.cmu.edu/Groups/AI/html/cltl/clm/node22.html
     def read_character
-      super
+      lit = read_literal
+
+      return " " if lit.empty? && peek_char == " "
+      CHARACTERS.fetch(lit.downcase) do |string|
+        # Return just the first character
+        unread(string[1..-1])
+        string[0,1]
+      end
     end
 
     ##

data/lib/sxp/reader/scheme.rb

@@ -11,6 +11,14 @@ module SXP; class Reader
     INTEGER_BASE_16 = /^[+-]?[\da-z]+$/i
     RATIONAL        = /^([+-]?\d+)\/(\d+)$/
 
+    # Escape characters, used in the form `#\newline`. Case is treated
+    # insensitively
+    # @see http://people.csail.mit.edu/jaffer/r4rs_9.html#SEC65
+    CHARACTERS = {
+      'newline'   => "\n",
+      'space'     => " ",
+    }
+
     ##
     # Initializes the reader.
     #
@@ -60,5 +68,23 @@ module SXP; class Reader
         else raise Error, "invalid sharp-sign read syntax: ##{char.chr}"
       end
     end
+
+    ##
+    # Read characters sequences like `#\space`. Otherwise,
+    # reads a single character. Requires the ability to put
+    # eroneously read characters back in the input stream
+    #
+    # @return [String]
+    # @see    http://people.csail.mit.edu/jaffer/r4rs_9.html#SEC65
+    def read_character
+      lit = read_literal
+
+      return " " if lit.empty? && peek_char == " "
+      CHARACTERS.fetch(lit.downcase) do
+        # Return just the first character
+        unread(lit[1..-1])
+        lit[0,1]
+      end
+    end
   end # Scheme
 end; end # SXP::Reader

data/lib/sxp/writer.rb

@@ -1,4 +1,6 @@
 require 'json'
+require 'bigdecimal'
+require 'time'
 
 ##
 # Extensions for Ruby's `Object` class.
@@ -148,62 +150,67 @@ class Regexp
   end
 end
 
-require 'rdf' # For SPARQL
+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::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::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
-      object.to_sxp
-    else
-      text = value.dump
-      text << "@#{language}" if self.has_language?
-      text << "^^#{datatype.to_sxp}" if self.has_datatype?
-      text
+  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
-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
-    (respond_to?(:named?) && named? ? [:graph, context, res] : res).to_sxp
+  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, context, res] : res).to_sxp
+    end
   end
-end
 
-class RDF::Query::Pattern
-  # Transform Query Pattern into an SXP
-  # @return [String]
-  def to_sxp
-    [:triple, subject, predicate, object].to_sxp
+  class RDF::Query::Pattern
+    # Transform Query Pattern into an SXP
+    # @return [String]
+    def to_sxp
+      [:triple, subject, predicate, object].to_sxp
+    end
   end
-end
 
-class RDF::Query::Variable
-  def to_sxp; to_s; end
+  class RDF::Query::Variable
+    def to_sxp; to_s; end
+  end
+rescue LoadError => e
+  # Ignore if RDF not loaded
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: sxp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
 - Arto Bendiken
+- Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-11 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -18,7 +19,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +27,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +35,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +43,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +51,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,9 +59,27 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.5
+- !ruby/object:Gem::Dependency
+  name: rdf
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: A pure-Ruby implementation of a universal S-expression parser.
-email: arto@bendiken.net
+email:
+- arto@bendiken.net
+- gregg@greggkellogg.net
 executables:
 - sxp2rdf
 - sxp2json