Finish 3.2.1

gkellogg · gkellogg · commit 8dbd85ee02f8 · 2022-05-28T17:39:28.000-07:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
         ruby:
           - 2.6
           - 2.7
-          - 3.0
+          - "3.0"
           - 3.1
           - ruby-head
           - jruby
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@v2
+      - 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
@@ -185,12 +185,12 @@ A copy of the [Turtle EBNF][] and derived parser files are included in the repos
 [YARD]:         https://yardoc.org/
 [YARD-GS]:      https://rubydoc.info/docs/yard/file/docs/GettingStarted.md
 [PDD]:              https://unlicense.org/#unlicensing-contributions
-[RDF.rb]:       https://rubydoc.info/github/ruby-rdf/rdf
+[RDF.rb]:       https://ruby-rdf.github.io/rdf
 [EBNF]:         https://rubygems.org/gems/ebnf
 [Backports]:    https://rubygems.org/gems/backports
 [N-Triples]:    https://www.w3.org/TR/rdf-testcases/#ntriples
 [Turtle]:       https://www.w3.org/TR/2012/WD-turtle-20120710/
 [RDF-star]:         https://w3c.github.io/rdf-star/rdf-star-cg-spec.html
-[Turtle doc]:   https://rubydoc.info/github/ruby-rdf/rdf-turtle/master/file/README.md
+[Turtle doc]:   https://ruby-rdf.github.io/rdf-turtle/master/file/README.md
 [Turtle EBNF]:  https://dvcs.w3.org/hg/rdf/file/default/rdf-turtle/turtle.bnf
 [Freebase Dumps]: https://developers.google.com/freebase/data
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.2.0
+3.2.1
diff --git a/etc/doap.nt b/etc/doap.nt
@@ -5,7 +5,7 @@
 <https://rubygems.org/gems/rdf-turtle> <http://usefulinc.com/ns/doap#category> <http://dbpedia.org/resource/Ruby_(programming_language)> .
 <https://rubygems.org/gems/rdf-turtle> <http://usefulinc.com/ns/doap#category> <http://dbpedia.org/resource/Resource_Description_Framework> .
 <https://rubygems.org/gems/rdf-turtle> <http://usefulinc.com/ns/doap#programming-language> "Ruby" .
-<https://rubygems.org/gems/rdf-turtle> <http://usefulinc.com/ns/doap#homepage> <https://ruby-rdf.github.com/rdf-turtle> .
+<https://rubygems.org/gems/rdf-turtle> <http://usefulinc.com/ns/doap#homepage> <https://ruby-rdf.github.io/rdf-turtle> .
 <https://rubygems.org/gems/rdf-turtle> <http://usefulinc.com/ns/doap#shortdesc> "Turtle reader/writer for RDF.rb."@en .
 <https://rubygems.org/gems/rdf-turtle> <http://purl.org/dc/terms/creator> <https://greggkellogg.net/foaf#me> .
 <https://rubygems.org/gems/rdf-turtle> <http://usefulinc.com/ns/doap#created> "2011-08-29"^^<http://www.w3.org/2001/XMLSchema#date> .
diff --git a/etc/doap.ttl b/etc/doap.ttl
@@ -10,7 +10,7 @@
 
 <> a doap:Project, earl:TestSubject, earl:Software ;
   doap:name          "Ruby RDF::Turtle" ;
-  doap:homepage      <https://ruby-rdf.github.com/rdf-turtle> ;
+  doap:homepage      <https://ruby-rdf.github.io/rdf-turtle> ;
   doap:license       <https://unlicense.org/1.0/> ;
   doap:shortdesc     "Turtle reader/writer for RDF.rb."@en ;
   doap:description   "RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite."@en ;
diff --git a/etc/earl-rdf-star.ttl b/etc/earl-rdf-star.ttl
@@ -10,7 +10,7 @@
 
 <> a doap:Project, earl:TestSubject, earl:Software ;
   doap:name          "Ruby RDF::Turtle" ;
-  doap:homepage      <https://ruby-rdf.github.com/rdf-turtle> ;
+  doap:homepage      <https://ruby-rdf.github.io/rdf-turtle> ;
   doap:license       <https://unlicense.org/1.0/> ;
   doap:shortdesc     "Turtle reader/writer for RDF.rb."@en ;
   doap:description   "RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite."@en ;
diff --git a/etc/earl.ttl b/etc/earl.ttl
@@ -10,7 +10,7 @@
 
 <> a doap:Project, earl:TestSubject, earl:Software ;
   doap:name          "Ruby RDF::Turtle" ;
-  doap:homepage      <https://ruby-rdf.github.com/rdf-turtle> ;
+  doap:homepage      <https://ruby-rdf.github.io/rdf-turtle> ;
   doap:license       <https://unlicense.org/1.0/> ;
   doap:shortdesc     "Turtle reader/writer for Ruby."@en ;
   doap:description   "RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite."@en ;
diff --git a/lib/rdf/turtle.rb b/lib/rdf/turtle.rb
@@ -15,7 +15,7 @@ module RDF
   #     end
   #   end
   #
-  # @see https://rubydoc.info/github/ruby-rdf/rdf/master/frames
+  # @see https://ruby-rdf.github.io/rdf/master/frames
   # @see https://dvcs.w3.org/hg/rdf/raw-file/default/rdf-turtle/index.html
   #
   # @author [Gregg Kellogg](https://greggkellogg.net/)
diff --git a/lib/rdf/turtle/format.rb b/lib/rdf/turtle/format.rb
@@ -18,6 +18,7 @@ module RDF::Turtle
   class Format < RDF::Format
     content_type     'text/turtle',
                      extension: :ttl,
+                     uri: 'http://www.w3.org/ns/formats/Turtle',
                      aliases: %w(
                        text/rdf+turtle
                        application/turtle;q=0.2
diff --git a/lib/rdf/turtle/reader.rb b/lib/rdf/turtle/reader.rb
@@ -40,7 +40,7 @@ class Reader < RDF::Reader
 
     ##
     # Reader options
-    # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Reader#options-class_method
+    # @see https://ruby-rdf.github.io/rdf/RDF/Reader#options-class_method
     def self.options
       super + [
         RDF::CLI::Option.new(
@@ -408,7 +408,7 @@ def read_quotedTriple
             error("Failed to end of embedded triple", production: :quotedTriple, token: @lexer.first)
           end
           @lexer.shift
-          statement = RDF::Statement(subject, predicate, object)
+          statement = RDF::Statement(subject, predicate, object, quoted: true)
           statement
         end
       end
@@ -442,7 +442,7 @@ def read_annotation(subject, predicate, object)
           @lexer.shift
 
           # Statement becomes subject for predicateObjectList
-          statement = RDF::Statement(subject, predicate, object)
+          statement = RDF::Statement(subject, predicate, object, quoted: true)
           read_predicateObjectList(statement) ||
             error("Expected predicateObjectList", production: :annotation, token: @lexer.first)
           error("annotation", "Expected closing '|}'") unless @lexer.first === '|}'
diff --git a/lib/rdf/turtle/writer.rb b/lib/rdf/turtle/writer.rb
@@ -65,7 +65,7 @@ class Writer < RDF::Writer
 
     ##
     # Writer options
-    # @see https://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(
@@ -201,7 +201,7 @@ def write_epilogue
       super
     end
 
-    # Return a QName for the URI, or nil. Adds namespace of QName to defined prefixes
+    # Return a PName for the URI, or nil. Adds namespace of PName to defined prefixes
     # @param [RDF::Resource] resource
     # @return [String, nil] value to use to identify URI
     def get_pname(resource)
@@ -223,14 +223,15 @@ def get_pname(resource)
         unless u.to_s.empty?
           prefix(prefix, u) unless u.to_s.empty?
           log_debug("get_pname") {"add prefix #{prefix.inspect} => #{u}"}
-          uri.sub(u.to_s, "#{prefix}:")
+          # Escape suffix, as necessary
+          RDF::URI(uri).pname(prefixes: {prefix => u})
         end
       when @options[:standard_prefixes] && vocab = RDF::Vocabulary.each.to_a.detect {|v| uri.index(v.to_uri.to_s) == 0}
         prefix = vocab.__name__.to_s.split('::').last.downcase
         @uri_to_prefix[vocab.to_uri.to_s] = prefix
         prefix(prefix, vocab.to_uri) # Define for output
         log_debug("get_pname") {"add standard prefix #{prefix.inspect} => #{vocab.to_uri}"}
-        uri.sub(vocab.to_uri.to_s, "#{prefix}:")
+        RDF::URI(uri).pname(prefixes: {prefix => vocab.to_uri})
       else
         nil
       end
diff --git a/rdf-turtle.gemspec b/rdf-turtle.gemspec
@@ -10,6 +10,13 @@ Gem::Specification.new do |gem|
   gem.license               = 'Unlicense'
   gem.summary               = "Turtle reader/writer for Ruby."
   gem.description           = %q{RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.}
+  gem.metadata           = {
+    "documentation_uri" => "https://ruby-rdf.github.io/rdf-turtle",
+    "bug_tracker_uri"   => "https://github.com/ruby-rdf/rdf-turtle/issues",
+    "homepage_uri"      => "https://github.com/ruby-rdf/rdf-turtle",
+    "mailing_list_uri"  => "https://lists.w3.org/Archives/Public/public-rdf-ruby/",
+    "source_code_uri"   => "https://github.com/ruby-rdf/rdf-turtle",
+  }
 
   gem.authors               = ['Gregg Kellogg']
   gem.email                 = 'public-rdf-ruby@w3.org'
diff --git a/spec/format_spec.rb b/spec/format_spec.rb
@@ -48,6 +48,10 @@
     specify {expect(described_class.to_sym).to eq :turtle}
   end
 
+  describe "#to_uri" do
+    specify {expect(described_class.to_uri).to eq RDF::URI('http://www.w3.org/ns/formats/Turtle')}
+  end
+
   describe ".detect" do
     {
       ntriples:          "<a> <b> <c> .",

-Original file line number
+Diff line change
         ruby:
           - 2.6
           - 2.7
 -          - 3.0
 +          - "3.0"
           - 3.1
           - ruby-head
           - jruby
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ module RDF`
`15`	`15`	`# end`
`16`	`16`	`# end`
`17`	`17`	`#`
`18`		`- # @see https://rubydoc.info/github/ruby-rdf/rdf/master/frames`
	`18`	`+ # @see https://ruby-rdf.github.io/rdf/master/frames`
`19`	`19`	`# @see https://dvcs.w3.org/hg/rdf/raw-file/default/rdf-turtle/index.html`
`20`	`20`	`#`
`21`	`21`	`# @author [Gregg Kellogg](https://greggkellogg.net/)`