sxp 0.0.1 → 0.0.2

data/AUTHORS

@@ -1 +1,2 @@
-* Arto Bendiken <arto.bendiken@gmail.com> (Lead developer)
+* Arto Bendiken <arto.bendiken@gmail.com>
+* Ben Lavender <blavender@gmail.com>

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/sxp/reader.rb

@@ -1,29 +1,54 @@
 module SXP
-
-  # Reads one S-expression from the given input stream.
-  def self.read(input)
-    Reader.new(input).read
-  end
-
-  # Reads all S-expressions from the given input stream.
-  def self.read_all(input)
-    Reader.new(input).read_all
+  ##
+  # Reads all S-expressions from a given input URI using the HTTP or FTP
+  # protocols.
+  #
+  # @param  [String, #to_s]          url
+  # @param  [Hash{Symbol => Object}] options
+  # @return [Enumerable<Object>]
+  def self.read_url(url, options = {})
+    require 'openuri'
+    open(url.to_s, 'rb', nil, options) { |io| read_all(io, options) }
   end
 
+  ##
   # Reads all S-expressions from the given input files.
+  #
+  # @param  [Enumerable<String>]     filenames
+  # @param  [Hash{Symbol => Object}] options
+  # @return [Enumerable<Object>]
   def self.read_files(*filenames)
-    filenames.map { |filename| read_file(filename) }.inject { |sxps, sxp| sxps + sxp }
+    filenames.map { |filename| read_file(filename, options) }.inject { |sxps, sxp| sxps + sxp }
   end
 
+  ##
   # Reads all S-expressions from a given input file.
-  def self.read_file(filename)
-    File.open(filename, 'rb') { |io| read_all(io) }
+  #
+  # @param  [String, #to_s]          filename
+  # @param  [Hash{Symbol => Object}] options
+  # @return [Enumerable<Object>]
+  def self.read_file(filename, options = {})
+    File.open(filename.to_s, 'rb') { |io| read_all(io, options) }
   end
 
-  # Reads all S-expressions from a given input URI using the HTTP or FTP protocols.
-  def self.read_uri(uri, options = {})
-    require 'openuri'
-    open(uri, 'rb', nil, options) { |io| read_all(io) }
+  ##
+  # Reads all S-expressions from the given input stream.
+  #
+  # @param  [IO, StringIO, String]   input
+  # @param  [Hash{Symbol => Object}] options
+  # @return [Enumerable<Object>]
+  def self.read_all(input, options = {})
+    Reader.new(input, options).read_all
+  end
+
+  ##
+  # Reads one S-expression from the given input stream.
+  #
+  # @param  [IO, StringIO, String]   input
+  # @param  [Hash{Symbol => Object}] options
+  # @return [Object]
+  def self.read(input, options = {})
+    Reader.new(input, options).read
   end
 
   class << self
@@ -31,7 +56,9 @@ module SXP
     alias_method :parse_all,   :read_all
     alias_method :parse_files, :read_files
     alias_method :parse_file,  :read_file
-    alias_method :parse_uri,   :read_uri
+    alias_method :parse_url,   :read_url
+    alias_method :parse_uri,   :read_url # @deprecated
+    alias_method :read_uri,    :read_url # @deprecated
   end
 
   class Reader
@@ -40,7 +67,7 @@ module SXP
     class Error < StandardError; end
     class EOF < Error; end
 
-    FLOAT           = /^[+-]?(?:\d+)?\.\d*$/
+    FLOAT           = /^[+-]?(\d*)?\.\d*$/
     INTEGER_BASE_2  = /^[+-]?[01]+$/
     INTEGER_BASE_8  = /^[+-]?[0-7]+$/
     INTEGER_BASE_10 = /^[+-]?\d+$/
@@ -50,7 +77,7 @@ module SXP
 
     attr_reader :input
 
-    def initialize(input)
+    def initialize(input, options = {})
       case
         when [:getc, :ungetc, :eof?].all? { |x| input.respond_to?(x) }
           @input = input
@@ -68,7 +95,7 @@ module SXP
 
     def read_all(options = {})
       list = []
-      catch (:eof) { list << read(:eof => :throw, *options) until eof? }
+      catch (:eof) { list << read(options.merge(:eof => :throw)) until eof? }
       list
     end
 

data/lib/sxp/version.rb

@@ -1,14 +1,23 @@
 module SXP
-  module VERSION #:nodoc:
+  module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     EXTRA = nil
 
     STRING = [MAJOR, MINOR, TINY].join('.')
-    STRING << "-#{EXTRA}" if EXTRA
+    STRING << ".#{EXTRA}" if EXTRA
 
-    def self.to_s()   STRING end
+    ##
+    # @return [String]
+    def self.to_s() STRING end
+
+    ##
+    # @return [String]
     def self.to_str() STRING end
+
+    ##
+    # @return [Array(Integer, Integer, Integer)]
+    def self.to_a() [MAJOR, MINOR, TINY] end
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sxp
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -9,24 +14,42 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 +01:00
-default_executable: sxp2json
+date: 2010-05-13 00:00:00 +02:00
+default_executable: sxp2rdf
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
+        segments: 
+        - 0
+        - 5
+        - 4
+        version: 0.5.4
+  type: :development
+  version_requirements: *id002
 description: "    SXP is a data interchange format based on S-expressions, the simplest and\n    most versatile known means of representing complex data structures such as\n    lists, trees and graphs.\n"
 email: arto.bendiken@gmail.com
 executables: 
-- sxp2json
 - sxp2rdf
+- sxp2json
 - sxp2xml
 - sxp2yaml
 extensions: []
@@ -36,7 +59,6 @@ extra_rdoc_files: []
 files: 
 - AUTHORS
 - README
-- Rakefile
 - UNLICENSE
 - VERSION
 - lib/sxp/extensions.rb
@@ -60,18 +82,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 2
       version: 1.8.2
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: sxp
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A pure-Ruby implementation of the SXP data interchange format.

data/Rakefile

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'lib')))
-require 'rubygems'
-begin
-  require 'rakefile' # http://github.com/bendiken/rakefile
-rescue LoadError => e
-end
-require 'sxp'