rdf-turtle 3.0.3 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 499e06e63d69ec0216db2600e34260d5eda5c7a3736e8f1a42c63a91c716779c
-  data.tar.gz: 3443fdb3e53d2b12d66f6a9534a9532dabde58b0b319ecc62ffff0a4bd87afb3
+  metadata.gz: 6a527c2357a49551b152847f83943ac2e215ac10b2c4c76d0727fd42a85026cd
+  data.tar.gz: 0d8fa400deaf2bbc4c8ea996b0a37d5ead4fbb00519cc95ac84dad58052125e9
 SHA512:
-  metadata.gz: 1cad03d53fb973b02f541168549cc110769fde86da3b37c1a6187d7fbfffe8bee3f72bea687d14786094ad0cb6a2cd7d4f2072c9989ec4d0c62b6ad81020bccd
-  data.tar.gz: 1e7f38e3f561a6f16304727fa89b2bbeab0b93b31e8e5a58633f533ba69e2a874e461f59bcf31d015d23382290e33b9b2ecfd007691fe6f5dc0961c98ca0d285
+  metadata.gz: 2493ae5d441f97c947249a58a7fd8a49ce8aca6f675b08fc5b223a8f3bab2037d2004416ddca6f0ea78ad4dca9199b5c31c92f14b7068085222a7b191de44deb
+  data.tar.gz: c4db12c8fe5e8401f82ae472ee343474704bb19a1bf202b1e551f29be6b2a874697e046a0c6bd4a91fe0a29c3428a02fe2e7fd2dff249c44a783ee17bdc9481c

data/History

@@ -30,7 +30,7 @@
 * Replace remaining uses of SPARQL with RDF::Turtle or RDF::LL1
 
 ### 0.0.3
- * Completed RDF 1.1 Turtle based on http://www.w3.org/TR/2011/WD-turtle-20110809/
+ * Completed RDF 1.1 Turtle based on https://www.w3.org/TR/2011/WD-turtle-20110809/
     * Reader
     * Writer
  * Issues:

data/README.md

@@ -2,8 +2,8 @@
 
 [Turtle][] reader/writer for [RDF.rb][RDF.rb] .
 
-[![Gem Version](https://badge.fury.io/rb/rdf-turtle.png)](http://badge.fury.io/rb/rdf-turtle)
-[![Build Status](https://travis-ci.org/ruby-rdf/rdf-turtle.png?branch=master)](http://travis-ci.org/ruby-rdf/rdf-turtle)
+[![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)
 
@@ -15,10 +15,11 @@ RDF::Turtle parses [Turtle][Turtle] and [N-Triples][N-Triples] into statements o
 
 Install with `gem install rdf-turtle`
 
-* 100% free and unencumbered [public domain](http://unlicense.org/) software.
+* 100% free and unencumbered [public domain](https://unlicense.org/) software.
 * Implements a complete parser for [Turtle][].
 * Compatible with Ruby >= 2.2.2.
 * Optional streaming writer, to serialize large graphs
+* Provisional support for [Turtle*][RDF*].
 
 ## Usage
 Instantiate a reader from a local file:
@@ -35,6 +36,50 @@ Write a graph to a file:
        writer << graph
     end
 
+## Turtle* (RDFStar)
+
+Both reader and writer include provisional support for [Turtle*][RDF*].
+
+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 `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:
+
+    graph = RDF::Graph.new do |graph|
+      RDF::Turtle::Reader.new(ttl, rdfstar: :PG) {|reader| graph << reader}
+    end
+    graph.count #=> 2
+
+When using the `:SA` mode, 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: :SA) {|reader| graph << reader}
+    end
+    graph.count #=> 1
+
 ## Documentation
 Full documentation available on [Rubydoc.info][Turtle doc]
 
@@ -85,22 +130,22 @@ This version uses a hand-written parser using the Lexer from the [EBNF][] gem in
 
 ## Dependencies
 
-* [Ruby](http://ruby-lang.org/) (>= 2.2)
-* [RDF.rb](http://rubygems.org/gems/rdf) (~> 3.0)
+* [Ruby](https://ruby-lang.org/) (>= 2.4)
+* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.1)
 * [EBNF][] (~> 1.1)
 
 ## Installation
 
-The recommended installation method is via [RubyGems](http://rubygems.org/).
+The recommended installation method is via [RubyGems](https://rubygems.org/).
 To install the latest official release of the `RDF::Turtle` gem, do:
 
     % [sudo] gem install rdf-turtle
 
 ## Mailing List
-* <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
+* <https://lists.w3.org/Archives/Public/public-rdf-ruby/>
 
 ## Author
-* [Gregg Kellogg](http://github.com/gkellogg) - <http://greggkellogg.net/>
+* [Gregg Kellogg](https://github.com/gkellogg) - <https://greggkellogg.net/>
 
 ## Contributing
 This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration.
@@ -119,20 +164,21 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo
 
 ## License
 This is free and unencumbered public domain software. For more information,
-see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
-
-A copy of the [Turtle EBNF][] and derived parser files are included in the repository, which are not covered under the UNLICENSE. These files are covered via the [W3C Document License](http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231).
-
-[Ruby]:         http://ruby-lang.org/
-[RDF]:          http://www.w3.org/RDF/
-[YARD]:         http://yardoc.org/
-[YARD-GS]:      http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
-[PDD]:          http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
-[RDF.rb]:       http://rubydoc.info/github/ruby-rdf/rdf
-[EBNF]:         http://rubygems.org/gems/ebnf
-[Backports]:    http://rubygems.org/gems/backports
-[N-Triples]:    http://www.w3.org/TR/rdf-testcases/#ntriples
-[Turtle]:       http://www.w3.org/TR/2012/WD-turtle-20120710/
-[Turtle doc]:   http://rubydoc.info/github/ruby-rdf/rdf-turtle/master/file/README.md
-[Turtle EBNF]:  http://dvcs.w3.org/hg/rdf/file/default/rdf-turtle/turtle.bnf
+see <https://unlicense.org/> or the accompanying {file:UNLICENSE} file.
+
+A copy of the [Turtle EBNF][] and derived parser files are included in the repository, which are not covered under the UNLICENSE. These files are covered via the [W3C Document License](https://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231).
+
+[Ruby]:         https://ruby-lang.org/
+[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
+[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
+[Turtle EBNF]:  https://dvcs.w3.org/hg/rdf/file/default/rdf-turtle/turtle.bnf
 [Freebase Dumps]: https://developers.google.com/freebase/data

data/UNLICENSE

@@ -21,4 +21,4 @@ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-For more information, please refer to <http://unlicense.org/>
+For more information, please refer to <https://unlicense.org/>

data/VERSION

@@ -1 +1 @@
-3.0.3
+3.1.1

data/lib/rdf/turtle.rb

@@ -15,10 +15,10 @@ module RDF
   #     end
   #   end
   #
-  # @see http://rubydoc.info/github/ruby-rdf/rdf/master/frames
-  # @see http://dvcs.w3.org/hg/rdf/raw-file/default/rdf-turtle/index.html
+  # @see https://rubydoc.info/github/ruby-rdf/rdf/master/frames
+  # @see https://dvcs.w3.org/hg/rdf/raw-file/default/rdf-turtle/index.html
   #
-  # @author [Gregg Kellogg](http://greggkellogg.net/)
+  # @author [Gregg Kellogg](https://greggkellogg.net/)
   module Turtle
     require  'rdf/turtle/format'
     autoload :Reader,         'rdf/turtle/reader'

data/lib/rdf/turtle/format.rb

@@ -14,7 +14,7 @@ module RDF::Turtle
   # @example Obtaining serialization format file extension mappings
   #     RDF::Format.file_extensions    #=> {ttl: "text/turtle"}
   #
-  # @see http://www.w3.org/TR/rdf-testcases/#ntriples
+  # @see https://www.w3.org/TR/rdf-testcases/#ntriples
   class Format < RDF::Format
     content_type     'text/turtle',
                      extension: :ttl,

data/lib/rdf/turtle/freebase_reader.rb

@@ -55,7 +55,7 @@ module RDF::Turtle
     ##
     # Read a PNAME of the form `prefix:suffix`.
     # @return [RDF::URI]
-    def read_pname(options = {})
+    def read_pname(**options)
       if pname_str = match(/^(\w+:\S+)/)
         ns, suffix = pname_str.split(':', 2)
         if suffix[-1,1] == "."
@@ -74,7 +74,7 @@ module RDF::Turtle
 
     ##
     # @return [RDF::Literal]
-    # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_grammar (literal)
+    # @see    https://www.w3.org/TR/rdf-testcases/#ntrip_grammar (literal)
     def read_literal
       if literal_str = match(LITERAL_PLAIN)
         literal_str = self.class.unescape(literal_str)

data/lib/rdf/turtle/reader.rb

@@ -25,7 +25,7 @@ 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|<<|>>))
 
     terminal(:PREFIX,                           PREFIX)
     terminal(:BASE,                             BASE)
@@ -33,7 +33,7 @@ module RDF::Turtle
 
     ##
     # Reader options
-    # @see http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Reader#options-class_method
+    # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Reader#options-class_method
     def self.options
       super + [
         RDF::CLI::Option.new(
@@ -48,14 +48,14 @@ module RDF::Turtle
     # Redirect for Freebase Reader
     #
     # @private
-    def self.new(input = nil, options = {}, &block)
+    def self.new(input = nil, **options, &block)
       klass = if options[:freebase]
         FreebaseReader
       else
         self
       end
       reader = klass.allocate
-      reader.send(:initialize, input, options, &block)
+      reader.send(:initialize, input, **options, &block)
       reader
     end
 
@@ -82,15 +82,13 @@ module RDF::Turtle
     # @option options [Boolean] :freebase (false)
     #   Use optimized Freebase reader
     # @return [RDF::Turtle::Reader]
-    def initialize(input = nil, options = {}, &block)
+    def initialize(input = nil, **options, &block)
       super do
         @options = {
           anon_base:  "b0",
-          validate:  false,
           whitespace:  WS,
-          log_depth: 0,
-        }.merge(options)
-        @options = {prefixes:  {nil => ""}}.merge(@options) unless @options[:validate]
+          depth: 0,
+        }.merge(@options)
         @prod_stack = []
 
         @options[:base_uri] = RDF::URI(base_uri || "")
@@ -100,7 +98,7 @@ module RDF::Turtle
         log_debug("canonicalize") {canonicalize?.inspect}
         log_debug("intern") {intern?.inspect}
 
-        @lexer = EBNF::LL1::Lexer.new(input, self.class.patterns, @options)
+        @lexer = EBNF::LL1::Lexer.new(input, self.class.patterns, **@options)
 
         if block_given?
           case block.arity
@@ -178,7 +176,7 @@ module RDF::Turtle
       value = RDF::URI(iri)
       value = base_uri.join(value) if value.relative?
       value.validate! if validate?
-      value.canonicalize! if canonicalize?
+      value.canonicalize! if canonicalize? && !value.frozen?
       value = RDF::URI.intern(value) if intern?
       value
     rescue ArgumentError => e
@@ -186,14 +184,14 @@ module RDF::Turtle
     end
     
     # Create a literal
-    def literal(value, options = {})
-      log_debug("literal") do
+    def literal(value, **options)
+      log_debug("literal", depth: @options[:depth]) do
         "value: #{value.inspect}, " +
         "options: #{options.inspect}, " +
         "validate: #{validate?.inspect}, " +
         "c14n?: #{canonicalize?.inspect}"
       end
-      RDF::Literal.new(value, options.merge(validate:  validate?, canonicalize:  canonicalize?))
+      RDF::Literal.new(value, validate:  validate?, canonicalize:  canonicalize?, **options)
     rescue ArgumentError => e
       error("Argument Error #{e.message}", production: :literal, token: @lexer.first)
     end
@@ -214,14 +212,16 @@ module RDF::Turtle
     # Expand a PNAME using string concatenation
     def pname(prefix, suffix)
       # Prefixes must be defined, except special case for empty prefix being alias for current @base
-      if prefix(prefix)
-        base = prefix(prefix).to_s
-      elsif !prefix(prefix)
+      base = if prefix(prefix)
+        prefix(prefix).to_s
+      elsif prefix.to_s.empty? && !validate?
+        base_uri.to_s
+      else
         error("undefined prefix", production: :pname, token: prefix)
-        base = ''
+        ''
       end
       suffix = suffix.to_s.sub(/^\#/, "") if base.index("#")
-      log_debug("pname") {"base: '#{base}', suffix: '#{suffix}'"}
+      log_debug("pname", depth: options[:depth]) {"base: '#{base}', suffix: '#{suffix}'"}
       process_iri(base + suffix.to_s)
     end
     
@@ -283,7 +283,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}"}
+            log_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'
 
@@ -362,6 +362,7 @@ module RDF::Turtle
         read_iri ||
         read_BlankNode ||
         read_collection ||
+        read_rdfstar ||
         error( "Expected subject", production: :subject, token: @lexer.first)
       end
     end
@@ -373,7 +374,8 @@ module RDF::Turtle
           read_BlankNode ||
           read_collection ||
           read_blankNodePropertyList ||
-          read_literal
+          read_literal ||
+          read_rdfstar
 
           add_statement(:object, RDF::Statement(subject, predicate, object)) if subject && predicate
           object
@@ -381,6 +383,28 @@ module RDF::Turtle
       end
     end
 
+    # Read an RDF* reified statement
+    # @return [RDF::Statement]
+    def read_rdfstar
+      return unless @options[:rdfstar]
+      if @lexer.first.value == '<<'
+        prod(:rdfstar) 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)
+          unless @lexer.first.value == '>>'
+            error("Failed to end of embedded triple", production: :rdfstar, 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
+        end
+      end
+    end
+
     # @return [RDF::Literal]
     def read_literal
       error("Unexpected end of file", production: :literal) unless token = @lexer.first
@@ -431,7 +455,7 @@ module RDF::Turtle
       if token === '['
         prod(:blankNodePropertyList, %{]}) do
           @lexer.shift
-          log_info("blankNodePropertyList") {"token: #{token.inspect}"}
+          log_info("blankNodePropertyList", depth: options[:depth]) {"token: #{token.inspect}"}
           node = bnode
           read_predicateObjectList(node)
           error("blankNodePropertyList", "Expected closing ']'") unless @lexer.first === ']'
@@ -447,7 +471,7 @@ module RDF::Turtle
         prod(:collection, %{)}) do
           @lexer.shift
           token = @lexer.first
-          log_info("collection") {"token: #{token.inspect}"}
+          log_info("collection", depth: options[:depth]) {"token: #{token.inspect}"}
           objects = []
           while object = read_object
             objects << object
@@ -483,8 +507,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
+      log_recover("#{production}(start)", depth: options[:depth]) {"token: #{@lexer.first.inspect}"}
       yield
     rescue EBNF::LL1::Lexer::Error, SyntaxError, Recovery =>  e
       # Lexer encountered an illegal token or the parser encountered
@@ -504,13 +528,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}")
+      log_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:")
+        log_debug("recovery", "stack follows:", depth: options[:depth])
         @prod_stack.reverse.each do |prod|
-          log_debug("recovery", level: 4) {"  #{prod[:prod]}: #{prod[:recover_to].inspect}"}
+          log_debug("recovery", level: 4, depth: options[:depth]) {"  #{prod[:prod]}: #{prod[:recover_to].inspect}"}
         end
       end
 
@@ -520,9 +544,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}"}
+        log_debug("recovery", depth: options[:depth]) {"skip #{skipped.inspect}"}
       end
-      log_debug("recovery") {"found #{token.inspect} in follows"}
+      log_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,8 +554,8 @@ 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
+      log_info("#{production}(finish)", depth: options[:depth])
+      @options[:depth] -= 1
       @prod_stack.pop
     end
 
@@ -554,7 +578,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
@@ -587,7 +612,7 @@ module RDF::Turtle
       # @option options [Symbol]         :production  (nil)
       # @option options [String]         :token  (nil)
       # @option options [Integer]        :lineno (nil)
-      def initialize(message, options = {})
+      def initialize(message, **options)
         @production = options[:production]
         @token      = options[:token]
         @lineno     = options[:lineno] || (@token.lineno if @token.respond_to?(:lineno))

data/lib/rdf/turtle/streaming_writer.rb

@@ -3,7 +3,7 @@ require 'rdf/turtle/terminals'
 module RDF::Turtle
   ##
   # Streaming writer interface
-  # @author [Gregg Kellogg](http://greggkellogg.net/)
+  # @author [Gregg Kellogg](https://greggkellogg.net/)
   module StreamingWriter
     ##
     # Write out declarations
@@ -28,15 +28,15 @@ module RDF::Turtle
       if statement.subject != @streaming_subject
         @output.puts ' .' if @streaming_subject
         @streaming_subject, @streaming_predicate = statement.subject, statement.predicate
-        @output.write "#{format_term(statement.subject, options)} "
-        @output.write "#{format_term(statement.predicate, options)} "
+        @output.write "#{format_term(statement.subject, **options)} "
+        @output.write "#{format_term(statement.predicate, **options)} "
       elsif statement.predicate != @streaming_predicate
         @streaming_predicate = statement.predicate
-        @output.write ";\n#{indent(1)}#{format_term(statement.predicate, options)} "
+        @output.write ";\n#{indent(1)}#{format_term(statement.predicate, **options)} "
       else
         @output.write ",\n#{indent(2)}"
       end
-      @output.write("#{format_term(statement.object, options)}")
+      @output.write("#{format_term(statement.object, **options)}")
     end
 
     ##

data/lib/rdf/turtle/writer.rb

@@ -54,7 +54,7 @@ module RDF::Turtle
   #     end
   #   end
   #
-  # @author [Gregg Kellogg](http://greggkellogg.net/)
+  # @author [Gregg Kellogg](https://greggkellogg.net/)
   class Writer < RDF::Writer
     include StreamingWriter
     include RDF::Util::Logger
@@ -65,7 +65,7 @@ module RDF::Turtle
 
     ##
     # Writer options
-    # @see http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Writer#options-class_method
+    # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Writer#options-class_method
     def self.options
       super + [
         RDF::CLI::Option.new(
@@ -123,7 +123,7 @@ module RDF::Turtle
     # @yieldreturn [void]
     # @yield  [writer]
     # @yieldparam [RDF::Writer] writer
-    def initialize(output = $stdout, options = {}, &block)
+    def initialize(output = $stdout, **options, &block)
       @graph = RDF::Graph.new
       @uri_to_pname = {}
       @uri_to_prefix = {}
@@ -272,7 +272,7 @@ module RDF::Turtle
     # @param  [RDF::Literal, String, #to_s] literal
     # @param  [Hash{Symbol => Object}] options
     # @return [String]
-    def format_literal(literal, options = {})
+    def format_literal(literal, **options)
       case literal
       when RDF::Literal
         case @options[:literal_shorthand] && literal.valid? ? literal.datatype : false
@@ -297,7 +297,7 @@ module RDF::Turtle
     # @param  [RDF::URI] uri
     # @param  [Hash{Symbol => Object}] options
     # @return [String]
-    def format_uri(uri, options = {})
+    def format_uri(uri, **options)
       md = uri.relativize(base_uri)
       log_debug("relativize") {"#{uri.to_ntriples} => #{md.inspect}"} if md != uri.to_s
       md != uri.to_s ? "<#{md}>" : (get_pname(uri) || "<#{uri}>")
@@ -309,10 +309,21 @@ module RDF::Turtle
     # @param  [RDF::Node] node
     # @param  [Hash{Symbol => Object}] options
     # @return [String]
-    def format_node(node, options = {})
+    def format_node(node, **options)
       options[:unique_bnodes] ? node.to_unique_base : node.to_base
     end
 
+    ##
+    # Returns an embedded triples
+    #
+    # @param [RDF::Statement] statement
+    # @param [Hash{Symbol => Object}] options
+    # @return [String]
+    def format_rdfstar(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
@@ -349,7 +360,7 @@ module RDF::Turtle
 
       # Add distinguished classes
       top_classes.each do |class_uri|
-        graph.query(predicate:  RDF.type, object:  class_uri).
+        graph.query({predicate:  RDF.type, object:  class_uri}).
           map {|st| st.subject}.
           sort.
           uniq.
@@ -363,11 +374,11 @@ module RDF::Turtle
       # Mark as seen lists that are part of another list
       @lists.values.map(&:statements).
         flatten.each do |st|
-          seen[st.object] if @lists.has_key?(st.object)
+          seen[st.object] = true if @lists.has_key?(st.object)
         end
 
-      # List elements should not be targets for top-level serialization
-      list_elements = @lists.values.map(&:to_a).flatten.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
       recursable = (@subjects.keys - list_elements).
@@ -447,7 +458,8 @@ module RDF::Turtle
     # @return [String]
     def quoted(string)
       if string.to_s.match(/[\t\n\r]/)
-        string = string.gsub('\\', '\\\\\\\\').gsub('"""', '\\"""')
+        string = string.gsub('\\', '\\\\\\\\').gsub('"', '\\"')
+
         %("""#{string}""")
       else
         "\"#{escaped(string)}\""
@@ -456,7 +468,7 @@ module RDF::Turtle
 
     # Can subject be represented as a blankNodePropertyList?
     def blankNodePropertyList?(resource, position)
-      resource.node? &&
+      !resource.statement? && resource.node? &&
         !is_valid_list?(resource) &&
         (!is_done?(resource) || position == :subject) &&
         ref_count(resource) == (position == :object ? 1 : 0)
@@ -504,12 +516,15 @@ module RDF::Turtle
       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
     end
 
@@ -519,7 +534,7 @@ module RDF::Turtle
       return false if position == :object && prop_count(node) > 0
       #log_debug("collection") {"#{node.to_ntriples}, #{position}"}
 
-      @output.write(position == :subject ? "(" : " (")
+      @output.write("(")
       log_depth {do_list(node, position)}
       @output.write(')')
     end
@@ -530,16 +545,20 @@ module RDF::Turtle
 
       log_debug("blankNodePropertyList") {resource.to_ntriples}
       subject_done(resource)
-      @output.write(position == :subject ? "\n#{indent} [" : ' [')
+      @output.write(position == :subject ? "\n#{indent} [" : '[')
       num_props = log_depth {predicateObjectList(resource, true)}
-      @output.write((num_props > 1 ? "\n#{indent}" : "") + (position == :object ? ']' : '] .'))
+      @output.write((num_props > 1 ? "\n#{indent(2)}" : "") + (position == :object ? ']' : '] .'))
       true
     end
 
     # Default singular resource representation.
     def p_term(resource, position)
       #log_debug("p_term") {"#{resource.to_ntriples}, #{position}"}
-      l = (position == :subject ? "" : " ") + format_term(resource, options)
+      l = if resource == RDF.nil
+        "()"
+      else
+        format_term(resource, **options)
+      end
       @output.write(l)
     end
 
@@ -562,7 +581,7 @@ module RDF::Turtle
     def predicate(resource)
       log_debug("predicate") {resource.to_ntriples}
       if resource == RDF.type
-        @output.write(" a")
+        @output.write("a")
       else
         path(resource, :predicate)
       end
@@ -587,7 +606,7 @@ module RDF::Turtle
     # @return [Integer] the number of properties serialized
     def predicateObjectList(subject, from_bpl = false)
       properties = {}
-      @graph.query(subject:  subject) do |st|
+      @graph.query({subject:  subject}) do |st|
         (properties[st.predicate.to_s] ||= []) << st.object
       end
 
@@ -601,6 +620,7 @@ module RDF::Turtle
         begin
           @output.write(";\n#{indent(2)}") if i > 0
           predicate(RDF::URI.intern(prop))
+          @output.write(" ")
           objectList(properties[prop])
         end
       end
@@ -611,8 +631,9 @@ module RDF::Turtle
     def triples(subject)
       @output.write("\n#{indent}")
       path(subject, :subject)
-      predicateObjectList(subject)
-      @output.write(" .")
+      @output.write(" ")
+      num_props = predicateObjectList(subject)
+      @output.write("#{num_props > 0 ? ' ' : ''}.")
       true
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-turtle
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.1
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-22 00:00:00.000000000 Z
+date: 2020-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -16,146 +16,146 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rdf-spec
+  name: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rdf-vocab
+  name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: json-ld
+  name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.20
 description: RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -175,7 +175,7 @@ files:
 - lib/rdf/turtle/terminals.rb
 - lib/rdf/turtle/version.rb
 - lib/rdf/turtle/writer.rb
-homepage: http://ruby-rdf.github.com/rdf-turtle
+homepage: https://github.com/ruby-rdf/rdf-turtle
 licenses:
 - Unlicense
 metadata: {}
@@ -187,15 +187,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Turtle reader/writer for Ruby.