rdf-rdfxml 0.3.3.1 → 0.3.4

data/History.rdoc

@@ -1,3 +1,6 @@
+=== 0.3.4
+* Decode XML Entity declarations when parsing.
+
 === 0.3.3.1
 * JRuby/FFI compatibility updates.
 * Simplify property value ordering in writer; this was causing unnecessary prefixes to be generated.

data/VERSION

@@ -1 +1 @@
-0.3.3.1
+0.3.4

data/lib/rdf/rdfxml/reader.rb

@@ -134,7 +134,11 @@ module RDF::RDFXML
             
         @doc = case input
         when Nokogiri::XML::Document then input
-        else Nokogiri::XML.parse(input, @base_uri.to_s)
+        else
+          Nokogiri::XML.parse(input, @base_uri.to_s) do |config|
+            config.noent
+            config.strict if options[:validate]
+          end
         end
         
         raise RDF::ReaderError, "Synax errors:\n#{@doc.errors}" if !@doc.errors.empty? && validate?

data/rdf-rdfxml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rdf-rdfxml}
-  s.version = "0.3.3.1"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Gregg Kellogg"]
-  s.date = %q{2011-05-06}
+  s.authors = [%q{Gregg Kellogg}]
+  s.date = %q{2011-08-08}
   s.description = %q{RDF::RDFXML is an RDF/XML reader and writer for the RDF.rb library suite.}
   s.email = %q{gregg@kellogg-assoc.com}
   s.extra_rdoc_files = [
@@ -59,19 +59,9 @@ Gem::Specification.new do |s|
     "spec/writer_spec.rb"
   ]
   s.homepage = %q{http://github.com/gkellogg/rdf-rdfxml}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{RDF/XML reader/writer for RDF.rb.}
-  s.test_files = [
-    "spec/format_spec.rb",
-    "spec/graph_spec.rb",
-    "spec/literal_spec.rb",
-    "spec/matchers.rb",
-    "spec/rdf_test.rb",
-    "spec/reader_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/writer_spec.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/reader_spec.rb

@@ -295,6 +295,39 @@ EOF
       graph.should be_equivalent_graph(triples, :about => "http://example.com/", :trace => @debug)
     end
   end
+  
+  context :entities do
+    it "decodes" do
+      sampledoc = <<-EOF;
+<?xml version="1.0"?>
+<!DOCTYPE rdf:RDF [<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#" >]>
+<rdf:RDF xmlns:rdf="&rdf;"
+         xmlns:ex="http://example.org/stuff/1.0/"
+         xml:base="http://example.org/triples/">
+  <rdf:Description rdf:about="http://example.org/">
+    <ex:prop rdf:ID="triple1">blah</ex:prop>
+  </rdf:Description>
+</rdf:RDF>
+EOF
+
+      triples = <<-EOF
+<http://example.org/> <http://example.org/stuff/1.0/prop> \"blah\" .
+<http://example.org/triples/#triple1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Statement> .
+<http://example.org/triples/#triple1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#subject> <http://example.org/> .
+<http://example.org/triples/#triple1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#predicate> <http://example.org/stuff/1.0/prop> .
+<http://example.org/triples/#triple1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#object> \"blah\" .
+EOF
+
+      graph = parse(sampledoc, :base_uri => "http://example.com", :validate => true)
+      graph.should be_equivalent_graph(triples, :about => "http://example.com/", :trace => @debug)
+    end
+
+    it "processes OWL definition" do
+      @debug = []
+      graph = RDF::Graph.load("http://www.w3.org/2002/07/owl", :format => :rdfxml, :debug => @debug)
+      graph.count.should > 10
+    end
+  end
 
   # W3C Test suite from http://www.w3.org/2000/10/rdf-tests/rdfcore/
   describe "w3c rdfcore tests" do

metadata

@@ -1,119 +1,115 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rdf-rdfxml
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.4
   prerelease: 
-  version: 0.3.3.1
 platform: ruby
-authors: 
+authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-06 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-08 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rdf
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157295280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2157295280
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2157293720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.4
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: open-uri-cached
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2157293720
+- !ruby/object:Gem::Dependency
+  name: open-uri-cached
+  requirement: &2157291780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: spira
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2157291780
+- !ruby/object:Gem::Dependency
+  name: spira
+  requirement: &2157289840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.12
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2157289840
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2157275140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rdf-spec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2157275140
+- !ruby/object:Gem::Dependency
+  name: rdf-spec
+  requirement: &2157273900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.3
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rdf-isomorphic
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2157273900
+- !ruby/object:Gem::Dependency
+  name: rdf-isomorphic
+  requirement: &2157269860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.4
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2157269860
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2157268780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.4
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: *2157268780
 description: RDF::RDFXML is an RDF/XML reader and writer for the RDF.rb library suite.
 email: gregg@kellogg-assoc.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - AUTHORS
 - CONTRIBUTORS
 - History.rdoc
 - README.md
 - UNLICENSE
-files: 
+files:
 - .yardopts
 - AUTHORS
 - CONTRIBUTORS
@@ -151,40 +147,28 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/writer_spec.rb
-has_rdoc: true
 homepage: http://github.com/gkellogg/rdf-rdfxml
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: RDF/XML reader/writer for RDF.rb.
-test_files: 
-- spec/format_spec.rb
-- spec/graph_spec.rb
-- spec/literal_spec.rb
-- spec/matchers.rb
-- spec/rdf_test.rb
-- spec/reader_spec.rb
-- spec/spec_helper.rb
-- spec/writer_spec.rb
+test_files: []