rdf-rdfa 0.2.1 → 0.2.2

data/lib/rdf/rdfa/version.rb

@@ -1,7 +1,7 @@
 module RDF::RDFa::VERSION
   MAJOR = 0
   MINOR = 2
-  TINY  = 1
+  TINY  = 2
   EXTRA = nil
 
   STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/rdf/rdfa.rb

@@ -26,8 +26,12 @@ module RDF
     require 'rdf/rdfa/format'
     require 'rdf/rdfa/vocab'
     require 'rdf/rdfa/patches/literal_hacks'
+    require 'rdf/rdfa/patches/nokogiri_hacks'
     require 'rdf/rdfa/patches/uri_hacks'
     autoload :Reader,  'rdf/rdfa/reader'
     autoload :VERSION, 'rdf/rdfa/version'
+    
+    def self.debug?; @debug; end
+    def self.debug=(value); @debug = value; end
   end
 end

data/rdf-rdfa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rdf-rdfa}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gregg Kellogg"]
-  s.date = %q{2010-06-28}
+  s.date = %q{2010-09-01}
   s.description = %q{    RDF::RDFa is an RDFa reader for Ruby using the RDF.rb library suite.
 }
   s.email = %q{gregg@kellogg-assoc.com}
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "lib/rdf/rdfa.rb",
      "lib/rdf/rdfa/format.rb",
      "lib/rdf/rdfa/patches/literal_hacks.rb",
+     "lib/rdf/rdfa/patches/nokogiri_hacks.rb",
      "lib/rdf/rdfa/patches/uri_hacks.rb",
      "lib/rdf/rdfa/reader.rb",
      "lib/rdf/rdfa/version.rb",
@@ -42,9 +43,11 @@ Gem::Specification.new do |s|
      "pkg/.gitignore",
      "rdf-rdfa.gemspec",
      "script/console",
+     "script/parse",
      "script/tc",
      "spec/html4-manifest.yml",
      "spec/html5-manifest.yml",
+     "spec/literal_spec.rb",
      "spec/matchers.rb",
      "spec/rdfa-triples/0001.nt",
      "spec/rdfa-triples/0006.nt",
@@ -162,15 +165,17 @@ Gem::Specification.new do |s|
      "spec/rdfa_reader_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
-     "spec/xhtml-manifest.yml"
+     "spec/xhtml-manifest.yml",
+     "spec/xhtml11-manifest.yml"
   ]
   s.homepage = %q{http://github.com/gkellogg/rdf-rdfa}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{RDFa reader for RDF.rb.}
   s.test_files = [
-    "spec/matchers.rb",
+    "spec/literal_spec.rb",
+     "spec/matchers.rb",
      "spec/rdfa_helper.rb",
      "spec/rdfa_reader_spec.rb",
      "spec/spec_helper.rb"
@@ -180,7 +185,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rdf>, [">= 0.2.1"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.3.3"])
       s.add_development_dependency(%q<rspec>, [">= 0"])

data/script/console

@@ -3,8 +3,8 @@
 irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
 
 libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/rdf/rdfa.rb'}"
+RDF = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "rdf", "lib"))
+libs << " -I #{RDF}" if File.directory?(RDF)
+libs <<  " -r #{File.join(File.expand_path(File.dirname(__FILE__)), "..", "lib", "rdf", "rdfa.rb")}"
 puts "Loading rdf-rdfa gem"
 exec "#{irb} #{libs} --simple-prompt"

data/script/parse

@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby -s
+require 'rubygems'
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", 'lib')))
+require 'rdf/rdfa'
+require 'getoptlong'
+
+def parse(input, base)
+  puts RDF::Writer.for($format.to_sym).buffer { |writer|
+    RDF::RDFa::Reader.new(input, :base_uri => base, :strict => true).each do |statement|
+      writer << statement
+    end
+  }
+end
+
+mode = ARGV.shift
+raise "Mode must be one of 'parse'" unless mode == "parse"
+
+$verbose = false
+$format = :ntriples
+base_uri  = "http://example.com"
+input = nil
+
+opts = GetoptLong.new(
+  ["--debug", GetoptLong::NO_ARGUMENT],
+  ["--verbose", GetoptLong::NO_ARGUMENT],
+  ["--quiet", GetoptLong::NO_ARGUMENT],
+  ["--format", GetoptLong::REQUIRED_ARGUMENT],
+  ["--execute", "-e", GetoptLong::REQUIRED_ARGUMENT],
+  ["--uri", GetoptLong::REQUIRED_ARGUMENT]
+)
+opts.each do |opt, arg|
+  case opt
+  when '--verbose' then $verbose = true
+  when '--quiet' then $quiet = true
+  when '--debug' then ::RDF::RDFa::debug = true
+  when '--execute' then input = arg
+  when '--format' then $format = arg
+  when '--uri' then base_uri = arg
+  end
+end
+
+if ARGV.empty?
+  s = input ? input : $stdin.read
+  parse(StringIO.new(s), base_uri)
+else
+  ARGV.each do |test_file|
+    parse(File.open(test_file), base_uri)
+  end
+end

data/script/tc

@@ -1,16 +1,18 @@
 #!/usr/bin/env ruby -s
 require 'rubygems'
-$:.unshift(File.join(File.dirname(__FILE__), "..", 'lib'))
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", 'lib')))
 require 'rdf/rdfa'
 require 'spec/rdfa_helper'
 require 'getoptlong'
 
-
-
 def run_tc(tc)
   puts "run #{tc.name}"
+  puts tc.inspect if $verbose
   puts RDF::Writer.for($format.to_sym).buffer { |writer|
-    RDF::RDFa::Reader.new(tc.input, :base_uri => tc.informationResourceInput, :strict => true).each do |statement|
+    RDF::RDFa::Reader.new(tc.input,
+      :base_uri => tc.informationResourceInput,
+      :strict => $strict,
+      :version => tc.version).each do |statement|
       writer << statement
     end
   }
@@ -18,21 +20,24 @@ end
 
 $verbose = false
 $format = :ntriples
+$strict = false
 suite = "xhtml"
 opts = GetoptLong.new(
   ["--debug", GetoptLong::NO_ARGUMENT],
   ["--verbose", GetoptLong::NO_ARGUMENT],
   ["--quiet", GetoptLong::NO_ARGUMENT],
   ["--suite", GetoptLong::OPTIONAL_ARGUMENT],
+  ["--strict", GetoptLong::NO_ARGUMENT],
   ["--format", GetoptLong::REQUIRED_ARGUMENT]
 )
 opts.each do |opt, arg|
   case opt
   when '--verbose' then $verbose = true
   when '--quiet' then $quiet = true
-  when '--debug' then $DEBUG = true
+  when '--debug' then ::RDF::RDFa::debug = true
   when '--format' then $format = arg
   when '--suite' then suite = arg
+  when '--strict' then $strict = true
   end
 end