From 423ee4353d42ee45a0fa25a47618783b1f4ac664 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Mon, 19 Jun 2023 12:31:46 -0700 Subject: [PATCH] Clean up some Ruby warnings. --- lib/rdf/rdfxml/reader.rb | 5 ++--- spec/reader_spec.rb | 12 ++++++------ spec/spec_helper.rb | 3 ++- spec/writer_spec.rb | 9 ++++----- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/lib/rdf/rdfxml/reader.rb b/lib/rdf/rdfxml/reader.rb index 23dadf4..baf52c2 100644 --- a/lib/rdf/rdfxml/reader.rb +++ b/lib/rdf/rdfxml/reader.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? diff --git a/spec/reader_spec.rb b/spec/reader_spec.rb index 769f787..f14ab1d 100644 --- a/spec/reader_spec.rb +++ b/spec/reader_spec.rb @@ -242,7 +242,7 @@ ) expect do - graph = parse(sampledoc, base_uri: "http://example.com", validate: true) + parse(sampledoc, base_uri: "http://example.com", validate: true) end.to raise_error(RDF::ReaderError) expect(logger.to_s).to match(/Obsolete attribute .*aboutEach/) end @@ -264,7 +264,7 @@ ) expect do - graph = parse(sampledoc, base_uri: "http://example.com", validate: true) + parse(sampledoc, base_uri: "http://example.com", validate: true) end.to raise_error(RDF::ReaderError) expect(logger.to_s).to match(/Obsolete attribute .*aboutEachPrefix/) end @@ -276,7 +276,7 @@ ) expect do - graph = parse(sampledoc, base_uri: "http://example.com", validate: true) + parse(sampledoc, base_uri: "http://example.com", validate: true) end.to raise_error(RDF::ReaderError) expect(logger.to_s).to match(/ID addtribute '.*' must be a NCName/) end @@ -291,7 +291,7 @@ ) expect do - graph = parse(sampledoc, base_uri: "http://example.com", validate: true) + parse(sampledoc, base_uri: "http://example.com", validate: true) end.to raise_error(RDF::ReaderError) expect(logger.to_s).to match(/ID addtribute '.*' must be a NCName/) end @@ -304,7 +304,7 @@ ) expect do - graph = parse(sampledoc, base_uri: "http://example.com", validate: true) + parse(sampledoc, base_uri: "http://example.com", validate: true) end.to raise_error(RDF::ReaderError) expect(logger.to_s).to include("ID addtribute 'a/b' must be a NCName") end @@ -316,7 +316,7 @@ ) expect do - graph = parse(sampledoc, base_uri: "http://example.com", validate: true) + parse(sampledoc, base_uri: "http://example.com", validate: true) end.to raise_error(RDF::ReaderError) expect(logger.to_s).to match(/Obsolete attribute .*bagID/) end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 350baed..e57f387 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -11,7 +11,7 @@ require 'matchers' begin require 'nokogiri' -rescue LoadError => e +rescue LoadError :rexml end begin @@ -32,6 +32,7 @@ end rescue LoadError end + require 'rdf/rdfxml' ::RSpec.configure do |c| diff --git a/spec/writer_spec.rb b/spec/writer_spec.rb index 290a09d..1d1b9dd 100644 --- a/spec/writer_spec.rb +++ b/spec/writer_spec.rb @@ -517,8 +517,8 @@ class FOO < RDF::Vocabulary("http://foo/"); end end end - specify { expect(subject).to match /