From 38897ae03d64fbfb0f4a91202973548ced7658d8 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 26 Aug 2023 13:00:59 -0700 Subject: [PATCH 1/3] Updates for version 3.3.0 with minimum Ruby version 3.0. Update minimum Nokogiri version (soft) to 1.15 due to vulnerability. --- .github/workflows/ci.yml | 4 ++-- Gemfile | 4 ++-- README.md | 6 +++--- VERSION | 2 +- rdf-rdfxml.gemspec | 10 +++++----- spec/suite_helper.rb | 10 ++++++++-- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32255be..bc96894 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: [2.6, 2.7, '3.0', 3.1, 3.2, ruby-head, jruby] + ruby: ['3.0', 3.1, 3.2, ruby-head, jruby] gemfile: - Gemfile - Gemfile-pure @@ -37,6 +37,6 @@ jobs: run: ruby --version; bundle exec rspec spec || $ALLOW_FAILURES - name: Coveralls GitHub Action uses: coverallsapp/github-action@v2 - if: ${{ matrix.ruby == '3.0' && matrix.gemfile == 'Gemfile' }} + if: ${{ matrix.ruby == '3.2' && matrix.gemfile == 'Gemfile' }} with: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/Gemfile b/Gemfile index 000e71a..14da3b9 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gemspec gem 'rdf', github: "ruby-rdf/rdf", branch: "develop" -gem "nokogiri", '~> 1.13', '>= 1.13.4', platforms: [:mri, :jruby] +gem "nokogiri", '~> 1.15', '>= 1.13.4', platforms: [:mri, :jruby] group :development do gem 'ebnf', github: "dryruby/ebnf", branch: "develop" @@ -24,6 +24,6 @@ group :debug do end group :test do - gem 'simplecov', '~> 0.21', platforms: :mri + gem 'simplecov', '~> 0.22', platforms: :mri gem 'simplecov-lcov', '~> 0.8', platforms: :mri end diff --git a/README.md b/README.md index ace7513..229acfe 100755 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Install with `gem install rdf-rdfxml` * 100% free and unencumbered [public domain](https://unlicense.org/) software. * Implements a complete parser for [RDF/XML][]. -* Compatible with Ruby >= 2.6. +* Compatible with Ruby >= 3.0. ## Usage: Instantiate a parser and parse source, specifying type and base-URL @@ -42,9 +42,9 @@ Write a graph to a file: end ## Dependencies -* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.2) +* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.3) * [Builder](https://rubygems.org/gems/builder) (~>- 3.2) -* Soft dependency on [Nokogiri](https://rubygems.org/gems/nokogiri) (>= 1.13) +* Soft dependency on [Nokogiri](https://rubygems.org/gems/nokogiri) (>= 1.15) ## Documentation Full documentation available on [Rubydoc.info][RDF/XML doc]) diff --git a/VERSION b/VERSION index be94e6f..15a2799 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.2 +3.3.0 diff --git a/rdf-rdfxml.gemspec b/rdf-rdfxml.gemspec index 016c070..84d8d2b 100755 --- a/rdf-rdfxml.gemspec +++ b/rdf-rdfxml.gemspec @@ -25,18 +25,18 @@ Gem::Specification.new do |gem| gem.files = %w(README.md History.md AUTHORS CONTRIBUTORS VERSION UNLICENSE) + Dir.glob('lib/**/*.rb') gem.require_paths = %w(lib) - gem.required_ruby_version = '>= 2.6' + gem.required_ruby_version = '>= 3.0' gem.requirements = [] - gem.add_runtime_dependency 'rdf', '~> 3.2' + gem.add_runtime_dependency 'rdf', '~> 3.3' gem.add_runtime_dependency 'rdf-xsd', '~> 3.2' gem.add_runtime_dependency 'htmlentities', '~> 4.3' gem.add_runtime_dependency 'builder', '~> 3.2' - gem.add_development_dependency 'json-ld', '>= 3.2' - gem.add_development_dependency 'rspec', '~> 3.10' + gem.add_development_dependency 'json-ld', '>= 3.3' + gem.add_development_dependency 'rspec', '~> 3.12' gem.add_development_dependency 'rspec-its', '~> 1.3' - gem.add_development_dependency 'rdf-isomorphic', '~> 3.2' + gem.add_development_dependency 'rdf-isomorphic', '~> 3.3' gem.add_development_dependency 'rdf-turtle', '~> 3.2' gem.add_development_dependency 'rdf-spec', '~> 3.2' gem.add_development_dependency 'rdf-vocab', '~> 3.2' diff --git a/spec/suite_helper.rb b/spec/suite_helper.rb index ef76ac7..6fbd523 100644 --- a/spec/suite_helper.rb +++ b/spec/suite_helper.rb @@ -82,6 +82,7 @@ module SuiteTest "rdft": "http://www.w3.org/ns/rdftest#", "comment": "rdfs:comment", + "baseIri": {"@id": "mf:assumedTestBase", "@type": "@id"}, "entries": {"@id": "mf:entries", "@container": "@list"}, "name": "mf:name", "action": {"@id": "mf:action", "@type": "@id"}, @@ -116,15 +117,20 @@ def self.from_jsonld(json) def entries # Map entries to resources - attributes['entries'].map {|e| Entry.new(e)} + attributes['entries'].map {|e| Entry.new(e, base_iri: attributes['baseIri'])} end end class Entry < JSON::LD::Resource attr_accessor :logger + def initialize(json, base_iri:) + @base_iri = base_iri + super + end + def base - RDF::URI(action) + RDF::URI(@base_iri || action) end # Alias data and query From b00ed0290034bd3f6b024d1ef4c82f5f5d271638 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sun, 27 Aug 2023 13:46:20 -0700 Subject: [PATCH 2/3] Update dependencies. --- rdf-rdfxml.gemspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rdf-rdfxml.gemspec b/rdf-rdfxml.gemspec index 84d8d2b..89d87c5 100755 --- a/rdf-rdfxml.gemspec +++ b/rdf-rdfxml.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |gem| gem.requirements = [] gem.add_runtime_dependency 'rdf', '~> 3.3' - gem.add_runtime_dependency 'rdf-xsd', '~> 3.2' + gem.add_runtime_dependency 'rdf-xsd', '~> 3.3' gem.add_runtime_dependency 'htmlentities', '~> 4.3' gem.add_runtime_dependency 'builder', '~> 3.2' @@ -37,9 +37,9 @@ Gem::Specification.new do |gem| gem.add_development_dependency 'rspec', '~> 3.12' gem.add_development_dependency 'rspec-its', '~> 1.3' gem.add_development_dependency 'rdf-isomorphic', '~> 3.3' - gem.add_development_dependency 'rdf-turtle', '~> 3.2' - gem.add_development_dependency 'rdf-spec', '~> 3.2' - gem.add_development_dependency 'rdf-vocab', '~> 3.2' + gem.add_development_dependency 'rdf-turtle', '~> 3.3' + gem.add_development_dependency 'rdf-spec', '~> 3.3' + gem.add_development_dependency 'rdf-vocab', '~> 3.3' gem.add_development_dependency 'yard' , '~> 0.9' gem.post_install_message = nil From 6603d88850b44efddef2f36b12cd28d087f6b3cb Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Fri, 1 Sep 2023 13:40:08 -0700 Subject: [PATCH 3/3] Minimum builder version 3.2.4. --- rdf-rdfxml.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdf-rdfxml.gemspec b/rdf-rdfxml.gemspec index 89d87c5..238e310 100755 --- a/rdf-rdfxml.gemspec +++ b/rdf-rdfxml.gemspec @@ -31,7 +31,7 @@ Gem::Specification.new do |gem| gem.add_runtime_dependency 'rdf', '~> 3.3' gem.add_runtime_dependency 'rdf-xsd', '~> 3.3' gem.add_runtime_dependency 'htmlentities', '~> 4.3' - gem.add_runtime_dependency 'builder', '~> 3.2' + gem.add_runtime_dependency 'builder', '~> 3.2', '>= 3.2.4' gem.add_development_dependency 'json-ld', '>= 3.3' gem.add_development_dependency 'rspec', '~> 3.12'