lightrdf 0.3.2 → 0.3.3

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.3.3 2011-03-22
+
+* Parsing of ntriples with literals with language annotations.
+* RDFa parsing support with URI as parsing parameter
+
 === 0.3.2 2011-03-22
 
 * Added RDF::Graph#== and RDF::Graph#contains methods that disambiguate bnodes

data/lib/lightrdf/parser.rb

@@ -51,13 +51,13 @@ module RDF
       end
     end
 
-    def self.parse format, text
+    def self.parse format, text, uri=nil
       case format
       when :ntriples
         graph = RDF::Graph.new
         graph.triples = text.split("\n").select{|l| l.strip!=''}.map do |l|
-          s, p, o = l.strip.match(/\A(<\S+>|".*"|_:\w+)\s+(<\S+>|".*"|_:\w+)\s+(<\S+>|".*"|_:\w+)\s+\.\Z/).captures
-          [parse_chunk_ntriples(s), parse_chunk_ntriples(p), parse_chunk_ntriples(o)]
+          s, lang1, p, lang2, o, lang3 = l.strip.match(/\A(<\S+>|".*"(@\w+)?|_:\w+)\s+(<\S+>|".*"(@\w+)?|_:\w+)\s+(<\S+>|".*"(@\w+)?|_:\w+)\s+\.\Z/).captures
+          [parse_chunk_ntriples(s,uri), parse_chunk_ntriples(p,uri), parse_chunk_ntriples(o,uri)]
         end
         graph
       when :yarf
@@ -83,7 +83,7 @@ module RDF
       else
         tempfile = new_tempfile
         File.open(tempfile, 'w') { |f| f.write text }
-        parse :ntriples, %x[rapper -q -i #{format} -o ntriples #{tempfile} 2> /dev/null]
+        parse :ntriples, %x[rapper -q -i #{format} -o ntriples #{tempfile} 2> /dev/null], uri
       end
     end
 
@@ -215,12 +215,17 @@ module RDF
       end
     end
   
-    def self.parse_chunk_ntriples c
+    def self.parse_chunk_ntriples c, uri=nil
       case c[0..0]
-      when '<' then Node c[1..-2]
+      when '<' then
+        if uri
+          Node(URI::parse(uri).merge(c[1..-2]).to_s)
+        else
+          Node c[1..-2]
+        end
       when '_' then Node c
       when '"' then
-        ActiveSupport::JSON.decode(c)
+        ActiveSupport::JSON.decode(c.match(/\A(\".*\")(@\w+)?\Z/).captures.first)
       else
         raise Exception, "Parsing error: #{c}"
       end

data/lib/lightrdf.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module RDF
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end
 
 require 'rubygems'

data/lightrdf.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lightrdf}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Ignacio"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Jose Ignacio