rdf-turtle 3.2.1 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57d92c642076069a911db896415fa9dbd3203b6c82a9074e0fc8a53dafb2389d
-  data.tar.gz: 238620d914ce1ff78d8710e12083d03eacb5f9be7106d0d12ef15c5105445b72
+  metadata.gz: '086c95b097002c034394631a59d5d4c52fe4403eaea9b68bf2d241b45951dca3'
+  data.tar.gz: 68fa875004dfcebf6295444ff9aa945689c58fe0c54d6b5e14ad91dc9d9f0d02
 SHA512:
-  metadata.gz: 0db24a8c173d7b522ba06e1af9e957c513a551a211d22b6a2d19b7218a79e236f6db1f66b738a1a76e5b96ef6161f432f7ece17dea4af8d3de46520960a89977
-  data.tar.gz: a2826f9e8fbd34364acc54a117e283067982491e9c8e736ac1c8fcb86aac1f6a3acc43811040242fea19e79019d809fd14dae6b46ecc0568b67775dddd84369d
+  metadata.gz: 2b69fe9cdd04a28078122d80f6d0e79a34b1223b9254aa4d4347714042cc0292a4d4051a6a3dae08305e999b63811a54dbfb491b7c2e0d394ebaab4f039ed011
+  data.tar.gz: 3686da200196de7c4e21eaf52a6e6ea927796cd4221722be9c6d7a8868faf0b2896a3713d684b1cadab9179b6b47673c5b8917c8376581f335b286c45fca7cb2

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.
 
@@ -138,11 +140,15 @@ An example of reading Freebase dumps:
 ## Implementation Notes
 This version uses a hand-written parser using the Lexer from the [EBNF][] gem instead of a general [EBNF][] LL(1) parser for faster performance.
 
+## Change Log
+
+See [Release Notes on GitHub](https://github.com/ruby-rdf/rdf-turtle/releases)
+
 ## 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.5)
 
 ## Installation
 
@@ -187,10 +193,10 @@ A copy of the [Turtle EBNF][] and derived parser files are included in the repos
 [PDD]:              https://unlicense.org/#unlicensing-contributions
 [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
+[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://dvcs.w3.org/hg/rdf/file/default/rdf-turtle/turtle.bnf
-[Freebase Dumps]: https://developers.google.com/freebase/data
+[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.1
+3.3.1

data/lib/rdf/turtle/freebase_reader.rb

@@ -64,6 +64,14 @@ module RDF::Turtle
         end
         pfx_iri = prefix(ns)
         raise RDF::ReaderError.new("ERROR [line #{lineno}] prefix #{ns.inspect} is not defined", lineno: lineno) unless pfx_iri
+
+        # Unescape PN_LOCAL_ESC
+        suffix = suffix.gsub(PN_LOCAL_ESC) {|esc| esc[1]} if
+          suffix.match?(PN_LOCAL_ESC)
+
+        # Remove any redundant leading hash from suffix
+        suffix = suffix.sub(/^\#/, "") if pfx_iri.to_s.index("#")
+
         uri = RDF::URI(pfx_iri + suffix)
         uri.validate!     if validate?
         uri
@@ -79,8 +87,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,7 +36,7 @@ module RDF::Turtle
 
     terminal(:PREFIX,                           PREFIX)
     terminal(:BASE,                             BASE)
-    terminal(:LANGTAG,                          LANGTAG)
+    terminal(:LANG_DIR,                          LANG_DIR)
 
     ##
     # Reader options
@@ -227,7 +227,14 @@ module RDF::Turtle
         error("undefined prefix", production: :pname, token: prefix)
         ''
       end
-      suffix = suffix.to_s.sub(/^\#/, "") if base.index("#")
+
+      # Unescape PN_LOCAL_ESC
+      suffix = suffix.gsub(PN_LOCAL_ESC) {|esc| esc[1]} if
+        suffix.match?(PN_LOCAL_ESC)
+
+      # Remove any redundant leading hash from suffix
+      suffix = suffix.sub(/^\#/, "") if base.index("#")
+
       debug("pname", depth: options[:depth]) {"base: '#{base}', suffix: '#{suffix}'"}
       process_iri(base + suffix.to_s)
     end
@@ -394,7 +401,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]
@@ -470,8 +477,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 +493,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

@@ -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
 
@@ -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
@@ -296,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-turtle
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.1
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-28 00:00:00.000000000 Z
+date: 2024-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -16,28 +16,62 @@ 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.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.5
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: getoptlong
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +120,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 +148,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: []
@@ -186,14 +234,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.