Skip to content

Commit

Permalink
Finish 3.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
gkellogg committed Sep 1, 2023
2 parents 97b5b59 + e2cb798 commit c66b069
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 30 deletions.
14 changes: 4 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,13 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby:
- 2.6
- 2.7
- "3.0"
- 3.1
- ruby-head
- jruby
ruby: ['3.0', 3.1, 3.2, ruby-head, jruby]
gemfile:
- Gemfile
- Gemfile-pure
steps:
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand All @@ -42,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
if: ${{ matrix.ruby == '3.0' && matrix.gemfile == 'Gemfile' }}
uses: coverallsapp/github-action@v2
if: ${{ matrix.ruby == '3.2' && matrix.gemfile == 'Gemfile' }}
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/generate-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: Update gh-pages with docs
steps:
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ gemspec
gem 'rdf', github: "ruby-rdf/rdf", branch: "develop"
gem 'rdf-spec', github: "ruby-rdf/rdf-spec", branch: "develop"
gem 'rdf-isomorphic', github: "ruby-rdf/rdf-isomorphic", branch: "develop"
gem "nokogiri", '~> 1.12'
gem "nokogiri", '~> 1.15', '>= 1.15.4'
gem 'equivalent-xml', '~> 0.6'

group :debug do
gem 'byebug', platforms: :mri
end

group :test do
gem 'simplecov', '~> 0.21', platforms: :mri
gem 'simplecov', '~> 0.22', platforms: :mri
gem 'simplecov-lcov', '~> 0.8', platforms: :mri
end
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This gem adds additional RDF::Literal subclasses for extended [XSD datatypes][] along with methods implementing many [XPath and XQuery Functions][]

[![Gem Version](https://badge.fury.io/rb/rdf-xsd.png)](https://badge.fury.io/rb/rdf-xsd)
[![Gem Version](https://badge.fury.io/rb/rdf-xsd.svg)](https://badge.fury.io/rb/rdf-xsd)
[![Build Status](https://github.com/ruby-rdf/rdf-xsd/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf-xsd/actions?query=workflow%3ACI)
[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-xsd/badge.svg)](https://coveralls.io/github/ruby-rdf/rdf-xsd?branch=develop)
[![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
Expand All @@ -22,11 +22,11 @@ This gem adds additional RDF::Literal subclasses for extended [XSD datatypes][]
require 'rdf/xsd'

## Dependencies
* [Ruby](https://ruby-lang.org/) (>= 2.6)
* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.2)
* Soft dependency on [Nokogiri](https://rubygems.org/gems/nokogiri) (>= 1.12)
* [Ruby](https://ruby-lang.org/) (>=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 [EquivalentXML](https://rubygems.org/gems/equivalent-xml) (~> 0.6)
* Soft dependency on [ActiveSupport](https://rubygems.org/gems/activesupport) (~> 6.2)
* Soft dependency on [ActiveSupport](https://rubygems.org/gems/activesupport) (~> 7.0)

## Documentation
Full documentation available on [GitHub][XSD doc]
Expand Down Expand Up @@ -104,4 +104,4 @@ Portions of tests are derived from [W3C DAWG tests](https://www.w3.org/2001/sw/D
[Backports]: https://rubygems.org/gems/backports
[XSD Datatypes]: https://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#built-in-datatypes
[XPath and XQuery Functions]: https://www.w3.org/TR/xpath-functions/
[XSD Doc]: https://ruby-rdf.github.io/rdf-xsd
[XSD Doc]: https://ruby-rdf.github.io/rdf-xsd
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.1
3.3.0
2 changes: 1 addition & 1 deletion lib/rdf/xsd/extensions.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
begin
require 'nokogiri'
rescue LoadError => e
rescue LoadError
end
require 'rexml/document'

Expand Down
6 changes: 3 additions & 3 deletions lib/rdf/xsd/xml.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
require 'nokogiri'
begin
require 'equivalent-xml'
rescue LoadError => e
rescue LoadError
:rexml # Uses Rexml for equivalent, even with Nokogiri if equivalent-xml is not present.
end
rescue LoadError => e
rescue LoadError
:rexml
end

Expand Down Expand Up @@ -123,7 +123,7 @@ def equivalent_rexml(other)
begin
require 'active_support'
require 'active_support/core_ext'
rescue LoadError => e
rescue LoadError
# string equivalence
end

Expand Down
12 changes: 6 additions & 6 deletions rdf-xsd.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@ Gem::Specification.new do |gem|
gem.files = %w(AUTHORS README.md UNLICENSE VERSION) + 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 'rexml', '~> 3.2'

#gem.add_development_dependency 'nokogiri' , '>= 1.10' # conditionally done in Gemfile
#gem.add_development_dependency 'nokogiri' # conditionally done in Gemfile
#gem.add_development_dependency 'equivalent-xml' , '~> 0.6'
gem.add_development_dependency 'activesupport', '~> 6.1'
gem.add_development_dependency 'rspec', '~> 3.10'
gem.add_development_dependency 'activesupport', '~> 7.0'
gem.add_development_dependency 'rspec', '~> 3.12'
gem.add_development_dependency 'rspec-its', '~> 1.3'
gem.add_development_dependency 'rdf-spec', '~> 3.2'
gem.add_development_dependency 'rdf-spec', '~> 3.3'
gem.add_development_dependency 'yard' , '~> 0.9'

gem.post_install_message = %(
Expand Down

0 comments on commit c66b069

Please sign in to comment.