diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9eaddce..7eb055f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,19 +20,13 @@ jobs: strategy: fail-fast: false matrix: - ruby: - - 2.6 - - 2.7 - - 3.0 - - 3.1 - - ruby-head - - jruby + ruby: [2.6, 2.7, '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: diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml new file mode 100644 index 0000000..65aea93 --- /dev/null +++ b/.github/workflows/generate-docs.yml @@ -0,0 +1,27 @@ +name: Build & deploy documentation +on: + push: + branches: + - master + workflow_dispatch: +jobs: + build: + runs-on: ubuntu-latest + name: Update gh-pages with docs + steps: + - name: Clone repository + uses: actions/checkout@v3 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: "3.1" + - name: Install required gem dependencies + run: gem install yard --no-document + - name: Build YARD Ruby Documentation + run: yardoc + - name: Deploy + uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./doc/yard + publish_branch: gh-pages diff --git a/Gemfile b/Gemfile index 0106453..0c72d41 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gemspec gem 'rdf', github: "ruby-rdf/rdf", branch: "develop" gem 'rdf-rdfa', github: "ruby-rdf/rdf-rdfa", branch: "develop" -gem "nokogiri", '~> 1.12', platforms: [:mri, :jruby] +gem "nokogiri", '~> 1.13', '>= 1.13.4', platforms: [:mri, :jruby] group :development do gem 'ebnf', github: "dryruby/ebnf", branch: "develop" diff --git a/README.md b/README.md index 682e54f..9c13f56 100755 --- a/README.md +++ b/README.md @@ -43,6 +43,7 @@ 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) ## Documentation @@ -103,5 +104,5 @@ see or the accompanying {file:UNLICENSE} file. [YARD]: https://yardoc.org/ [YARD-GS]: https://rubydoc.info/docs/yard/file/docs/GettingStarted.md [PDD]: https://unlicense.org/#unlicensing-contributions -[RDF/XML doc]: https://rubydoc.info/github/ruby-rdf/rdf-rdfxml/master/frames +[RDF/XML doc]: https://ruby-rdf.github.io/rdf-rdfxml/master/frames [RDF-star]: https://w3c.github.io/rdf-star/rdf-star-cg-spec.html diff --git a/VERSION b/VERSION index 944880f..e4604e3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.0 +3.2.1 diff --git a/lib/rdf/rdfxml/format.rb b/lib/rdf/rdfxml/format.rb index fd2f63e..70d8cbc 100644 --- a/lib/rdf/rdfxml/format.rb +++ b/lib/rdf/rdfxml/format.rb @@ -20,7 +20,9 @@ module RDF::RDFXML # # @see http://www.w3.org/TR/rdf-testcases/#ntriples class Format < RDF::Format - content_type 'application/rdf+xml', extensions: [:rdf, :owl] + content_type 'application/rdf+xml', + extensions: [:rdf, :owl], + uri: 'http://www.w3.org/ns/formats/RDF_XML' content_encoding 'utf-8' reader { RDF::RDFXML::Reader } diff --git a/lib/rdf/rdfxml/reader/nokogiri.rb b/lib/rdf/rdfxml/reader/nokogiri.rb index 47f5453..0e21202 100644 --- a/lib/rdf/rdfxml/reader/nokogiri.rb +++ b/lib/rdf/rdfxml/reader/nokogiri.rb @@ -25,7 +25,7 @@ def initialize(node, parent = nil) # Create a new element child of an existing node def create_node(name, children) - native = ::Nokogiri::XML::Element.new(name, @node) + native = ::Nokogiri::XML::Element.new(name, @node.document) children.each do |c| native.add_child(c.node) end diff --git a/lib/rdf/rdfxml/writer.rb b/lib/rdf/rdfxml/writer.rb index 69d5d0b..b1ce122 100644 --- a/lib/rdf/rdfxml/writer.rb +++ b/lib/rdf/rdfxml/writer.rb @@ -55,7 +55,7 @@ class Writer < RDF::RDFa::Writer ## # RDF/XML Writer options - # @see http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Writer#options-class_method + # @see https://ruby-rdf.github.io/rdf/RDF/Writer#options-class_method def self.options super + [ RDF::CLI::Option.new( diff --git a/rdf-rdfxml.gemspec b/rdf-rdfxml.gemspec index 5f6df12..586b641 100755 --- a/rdf-rdfxml.gemspec +++ b/rdf-rdfxml.gemspec @@ -10,6 +10,13 @@ Gem::Specification.new do |gem| gem.license = 'Unlicense' gem.summary = %q{RDF/XML reader/writer for RDF.rb.} gem.description = %q{RDF::RDFXML is an RDF/XML reader and writer for the RDF.rb library suite.} + gem.metadata = { + "documentation_uri" => "https://ruby-rdf.github.io/rdf-rdfxml", + "bug_tracker_uri" => "https://github.com/ruby-rdf/rdf-rdfxml/issues", + "homepage_uri" => "https://github.com/ruby-rdf/rdf-rdfxml", + "mailing_list_uri" => "https://lists.w3.org/Archives/Public/public-rdf-ruby/", + "source_code_uri" => "https://github.com/ruby-rdf/rdf-rdfxml", + } gem.authors = %w(Gregg Kellogg) gem.email = 'public-rdf-ruby@w3.org' @@ -25,6 +32,7 @@ Gem::Specification.new do |gem| gem.add_runtime_dependency 'rdf-xsd', '~> 3.2' gem.add_runtime_dependency 'rdf-rdfa', '~> 3.2' gem.add_runtime_dependency 'htmlentities', '~> 4.3' + gem.add_runtime_dependency 'haml', '~> 5.2' # Until workaround for haml_tag is found. gem.add_development_dependency 'json-ld', '>= 3.2' gem.add_development_dependency 'rspec', '~> 3.10' diff --git a/spec/format_spec.rb b/spec/format_spec.rb index 9ec03b8..0b2fc23 100644 --- a/spec/format_spec.rb +++ b/spec/format_spec.rb @@ -37,6 +37,10 @@ specify {expect(described_class.to_sym).to eq :rdfxml} end + describe "#to_uri" do + specify {expect(described_class.to_uri).to eq RDF::URI('http://www.w3.org/ns/formats/RDF_XML')} + end + describe ".detect" do { rdfxml: '',