Release 1.1.2.

* Use updated ref_count logic from rdf-rdfa.
* Override rdf-rdfa preprocessing for RDF/XML semantics in managing prefixes.

Author: gkellogg

VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

lib/rdf/rdfxml/writer.rb

@@ -307,13 +307,26 @@ def prefix_attrs
     # Perform any preprocessing of statements required
     # @return [ignored]
     def preprocess
+      # Load defined prefixes
+      (@options[:prefixes] || {}).each_pair do |k, v|
+        @uri_to_prefix[v.to_s] = k
+      end
+      @options[:prefixes] = {}  # Will define actual used when matched
+
+      prefix(:rdf, RDF.to_uri)
+      @uri_to_prefix[RDF.to_uri.to_s] = :rdf
+      if base_uri || @options[:lang]
+        prefix(:xml, RDF::XML)
+        @uri_to_prefix[RDF::XML.to_s] = :xml
+      end
+
       if @options[:default_namespace]
+        @uri_to_prefix[@options[:default_namespace]] = nil
         prefix(nil, @options[:default_namespace])
       end
-        
-      super
-      prefix(:rdf, RDF.to_uri)
-      prefix(:xml, RDF::XML) if base_uri || @options[:lang]
+
+      # Process each statement to establish CURIEs and Terms
+      @graph.each {|statement| preprocess_statement(statement)}
     end
 
     ##

lib/rdf/rdfxml/writer/haml_templates.rb

@@ -30,7 +30,7 @@ class Writer
         - (types.unshift(first_type); first_type = nil) if first_type && (first_type.include?('/') || first_type.start_with?('_:'))
         - first_type ||= get_qname(RDF.Description)
         - first_type = first_type[1..-1] if first_type.to_s.start_with?(":")
-        - attr_props = attr_props.merge(get_qname(RDF.nodeID) => subject.id) if subject.node? && ref_count(subject) > 1
+        - attr_props = attr_props.merge(get_qname(RDF.nodeID) => subject.id) if subject.node? && ref_count(subject) >= 1
         - attr_props = attr_props.merge(get_qname(RDF.about) => relativize(subject)) if subject.uri?
         - haml_tag(first_type, attr_props) do
           - types.each do |type|

rdf-rdfxml.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
   gem.requirements          = []
 
-  gem.add_runtime_dependency     'rdf',             '~> 1.1'
-  gem.add_runtime_dependency     'rdf-rdfa',        '~> 1.1'
+  gem.add_runtime_dependency     'rdf',             '~> 1.1', '>= 1.1.6'
+  gem.add_runtime_dependency     'rdf-rdfa',        '~> 1.1', '>= 1.1.4.1'
   gem.add_runtime_dependency     'rdf-xsd',         '~> 1.1'
 
   #gem.add_development_dependency 'nokogiri' ,       '>= 1.6.1' # conditionally done in Gemfile

spec/matchers.rb

@@ -1,14 +1,14 @@
 require 'rspec/matchers'
 
-RSpec::Matchers.define :have_xpath do |xpath, value, namespaces, trace|
+RSpec::Matchers.define :have_xpath do |path, value, namespaces, trace|
   match do |actual|
     @doc = Nokogiri::XML.parse(actual)
     return false unless @doc.is_a?(Nokogiri::XML::Document)
     return false unless @doc.root.is_a?(Nokogiri::XML::Element)
-    @namespaces = @doc.namespaces.inject({}) {|memo, (k,v)| memo[k.to_s.sub(/xmlns:?/, '')] = v; memo}.
+    namespaces = @doc.namespaces.inject({}) {|memo, (k,v)| memo[k.to_s.sub(/xmlns:?/, '')] = v; memo}.
       merge(namespaces).
       merge("xhtml" => "http://www.w3.org/1999/xhtml", "xml" => "http://www.w3.org/XML/1998/namespace")
-    @result = @doc.root.at_xpath(xpath, @namespaces) rescue false
+    @result = @doc.root.at_xpath(path, namespaces) rescue false
     case value
     when false
       @result.nil?
@@ -19,14 +19,23 @@
     when Regexp
       @result.to_s =~ value
     else
-      @result.to_s. == value
+      @result.to_s == value
     end
   end
-  
+
+  failure_message do |actual|
+    msg = "expected that #{path.inspect}\nwould be: #{value.inspect}"
+    msg += "\n     was: #{@result}"
+    msg += "\nsource:" + actual
+    msg +=  "\nDebug:#{Array(trace).join("\n")}" if trace
+    msg
+  end
+
   failure_message_when_negated do |actual|
-    msg = "expected to that #{xpath.inspect} would be #{value.inspect} in:\n" + actual.to_s
-    msg += "was: #{@result}"
-    msg +=  "\nDebug:#{trace.join("\n")}" if trace
+    msg = "expected that #{path.inspect}\nwould not be #{value.inspect}"
+    msg += "\nsource:" + actual
+    msg +=  "\nDebug:#{Array(trace).join("\n")}" if trace
+    msg
   end
 end
 

spec/writer_spec.rb

@@ -629,6 +629,35 @@ class FOO < RDF::Vocabulary("http://foo/"); end
       end
     end
 
+    describe "reported issues" do
+      {
+        "issue #31 no namespaces" => [
+          %(<http://example.com/> <http://www.w3.org/1999/xhtml/vocab#license> <http://creativecommons.org/licenses/by-sa/3.0/> .),
+          {},
+          {
+            "/rdf:RDF/rdf:Description/@rdf:about" => 'http://example.com/',
+            "/rdf:RDF/rdf:Description/ns0:license/@rdf:resource" => 'http://creativecommons.org/licenses/by-sa/3.0/'
+          }
+        ],
+        "issue #31 with namespaces" => [
+          %(<http://example.com/> <http://www.w3.org/1999/xhtml/vocab#license> <http://creativecommons.org/licenses/by-sa/3.0/> .),
+          {xhv: 'http://www.w3.org/1999/xhtml/vocab#'},
+          {
+            "/rdf:RDF/rdf:Description/@rdf:about" => 'http://example.com/',
+            "/rdf:RDF/rdf:Description/xhv:license/@rdf:resource" => 'http://creativecommons.org/licenses/by-sa/3.0/'
+          }
+        ]
+      }.each do |test, (input, prefixes, paths)|
+        it test do
+          @graph = RDF::Graph.new << RDF::Turtle::Reader.new(input)
+          result = serialize(prefixes: prefixes, standard_prefixes: false)
+          paths.each do |path, value|
+            expect(result).to have_xpath(path, value, {}, @debug)
+          end
+        end
+      end
+    end
+
     # W3C RDF/XML Test suite from https://dvcs.w3.org/hg/rdf/raw-file/default/rdf-xml/tests/
     describe "w3c RDF/XML tests" do
       require 'suite_helper'
@@ -669,7 +698,7 @@ def parse(input, options = {})
     # Serialize  @graph to a string and compare against regexps
     def serialize(options = {})
       @debug = []
-      result = @writer_class.buffer({:debug => @debug, :standard_prefixes => true}.merge(options)) do |writer|
+      result = @writer_class.buffer({debug: @debug, standard_prefixes: true}.merge(options)) do |writer|
         writer << @graph
       end
       require 'cgi'