Finish 3.2.2

Author: gkellogg

.github/workflows/ci.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Run tests
         run: ruby --version; bundle exec rspec spec || $ALLOW_FAILURES
       - name: Coveralls GitHub Action
-        uses: coverallsapp/github-action@v1.1.2
+        uses: coverallsapp/github-action@v2
         if: ${{ matrix.ruby == '3.0' && matrix.gemfile == 'Gemfile' }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

Gemfile

@@ -3,7 +3,6 @@ source "https://rubygems.org"
 gemspec
 
 gem 'rdf',            github: "ruby-rdf/rdf",       branch: "develop"
-gem 'rdf-rdfa',       github: "ruby-rdf/rdf-rdfa",  branch: "develop"
 gem "nokogiri",       '~> 1.13', '>= 1.13.4', platforms: [:mri, :jruby]
 
 group :development do

Gemfile-pure

@@ -4,7 +4,6 @@ source "https://rubygems.org"
 gemspec
 
 gem 'rdf',      github: "ruby-rdf/rdf",       branch: "develop"
-gem 'rdf-rdfa', github: "ruby-rdf/rdf-rdfa",  branch: "develop"
 
 group :development do
   gem 'ebnf',               github: "dryruby/ebnf",                 branch: "develop"

README.md

@@ -2,7 +2,7 @@
 
 [RDF/XML][] reader/writer for [RDF.rb][].
 
-[![Gem Version](https://badge.fury.io/rb/rdf-rdfxml.png)](https://badge.fury.io/rb/rdf-rdfxml)
+[![Gem Version](https://badge.fury.io/rb/rdf-rdfxml.svg)](https://badge.fury.io/rb/rdf-rdfxml)
 [![Build Status](https://github.com/ruby-rdf/rdf-rdfxml/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf-rdfxml/actions?query=workflow%3ACI)
 [![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-rdfxml/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/rdf-rdfxml?branch=develop)
 [![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
@@ -43,8 +43,8 @@ Write a graph to a file:
 
 ## Dependencies
 * [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.2)
-* [Haml](https://rubygems.org/gems/haml) (~>- 5.2)
-* Soft dependency on [Nokogiri](https://rubygems.org/gems/nokogiri) (>= 1.12)
+* [Builder](https://rubygems.org/gems/builder) (~>- 3.2)
+* Soft dependency on [Nokogiri](https://rubygems.org/gems/nokogiri) (>= 1.13)
 
 ## Documentation
 Full documentation available on [Rubydoc.info][RDF/XML doc])

VERSION

@@ -1 +1 @@
-3.2.1
+3.2.2

lib/rdf/rdfxml.rb

@@ -2,7 +2,8 @@
 require 'rdf'
 
 module RDF
-  autoload :XML, 'rdf/rdfa/vocab'
+  XML = Class.new(Vocabulary("http://www.w3.org/XML/1998/namespace"))
+
   ##
   # **`RDF::RDFXML`** is an RDF/XML extension for RDF.rb.
   #

lib/rdf/rdfxml/extensions.rb

@@ -0,0 +1,54 @@
+# Extend builder to allow for better control of whitespace in XML Literals
+
+require 'builder'
+
+module Builder
+  # Extends XmlMarkup#tag! to better control whitespace when adding content from a block
+  #
+  class RdfXml < Builder::XmlMarkup
+    # Create a tag named +sym+.  Other than the first argument which
+    # is the tag name, the arguments are the same as the tags
+    # implemented via <tt>method_missing</tt>.
+    #
+    # @see https://github.com/jimweirich/builder/blob/master/lib/builder/xmlbase.rb
+    def tag!(sym, *args, &block)
+      text = nil
+      attrs = args.last.is_a?(::Hash) ? args.last : {}
+      return super unless block && attrs[:no_whitespace]
+      attrs.delete(:no_whitespace)
+
+      sym = "#{sym}:#{args.shift}".to_sym if args.first.kind_of?(::Symbol)
+
+      args.each do |arg|
+        case arg
+        when ::Hash
+          attrs.merge!(arg)
+        when nil
+          attrs.merge!({:nil => true}) if explicit_nil_handling?
+        else
+          text ||= ''
+          text << arg.to_s
+        end
+      end
+
+      unless text.nil?
+        ::Kernel::raise ::ArgumentError,
+          "XmlMarkup cannot mix a text argument with a block"
+      end
+
+      # Indent
+      _indent
+      #unless @indent == 0 || @level == 0
+      #  text!(" " * (@level * @indent))
+      #end
+
+      _start_tag(sym, attrs)
+      begin
+        _nested_structures(block)
+      ensure
+        _end_tag(sym)
+        _newline
+      end
+    end
+  end
+end

lib/rdf/rdfxml/patches/nokogiri_hacks.rb

@@ -1,6 +1,6 @@
 begin
   require 'nokogiri'
-rescue LoadError => e
+rescue LoadError
   :rexml
 end
 require 'rdf/xsd'
@@ -91,7 +91,7 @@ def extract_mappings(element, &cb)
       # Produce the next list entry for this context
       def li_next
         @li_counter += 1
-        predicate = RDF["_#{@li_counter}"]
+        RDF["_#{@li_counter}"]
       end
 
       # Set XML base. Ignore any fragment
@@ -328,7 +328,6 @@ def nodeElement(el, ec)
       end
 
       # Handle the propertyEltList children events in document order
-      li_counter = 0 # this will increase for each li we iterate through
       el.children.each do |child|
         log_fatal "child must be a proxy not a #{child.class}" unless child.is_a?(@implementation::NodeProxy)
         next unless child.element?