Release 1.1.4

gkellogg · gkellogg · commit 0f2323bc082a · 2015-04-05T14:17:13.000-07:00
* Remove whitespace around outer RDF tag; not ideal but it works. (issue #33) * Add back support for `max_depth` writer option (default 10). (issue #27) * correct XML escaping of illegal characters in literals (@barmintor) * Don't write out property value both as attribute and element by expanding attribute key to a URI before removing from properties. * To work around odd Nokogiri issue with reading files while specifying an encoding, read the file in to memory before passing to Nokogiri. (issue #35)
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,8 @@ rvm:
   - 1.9.3
   - 2.0
   - 2.1
-  - jruby-19mode
+  - 2.2
+  - jruby
   - rbx-2
 gemfile:
   - Gemfile
diff --git a/README.md b/README.md
@@ -101,7 +101,7 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [Ruby]:         http://ruby-lang.org/
 [RDF]:          http://www.w3.org/RDF/
 [RDF.rb]:       http://rubygems.org/gems/rdf
-[RDF/XML]:      http://www.w3.org/TR/REC-rdf-syntax/  "RDF/XML Syntax Specification"
+[RDF/XML]:      hhttp://www.w3.org/TR/rdf-syntax-grammar/ "RDF/XML Syntax Specification"
 [YARD]:         http://yardoc.org/
 [YARD-GS]:      http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
 [PDD]:          http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
diff --git a/Rakefile b/Rakefile
@@ -48,3 +48,14 @@ end
 
 task :specs => :spec
 task :default => :spec
+
+
+desc "Generate etc/doap.{nt,ttl} from etc/doap.html."
+task :doap do
+  require 'rdf/rdfxml'
+  require 'rdf/turtle'
+  require 'rdf/ntriples'
+  g = RDF::Graph.load("etc/doap.rdf")
+  RDF::NTriples::Writer.open("etc/doap.nt") {|w| w <<g }
+  RDF::Turtle::Writer.open("etc/doap.ttl", standard_prefixes: true) {|w| w <<g }
+end
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1.3
+1.1.4
diff --git a/etc/doap.nt b/etc/doap.nt
@@ -9,6 +9,7 @@
 <http://rubygems.org/gems/rdf-rdfxml> <http://usefulinc.com/ns/doap#developer> <http://greggkellogg.net/foaf#me> .
 <http://rubygems.org/gems/rdf-rdfxml> <http://usefulinc.com/ns/doap#helper> <http://njh.me/> .
 <http://rubygems.org/gems/rdf-rdfxml> <http://usefulinc.com/ns/doap#documenter> <http://greggkellogg.net/foaf#me> .
+<http://rubygems.org/gems/rdf-rdfxml> <http://usefulinc.com/ns/doap#implements> <http://www.w3.org/TR/rdf-syntax-grammar/> .
 <http://rubygems.org/gems/rdf-rdfxml> <http://usefulinc.com/ns/doap#download-page> <http://rubygems.org/gems/rdf-rdfxml> .
 <http://rubygems.org/gems/rdf-rdfxml> <http://usefulinc.com/ns/doap#homepage> <http://github.com/gkellogg/rdf-rdfxml> .
 <http://rubygems.org/gems/rdf-rdfxml> <http://usefulinc.com/ns/doap#mailing-list> <http://lists.w3.org/Archives/Public/public-rdf-ruby/> .
diff --git a/etc/doap.rdf b/etc/doap.rdf
@@ -19,6 +19,7 @@
     <doap:developer rdf:resource="http://greggkellogg.net/foaf#me"/>
     <doap:helper rdf:resource="http://njh.me/"/>
     <doap:documenter rdf:resource="http://greggkellogg.net/foaf#me"/>
+    <doap:implements rdf:resource="http://www.w3.org/TR/rdf-syntax-grammar/"/>
     <doap:download-page rdf:resource="http://rubygems.org/gems/rdf-rdfxml"/>
     <doap:homepage rdf:resource="http://github.com/gkellogg/rdf-rdfxml"/>
     <doap:mailing-list rdf:resource="http://lists.w3.org/Archives/Public/public-rdf-ruby/"/>
diff --git a/etc/doap.ttl b/etc/doap.ttl
@@ -0,0 +1,29 @@
+@prefix dc: <http://purl.org/dc/terms/> .
+@prefix doap: <http://usefulinc.com/ns/doap#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix xhv: <http://www.w3.org/1999/xhtml/vocab#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+<http://rubygems.org/gems/rdf-rdfxml> a doap:Project;
+   dc:creator <http://greggkellogg.net/foaf#me>;
+   doap:blog <http://greggkellogg.net/>;
+   doap:bug-database <http://github.com/ruby-rdf/rdf-rdfxml/issues>;
+   doap:category <http://dbpedia.org/resource/Resource_Description_Framework>,
+     <http://dbpedia.org/resource/Ruby_(programming_language)>;
+   doap:created "2010-06-03"^^xsd:date;
+   doap:description """
+      RDF::RDFXML is an RDF/XML reader/writer for Ruby using the RDF.rb library suite.
+    """@en;
+   doap:developer <http://greggkellogg.net/foaf#me>;
+   doap:documenter <http://greggkellogg.net/foaf#me>;
+   doap:download-page <http://rubygems.org/gems/rdf-rdfxml>;
+   doap:helper <http://njh.me/>;
+   doap:homepage <http://github.com/gkellogg/rdf-rdfxml>;
+   doap:implements <http://www.w3.org/TR/rdf-syntax-grammar/>;
+   doap:mailing-list <http://lists.w3.org/Archives/Public/public-rdf-ruby/>;
+   doap:maintainer <http://greggkellogg.net/foaf#me>;
+   doap:name "RDF::RDFXML";
+   doap:shortdesc "RDF/XML reader/writer for Ruby."@en;
+   xhv:license <http://creativecommons.org/licenses/publicdomain/>;
+   foaf:maker <http://greggkellogg.net/foaf#me> .
diff --git a/example-files/dwcterms.rdf b/example-files/dwcterms.rdf
diff --git a/lib/rdf/rdfxml/reader/nokogiri.rb b/lib/rdf/rdfxml/reader/nokogiri.rb
@@ -232,7 +232,7 @@ def initialize_xml(input, options = {})
           options[:encoding] ||= 'utf-8'
           options[:encoding] = options[:encoding].to_s if options[:encoding]
 
-          ::Nokogiri::XML.parse(input, base_uri.to_s, options[:encoding]) do |config|
+          ::Nokogiri::XML.parse(input.respond_to?(:read) ? input.read : input.to_s, base_uri.to_s, options[:encoding]) do |config|
             config.noent
           end
         end
diff --git a/lib/rdf/rdfxml/writer.rb b/lib/rdf/rdfxml/writer.rb
@@ -65,6 +65,8 @@ class Writer < RDF::RDFa::Writer
     #   the prefix mappings to use (not supported by all writers)
     # @option options [#to_s]    :base_uri     (nil)
     #   the base URI to use when constructing relative URIs
+    # @option options [Integer]  :max_depth (10)
+    #   Maximum depth for recursively defining resources
     # @option options [#to_s]   :lang   (nil)
     #   Output as root xml:lang attribute, and avoid generation _xml:lang_ where possible
     # @option options [Symbol]    :attributes   (nil)
@@ -92,7 +94,8 @@ def haml_template
 
     def write_epilogue
       @force_RDF_about = {}
-      @attributes = @options[:attributes] || :none
+      @max_depth = @options.fetch(:max_depth, 10)
+      @attributes = @options.fetch(:attributes, :none)
 
       super
     end
@@ -151,7 +154,7 @@ def render_subject(subject, predicates, options = {}, &block)
         {}
       end
 
-      predicates -= attr_props.keys
+      predicates -= attr_props.keys.map {|k| expand_curie(k).to_s}
       super(subject, predicates, options.merge(:attr_props => attr_props), &block)
     end
     # See if we can serialize as attribute.
@@ -259,9 +262,10 @@ def render_property(predicate, objects, options = {}, &block)
         raise RDF::WriterError, "Missing property template" if template.nil?
 
         options = {
-          :object     => objects.first,
-          :predicate  => predicate,
-          :property   => get_qname(predicate),
+          object:     objects.first,
+          predicate:  predicate,
+          property:   get_qname(predicate),
+          recurse:    @depth <= @max_depth
         }.merge(options)
         hamlify(template, options, &block)
       end
@@ -285,9 +289,10 @@ def render_collection(predicate, list, options = {}, &block)
       template = options[:haml] || haml_template[:collection]
 
       options = {
-        :list       => list,
-        :predicate  => predicate,
-        :property   => get_qname(predicate),
+        list:       list,
+        predicate:  predicate,
+        property:   get_qname(predicate),
+        recurse:    @depth <= @max_depth,
       }.merge(options)
       hamlify(template, options) do |object|
         yield object
diff --git a/lib/rdf/rdfxml/writer/haml_templates.rb b/lib/rdf/rdfxml/writer/haml_templates.rb
@@ -49,15 +49,15 @@ class Writer
       # If nil is returned, render as a leaf
       # Otherwise, render result
       :property_value => %q(
-      - if res = yield(object)
+      - if recurse && res = yield(object)
         - haml_tag(property) do
           = res
       - elsif object.literal? && object.datatype == RDF.XMLLiteral
         - haml_tag(property, :"<", "rdf:parseType" => "Literal") do
           = object.value
       - elsif object.literal?
         - haml_tag(property, :"<", "xml:lang" => object.language, "rdf:datatype" => (object.datatype unless object.plain?)) do
-          = object.value
+          = object.value.to_s.encode(xml: :text)
       - elsif object.node?
         - haml_tag(property, :"/", "rdf:nodeID" => object.id)
       - else
@@ -72,7 +72,7 @@ class Writer
       :collection => %q(
         - haml_tag(property, get_qname(RDF.parseType) => "Collection") do
           - list.each do |object|
-            - if res = yield(object)
+            - if recurse && res = yield(object)
               = res
             - elsif object.node?
               - haml_tag(get_qname(RDF.Description), :"/", "rdf:nodeID" => (object.id if ref_count(object) > 1))
diff --git a/spec/matchers.rb b/spec/matchers.rb
@@ -59,7 +59,7 @@ def normalize(graph)
     @info = if info.respond_to?(:input)
       info
     elsif info.is_a?(Hash)
-      identifier = info[:identifier] || expected.is_a?(RDF::Enumerable) ? expected.context : info[:about]
+      identifier = info[:identifier] || info[:about]
       debug = info[:debug]
       if debug.is_a?(Array)
         debug = if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby" && RUBY_VERSION >= "1.9"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -11,6 +11,11 @@
 require 'rdf/spec/matchers'
 require 'rdf/isomorphic'
 require 'open-uri/cached'
+begin
+  require 'nokogiri'
+rescue LoadError => e
+  :rexml
+end
 
 # Create and maintain a cache of downloaded URIs
 URI_CACHE = File.expand_path(File.join(File.dirname(__FILE__), "uri-cache"))
@@ -20,10 +25,6 @@
 ::RSpec.configure do |c|
   c.filter_run :focus => true
   c.run_all_when_everything_filtered = true
-  c.exclusion_filter = {
-    :ruby => lambda { |version| !(RUBY_VERSION.to_s =~ /^#{version.to_s}/) },
-    :no_jruby => lambda { |version| !(RUBY_PLATFORM.to_s != 'java') },
-  }
   c.include(RDF::Spec::Matchers)
 end
 
diff --git a/spec/writer_spec.rb b/spec/writer_spec.rb
