Finish 3.2.1

gkellogg · gkellogg · commit fe2d5715bcf2 · 2023-07-23T13:50:19.000-07:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,16 +19,10 @@ 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]
     steps:
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -38,7 +32,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
+        uses: coverallsapp/github-action@v2
         if: "matrix.ruby == '3.0'"
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/generate-docs.yml 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/README.md b/README.md
@@ -2,7 +2,7 @@
 
 This is a [Ruby][] implementation of [LD Patch][] for [RDF.rb][].
 
-[![Gem Version](https://badge.fury.io/rb/ld-patch.png)](https://badge.fury.io/rb/ld-patch)
+[![Gem Version](https://badge.fury.io/rb/ld-patch.svg)](https://badge.fury.io/rb/ld-patch)
 [![Build Status](https://github.com/ruby-rdf/ld-patch/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/ld-patch/actions?query=workflow%3ACI)
 [![Coverage Status](https://coveralls.io/repos/ruby-rdf/ld-patch/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/ld-patch?branch=develop)
 [![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
@@ -118,6 +118,6 @@ A copy of the [LD Patch EBNF](file:etc/ld-patch.ebnf) and derived parser files a
 [SPARQL]:         https://rubygems.org/gems/sparql
 [Linked Data]:    https://rubygems.org/gems/linkeddata
 [SSE]:            http://openjena.org/wiki/SSE
-[SXP]:            https://rubygems.org/gems/sxp-ruby
+[SXP]:            https://dryruby.github.io/sxp
 [LD Patch]:       http://www.w3.org/TR/ldpatch/
-[LD-Patch doc]:   http://rubydoc.info/github/ruby-rdf/ld-patch
+[LD-Patch doc]:   https://ruby-rdf.github.io/ld-patch
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.2.0
+3.2.2
diff --git a/etc/doap.ttl b/etc/doap.ttl
@@ -11,7 +11,7 @@
 
 <> a doap:Project, earl:TestSubject, earl:Software ;
   doap:name          "LD::Patch" ;
-  doap:homepage      <https://ruby-rdf.github.com/ld-patch> ;
+  doap:homepage      <https://ruby-rdf.github.io/ld-patch> ;
   doap:license       <https://unlicense.org/1.0/> ;
   doap:shortdesc     "W3C Linked Data Patch Format for RDF.rb."@en ;
   doap:description   "Implements the W3C Linked Data Patch Format and operations for RDF.rb."@en ;
diff --git a/etc/earl.html b/etc/earl.html
@@ -88,8 +88,8 @@ <h2>
             <dd property='doap:programming-language'>Ruby</dd>
             <dt>Home Page</dt>
             <dd property='doap:homepage'>
-              <a href='http://ruby-rdf.github.com/ld-patch'>
-                http://ruby-rdf.github.com/ld-patch
+              <a href='https://ruby-rdf.github.io/ld-patch'>
+                https://ruby-rdf.github.io/ld-patch
               </a>
             </dd>
             <dt>Developer</dt>
diff --git a/etc/earl.jsonld b/etc/earl.jsonld
diff --git a/etc/earl.ttl b/etc/earl.ttl
@@ -10,7 +10,7 @@
 
 <https://rubygems.org/gems/ld-patch> a doap:Project, earl:TestSubject, earl:Software ;
   doap:name          "LD::Patch" ;
-  doap:homepage      <http://ruby-rdf.github.com/ld-patch> ;
+  doap:homepage      <https://ruby-rdf.github.io/ld-patch> ;
   doap:license       <https://unlicense.org/1.0/> ;
   doap:shortdesc     "W3C Linked Data Patch Format for RDF.rb."@en ;
   doap:description   """
diff --git a/ld-patch.gemspec b/ld-patch.gemspec
@@ -9,6 +9,13 @@ Gem::Specification.new do |gem|
   gem.homepage           = "https://github.com/ruby-rdf/ld-patch"
   gem.license            = 'Unlicense'
   gem.summary            = "W3C Linked Data Patch Format for RDF.rb."
+  gem.metadata           = {
+    "documentation_uri" => "https://ruby-rdf.github.io/ld-patch",
+    "bug_tracker_uri"   => "https://github.com/ruby-rdf/ld-patch/issues",
+    "homepage_uri"      => "https://github.com/ruby-rdf/ld-patch",
+    "mailing_list_uri"  => "https://lists.w3.org/Archives/Public/public-rdf-ruby/",
+    "source_code_uri"   => "https://github.com/ruby-rdf/ld-patch",
+  }
 
   gem.authors            = ['Gregg Kellogg']
   gem.email              = 'public-rdf-ruby@w3.org'
@@ -23,18 +30,19 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version      = '>= 2.6'
   gem.requirements               = []
   gem.add_runtime_dependency     'rdf',               '~> 3.2'
-  gem.add_runtime_dependency     'ebnf',              '~> 2.2'
+  gem.add_runtime_dependency     'ebnf',              '~> 2.3'
   gem.add_runtime_dependency     'sparql',            '~> 3.2'
   gem.add_runtime_dependency     'sxp',               '~> 1.2'
   gem.add_runtime_dependency     'rdf-xsd',           '~> 3.2'
 
   gem.add_development_dependency 'json-ld',           '~> 3.2'
-  gem.add_development_dependency 'rack',              '~> 2.2'
+  gem.add_development_dependency 'rack',              '~> 3.0'
+  gem.add_development_dependency 'rdf-normalize',     '~> 0.6'
   gem.add_development_dependency 'rdf-spec',          '~> 3.2'
-  gem.add_development_dependency 'rspec',             '~> 3.10'
+  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 'webmock',           '~> 3.11'
+  gem.add_development_dependency 'webmock',           '~> 3.18'
 
   gem.post_install_message       = nil
 end
diff --git a/lib/ld/patch/format.rb b/lib/ld/patch/format.rb
@@ -11,7 +11,9 @@ module LD::Patch
   #
   # @see http://www.w3.org/TR/ldpatch/
   class Format < RDF::Format
-    content_type     'text/ldpatch', extension: :ldp
+    content_type     'text/ldpatch',
+                     extension: :ldp,
+                     uri: 'http://www.w3.org/ns/formats/LD_Patch'
     content_encoding 'utf-8'
 
     ##
diff --git a/spec/format_spec.rb b/spec/format_spec.rb
@@ -26,6 +26,10 @@
     specify {expect(described_class.to_sym).to eq :ldpatch}
   end
 
+  describe "#to_uri" do
+    specify {expect(described_class.to_uri).to eq RDF::URI('http://www.w3.org/ns/formats/LD_Patch')}
+  end
+
   describe ".cli_commands" do
     require 'rdf/cli'
     let(:nt) {File.expand_path("../test-files/1triple.nt", __FILE__)}
diff --git a/spec/suite_helper.rb b/spec/suite_helper.rb
@@ -2,6 +2,7 @@
 # Used for Turtle tests
 require 'rdf/turtle'
 require 'json/ld'
+require 'rdf/normalize'
 
 # For now, override RDF::Utils::File.open_file to look for the file locally before attempting to retrieve it
 module RDF::Util
@@ -132,6 +133,7 @@ def entries
 
     class Entry < JSON::LD::Resource
       attr_accessor :debug
+      def format; :normalize; end # for debug output
 
       def base
         action.is_a?(Hash) ? action.fetch("base", action["data"]) : action
@@ -151,15 +153,19 @@ def data
       end
 
       def target_graph
-        @graph ||= RDF::Graph.load(CGI.unescape(data), base_uri: base)
+        @graph ||= RDF::Graph.new do |g|
+          g << RDF::Reader.open(CGI.unescape(data), base_uri: base)
+        end
       end
 
       def expected
         @expected ||= RDF::Util::File.open_file(CGI.unescape(result)) {|f| f.read}
       end
 
       def expected_graph
-        @expected_graph ||= RDF::Graph.load(CGI.unescape(result), base_uri: base)
+        @expected_graph ||= RDF::Graph.new do |g|
+          g << RDF::Reader.open(CGI.unescape(result), base_uri: base)
+        end
       end
 
       def evaluate?
