rdf-turtle 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96b5531c582f4d0cd8d8fda744147e74501bf4efc0c721b1b3cf05a1d2cc60b3
-  data.tar.gz: 61e7f1e122300b7e822d81d9429dfee943a7ef7cfb12bb031f9ff133edd6a263
+  metadata.gz: 0e3cededb73cd8863f7a82386dc5ae0667edee714910a148df381402c8daf664
+  data.tar.gz: 7952f03d779df79e0f02fd5c9281118afeb661fc810ada681e98e4b604941528
 SHA512:
-  metadata.gz: faad4f256da8872159efeb82c150b30566770ad8fe1fdf504aa2b993b2b8e070192365ecfa5cea8c3f99d0087e3da4b21f0794b17883f17e0a8d6eaac6b82f26
-  data.tar.gz: f3c231a0ba031d14ff8273ec17a134144387626fe0594c6cb7d6b039d3aaac88d673344e8cf5cbb9019c3e3caba62929fa21ed0beb84c79f2896ea03bdd7028f
+  metadata.gz: 7d24d8479b3055dff29ac2c958532817d32860e419dd1d9e978ef63bfca8c8c08cf2da93b08353dc488b5489d20d83b2c33959277d3d8b2fd2c4a3d768bcd4bb
+  data.tar.gz: 3a3f31bb8ca9e14228596de15a3108d9a30903f9ef947d6fa5338bd038684b44cdc8fee7aa3b4d3ce6f473bda11b8b0501bd6eab76585585863f3a98db25f2ba

data/README.md

@@ -2,7 +2,7 @@
 
 [Turtle][] reader/writer for [RDF.rb][RDF.rb] .
 
-[![Gem Version](https://badge.fury.io/rb/rdf-turtle.png)](https://badge.fury.io/rb/rdf-turtle)
+[![Gem Version](https://badge.fury.io/rb/rdf-turtle.svg)](https://badge.fury.io/rb/rdf-turtle)
 [![Build Status](https://github.com/ruby-rdf/rdf-turtle/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf-turtle/actions?query=workflow%3ACI)
 [![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-turtle/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/rdf-turtle?branch=develop)
 [![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
@@ -17,9 +17,9 @@ Install with `gem install rdf-turtle`
 
 * 100% free and unencumbered [public domain](https://unlicense.org/) software.
 * Implements a complete parser for [Turtle][].
-* Compatible with Ruby >= 2.6.
+* Compatible with Ruby >= 3.0.
 * Optional streaming writer, to serialize large graphs
-* Provisional support for [Turtle-star][RDF-star].
+* Provisional support for [RDF 1.2][].
 
 ## Usage
 Instantiate a reader from a local file:
@@ -36,15 +36,17 @@ Write a graph to a file:
        writer << graph
     end
 
-## Turtle-star (RDF-star)
+## RDF 1.2
 
-Both reader and writer include provisional support for [Turtle-star][RDF-star].
+Both reader and writer include provisional support for [RDF 1.2][] quoted triples.
+
+Both reader and writer include provisional support for [RDF 1.2][] directional language-tagged strings, which are literals of type `rdf:dirLangString` having both a `language` and `direction`.
 
 Internally, an `RDF::Statement` is treated as another resource, along with `RDF::URI` and `RDF::Node`, which allows an `RDF::Statement` to have a `#subject` or `#object` which is also an `RDF::Statement`.
 
 **Note: This feature is subject to change or elimination as the standards process progresses.**
 
-### Serializing a Graph containing embedded statements
+### Serializing a Graph containing quoted triples
 
     require 'rdf/turtle'
     statement = RDF::Statement(RDF::URI('bob'), RDF::Vocab::FOAF.age, RDF::Literal(23))
@@ -52,7 +54,7 @@ Internally, an `RDF::Statement` is treated as another resource, along with `RDF:
     graph.dump(:ttl, validate: false, standard_prefixes: true)
     # => '<<<bob> foaf:age 23>> <ex:certainty> 9.0e-1 .'
 
-### Reading a Graph containing embedded statements
+### Reading a Graph containing quoted triples
 
 By default, the Turtle reader will reject a document containing a subject resource.
 
@@ -140,9 +142,9 @@ This version uses a hand-written parser using the Lexer from the [EBNF][] gem in
 
 ## Dependencies
 
-* [Ruby](https://ruby-lang.org/) (>= 2.6)
-* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.2)
-* [EBNF][] (~> 1.2)
+* [Ruby](https://ruby-lang.org/) (>= 3.0)
+* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.3)
+* [EBNF][] (~> 2.4)
 
 ## Installation
 
@@ -185,12 +187,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 EBNF]:  https://dvcs.w3.org/hg/rdf/file/default/rdf-turtle/turtle.bnf
-[Freebase Dumps]: https://developers.google.com/freebase/data
+[N-Triples]:    https://www.w3.org/TR/rdf12-n-triples
+[Turtle]:       https://www.w3.org/TR/rdf12-turtle
+[RDF 1.1]:          https://www.w3.org/TR/rdf11-concepts/
+[RDF 1.2]:          https://www.w3.org/TR/rdf12-concepts/
+[Turtle doc]:   https://ruby-rdf.github.io/rdf-turtle/master/file/README.md
+[Turtle EBNF]:  https://w3c.github.io/rdf-turtle/spec/turtle-bnf.html
+[Freebase Dumps]: https://developers.google.com/freebase/data

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.3.0

data/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

data/lib/rdf/turtle/freebase_reader.rb

@@ -79,8 +79,9 @@ module RDF::Turtle
       if literal_str = match(LITERAL_PLAIN)
         literal_str = self.class.unescape(literal_str)
         literal = case
-          when language = match(RDF::NTriples::Reader::LANGTAG)
-            RDF::Literal.new(literal_str, language:  language)
+          when lang_dir = match(RDF::Turtle::Reader::LANG_DIR)
+            language, direction = lang_dir.split('--')
+            RDF::Literal.new(literal_str, language:  language, direction: direction)
           when datatype = match(/^(\^\^)/)
             RDF::Literal.new(literal_str, datatype:  read_pname(intern:  true) || read_uriref || fail_object)
           else

data/lib/rdf/turtle/reader.rb

@@ -36,11 +36,11 @@ module RDF::Turtle
 
     terminal(:PREFIX,                           PREFIX)
     terminal(:BASE,                             BASE)
-    terminal(:LANGTAG,                          LANGTAG)
+    terminal(:LANG_DIR,                          LANG_DIR)
 
     ##
     # 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(
@@ -394,7 +394,7 @@ module RDF::Turtle
       end
     end
 
-    # Read an RDF-star reified statement
+    # Read a quoted triple
     # @return [RDF::Statement]
     def read_quotedTriple
       return unless @options[:rdfstar]
@@ -408,7 +408,7 @@ module RDF::Turtle
             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 @@ module RDF::Turtle
           @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 === '|}'
@@ -470,8 +470,10 @@ module RDF::Turtle
           value = @lexer.shift.value[1..-2]
           error("read_literal", "Unexpected end of file") unless token = @lexer.first
           case token.type || token.value
-          when :LANGTAG
-            literal(value, language: @lexer.shift.value[1..-1].to_sym)
+          when :LANG_DIR
+            lang_dir = @lexer.shift.value[1..-1]
+            language, direction = lang_dir.split('--')
+            literal(value, language: language, direction: direction)
           when '^^'
             @lexer.shift
             literal(value, datatype: read_iri)
@@ -484,8 +486,10 @@ module RDF::Turtle
           value = @lexer.shift.value[3..-4]
           error("read_literal", "Unexpected end of file") unless token = @lexer.first
           case token.type || token.value
-          when :LANGTAG
-            literal(value, language: @lexer.shift.value[1..-1].to_sym)
+          when :LANG_DIR
+            lang_dir = @lexer.shift.value[1..-1]
+            language, direction = lang_dir.split('--')
+            literal(value, language: language, direction: direction)
           when '^^'
             @lexer.shift
             literal(value, datatype: read_iri)

data/lib/rdf/turtle/terminals.rb

@@ -48,7 +48,7 @@ module RDF::Turtle
     # 141s
     BLANK_NODE_LABEL     = /_:(?:[0-9]|#{PN_CHARS_U})(?:(?:#{PN_CHARS}|\.)*#{PN_CHARS})?/u.freeze
     # 144s
-    LANGTAG              = /@[a-zA-Z]+(?:-[a-zA-Z0-9]+)*/u.freeze
+    LANG_DIR              = /@([a-zA-Z]+(?:-[a-zA-Z0-9]+)*(?:--[a-zA-Z]+)?)/u.freeze
     # 19
     INTEGER              = /[+-]?[0-9]+/u.freeze
     # 20

data/lib/rdf/turtle/writer.rb

@@ -65,7 +65,7 @@ module RDF::Turtle
 
     ##
     # 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(
@@ -87,7 +87,7 @@ module RDF::Turtle
           symbol: :literal_shorthand,
           datatype: FalseClass,
           on: ["--no-literal-shorthand"],
-          description: "Do not ttempt to use Literal shorthands fo numbers and boolean values.") {false},
+          description: "Do not attempt to use Literal shorthands fo numbers and boolean values.") {false},
       ]
     end
 
@@ -201,7 +201,7 @@ module RDF::Turtle
       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)
@@ -215,7 +215,7 @@ module RDF::Turtle
       end
 
       pname = case
-      when @uri_to_pname.has_key?(uri)
+      when @uri_to_pname.key?(uri)
         return @uri_to_pname[uri]
       when u = @uri_to_prefix.keys.sort_by {|uu| uu.length}.reverse.detect {|uu| uri.index(uu.to_s) == 0}
         # Use a defined prefix
@@ -223,14 +223,15 @@ module RDF::Turtle
         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
@@ -295,8 +296,9 @@ module RDF::Turtle
           in_form ? literal.value : literal.canonicalize.to_s.sub('E', 'e').to_s
         else
           text = quoted(literal.value)
-          text << "@#{literal.language}" if literal.has_language?
-          text << "^^#{format_uri(literal.datatype)}" if literal.has_datatype?
+          text << "@#{literal.language}" if literal.language?
+          text << "--#{literal.direction}" if literal.direction?
+          text << "^^#{format_uri(literal.datatype)}" if literal.datatype?
           text
         end
       else

data/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/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-turtle
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -100,56 +100,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 description: RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -172,7 +172,12 @@ files:
 homepage: https://github.com/ruby-rdf/rdf-turtle
 licenses:
 - Unlicense
-metadata: {}
+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
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -181,14 +186,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Turtle reader/writer for Ruby.