rdf 3.1.15 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8747674533ca06af62b3ee536ea4342be3c8bedc8831b1a1838e244d927263cb
-  data.tar.gz: fbc0593916678f9f696d4c461b29df01549da5af7d436b700d66735f5350054d
+  metadata.gz: fac2b932398cb302e6b2ecf300e6508879ed43314c52822d7a7ae9482127ea05
+  data.tar.gz: 6f78f54676b45f1bfd4767b30b545ec3016de440fcb8d5803ead213eed0e799d
 SHA512:
-  metadata.gz: fb56f5b72af92421afb2216ca5d1dec10907860a2f1ad069e4d69e37ee3126219dfb0c60fab256c1088424b9a8dcc42f6637e98b1c52258cc88163b394e06fc5
-  data.tar.gz: dcd897b9313decf48df3a89d4e8885ac74da1b966d194c28faa56a2edff2f4b123d093322655985ae1c0c059c6e8e49be9f18bbc9b1ef9c87634394d9090064b
+  metadata.gz: fa02358aa8f3362695cd433767c966a5c47fc3ba4c4bc8b95952e207dbf1e693a3468ea75735c34461d012b9efcd8f72e842d007e4dd1239b26d480d9e4f3f4c
+  data.tar.gz: e524ebef2e88903b3c8b0a48aa7b15b843924a8f6bc97fe06f524378d101409b1d88c07756b6a1be8002a38648b03d4ab362b6033f53bd810d05cc6dee141194

data/README.md

@@ -3,7 +3,7 @@
 This is a pure-Ruby library for working with [Resource Description Framework
 (RDF)][RDF] data.
 
-* <https://ruby-rdf.github.com/rdf>
+* <https://ruby-rdf.github.io/rdf>
 
 [![Gem Version](https://badge.fury.io/rb/rdf.png)](https://badge.fury.io/rb/rdf)
 [![Build Status](https://github.com/ruby-rdf/rdf/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf/actions?query=workflow%3ACI)
@@ -141,11 +141,11 @@ or
 ### Reading RDF data in the [N-Triples][] format
 
     require 'rdf/ntriples'
-    graph = RDF::Graph.load("https://ruby-rdf.github.com/rdf/etc/doap.nt")
+    graph = RDF::Graph.load("https://ruby-rdf.github.io/rdf/etc/doap.nt")
 
 or
 
-    RDF::Reader.open("https://ruby-rdf.github.com/rdf/etc/doap.nt") do |reader|
+    RDF::Reader.open("https://ruby-rdf.github.io/rdf/etc/doap.nt") do |reader|
       reader.each_statement do |statement|
         puts statement.inspect
       end
@@ -160,13 +160,13 @@ MimeType or file extension, where available.
 
     require 'rdf/nquads'
 
-    graph = RDF::Graph.load("https://ruby-rdf.github.com/rdf/etc/doap.nq", format: :nquads)
+    graph = RDF::Graph.load("https://ruby-rdf.github.io/rdf/etc/doap.nq", format: :nquads)
 
 A specific sub-type of Reader can also be invoked directly:
 
     require 'rdf/nquads'
 
-    RDF::NQuads::Reader.open("https://ruby-rdf.github.com/rdf/etc/doap.nq") do |reader|
+    RDF::NQuads::Reader.open("https://ruby-rdf.github.io/rdf/etc/doap.nq") do |reader|
       reader.each_statement do |statement|
         puts statement.inspect
       end
@@ -220,7 +220,7 @@ Note that no prefixes are loaded automatically, however they can be provided as
 
     require 'rdf/ntriples'
 
-    graph = RDF::Graph.load("https://ruby-rdf.github.com/rdf/etc/doap.nt")
+    graph = RDF::Graph.load("https://ruby-rdf.github.io/rdf/etc/doap.nt")
     query = RDF::Query.new({
       person: {
         RDF.type  => FOAF.Person,
@@ -295,7 +295,7 @@ Readers support a boolean valued `rdfstar` option.
 
 ## Documentation
 
-<https://rubydoc.info/github/ruby-rdf/rdf>
+<https://ruby-rdf.github.io/rdf>
 
 ### RDF Object Model
 
@@ -309,7 +309,7 @@ Readers support a boolean valued `rdfstar` option.
       * {RDF::Literal::Double}
       * {RDF::Literal::Integer}
       * {RDF::Literal::Time}
-      * [RDF::XSD](https://rubydoc.info/github/gkellogg/rdf-xsd) (extension)
+      * [RDF::XSD](https://ruby-rdf.github.io/rdf-xsd) (extension)
     * {RDF::Resource}
       * {RDF::Node}
       * {RDF::URI}
@@ -371,10 +371,10 @@ from BNode identity (i.e., they each entail the other)
   * {RDF::Mutable}
   * {RDF::Durable}
 * {RDF::Transaction}
-* [RDF::AllegroGraph](https://rubydoc.info/github/ruby-rdf/rdf-agraph) (extension)
-* [RDF::Mongo](https://rubydoc.info/github/ruby-rdf/rdf-mongo) (extension)
-* [RDF::DataObjects](https://rubydoc.info/github/ruby-rdf/rdf-do) (extension)
-* [RDF::Sesame](https://rubydoc.info/github/ruby-rdf/rdf-sesame) (extension)
+* [RDF::AllegroGraph](https://ruby-rdf.github.io/rdf-agraph) (extension)
+* [RDF::Mongo](https://ruby-rdf.github.io/rdf-mongo) (extension)
+* [RDF::DataObjects](https://ruby-rdf.github.io/rdf-do) (extension)
+* [RDF::Sesame](https://ruby-rdf.github.io/rdf-sesame) (extension)
 
 ### RDF Querying
 
@@ -384,7 +384,7 @@ from BNode identity (i.e., they each entail the other)
   * {RDF::Query::Solution}
   * {RDF::Query::Solutions}
   * {RDF::Query::Variable}
-* [SPARQL](https://rubydoc.info/github/ruby-rdf/sparql) (extension)
+* [SPARQL](https://ruby-rdf.github.io/sparql) (extension)
 
 
 ### RDF Vocabularies
@@ -398,16 +398,16 @@ from BNode identity (i.e., they each entail the other)
 
 ## Dependencies
 
-* [Ruby](https://ruby-lang.org/) (>= 2.2)
+* [Ruby](https://ruby-lang.org/) (>= 2.6)
 * [LinkHeader][] (>= 0.0.8)
-* Soft dependency on [RestClient][] (>= 1.7)
+* Soft dependency on [RestClient][] (>= 2.1)
 
 ## Installation
 
 The recommended installation method is via [RubyGems](https://rubygems.org/).
 To install the latest official release of RDF.rb, do:
 
-    % [sudo] gem install rdf             # Ruby 2+
+    % [sudo] gem install rdf             # Ruby 2.6+
 
 ## Download
 
@@ -422,7 +422,7 @@ follows:
 
 ## Resources
 
-* <https://rubydoc.info/github/ruby-rdf/rdf>
+* <https://ruby-rdf.github.io/rdf>
 * <https://github.com/ruby-rdf/rdf>
 * <https://rubygems.org/gems/rdf>
 * <https://www.ohloh.net/p/rdf>
@@ -486,33 +486,33 @@ see <https://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [YARD]:             https://yardoc.org/
 [YARD-GS]:          https://rubydoc.info/docs/yard/file/docs/GettingStarted.md
 [PDD]:              https://unlicense.org/#unlicensing-contributions
-[JSONLD doc]:       https://rubydoc.info/github/ruby-rdf/json-ld
-[LinkedData doc]:   https://rubydoc.info/github/ruby-rdf/linkeddata
-[Microdata doc]:    https://rubydoc.info/github/ruby-rdf/rdf-microdata
-[N3 doc]:           https://rubydoc.info/github/ruby-rdf/rdf-n3
-[RDFa doc]:         https://rubydoc.info/github/ruby-rdf/rdf-rdfa
-[RDFXML doc]:       https://rubydoc.info/github/ruby-rdf/rdf-rdfxml
-[Turtle doc]:       https://rubydoc.info/github/ruby-rdf/rdf-turtle
-[SPARQL doc]:       https://rubydoc.info/github/ruby-rdf/sparql
+[JSONLD doc]:       https://ruby-rdf.github.io/json-ld
+[LinkedData doc]:   https://ruby-rdf.github.io/linkeddata
+[Microdata doc]:    https://ruby-rdf.github.io/rdf-microdata
+[N3 doc]:           https://ruby-rdf.github.io/rdf-n3
+[RDFa doc]:         https://ruby-rdf.github.io/rdf-rdfa
+[RDFXML doc]:       https://ruby-rdf.github.io/rdf-rdfxml
+[Turtle doc]:       https://ruby-rdf.github.io/rdf-turtle
+[SPARQL doc]:       https://ruby-rdf.github.io/sparql
 [RDF 1.0]:          https://www.w3.org/TR/2004/REC-rdf-concepts-20040210/
 [RDF 1.1]:          https://www.w3.org/TR/rdf11-concepts/
 [SPARQL 1.1]:       https://www.w3.org/TR/sparql11-query/
-[RDF.rb]:           https://ruby-rdf.github.com/
-[RDF::DO]:          https://ruby-rdf.github.com/rdf-do
-[RDF::Mongo]:       https://ruby-rdf.github.com/rdf-mongo
-[RDF::Sesame]:      https://ruby-rdf.github.com/rdf-sesame
-[RDF::JSON]:        https://ruby-rdf.github.com/rdf-json
-[RDF::Microdata]:   https://ruby-rdf.github.com/rdf-microdata
-[RDF::N3]:          https://ruby-rdf.github.com/rdf-n3
-[RDF::RDFa]:        https://ruby-rdf.github.com/rdf-rdfa
-[RDF::RDFXML]:      https://ruby-rdf.github.com/rdf-rdfxml
-[RDF::TriG]:        https://ruby-rdf.github.com/rdf-trig
-[RDF::TriX]:        https://ruby-rdf.github.com/rdf-trix
-[RDF::Turtle]:      https://ruby-rdf.github.com/rdf-turtle
-[RDF::Raptor]:      https://ruby-rdf.github.com/rdf-raptor
+[RDF.rb]:           https://ruby-rdf.github.io/
+[RDF::DO]:          https://ruby-rdf.github.io/rdf-do
+[RDF::Mongo]:       https://ruby-rdf.github.io/rdf-mongo
+[RDF::Sesame]:      https://ruby-rdf.github.io/rdf-sesame
+[RDF::JSON]:        https://ruby-rdf.github.io/rdf-json
+[RDF::Microdata]:   https://ruby-rdf.github.io/rdf-microdata
+[RDF::N3]:          https://ruby-rdf.github.io/rdf-n3
+[RDF::RDFa]:        https://ruby-rdf.github.io/rdf-rdfa
+[RDF::RDFXML]:      https://ruby-rdf.github.io/rdf-rdfxml
+[RDF::TriG]:        https://ruby-rdf.github.io/rdf-trig
+[RDF::TriX]:        https://ruby-rdf.github.io/rdf-trix
+[RDF::Turtle]:      https://ruby-rdf.github.io/rdf-turtle
+[RDF::Raptor]:      https://ruby-rdf.github.io/rdf-raptor
 [RDF*]:             https://w3c.github.io/rdf-star/rdf-star-cg-spec.html
-[LinkedData]:       https://ruby-rdf.github.com/linkeddata
-[JSON::LD]:         https://ruby-rdf.github.com/json-ld
+[LinkedData]:       https://ruby-rdf.github.io/linkeddata
+[JSON::LD]:         https://ruby-rdf.github.io/json-ld
 [RestClient]:       https://rubygems.org/gems/rest-client
 [RestClient Components]: https://rubygems.org/gems/rest-client-components
 [Rack::Cache]:      https://rtomayko.github.io/rack-cache/

data/VERSION

@@ -1 +1 @@
-3.1.15
+3.2.4

data/lib/rdf/mixin/countable.rb

@@ -2,9 +2,13 @@ module RDF
   ##
   # @since 0.2.0
   module Countable
-    autoload :Enumerator, 'rdf/mixin/enumerator'
     extend RDF::Util::Aliasing::LateBound
 
+    # Extends Enumerator with {Countable}, which is used by {Countable#enum_for}
+    class Enumerator < ::Enumerator
+      include RDF::Countable
+    end
+
     ##
     # Returns `true` if `self` contains no RDF statements.
     #

data/lib/rdf/mixin/enumerable.rb

@@ -57,11 +57,23 @@ module RDF
   # @see RDF::Graph
   # @see RDF::Repository
   module Enumerable
-    autoload :Enumerator, 'rdf/mixin/enumerator'
     extend  RDF::Util::Aliasing::LateBound
     include ::Enumerable
     include RDF::Countable # NOTE: must come after ::Enumerable
 
+    # Extends Enumerator with {Queryable} and {Enumerable}, which is used by {Enumerable#each_statement} and {Queryable#enum_for}
+    class Enumerator < ::Enumerator
+      include RDF::Queryable
+      include RDF::Enumerable
+
+      ##
+      # @return [Array]
+      # @note Make sure returned arrays are also queryable
+      def to_a
+        return super.to_a.extend(RDF::Queryable, RDF::Enumerable)
+      end
+    end
+
     ##
     # Returns `true` if this enumerable supports the given `feature`.
     #

data/lib/rdf/mixin/queryable.rb

@@ -9,9 +9,21 @@ module RDF
   # @see RDF::Graph
   # @see RDF::Repository
   module Queryable
-    autoload :Enumerator, 'rdf/mixin/enumerator'
     include ::Enumerable
 
+    # Extends Enumerator with {Queryable} and {Enumerable}, which is used by {Enumerable#each_statement} and {Queryable#enum_for}
+    class Enumerator < ::Enumerator
+      include RDF::Queryable
+      include RDF::Enumerable
+
+      ##
+      # @return [Array]
+      # @note Make sure returned arrays are also queryable
+      def to_a
+        return super.to_a.extend(RDF::Queryable, RDF::Enumerable)
+      end
+    end
+
     ##
     # Queries `self` for RDF statements matching the given `pattern`.
     #

data/lib/rdf/model/list.rb

@@ -476,7 +476,7 @@ module RDF
     # @return [Integer]
     # @see    http://ruby-doc.org/core-2.2.2/Array.html#method-i-3C-3D-3E
     def eql?(other)
-      to_a.eql? other.to_a # TODO: optimize this
+      to_a.eql? Array(other)
     end
 
     ##

data/lib/rdf/model/literal/double.rb

@@ -43,6 +43,7 @@ module RDF; class Literal
       # Can't use simple %f transformation due to special requirements from
       # N3 tests in representation
       @string = case
+        when @object.nil?      then 'NaN'
         when @object.nan?      then 'NaN'
         when @object.infinite? then @object.to_s[0...-'inity'.length].upcase
         when @object.zero?     then '0.0E0'

data/lib/rdf/model/literal.rb

@@ -166,12 +166,12 @@ module RDF
       @object   = value.freeze
       @string   = lexical if lexical
       @string   = value if !defined?(@string) && value.is_a?(String)
-      @string   = @string.encode(Encoding::UTF_8).freeze if @string
-      @object   = @string if @string && @object.is_a?(String)
+      @string   = @string.encode(Encoding::UTF_8).freeze if instance_variable_defined?(:@string)
+      @object   = @string if instance_variable_defined?(:@string) && @object.is_a?(String)
       @language = language.to_s.downcase.to_sym if language
       @datatype = RDF::URI(datatype).freeze if datatype
       @datatype ||= self.class.const_get(:DATATYPE) if self.class.const_defined?(:DATATYPE)
-      @datatype ||= @language ? RDF.langString : RDF::URI("http://www.w3.org/2001/XMLSchema#string")
+      @datatype ||= instance_variable_defined?(:@language) && @language ? RDF.langString : RDF::URI("http://www.w3.org/2001/XMLSchema#string")
     end
 
     ##
@@ -179,7 +179,7 @@ module RDF
     #
     # @return [String]
     def value
-      @string || to_s
+      instance_variable_defined?(:@string) && @string || to_s
     end
 
     ##
@@ -431,12 +431,10 @@ module RDF
     end
 
     ##
-    # Returns `true` if the literal has a datatype and the comparison should
-    # return false instead of raise a type error.
+    # Returns `true` if the literals are comperable.
     #
     # Used for <=> operator.
     #
-    # This behavior is intuited from SPARQL data-r2/expr-equal/eq-2-2
     # @return [Boolean]
     def comperable_datatype2?(other)
       case self
@@ -445,13 +443,9 @@ module RDF
         when RDF::Literal::Numeric, RDF::Literal::Boolean
           true
         else
-          self.plain? || other.plain? ||
-          self.language? || other.language? ||
-          self.datatype == other.datatype
+          false
         end
       else
-        self.plain? || other.plain? ||
-        self.language? || other.language? ||
         self.datatype == other.datatype
       end
     end

data/lib/rdf/model/statement.rb

@@ -71,6 +71,7 @@ module RDF
     #   @option options [RDF::Term]  :graph_name   (nil)
     #     Note, in RDF 1.1, a graph name MUST be an {Resource}.
     #   @option options [Boolean] :inferred used as a marker to record that this statement was inferred based on semantic relationships (T-Box).
+    #   @option options [Boolean] :quoted used as a marker to record that this statement quoted and appears as the subject or object of another RDF::Statement.
     #   @return [RDF::Statement]
     #
     # @overload initialize(subject, predicate, object, **options)
@@ -83,6 +84,7 @@ module RDF
     #   @option options [RDF::Term]  :graph_name   (nil)
     #     Note, in RDF 1.1, a graph name MUST be an {Resource}.
     #   @option options [Boolean] :inferred used as a marker to record that this statement was inferred based on semantic relationships (T-Box).
+    #   @option options [Boolean] :quoted used as a marker to record that this statement quoted and appears as the subject or object of another RDF::Statement.
     #   @return [RDF::Statement]
     def initialize(subject = nil, predicate = nil, object = nil, options = {})
       if subject.is_a?(Hash)
@@ -209,7 +211,7 @@ module RDF
     ##
     # @return [Boolean]
     def quoted?
-      false
+      !!@options[:quoted]
     end
 
     ##

data/lib/rdf/model/uri.rb

@@ -111,6 +111,11 @@ module RDF
       tag tel turn turns tv urn javascript
     ).freeze
 
+    # Characters in a PName which must be escaped
+    # Note: not all reserved characters need to be escaped in SPARQL/Turtle, but they must be unescaped when encountered
+    PN_ESCAPE_CHARS      = /[~\.!\$&'\(\)\*\+,;=\/\?\#@%]/.freeze
+    PN_ESCAPES           = /\\#{Regexp.union(PN_ESCAPE_CHARS, /[\-_]/)}/.freeze
+    
     ##
     # Cache size may be set through {RDF.config} using `uri_cache_size`.
     #
@@ -621,16 +626,26 @@ module RDF
     end
 
     ##
-    # Returns a qualified name (QName) for this URI based on available vocabularies, if possible.
+    # Returns a qualified name (QName) as a tuple of `[prefix, suffix]` for this URI based on available vocabularies, if possible.
     #
     # @example
     #   RDF::URI('http://www.w3.org/2000/01/rdf-schema#').qname       #=> [:rdfs, nil]
     #   RDF::URI('http://www.w3.org/2000/01/rdf-schema#label').qname  #=> [:rdfs, :label]
     #   RDF::RDFS.label.qname                                         #=> [:rdfs, :label]
-    #
-    # @return [Array(Symbol, Symbol)] or `nil` if no QName found
-    def qname
-      if self.to_s =~ %r([:/#]([^:/#]*)$)
+    #   RDF::Vocab::DC.title.qname(
+    #     prefixes: {dcterms: 'http://purl.org/dc/terms/'})           #=> [:dcterms, :title]
+    #
+    # @note within this software, the term QName is used to describe the tuple of prefix and suffix for a given IRI, where the prefix identifies some defined vocabulary. This somewhat contrasts with the notion of a [Qualified Name](https://www.w3.org/TR/2006/REC-xml-names11-20060816/#ns-qualnames) from XML, which are a subset of Prefixed Names.
+    #
+    # @param [Hash{Symbol => String}] prefixes
+    #   Explicit set of prefixes to look for matches, defaults to loaded vocabularies.
+    # @return [Array(Symbol, Symbol)] or `nil` if no QName found. The suffix component will not have [reserved characters](https://www.w3.org/TR/turtle/#reserved) escaped.
+    def qname(prefixes: nil)
+      if prefixes
+        prefixes.each do |prefix, uri|
+          return [prefix, self.to_s[uri.length..-1].to_sym] if self.start_with?(uri)
+        end
+      elsif self.to_s =~ %r([:/#]([^:/#]*)$)
         local_name = $1
         vocab_uri  = local_name.empty? ? self.to_s : self.to_s[0...-(local_name.length)]
         Vocabulary.each do |vocab|
@@ -653,11 +668,25 @@ module RDF
     end
 
     ##
-    # Returns a string version of the QName or the full IRI
+    # Returns a Prefixed Name (PName) or the full IRI with any [reserved characters](https://www.w3.org/TR/turtle/#reserved) in the suffix escaped.
+    #
+    # @example Using a custom prefix for creating a PNname.
+    #   RDF::URI('http://purl.org/dc/terms/creator').
+    #     pname(prefixes: {dcterms: 'http://purl.org/dc/terms/'})
+    #     #=> "dcterms:creator"
     #
+    # @param [Hash{Symbol => String}] prefixes
+    #   Explicit set of prefixes to look for matches, defaults to loaded vocabularies.
     # @return [String] or `nil`
-    def pname
-      (q = self.qname) ? q.join(":") : to_s
+    # @see #qname
+    # @see https://www.w3.org/TR/rdf-sparql-query/#prefNames
+    def pname(prefixes: nil)
+      q = self.qname(prefixes: prefixes)
+      return self.to_s unless q
+      prefix, suffix = q
+      suffix = suffix.to_s.gsub(PN_ESCAPE_CHARS) {|c| "\\#{c}"} if
+        suffix.to_s.match?(PN_ESCAPE_CHARS)
+      [prefix, suffix].join(":")
     end
 
     ##

data/lib/rdf/nquads.rb

@@ -69,9 +69,9 @@ module RDF
 
           begin
             unless blank? || read_comment
-              subject   = read_uriref || read_node || read_embTriple || fail_subject
+              subject   = read_uriref || read_node || read_quotedTriple || fail_subject
               predicate = read_uriref(intern: true) || fail_predicate
-              object    = read_uriref || read_node || read_literal || read_embTriple || fail_object
+              object    = read_uriref || read_node || read_literal || read_quotedTriple || fail_object
               graph_name    = read_uriref || read_node
               if validate? && !read_eos
                 log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)

data/lib/rdf/ntriples/reader.rb

@@ -213,7 +213,7 @@ module RDF::NTriples
       begin
         read_statement
       rescue RDF::ReaderError
-        value = read_uriref || read_node || read_literal || read_embTriple
+        value = read_uriref || read_node || read_literal || read_quotedTriple
         log_recover
         value
       end
@@ -229,9 +229,9 @@ module RDF::NTriples
 
         begin
           unless blank? || read_comment
-            subject   = read_uriref || read_node || read_embTriple || fail_subject
+            subject   = read_uriref || read_node || read_quotedTriple || fail_subject
             predicate = read_uriref(intern: true) || fail_predicate
-            object    = read_uriref || read_node || read_literal || read_embTriple || fail_object
+            object    = read_uriref || read_node || read_literal || read_quotedTriple || fail_object
 
             if validate? && !read_eos
               log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)
@@ -247,15 +247,15 @@ module RDF::NTriples
 
     ##
     # @return [RDF::Statement]
-    def read_embTriple
+    def read_quotedTriple
       if @options[:rdfstar] && match(ST_START)
-        subject   = read_uriref || read_node || read_embTriple || fail_subject
+        subject   = read_uriref || read_node || read_quotedTriple || fail_subject
         predicate = read_uriref(intern: true) || fail_predicate
-        object    = read_uriref || read_node || read_literal || read_embTriple || fail_object
+        object    = read_uriref || read_node || read_literal || read_quotedTriple || fail_object
         if !match(ST_END)
           log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)
         end
-        RDF::Statement.new(subject, predicate, object)
+        RDF::Statement.new(subject, predicate, object, quoted: true)
       end
     end
 

data/lib/rdf/ntriples/writer.rb

@@ -227,7 +227,7 @@ module RDF::NTriples
     # @param  [RDF::Statement] statement
     # @param  [Hash{Symbol => Object}] options ({})
     # @return [String]
-    def format_embTriple(statement, **options)
+    def format_quotedTriple(statement, **options)
       "<<%s %s %s>>" % statement.to_a.map { |value| format_term(value, **options) }
     end
     ##

data/lib/rdf/reader.rb

@@ -647,7 +647,7 @@ module RDF
     ##
     # @return [String]
     def readline
-      @line = @line_rest || @input.readline
+      @line = instance_variable_defined?(:@line_rest) && @line_rest || @input.readline
       @line, @line_rest = @line.split("\r", 2)
       @line = String.new if @line.nil? # not frozen
       @line.chomp!