rdf-turtle 3.1.2 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cab6a95280c9ece9d97ed7bde134044c247d0990cd9451772b3726a85c1dafce
-  data.tar.gz: 56c87a3f41a22ffae491aed4197261e204332541855777f1822bd24d965047f0
+  metadata.gz: 57d92c642076069a911db896415fa9dbd3203b6c82a9074e0fc8a53dafb2389d
+  data.tar.gz: 238620d914ce1ff78d8710e12083d03eacb5f9be7106d0d12ef15c5105445b72
 SHA512:
-  metadata.gz: c5ce46d746a7ed5ac19c3b8fde60934485781149302d6b02e64d1b45dd70a6402c46ba8ca9e7eb06c3d96030c93c26646751bc92155dc239dbc41179d9c72c49
-  data.tar.gz: ad9a7a6ea210992f5a0ddbd037ded7b7f0a0129e4fc4a5610ad03f313381354207394840c9c729c70192906dfac58294c216a62382316b909f79a34c3db9d172
+  metadata.gz: 0db24a8c173d7b522ba06e1af9e957c513a551a211d22b6a2d19b7218a79e236f6db1f66b738a1a76e5b96ef6161f432f7ece17dea4af8d3de46520960a89977
+  data.tar.gz: a2826f9e8fbd34364acc54a117e283067982491e9c8e736ac1c8fcb86aac1f6a3acc43811040242fea19e79019d809fd14dae6b46ecc0568b67775dddd84369d

data/README.md

@@ -3,8 +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)
+[![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][].
@@ -16,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.2.2.
+* Compatible with Ruby >= 2.6.
 * Optional streaming writer, to serialize large graphs
-* Provisional support for [Turtle*][RDF*].
+* Provisional support for [Turtle-star][RDF-star].
 
 ## Usage
 Instantiate a reader from a local file:
@@ -35,9 +36,9 @@ Write a graph to a file:
        writer << graph
     end
 
-## Turtle* (RDFStar)
+## Turtle-star (RDF-star)
 
-Both reader and writer include provisional support for [Turtle*][RDF*].
+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`.
 
@@ -65,19 +66,29 @@ By default, the Turtle reader will reject a document containing a subject resour
     end
     # => RDF::ReaderError
 
-Readers support a `rdfstar` option with either `:PG` (Property Graph) or `:SA` (Separate Assertions) modes. In `:PG` mode, statements that are used in the subject or object positions are also implicitly added to the graph:
+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: :PG) {|reader| graph << reader}
+      RDF::Turtle::Reader.new(ttl, rdfstar: true) {|reader| graph << reader}
     end
-    graph.count #=> 2
+    graph.count #=> 1
+
+### Reading a Graph containing statement annotations
 
-When using the `:SA` mode, only one statement is asserted, although the reified statement is contained within the graph.
+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, rdfstar: :SA) {|reader| graph << reader}
+      RDF::Turtle::Reader.new(ttl) {|reader| graph << reader}
     end
-    graph.count #=> 1
+    # => RDF::ReaderError
+
+Note that this requires the `rdfstar` option to be set.
 
 ## Documentation
 Full documentation available on [Rubydoc.info][Turtle doc]
@@ -129,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
 
@@ -159,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,
@@ -171,13 +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
-[RDF.rb]:       https://rubydoc.info/github/ruby-rdf/rdf
+[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*]:         https://lists.w3.org/Archives/Public/public-rdf-star/
-[Turtle doc]:   https://rubydoc.info/github/ruby-rdf/rdf-turtle/master/file/README.md
+[RDF-star]:         https://w3c.github.io/rdf-star/rdf-star-cg-spec.html
+[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

data/VERSION

@@ -1 +1 @@
-3.1.2
+3.2.1

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/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)
@@ -33,7 +40,7 @@ module RDF::Turtle
 
     ##
     # 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(
@@ -92,11 +99,11 @@ module RDF::Turtle
         @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)
 
@@ -185,7 +192,7 @@ module RDF::Turtle
     
     # Create a literal
     def literal(value, **options)
-      log_debug("literal", depth: @options[:depth]) 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", depth: options[:depth]) {"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", depth: options[:depth]) {"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,7 +373,7 @@ module RDF::Turtle
         read_iri ||
         read_BlankNode ||
         read_collection ||
-        read_rdfstar ||
+        read_quotedTriple ||
         error( "Expected subject", production: :subject, token: @lexer.first)
       end
     end
@@ -375,7 +386,7 @@ module RDF::Turtle
           read_collection ||
           read_blankNodePropertyList ||
           read_literal ||
-          read_rdfstar
+          read_quotedTriple
 
           add_statement(:object, RDF::Statement(subject, predicate, object)) if subject && predicate
           object
@@ -383,35 +394,71 @@ module RDF::Turtle
       end
     end
 
-    # Read an RDF* reified statement
+    # Read an RDF-star reified statement
     # @return [RDF::Statement]
-    def read_rdfstar
+    def read_quotedTriple
       return unless @options[:rdfstar]
       if @lexer.first.value == '<<'
-        prod(:rdfstar) do
+        prod(:quotedTriple) do
           @lexer.shift # eat <<
-          subject = read_subject || error("Failed to parse subject", production: :rdfstar, token: @lexer.first)
-          predicate = read_verb || error("Failed to parse predicate", production: :rdfstar, token: @lexer.first)
-          object = read_object || error("Failed to parse object", production: :rdfstar, token: @lexer.first)
+          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: :rdfstar, token: @lexer.first)
+            error("Failed to end of embedded triple", production: :quotedTriple, token: @lexer.first)
           end
           @lexer.shift
-          statement = RDF::Statement(subject, predicate, object)
-          # Emit the statement if in Property Graph mode
-          add_statement(:rdfstar, statement) if @options[:rdfstar] == :PG
+          statement = RDF::Statement(subject, predicate, object, quoted: true)
           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, quoted: true)
+          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)
@@ -455,7 +502,7 @@ module RDF::Turtle
       if token === '['
         prod(:blankNodePropertyList, %{]}) do
           @lexer.shift
-          log_info("blankNodePropertyList", depth: options[:depth]) {"token: #{token.inspect}"}
+          progress("blankNodePropertyList", depth: options[:depth]) {"token: #{token.inspect}"}
           node = bnode
           read_predicateObjectList(node)
           error("blankNodePropertyList", "Expected closing ']'") unless @lexer.first === ']'
@@ -471,7 +518,7 @@ module RDF::Turtle
         prod(:collection, %{)}) do
           @lexer.shift
           token = @lexer.first
-          log_info("collection", depth: options[:depth]) {"token: #{token.inspect}"}
+          progress("collection", depth: options[:depth]) {"token: #{token.inspect}"}
           objects = []
           while object = read_object
             objects << object
@@ -508,7 +555,7 @@ module RDF::Turtle
     def prod(production, recover_to = [])
       @prod_stack << {prod: production, recover_to: recover_to}
       @options[:depth] += 1
-      log_recover("#{production}(start)", depth: options[:depth]) {"token: #{@lexer.first.inspect}"}
+      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
@@ -528,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}", depth: options[:depth])
+      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:", depth: options[:depth])
+        debug("recovery", "stack follows:", depth: options[:depth])
         @prod_stack.reverse.each do |prod|
-          log_debug("recovery", level: 4, depth: options[:depth]) {"  #{prod[:prod]}: #{prod[:recover_to].inspect}"}
+          debug("recovery", level: 4, depth: options[:depth]) {"  #{prod[:prod]}: #{prod[:recover_to].inspect}"}
         end
       end
 
@@ -544,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", depth: options[:depth]) {"skip #{skipped.inspect}"}
+        debug("recovery", depth: options[:depth]) {"skip #{skipped.inspect}"}
       end
-      log_debug("recovery", depth: options[:depth]) {"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}
@@ -554,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)", depth: options[:depth])
+      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.
     #

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(
@@ -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)
@@ -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
@@ -276,10 +277,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?
@@ -314,12 +328,12 @@ module RDF::Turtle
     end
 
     ##
-    # Returns an embedded triples
+    # Returns an embedded triple.
     #
     # @param [RDF::Statement] statement
     # @param [Hash{Symbol => Object}] options
     # @return [String]
-    def format_rdfstar(statement, **options)
+    def format_quotedTriple(statement, **options)
       log_debug("rdfstar") {"#{statement.to_ntriples}"}
       "<<%s %s %s>>" % statement.to_a.map { |value| format_term(value, **options) }
     end
@@ -374,16 +388,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}
@@ -469,7 +483,7 @@ module RDF::Turtle
     # Can subject be represented as a blankNodePropertyList?
     def blankNodePropertyList?(resource, position)
       !resource.statement? && resource.node? &&
-        !is_valid_list?(resource) &&
+        !collection?(resource) &&
         (!is_done?(resource) || position == :subject) &&
         ref_count(resource) == (position == :object ? 1 : 0)
     end
@@ -507,35 +521,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
 
@@ -568,7 +580,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
@@ -588,7 +600,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?
 
@@ -599,6 +611,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
 
@@ -611,17 +632,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

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.1.2
+  version: 3.2.1
 platform: ruby
 authors:
 - Gregg Kellogg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2022-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -16,146 +16,140 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: '3.2'
   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.2
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        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: []
@@ -178,8 +172,13 @@ files:
 homepage: https://github.com/ruby-rdf/rdf-turtle
 licenses:
 - Unlicense
-metadata: {}
-post_install_message: 
+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:
 - lib
@@ -187,15 +186,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.1.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Turtle reader/writer for Ruby.
 test_files: []