sxp 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/sxp/reader/sparql.rb

@@ -10,8 +10,8 @@ module SXP; class Reader
   class SPARQL < Extended
     BNODE_ID  = /^_:([A-Za-z][A-Za-z0-9]*)/.freeze # FIXME
     BNODE_NEW = /^_:$/.freeze
-    VARIABLE = /^\?([A-Za-z][A-Za-z0-9]*)/.freeze # FIXME
-    URIREF   = /^<([^>]+)>/.freeze
+    VARIABLE  = /^\?([A-Za-z][A-Za-z0-9]*)/.freeze # FIXME
+    URIREF    = /^<([^>]+)>/.freeze
 
     ##
     # @return [Object]
@@ -36,7 +36,7 @@ module SXP; class Reader
           {:datatype => read_rdf_uri} # TODO: support prefixed names
         else {}
       end
-      RDF::Literal.new(value, options)
+      RDF::Literal(value, options)
     end
 
     ##
@@ -44,11 +44,12 @@ module SXP; class Reader
     def read_rdf_uri
       buffer = String.new
       skip_char # '<'
+      return :< if (char = peek_char).nil? || char !~ ATOM # FIXME: nasty special case for '< symbol
       until peek_char == ?>
         buffer << read_char # TODO: unescaping
       end
       skip_char # '>'
-      RDF::URI.new(buffer)
+      RDF::URI(buffer)
     end
 
     ##
@@ -56,8 +57,9 @@ module SXP; class Reader
     def read_atom
       case buffer = read_literal
         when '.'       then buffer.to_sym
-        when INTEGER   then RDF::Literal.new(Integer(buffer))
-        when BNODE_ID  then RDF::Node.new($1)
+        when DECIMAL   then RDF::Literal(Float(buffer))
+        when INTEGER   then RDF::Literal(Integer(buffer))
+        when BNODE_ID  then RDF::Node($1)
         when BNODE_NEW then RDF::Node.new
         when VARIABLE  then RDF::Query::Variable.new($1)
         else buffer.to_sym

data/lib/sxp/version.rb

@@ -2,7 +2,7 @@ module SXP
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 6
+    TINY  = 7
     EXTRA = nil
 
     STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 +02:00
+date: 2010-10-21 00:00:00 +02:00
 default_executable: sxp2rdf
 dependencies: 
 - !ruby/object:Gem::Dependency