rdf-turtle 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23a25ff951065479aaa42feb25d8646ed7e87270556e759ea10d219e24b4ac72
-  data.tar.gz: ee4be6acf9c89792f5df29e018a3ab22c667477de4e95178517a4002da68707b
+  metadata.gz: 96b5531c582f4d0cd8d8fda744147e74501bf4efc0c721b1b3cf05a1d2cc60b3
+  data.tar.gz: 61e7f1e122300b7e822d81d9429dfee943a7ef7cfb12bb031f9ff133edd6a263
 SHA512:
-  metadata.gz: 34c956ae30fbbe235344fc2ada8ed41539e912022b6ec0699afde1108d98d6b83a8c3008bc131535e0f96ef9b9f481079aa58dc5f8b384b250b20b4b33b72d90
-  data.tar.gz: 405cfd25f8899631bac219096670d36969602329c7f3ea4905f0a36a47835ee6ac8aac65c163c6b8d4cc4ce284d2e162cb00ff1e7db193c8bf072c00c84c77dd
+  metadata.gz: faad4f256da8872159efeb82c150b30566770ad8fe1fdf504aa2b993b2b8e070192365ecfa5cea8c3f99d0087e3da4b21f0794b17883f17e0a8d6eaac6b82f26
+  data.tar.gz: f3c231a0ba031d14ff8273ec17a134144387626fe0594c6cb7d6b039d3aaac88d673344e8cf5cbb9019c3e3caba62929fa21ed0beb84c79f2896ea03bdd7028f

data/README.md

@@ -3,9 +3,9 @@
 [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)
-[![Build Status](https://travis-ci.org/ruby-rdf/rdf-turtle.png?branch=master)](https://travis-ci.org/ruby-rdf/rdf-turtle)
-[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-turtle/badge.svg)](https://coveralls.io/r/ruby-rdf/rdf-turtle)
-[![Dependency Status](https://gemnasium.com/ruby-rdf/rdf-turtle.png)](https://gemnasium.com/ruby-rdf/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)
 
 ## Description
 This is a [Ruby][] implementation of a [Turtle][] parser for [RDF.rb][].
@@ -17,8 +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.2.2.
+* Compatible with Ruby >= 2.6.
 * Optional streaming writer, to serialize large graphs
+* Provisional support for [Turtle-star][RDF-star].
 
 ## Usage
 Instantiate a reader from a local file:
@@ -35,6 +36,60 @@ Write a graph to a file:
        writer << graph
     end
 
+## Turtle-star (RDF-star)
+
+Both reader and writer include provisional support for [Turtle-star][RDF-star].
+
+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
+
+    require 'rdf/turtle'
+    statement = RDF::Statement(RDF::URI('bob'), RDF::Vocab::FOAF.age, RDF::Literal(23))
+    graph = RDF::Graph.new << [statement, RDF::URI("ex:certainty"), RDF::Literal(0.9)]
+    graph.dump(:ttl, validate: false, standard_prefixes: true)
+    # => '<<<bob> foaf:age 23>> <ex:certainty> 9.0e-1 .'
+
+### Reading a Graph containing embedded statements
+
+By default, the Turtle reader will reject a document containing a subject resource.
+
+    ttl = %(
+      @prefix foaf: <http://xmlns.com/foaf/0.1/> .
+      @prefix ex: <http://example.com/> .
+      <<<bob> foaf:age 23>> ex:certainty 9.0e-1 .
+    )
+    graph = RDF::Graph.new do |graph|
+      RDF::Turtle::Reader.new(ttl) {|reader| graph << reader}
+    end
+    # => RDF::ReaderError
+
+Readers support a boolean valued `rdfstar` option; only one statement is asserted, although the reified statement is contained within the graph.
+
+    graph = RDF::Graph.new do |graph|
+      RDF::Turtle::Reader.new(ttl, rdfstar: true) {|reader| graph << reader}
+    end
+    graph.count #=> 1
+
+### Reading a Graph containing statement annotations
+
+Annotations are introduced using the `{| ... |}` syntax, which is treated like a `blankNodePropertyList`,
+where the subject is the the triple ending with that annotation.
+
+    ttl = %(
+      @prefix foaf: <http://xmlns.com/foaf/0.1/> .
+      @prefix ex: <http://example.com/> .
+      <bob> foaf:age 23 {| ex:certainty 9.0e-1 |} .
+    )
+    graph = RDF::Graph.new do |graph|
+      RDF::Turtle::Reader.new(ttl) {|reader| graph << reader}
+    end
+    # => RDF::ReaderError
+
+Note that this requires the `rdfstar` option to be set.
+
 ## Documentation
 Full documentation available on [Rubydoc.info][Turtle doc]
 
@@ -85,9 +140,9 @@ This version uses a hand-written parser using the Lexer from the [EBNF][] gem in
 
 ## Dependencies
 
-* [Ruby](https://ruby-lang.org/) (>= 2.4)
-* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.1)
-* [EBNF][] (~> 1.1)
+* [Ruby](https://ruby-lang.org/) (>= 2.6)
+* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.2)
+* [EBNF][] (~> 1.2)
 
 ## Installation
 
@@ -115,7 +170,9 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo
   list in the the `README`. Alphabetical order applies.
 * Do note that in order for us to merge any non-trivial changes (as a rule
   of thumb, additions larger than about 15 lines of code), we need an
-  explicit [public domain dedication][PDD] on record from you.
+  explicit [public domain dedication][PDD] on record from you,
+  which you will be asked to agree to on the first commit to a repo within the organization.
+  Note that the agreement applies to all repos in the [Ruby RDF](https://github.com/ruby-rdf/) organization.
 
 ## License
 This is free and unencumbered public domain software. For more information,
@@ -127,12 +184,13 @@ A copy of the [Turtle EBNF][] and derived parser files are included in the repos
 [RDF]:          https://www.w3.org/RDF/
 [YARD]:         https://yardoc.org/
 [YARD-GS]:      https://rubydoc.info/docs/yard/file/docs/GettingStarted.md
-[PDD]:          https://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
+[PDD]:              https://unlicense.org/#unlicensing-contributions
 [RDF.rb]:       https://rubydoc.info/github/ruby-rdf/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

data/VERSION

@@ -1 +1 @@
-3.1.0
+3.2.0

data/lib/rdf/turtle/reader.rb

@@ -25,7 +25,14 @@ module RDF::Turtle
     terminal(:STRING_LITERAL_SINGLE_QUOTE,      STRING_LITERAL_SINGLE_QUOTE,      unescape:  true)
     
     # String terminals
-    terminal(nil,                               %r([\(\),.;\[\]Aa]|\^\^|true|false))
+    terminal(nil,                               %r(
+                                                    [\(\),.;\[\]Aa]
+                                                  | \^\^
+                                                  | \{\|
+                                                  | \|\}
+                                                  | true|false
+                                                  | <<|>>
+                                                )x)
 
     terminal(:PREFIX,                           PREFIX)
     terminal(:BASE,                             BASE)
@@ -87,16 +94,16 @@ module RDF::Turtle
         @options = {
           anon_base:  "b0",
           whitespace:  WS,
-          log_depth: 0,
+          depth: 0,
         }.merge(@options)
         @prod_stack = []
 
         @options[:base_uri] = RDF::URI(base_uri || "")
-        log_debug("base IRI") {base_uri.inspect}
+        debug("base IRI") {base_uri.inspect}
         
-        log_debug("validate") {validate?.inspect}
-        log_debug("canonicalize") {canonicalize?.inspect}
-        log_debug("intern") {intern?.inspect}
+        debug("validate") {validate?.inspect}
+        debug("canonicalize") {canonicalize?.inspect}
+        debug("intern") {intern?.inspect}
 
         @lexer = EBNF::LL1::Lexer.new(input, self.class.patterns, **@options)
 
@@ -163,7 +170,7 @@ module RDF::Turtle
     # @return [RDF::Statement] Added statement
     # @raise [RDF::ReaderError] Checks parameter types and raises if they are incorrect if parsing mode is _validate_.
     def add_statement(production, statement)
-      error("Statement is invalid: #{statement.inspect.inspect}", production: produciton) if validate? && statement.invalid?
+      error("Statement is invalid: #{statement.inspect}", production: produciton) if validate? && statement.invalid?
       @callback.call(statement) if statement.subject &&
                                    statement.predicate &&
                                    statement.object &&
@@ -185,7 +192,7 @@ module RDF::Turtle
     
     # Create a literal
     def literal(value, **options)
-      log_debug("literal") do
+      debug("literal", depth: @options[:depth]) do
         "value: #{value.inspect}, " +
         "options: #{options.inspect}, " +
         "validate: #{validate?.inspect}, " +
@@ -221,7 +228,7 @@ module RDF::Turtle
         ''
       end
       suffix = suffix.to_s.sub(/^\#/, "") if base.index("#")
-      log_debug("pname") {"base: '#{base}', suffix: '#{suffix}'"}
+      debug("pname", depth: options[:depth]) {"base: '#{base}', suffix: '#{suffix}'"}
       process_iri(base + suffix.to_s)
     end
     
@@ -283,7 +290,7 @@ module RDF::Turtle
             terminated = token.value == '@prefix'
             error("Expected PNAME_NS", production: :prefix, token: pfx) unless pfx === :PNAME_NS
             error("Expected IRIREF", production: :prefix, token: iri) unless iri === :IRIREF
-            log_debug("prefixID") {"Defined prefix #{pfx.inspect} mapping to #{iri.inspect}"}
+            debug("prefixID", depth: options[:depth]) {"Defined prefix #{pfx.inspect} mapping to #{iri.inspect}"}
             prefix(pfx.value[0..-2], process_iri(iri))
             error("prefixId", "#{token} should be downcased") if token.value.start_with?('@') && token.value != '@prefix'
 
@@ -340,6 +347,10 @@ module RDF::Turtle
         last_object = nil
         while object = prod(:_objectList_2) {read_object(subject, predicate)}
           last_object = object
+
+          # If object is followed by an annotation, read that and also emit an embedded triple.
+          read_annotation(subject, predicate, object)
+
           break unless @lexer.first === ','
           @lexer.shift while @lexer.first === ','
         end
@@ -362,6 +373,7 @@ module RDF::Turtle
         read_iri ||
         read_BlankNode ||
         read_collection ||
+        read_quotedTriple ||
         error( "Expected subject", production: :subject, token: @lexer.first)
       end
     end
@@ -373,7 +385,8 @@ module RDF::Turtle
           read_BlankNode ||
           read_collection ||
           read_blankNodePropertyList ||
-          read_literal
+          read_literal ||
+          read_quotedTriple
 
           add_statement(:object, RDF::Statement(subject, predicate, object)) if subject && predicate
           object
@@ -381,13 +394,71 @@ module RDF::Turtle
       end
     end
 
+    # Read an RDF-star reified statement
+    # @return [RDF::Statement]
+    def read_quotedTriple
+      return unless @options[:rdfstar]
+      if @lexer.first.value == '<<'
+        prod(:quotedTriple) do
+          @lexer.shift # eat <<
+          subject = read_qtSubject || error("Failed to parse subject", production: :quotedTriple, token: @lexer.first)
+          predicate = read_verb || error("Failed to parse predicate", production: :quotedTriple, token: @lexer.first)
+          object = read_qtObject || error("Failed to parse object", production: :quotedTriple, token: @lexer.first)
+          unless @lexer.first.value == '>>'
+            error("Failed to end of embedded triple", production: :quotedTriple, token: @lexer.first)
+          end
+          @lexer.shift
+          statement = RDF::Statement(subject, predicate, object)
+          statement
+        end
+      end
+    end
+
+    # @return [RDF::Resource]
+    def read_qtSubject
+      prod(:qtSubject) do
+        read_iri ||
+        read_BlankNode ||
+        read_quotedTriple ||
+        error( "Expected embedded subject", production: :qtSubject, token: @lexer.first)
+      end
+    end
+
+    # @return [RDF::Term]
+    def read_qtObject(subject = nil, predicate = nil)
+      prod(:qtObject) do
+        read_iri ||
+        read_BlankNode ||
+        read_literal ||
+        read_quotedTriple
+      end
+    end
+
+    # Read an annotation on a triple
+    def read_annotation(subject, predicate, object)
+      error("Unexpected end of file", production: :annotation) unless token = @lexer.first
+      if token === '{|'
+        prod(:annotation, %(|})) do
+          @lexer.shift
+
+          # Statement becomes subject for predicateObjectList
+          statement = RDF::Statement(subject, predicate, object)
+          read_predicateObjectList(statement) ||
+            error("Expected predicateObjectList", production: :annotation, token: @lexer.first)
+          error("annotation", "Expected closing '|}'") unless @lexer.first === '|}'
+          @lexer.shift
+        end
+      end
+
+    end
+
     # @return [RDF::Literal]
     def read_literal
       error("Unexpected end of file", production: :literal) unless token = @lexer.first
       case token.type || token.value
       when :INTEGER then prod(:literal) {literal(@lexer.shift.value, datatype:  RDF::XSD.integer)}
       when :DECIMAL
-        prod(:litearl) do
+        prod(:literal) do
           value = @lexer.shift.value
           value = "0#{value}" if value.start_with?(".")
           literal(value, datatype:  RDF::XSD.decimal)
@@ -431,7 +502,7 @@ module RDF::Turtle
       if token === '['
         prod(:blankNodePropertyList, %{]}) do
           @lexer.shift
-          log_info("blankNodePropertyList") {"token: #{token.inspect}"}
+          progress("blankNodePropertyList", depth: options[:depth]) {"token: #{token.inspect}"}
           node = bnode
           read_predicateObjectList(node)
           error("blankNodePropertyList", "Expected closing ']'") unless @lexer.first === ']'
@@ -447,7 +518,7 @@ module RDF::Turtle
         prod(:collection, %{)}) do
           @lexer.shift
           token = @lexer.first
-          log_info("collection") {"token: #{token.inspect}"}
+          progress("collection", depth: options[:depth]) {"token: #{token.inspect}"}
           objects = []
           while object = read_object
             objects << object
@@ -483,8 +554,8 @@ module RDF::Turtle
 
     def prod(production, recover_to = [])
       @prod_stack << {prod: production, recover_to: recover_to}
-      @options[:log_depth] += 1
-      log_recover("#{production}(start)") {"token: #{@lexer.first.inspect}"}
+      @options[:depth] += 1
+      recover("#{production}(start)", depth: options[:depth], token: @lexer.first)
       yield
     rescue EBNF::LL1::Lexer::Error, SyntaxError, Recovery =>  e
       # Lexer encountered an illegal token or the parser encountered
@@ -504,13 +575,13 @@ module RDF::Turtle
         end
       end
       raise EOFError, "End of input found when recovering" if @lexer.first.nil?
-      log_debug("recovery", "current token: #{@lexer.first.inspect}")
+      debug("recovery", "current token: #{@lexer.first.inspect}", depth: options[:depth])
 
       unless e.is_a?(Recovery)
         # Get the list of follows for this sequence, this production and the stacked productions.
-        log_debug("recovery", "stack follows:")
+        debug("recovery", "stack follows:", depth: options[:depth])
         @prod_stack.reverse.each do |prod|
-          log_debug("recovery", level: 4) {"  #{prod[:prod]}: #{prod[:recover_to].inspect}"}
+          debug("recovery", level: 4, depth: options[:depth]) {"  #{prod[:prod]}: #{prod[:recover_to].inspect}"}
         end
       end
 
@@ -520,9 +591,9 @@ module RDF::Turtle
       # Skip tokens until one is found in follows
       while (token = (@lexer.first rescue @lexer.recover)) && follows.none? {|t| token === t}
         skipped = @lexer.shift
-        log_debug("recovery") {"skip #{skipped.inspect}"}
+        debug("recovery", depth: options[:depth]) {"skip #{skipped.inspect}"}
       end
-      log_debug("recovery") {"found #{token.inspect} in follows"}
+      debug("recovery", depth: options[:depth]) {"found #{token.inspect} in follows"}
 
       # Re-raise the error unless token is a follows of this production
       raise Recovery unless Array(recover_to).any? {|t| token === t}
@@ -530,11 +601,35 @@ module RDF::Turtle
       # Skip that token to get something reasonable to start the next production with
       @lexer.shift
     ensure
-      log_info("#{production}(finish)")
-      @options[:log_depth] -= 1
+      progress("#{production}(finish)", depth: options[:depth])
+      @options[:depth] -= 1
       @prod_stack.pop
     end
 
+    def progress(*args, &block)
+      lineno = (options[:token].lineno if options[:token].respond_to?(:lineno)) || (@lexer && @lexer.lineno)
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+      opts[:level] ||= 1
+      opts[:lineno] ||= lineno
+      log_info(*args, **opts, &block)
+    end
+
+    def recover(*args, &block)
+      lineno = (options[:token].lineno if options[:token].respond_to?(:lineno)) || (@lexer && @lexer.lineno)
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+      opts[:level] ||= 1
+      opts[:lineno] ||= lineno
+      log_recover(*args, **opts, &block)
+    end
+
+    def debug(*args, &block)
+      lineno = (options[:token].lineno if options[:token].respond_to?(:lineno)) || (@lexer && @lexer.lineno)
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+      opts[:level] ||= 0
+      opts[:lineno] ||= lineno
+      log_debug(*args, **opts, &block)
+    end
+
     ##
     # Error information, used as level `0` debug messages.
     #
@@ -554,7 +649,8 @@ module RDF::Turtle
         lineno:     lineno,
         token:      options[:token],
         production: options[:production],
-        exception:  SyntaxError)
+        depth:      options[:depth],
+        exception:  SyntaxError,)
     end
 
     # Used for internal error recovery

data/lib/rdf/turtle/terminals.rb

@@ -1,9 +1,9 @@
+# encoding: utf-8
 require 'ebnf/ll1/lexer'
 
 module RDF::Turtle
   module Terminals
     # Definitions of token regular expressions used for lexical analysis
-  
     ##
     # Unicode regular expressions for Ruby 1.9+ with the Oniguruma engine.
     U_CHARS1         = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
@@ -12,66 +12,66 @@ module RDF::Turtle
                          [\\u2070-\\u218F]|[\\u2C00-\\u2FEF]|[\\u3001-\\uD7FF]|
                          [\\uF900-\\uFDCF]|[\\uFDF0-\\uFFFD]|[\\u{10000}-\\u{EFFFF}]
                        EOS
-    U_CHARS2         = Regexp.compile("\\u00B7|[\\u0300-\\u036F]|[\\u203F-\\u2040]").freeze
-    IRI_RANGE        = Regexp.compile("[[^<>\"{}|^`\\\\]&&[^\\x00-\\x20]]").freeze
+    U_CHARS2         = Regexp.compile("\\u00B7|[\\u0300-\\u036F]|[\\u203F-\\u2040]", Regexp::FIXEDENCODING).freeze
+    IRI_RANGE        = Regexp.compile("[[^<>\"{}|^`\\\\]&&[^\\x00-\\x20]]", Regexp::FIXEDENCODING).freeze
 
     # 26
     UCHAR                = EBNF::LL1::Lexer::UCHAR
     # 170s
-    PERCENT              = /%[0-9A-Fa-f]{2}/.freeze
+    PERCENT              = /%[0-9A-Fa-f]{2}/u.freeze
     # 172s
-    PN_LOCAL_ESC         = /\\[_~\.\-\!$\&'\(\)\*\+,;=\/\?\#@%]/.freeze
+    PN_LOCAL_ESC         = /\\[_~\.\-\!$\&'\(\)\*\+,;=\/\?\#@%]/u.freeze
     # 169s
-    PLX                  = /#{PERCENT}|#{PN_LOCAL_ESC}/.freeze.freeze
+    PLX                  = /#{PERCENT}|#{PN_LOCAL_ESC}/u.freeze
     # 163s
-    PN_CHARS_BASE        = /[A-Z]|[a-z]|#{U_CHARS1}/.freeze
+    PN_CHARS_BASE        = /[A-Z]|[a-z]|#{U_CHARS1}/u.freeze
     # 164s
-    PN_CHARS_U           = /_|#{PN_CHARS_BASE}/.freeze
+    PN_CHARS_U           = /_|#{PN_CHARS_BASE}/u.freeze
     # 166s
-    PN_CHARS             = /-|[0-9]|#{PN_CHARS_U}|#{U_CHARS2}/.freeze
-    PN_LOCAL_BODY        = /(?:(?:\.|:|#{PN_CHARS}|#{PLX})*(?:#{PN_CHARS}|:|#{PLX}))?/.freeze
-    PN_CHARS_BODY        = /(?:(?:\.|#{PN_CHARS})*#{PN_CHARS})?/.freeze
+    PN_CHARS             = /-|[0-9]|#{PN_CHARS_U}|#{U_CHARS2}/u.freeze
+    PN_LOCAL_BODY        = /(?:(?:\.|:|#{PN_CHARS}|#{PLX})*(?:#{PN_CHARS}|:|#{PLX}))?/u.freeze
+    PN_CHARS_BODY        = /(?:(?:\.|#{PN_CHARS})*#{PN_CHARS})?/u.freeze
     # 167s
-    PN_PREFIX            = /#{PN_CHARS_BASE}#{PN_CHARS_BODY}/.freeze
+    PN_PREFIX            = /#{PN_CHARS_BASE}#{PN_CHARS_BODY}/u.freeze
     # 168s
-    PN_LOCAL             = /(?:[0-9]|:|#{PN_CHARS_U}|#{PLX})#{PN_LOCAL_BODY}/.freeze
+    PN_LOCAL             = /(?:[0-9]|:|#{PN_CHARS_U}|#{PLX})#{PN_LOCAL_BODY}/u.freeze
     # 154s
-    EXPONENT             = /[eE][+-]?[0-9]+/
+    EXPONENT             = /[eE][+-]?[0-9]+/u.freeze
     # 159s
-    ECHAR                = /\\[tbnrf\\"']/
+    ECHAR                = /\\[tbnrf\\"']/u.freeze
     # 18
-    IRIREF               = /<(?:#{IRI_RANGE}|#{UCHAR})*>/.freeze
+    IRIREF               = /<(?:#{IRI_RANGE}|#{UCHAR})*>/u.freeze
     # 139s
-    PNAME_NS             = /#{PN_PREFIX}?:/.freeze
+    PNAME_NS             = /#{PN_PREFIX}?:/u.freeze
     # 140s
-    PNAME_LN             = /#{PNAME_NS}#{PN_LOCAL}/.freeze
+    PNAME_LN             = /#{PNAME_NS}#{PN_LOCAL}/u.freeze
     # 141s
-    BLANK_NODE_LABEL     = /_:(?:[0-9]|#{PN_CHARS_U})(?:(?:#{PN_CHARS}|\.)*#{PN_CHARS})?/.freeze
+    BLANK_NODE_LABEL     = /_:(?:[0-9]|#{PN_CHARS_U})(?:(?:#{PN_CHARS}|\.)*#{PN_CHARS})?/u.freeze
     # 144s
-    LANGTAG              = /@[a-zA-Z]+(?:-[a-zA-Z0-9]+)*/.freeze
+    LANGTAG              = /@[a-zA-Z]+(?:-[a-zA-Z0-9]+)*/u.freeze
     # 19
-    INTEGER              = /[+-]?[0-9]+/.freeze
+    INTEGER              = /[+-]?[0-9]+/u.freeze
     # 20
-    DECIMAL              = /[+-]?(?:[0-9]*\.[0-9]+)/.freeze
+    DECIMAL              = /[+-]?(?:[0-9]*\.[0-9]+)/u.freeze
     # 21
-    DOUBLE               = /[+-]?(?:[0-9]+\.[0-9]*#{EXPONENT}|\.?[0-9]+#{EXPONENT})/.freeze
+    DOUBLE               = /[+-]?(?:[0-9]+\.[0-9]*#{EXPONENT}|\.?[0-9]+#{EXPONENT})/u.freeze
     # 22
-    STRING_LITERAL_SINGLE_QUOTE      = /'(?:[^\'\\\n\r]|#{ECHAR}|#{UCHAR})*'/.freeze
+    STRING_LITERAL_SINGLE_QUOTE      = /'(?:[^\'\\\n\r]|#{ECHAR}|#{UCHAR})*'/u.freeze
     # 23
-    STRING_LITERAL_QUOTE             = /"(?:[^\"\\\n\r]|#{ECHAR}|#{UCHAR})*"/.freeze
+    STRING_LITERAL_QUOTE             = /"(?:[^\"\\\n\r]|#{ECHAR}|#{UCHAR})*"/u.freeze
     # 24
-    STRING_LITERAL_LONG_SINGLE_QUOTE = /'''(?:(?:'|'')?(?:[^'\\]|#{ECHAR}|#{UCHAR}))*'''/m.freeze
+    STRING_LITERAL_LONG_SINGLE_QUOTE = /'''(?:(?:'|'')?(?:[^'\\]|#{ECHAR}|#{UCHAR}))*'''/um.freeze
     # 25
-    STRING_LITERAL_LONG_QUOTE        = /"""(?:(?:"|"")?(?:[^"\\]|#{ECHAR}|#{UCHAR}))*"""/m.freeze
+    STRING_LITERAL_LONG_QUOTE        = /"""(?:(?:"|"")?(?:[^"\\]|#{ECHAR}|#{UCHAR}))*"""/um.freeze
 
     # 161s
-    WS                   = /(?:\s|(?:#[^\n\r]*))+/m.freeze
+    WS                   = /(?:\s|(?:#[^\n\r]*))+/um.freeze
     # 162s
-    ANON                 = /\[#{WS}*\]/m.freeze
+    ANON                 = /\[#{WS}*\]/um.freeze
     # 28t
-    PREFIX               = /@?prefix/i.freeze
+    PREFIX               = /@?prefix/ui.freeze
     # 29t
-    BASE                 = /@?base/i.freeze
+    BASE                 = /@?base/ui.freeze
   
   end
 end

data/lib/rdf/turtle/writer.rb

@@ -276,10 +276,23 @@ module RDF::Turtle
       case literal
       when RDF::Literal
         case @options[:literal_shorthand] && literal.valid? ? literal.datatype : false
-        when RDF::XSD.boolean, RDF::XSD.integer, RDF::XSD.decimal
-          literal.canonicalize.to_s
+        when RDF::XSD.boolean
+          %w(true false).include?(literal.value) ? literal.value : literal.canonicalize.to_s
+        when RDF::XSD.integer
+          literal.value.match?(/^[\+\-]?\d+$/) && !canonicalize? ? literal.value : literal.canonicalize.to_s
+        when RDF::XSD.decimal
+          literal.value.match?(/^[\+\-]?\d+\.\d+?$/) && !canonicalize? ?
+            literal.value :
+            literal.canonicalize.to_s
         when RDF::XSD.double
-          literal.canonicalize.to_s.sub('E', 'e')  # Favor lower case exponent
+          in_form = case literal.value
+          when /[\+\-]?\d+\.\d*E[\+\-]?\d+$/i then true
+          when /[\+\-]?\.\d+E[\+\-]?\d+$/i    then true
+          when /[\+\-]?\d+E[\+\-]?\d+$/i      then true
+          else false
+          end && !canonicalize?
+
+          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?
@@ -313,6 +326,17 @@ module RDF::Turtle
       options[:unique_bnodes] ? node.to_unique_base : node.to_base
     end
 
+    ##
+    # Returns an embedded triple.
+    #
+    # @param [RDF::Statement] statement
+    # @param [Hash{Symbol => Object}] options
+    # @return [String]
+    def format_quotedTriple(statement, **options)
+      log_debug("rdfstar") {"#{statement.to_ntriples}"}
+      "<<%s %s %s>>" % statement.to_a.map { |value| format_term(value, **options) }
+    end
+
     protected
     # Output @base and @prefix definitions
     def start_document
@@ -363,16 +387,16 @@ module RDF::Turtle
       # Mark as seen lists that are part of another list
       @lists.values.map(&:statements).
         flatten.each do |st|
-          seen[st.object] = true if @lists.has_key?(st.object)
+          seen[st.object] = true if @lists.key?(st.object)
         end
 
-        # List elements which are bnodes should not be targets for top-level serialization
-        list_elements = @lists.values.map(&:to_a).flatten.select(&:node?).compact
+      # List elements which are bnodes should not be targets for top-level serialization
+      list_elements = @lists.values.map(&:to_a).flatten.select(&:node?).compact
 
-      # Sort subjects by resources over bnodes, ref_counts and the subject URI itself
+      # Sort subjects by resources and statements over bnodes, ref_counts and the subject URI itself
       recursable = (@subjects.keys - list_elements).
         select {|s| !seen.include?(s)}.
-        map {|r| [r.node? ? 1 : 0, ref_count(r), r]}.
+        map {|r| [r.node? ? 2 : (r.statement? ? 1 : 0), ref_count(r), r]}.
         sort
 
       subjects + recursable.map{|r| r.last}
@@ -457,8 +481,8 @@ module RDF::Turtle
 
     # Can subject be represented as a blankNodePropertyList?
     def blankNodePropertyList?(resource, position)
-      resource.node? &&
-        !is_valid_list?(resource) &&
+      !resource.statement? && resource.node? &&
+        !collection?(resource) &&
         (!is_done?(resource) || position == :subject) &&
         ref_count(resource) == (position == :object ? 1 : 0)
     end
@@ -496,35 +520,33 @@ module RDF::Turtle
     private
 
     # Checks if l is a valid RDF list, i.e. no nodes have other properties.
-    def is_valid_list?(l)
-      #log_debug("is_valid_list?") {l.inspect}
-      return @lists[l] && @lists[l].valid?
-    end
-
-    def do_list(l, position)
-      list = @lists[l]
-      log_debug("do_list") {list.inspect}
-      subject_done(RDF.nil)
-      index = 0
-      list.each_statement do |st|
-        next unless st.predicate == RDF.first
-        log_debug {" list this: #{st.subject} first: #{st.object}[#{position}]"}
-        @output.write(" ") if index > 0
-        path(st.object, position)
-        subject_done(st.subject)
-        position = :object
-        index += 1
-      end
+    def collection?(l)
+      #log_debug("collection?") {l.inspect}
+      return @lists.key?(l)
     end
 
     def collection(node, position)
-      return false if !is_valid_list?(node)
+      return false if !collection?(node)
       return false if position == :subject && ref_count(node) > 0
       return false if position == :object && prop_count(node) > 0
       #log_debug("collection") {"#{node.to_ntriples}, #{position}"}
 
       @output.write("(")
-      log_depth {do_list(node, position)}
+      log_depth do
+        list = @lists[node]
+        log_debug("collection") {list.inspect}
+        subject_done(RDF.nil)
+        index = 0
+        list.each_statement do |st|
+          next unless st.predicate == RDF.first
+          log_debug {" list this: #{st.subject} first: #{st.object}[#{position}]"}
+          @output.write(" ") if index > 0
+          path(st.object, position)
+          subject_done(st.subject)
+          position = :object
+          index += 1
+        end
+      end
       @output.write(')')
     end
 
@@ -557,7 +579,7 @@ module RDF::Turtle
       log_debug("path") do
         "#{resource.to_ntriples}, " +
         "pos: #{position}, " +
-        "()?: #{is_valid_list?(resource)}, " +
+        "()?: #{collection?(resource)}, " +
         "[]?: #{blankNodePropertyList?(resource, position)}, " +
         "rc: #{ref_count(resource)}"
       end
@@ -577,7 +599,7 @@ module RDF::Turtle
     end
 
     # Render an objectList having a common subject and predicate
-    def objectList(objects)
+    def objectList(subject, predicate, objects)
       log_debug("objectList") {objects.inspect}
       return if objects.empty?
 
@@ -588,6 +610,15 @@ module RDF::Turtle
           @output.write ",\n#{indent(4)}"
         end
         path(obj, :object)
+
+        # If subject, predicate, and object are embedded, write those bits out too.
+        emb = RDF::Statement(subject, predicate, obj)
+        if !@graph.query({subject: emb}).empty?
+          @output.write ' {| '
+          predicateObjectList(emb, true)
+          @output.write ' |}'
+          subject_done(emb)
+        end
       end
     end
 
@@ -600,17 +631,18 @@ module RDF::Turtle
       end
 
       prop_list = sort_properties(properties)
-      prop_list -= [RDF.first.to_s, RDF.rest.to_s] if @lists.include?(subject)
+      prop_list -= [RDF.first.to_s, RDF.rest.to_s] if @lists.key?(subject)
       log_debug("predicateObjectList") {prop_list.inspect}
       return 0 if prop_list.empty?
 
       @output.write("\n#{indent(2)}") if properties.keys.length > 1 && from_bpl
       prop_list.each_with_index do |prop, i|
         begin
+          pred = RDF::URI.intern(prop)
           @output.write(";\n#{indent(2)}") if i > 0
-          predicate(RDF::URI.intern(prop))
+          predicate(pred)
           @output.write(" ")
-          objectList(properties[prop])
+          objectList(subject, pred, properties[prop])
         end
       end
       properties.keys.length

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-turtle
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Gregg Kellogg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -16,140 +16,140 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '4.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
-  name: rdf-isomorphic
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
-  name: json-ld
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rdf-spec
+  name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: rdf-vocab
+  name: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '3.2'
 description: RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -169,11 +169,11 @@ files:
 - lib/rdf/turtle/terminals.rb
 - lib/rdf/turtle/version.rb
 - lib/rdf/turtle/writer.rb
-homepage: https://ruby-rdf.github.com/rdf-turtle
+homepage: https://github.com/ruby-rdf/rdf-turtle
 licenses:
 - Unlicense
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -181,15 +181,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Turtle reader/writer for Ruby.
 test_files: []