lightrdf 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.2.2 2011-03-10
+
+* Removed dependency open3 for Windows compatibility
+
 === 0.2.1 2011-03-07
 
 * Corrected bug when building a graph out of triples.

data/lib/lightrdf/parser.rb

@@ -20,28 +20,23 @@ module RDF
           serialize_yarf(nodes, ns)
         end
       when :ejson
-        stdin, stdout, stderr = Open3.popen3("python -mjson.tool")
-        stdin.puts ActiveSupport::JSON.encode(serialize_ejson(nodes))
-        stdin.close
-        stdout.read
+        RDF::Parser.run "python -mjson.tool", ActiveSupport::JSON.encode(serialize_ejson(nodes))
       when :png
         dot = serialize(:dot)
         ns = respond_to?(:ns) ? ID.ns.merge(self.ns) : ID.ns
         ns.each { |k,v| dot.gsub!(v, "#{k}:") }
         dot.gsub!(/label=\"\\n\\nModel:.*\)\";/, '')
-        stdin, stdout, stderr = Open3.popen3("dot -o/dev/stdout -Tpng")
-        stdin.puts dot
-        stdin.close
-        stdout.read
+
+        RDF::Parser.run "dot -o/dev/stdout -Tpng", dot
       when :rdf
         serialize(:'rdfxml-abbrev')
       else
         namespaces = if [:rdfxml, :'rdfxml-abbrev'].include?(format)
           ID.ns.map {|k,v| "-f 'xmlns:#{k}=#{v.inspect}'" } * " "
         end
-        tmpfile = File.join(Dir.tmpdir, "rapper#{$$}#{Thread.current.object_id}")
-        File.open(tmpfile, 'w') { |f| f.write(serialize(:ntriples)) }
-        %x[rapper -q -i ntriples #{namespaces} -o #{format} #{tmpfile} 2> /dev/null]
+        tempfile = RDF::Parser.new_tempfile
+        File.open(tempfile, 'w') { |f| f.write(serialize(:ntriples)) }
+        %x[rapper -q -i ntriples #{namespaces} -o #{format} #{tempfile} 2> /dev/null]
       end
     end
 
@@ -75,9 +70,9 @@ module RDF
       when :ejson
         raise Exception, "eJSON format cannot be parsed (yet)"
       else
-        tmpfile = File.join(Dir.tmpdir, "rapper#{$$}#{Thread.current.object_id}")
-        File.open(tmpfile, 'w') { |f| f.write text }
-        parse :ntriples, %x[rapper -q -i #{format} -o ntriples #{tmpfile} 2> /dev/null]
+        tempfile = new_tempfile
+        File.open(tempfile, 'w') { |f| f.write text }
+        parse :ntriples, %x[rapper -q -i #{format} -o ntriples #{tempfile} 2> /dev/null]
       end
     end
 
@@ -219,5 +214,17 @@ module RDF
         raise Exception, "Parsing error: #{c}"
       end
     end
+    
+    def self.run program, input
+      tempfile = new_tempfile
+      File.open(tempfile, 'w') { |f| f.write(input) }
+      %x[#{program} < #{tempfile}]
+    end
+
+    def self.new_tempfile
+      @num_tempfile ||= 0
+      @num_tempfile  += 1
+      File.join(Dir.tmpdir, "lightrdf-#{@num_tempfile}-#{$$}#{Thread.current.object_id}")
+    end
   end
 end

data/lib/lightrdf.rb

@@ -2,13 +2,12 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module RDF
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end
 
 require 'rubygems'
 require 'active_support'
 require 'uri'
-require 'open3'
 require 'open-uri'
 require 'tmpdir'
 require 'rest-client'

data/lightrdf.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lightrdf}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Ignacio"]
-  s.date = %q{2011-03-07}
+  s.date = %q{2011-03-10}
   s.default_executable = %q{yarfp}
   s.description = %q{RDF library}
   s.email = %q{joseignacio.fernandez@gmail.com}

data/test/test_lightrdf.rb

@@ -94,7 +94,6 @@ class TestLightRDF < Test::Unit::TestCase
     a = Node('ex:bob')
     a.foaf::weblog = Node('http://www.awesomeweblogfordummies.com')
     g = RDF::Graph.new a.triples
-    p a.foaf::weblog
     assert g[Node('ex:bob')].foaf::weblog?(Node('http://www.awesomeweblogfordummies.com'))
   end
   
@@ -159,6 +158,7 @@ foaf: http://xmlns.com/foaf/0.1/
     g = RDF::Graph.new
     g << a
 
+    g.serialize(:ejson) # Just check that parsing doesn't crash
     assert_equal 3, RDF::Parser.parse(:yarf,   g.serialize(:yarf)  ).triples.size
     assert_equal 3, RDF::Parser.parse(:rdfxml, g.serialize(:rdfxml)).triples.size
     assert_equal 3, RDF::Parser.parse(:rdf,    g.serialize(:rdf)   ).triples.size
@@ -166,9 +166,9 @@ foaf: http://xmlns.com/foaf/0.1/
   
   def test_repository
     repository = RDF::Repository.new
-    triple = [Node("http://testuri.org"), Node('rdf:type'), Node('rdf:Class')]
+    triple = [ID("http://testuri.org"), ID('rdf:type'), ID('rdf:Class')]
     graph = RDF::Graph.new [triple]
-    context = "http://test_repository.org"
+    context = "http://test_context.org"
     repository.data = graph, context
     
     # Check if the added data is there

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Jose Ignacio
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 +01:00
+date: 2011-03-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency