Skip to content

Commit

Permalink
Updates for version 3.3.0 with minimum Ruby version 3.0.
Browse files Browse the repository at this point in the history
Updates Nokogiri to version 1.15 due to vulnerability.
  • Loading branch information
gkellogg committed Aug 26, 2023
1 parent d4a5660 commit 7502601
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 28 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,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]
steps:
- name: Clone repository
uses: actions/checkout@v3
Expand All @@ -31,7 +31,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
if: "matrix.ruby == '3.0'"
uses: coverallsapp/github-action@v2
if: "matrix.ruby == '3.2'"
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ group :development 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
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Install with `gem install rdf-trix`

* 100% free and unencumbered [public domain](https://unlicense.org/) software.
* Implements a complete parser and serializer for [TriX][].
* Compatible with Ruby >= 2.6, and JRuby 9+.
* Compatible with Ruby >= 3.0, and JRuby 9+.

### Support for xml:base

Expand Down Expand Up @@ -91,9 +91,9 @@ Write a repository to a file:
end

## Dependencies
* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.1)
* Soft dependency on [Nokogiri](https://rubygems.org/gems/nokogiri) (>= 1.10)
* Soft dependency on [Libxml-Ruby](https://rubygems.org/gems/libxml-ruby) (>= 3.0)
* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.3)
* Soft dependency on [Nokogiri](https://rubygems.org/gems/nokogiri) (>= 1.15)
* Soft dependency on [Libxml-Ruby](https://rubygems.org/gems/libxml-ruby) (>= 4.1)

## Documentation

Expand All @@ -104,9 +104,9 @@ Write a repository to a file:

## Dependencies

* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.2)
[Nokogiri](https://rubygems.org/gems/nokogiri) (~> 1.12)
[LibXML](https://rubygems.org/gems/libxml) (>= 3.2)
* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.3)
[Nokogiri](https://rubygems.org/gems/nokogiri) (~> 1.15)
[LibXML](https://rubygems.org/gems/libxml) (>= 4.1)

## Installation

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.0
3.3.0
16 changes: 8 additions & 8 deletions rdf-trix.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ Gem::Specification.new do |gem|
gem.files = %w(AUTHORS CREDITS README.md UNLICENSE VERSION etc/doap.xml) + Dir.glob('lib/**/*.rb')
gem.require_paths = %w(lib)

gem.required_ruby_version = '>= 2.6'
gem.add_runtime_dependency 'rdf', '~> 3.2'
gem.required_ruby_version = '>= 3.0'
gem.add_runtime_dependency 'rdf', '~> 3.3'
gem.add_runtime_dependency 'rdf-xsd', '~> 3.2'
gem.add_development_dependency 'rdf-spec', '~> 3.2'
gem.add_development_dependency 'rdf-trig', '~> 3.2'
gem.add_development_dependency 'rdf-ordered-repo', '~> 3.2'
gem.add_development_dependency 'rspec', '~> 3.10'
gem.add_development_dependency 'rdf-spec', '~> 3.3'
gem.add_development_dependency 'rdf-trig', '~> 3.3'
gem.add_development_dependency 'rdf-ordered-repo', '~> 3.3'
gem.add_development_dependency 'rspec', '~> 3.12'
gem.add_development_dependency 'rspec-its', '~> 1.3'
gem.add_development_dependency 'yard' , '~> 0.9'
gem.add_development_dependency 'nokogiri', '~> 1.13', '>= 1.13.4'
gem.add_development_dependency 'libxml-ruby', '~> 3.2' unless is_java
gem.add_development_dependency 'nokogiri', '~> 1.15', '>= 1.15.4'
gem.add_development_dependency 'libxml-ruby', '~> 4.1' unless is_java

gem.post_install_message = nil
end
6 changes: 3 additions & 3 deletions spec/reader_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
},
}.each do |name, params|
it name do
res = RDF::OrderedRepo.new << RDF::NQuads::Reader.new(params[:expect])
res = RDF::Repository.new << RDF::NQuads::Reader.new(params[:expect])
expect(parse(params[:input], library: impl.to_sym, **params)).to be_equivalent_graph(res, logger: @logger)
end unless Array(params[:except]).include?(impl.to_sym)
end
Expand Down Expand Up @@ -466,7 +466,7 @@
},
}.each do |name, params|
it name do
res = RDF::OrderedRepo.new << RDF::NQuads::Reader.new(params[:expect], rdfstar: true)
res = RDF::Repository.new << RDF::NQuads::Reader.new(params[:expect], rdfstar: true)
expect(parse(params[:input], library: impl.to_sym, rdfstar: true, **params)).to be_equivalent_graph(res, logger: @logger)
end unless Array(params[:except]).include?(impl.to_sym)
end
Expand All @@ -482,7 +482,7 @@ def parse(input, **options)
validate: false,
canonicalize: false,
}.merge(options)
graph = options[:graph] || RDF::OrderedRepo.new
graph = options[:graph] || RDF::Repository.new
RDF::TriX::Reader.new(input, **options).each do |statement|
graph << statement
end
Expand Down
10 changes: 5 additions & 5 deletions spec/writer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@
},
}.each do |name, params|
it name do
graph = RDF::OrderedRepo.new << RDF::NQuads::Reader.new(params[:input])
graph = RDF::Repository.new << RDF::NQuads::Reader.new(params[:input])
trix = graph.dump(:trix)
graph2 = RDF::OrderedRepo.new << RDF::TriX::Reader.new(trix)
graph2 = RDF::Repository.new << RDF::TriX::Reader.new(trix)
expect(graph2).to be_equivalent_graph(graph)
end
end
Expand All @@ -81,7 +81,7 @@
nt = %(
<http://release/a> <http://foo/ref> <http://release/b> .
)
graph = RDF::OrderedRepo.new << RDF::NQuads::Reader.new(nt)
graph = RDF::Repository.new << RDF::NQuads::Reader.new(nt)
graph.dump(:trix, base_uri: "http://release/")
end

Expand Down Expand Up @@ -193,9 +193,9 @@
},
}.each do |name, params|
it name do
graph = RDF::OrderedRepo.new {|g| g << params[:input]}
graph = RDF::Repository.new {|g| g << params[:input]}
trix = graph.dump(:trix)
graph2 = RDF::OrderedRepo.new << RDF::TriX::Reader.new(trix, rdfstar: true)
graph2 = RDF::Repository.new << RDF::TriX::Reader.new(trix, rdfstar: true)
expect(graph2).to be_equivalent_graph(graph)
end
end
Expand Down

0 comments on commit 7502601

Please sign in to comment.