rdf-turtle 1.99.0 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e106cccdded10be877a7fc25a9f2e1f3fcebebd8
-  data.tar.gz: 84c90e3f6dd3dba04d2e76a0d0b8a950ef150883
+  metadata.gz: 7e71bbbae04dd8cd11ad1a9b33b8306c93c005a0
+  data.tar.gz: 215ea0878f18271c5dfaebf2979f63a0f7234e86
 SHA512:
-  metadata.gz: a31cfcbe12f72b95d4d994f3dd2c518628c4e4c4413a60c58940e1fca9922efcb6151cb2d16ecc5b8e0d9a583fac10f3b2497d7d4a8469feb277c8619226a921
-  data.tar.gz: 80aa5ad160e0c338fb55af63c1c55480f62ee818d1de4c36c1fa85dec48d1caf6a5cdb8fce88e04089b8e2688f8d4d9f3852c447c8ffa31268b16033a646223a
+  metadata.gz: bc1436d3c37d6b7d8d80a50dfd8197383959558b383b59ce2603d3c3cf7703851ae2f45ce8e6a5cd17ded2bd901bab79cc3a61e8e4672e1cd1e7c13aefe96862
+  data.tar.gz: 8c349965005898fcc0c9b5ea6d95ef83673127667d834493077b2fdf3514ab730acc92ef0297fa984d0861b87e66d351f2534b604e76c98cc40ccf8f2ed45824

data/README.md

@@ -17,7 +17,7 @@ Install with `gem install rdf-turtle`
 
 * 100% free and unencumbered [public domain](http://unlicense.org/) software.
 * Implements a complete parser for [Turtle][].
-* Compatible with Ruby >= 1.9.2.
+* Compatible with Ruby >= 2.0.
 * Optional streaming writer, to serialize large graphs
 
 ## Usage
@@ -86,9 +86,9 @@ This version uses a hand-written parser using the Lexer from the [EBNF][] gem in
 
 ## Dependencies
 
-* [Ruby](http://ruby-lang.org/) (>= 1.9.3)
-* [RDF.rb](http://rubygems.org/gems/rdf) (~> 1.1)
-* [EBNF][] (~> 0.3)
+* [Ruby](http://ruby-lang.org/) (>= 2.0)
+* [RDF.rb](http://rubygems.org/gems/rdf) (~> 2.0)
+* [EBNF][] (~> 1.0)
 
 ## Installation
 

data/VERSION

@@ -1 +1 @@
-1.99.0
+2.0.0.beta1

data/lib/rdf/turtle.rb

@@ -26,8 +26,5 @@ module RDF
     autoload :Terminals,      'rdf/turtle/terminals'
     autoload :VERSION,        'rdf/turtle/version'
     autoload :Writer,         'rdf/turtle/writer'
-
-    def self.debug?; @debug; end
-    def self.debug=(value); @debug = value; end
   end
 end

data/lib/rdf/turtle/format.rb

@@ -54,21 +54,10 @@ module RDF::Turtle
         sample.match(%r("@(context|subject|iri)"))                      # JSON-LD
       )
     end
-  end
-  
-  # Alias for TTL format
-  #
-  # This allows the following:
-  #
-  # @example Obtaining an TTL format class
-  #     RDF::Format.for(:ttl)         # RDF::Turtle::TTL
-  #     RDF::Format.for(:ttl).reader  # RDF::Turtle::Reader
-  #     RDF::Format.for(:ttl).writer  # RDF::Turtle::Writer
-  class TTL < Format
-    content_encoding 'utf-8'
-    content_type     'text/turtle'
 
-    reader { RDF::Turtle::Reader }
-    writer { RDF::Turtle::Writer }
+    # List of symbols used to lookup this format
+    def self.symbols
+      [:turtle, :ttl]
+    end
   end
 end

data/lib/rdf/turtle/freebase_reader.rb

@@ -24,7 +24,7 @@ module RDF::Turtle
             predicate = read_pname(intern:  true) || fail_predicate
             object    = read_pname || read_uriref || read_boolean || read_numeric || read_literal || fail_object
             if validate? && !read_eos
-              raise RDF::ReaderError.new("ERROR [line #{lineno}] Expected end of statement (found: #{current_line.inspect})", lineno: lineno)
+              log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)
             end
             return [subject, predicate, object]
           end

data/lib/rdf/turtle/reader.rb

@@ -8,6 +8,7 @@ module RDF::Turtle
     format Format
     include EBNF::LL1::Parser
     include RDF::Turtle::Terminals
+    include RDF::Util::Logger
 
     # Terminals passed to lexer. Order matters!
     terminal(:ANON,                             ANON)
@@ -31,14 +32,17 @@ module RDF::Turtle
     terminal(:LANGTAG,                          LANGTAG)
 
     ##
-    # Accumulated errors found during processing
-    # @return [Array<String>]
-    attr_reader :errors
-
-    ##
-    # Accumulated warnings found during processing
-    # @return [Array<String>]
-    attr_reader :warnings
+    # Reader options
+    # @see http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Reader#options-class_method
+    def self.options
+      super + [
+        RDF::CLI::Option.new(
+          symbol: :freebase,
+          datatype: TrueClass,
+          on: ["--freebase"],
+          description: "Use optimized Freebase reader.") {true},
+      ]
+    end
 
     ##
     # Redirect for Freebase Reader
@@ -73,18 +77,8 @@ module RDF::Turtle
     # @option options [Boolean]  :validate     (false)
     #   whether to validate the parsed statements and values. If not validating,
     #   the parser will attempt to recover from errors.
-    # @option options [Array] :errors
-    #   array for placing errors found when parsing
-    # @option options [Array] :warnings
-    #   array for placing warnings found when parsing
-    # @option options [Boolean] :progress
-    #   Show progress of parser productions
-    # @option options [Boolean, Integer, Array] :debug
-    #   Detailed debug output. If set to an Integer, output is restricted
-    #   to messages of that priority: `0` for errors, `1` for warnings,
-    #   `2` for processor tracing, and anything else for various levels
-    #   of debug. If set to an Array, information is collected in the array
-    #   instead of being output to `$stderr`.
+    # @option options [Logger, #write, #<<] :logger
+    #   Record error/info/debug output
     # @option options [Boolean] :freebase (false)
     #   Use optimized Freebase reader
     # @return [RDF::Turtle::Reader]
@@ -94,25 +88,17 @@ module RDF::Turtle
           anon_base:  "b0",
           validate:  false,
           whitespace:  WS,
+          log_depth: 0,
         }.merge(options)
         @options = {prefixes:  {nil => ""}}.merge(@options) unless @options[:validate]
-        @errors = @options[:errors] || []
-        @warnings = @options[:warnings] || []
-        @depth = 0
         @prod_stack = []
 
-        @options[:debug] ||= case
-        when RDF::Turtle.debug? then true
-        when @options[:progress] then 2
-        when @options[:validate] then 1
-        end
-
         @options[:base_uri] = RDF::URI(base_uri || "")
-        debug("base IRI") {base_uri.inspect}
+        log_debug("base IRI") {base_uri.inspect}
         
-        debug("validate") {validate?.inspect}
-        debug("canonicalize") {canonicalize?.inspect}
-        debug("intern") {intern?.inspect}
+        log_debug("validate") {validate?.inspect}
+        log_debug("canonicalize") {canonicalize?.inspect}
+        log_debug("intern") {intern?.inspect}
 
         @lexer = EBNF::LL1::Lexer.new(input, self.class.patterns, @options)
 
@@ -137,7 +123,7 @@ module RDF::Turtle
     # @return [void]
     def each_statement(&block)
       if block_given?
-        @recovering = false
+        log_recover
         @callback = block
 
         begin
@@ -148,14 +134,8 @@ module RDF::Turtle
           # Terminate loop if EOF found while recovering
         end
 
-        if validate?
-          if !warnings.empty? && !@options[:warnings]
-            $stderr.puts "Warnings: #{warnings.join("\n")}"
-          end
-          if !errors.empty?
-            $stderr.puts "Errors: #{errors.join("\n")}" unless @options[:errors]
-            raise RDF::ReaderError, "Errors found during processing"
-          end
+        if validate? && log_statistics[:error]
+          raise RDF::ReaderError, "Errors found during processing"
         end
       end
       enum_for(:each_statement)
@@ -207,7 +187,7 @@ module RDF::Turtle
     
     # Create a literal
     def literal(value, options = {})
-      debug("literal") do
+      log_debug("literal") do
         "value: #{value.inspect}, " +
         "options: #{options.inspect}, " +
         "validate: #{validate?.inspect}, " +
@@ -241,7 +221,7 @@ module RDF::Turtle
         base = ''
       end
       suffix = suffix.to_s.sub(/^\#/, "") if base.index("#")
-      debug("pname") {"base: '#{base}', suffix: '#{suffix}'"}
+      log_debug("pname") {"base: '#{base}', suffix: '#{suffix}'"}
       process_iri(base + suffix.to_s)
     end
     
@@ -262,7 +242,7 @@ module RDF::Turtle
           read_directive || error("Failed to parse directive", production: :directive, token: token)
         else
           read_triples || error("Expected token", production: :statement, token: token)
-          if !@recovering || @lexer.first === '.'
+          if !log_recovering? || @lexer.first === '.'
             # If recovering, we will have eaten the closing '.'
             token = @lexer.shift
             unless token && token.value == '.'
@@ -303,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
-            debug("prefixID") {"Defined prefix #{pfx.inspect} mapping to #{iri.inspect}"}
+            log_debug("prefixID") {"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'
 
@@ -451,7 +431,7 @@ module RDF::Turtle
       if token === '['
         prod(:blankNodePropertyList, %{]}) do
           @lexer.shift
-          progress("blankNodePropertyList") {"token: #{token.inspect}"}
+          log_info("blankNodePropertyList") {"token: #{token.inspect}"}
           node = bnode
           read_predicateObjectList(node)
           error("blankNodePropertyList", "Expected closing ']'") unless @lexer.first === ']'
@@ -467,12 +447,12 @@ module RDF::Turtle
         prod(:collection, %{)}) do
           @lexer.shift
           token = @lexer.first
-          progress("collection") {"token: #{token.inspect}"}
+          log_info("collection") {"token: #{token.inspect}"}
           objects = []
           while object = read_object
             objects << object
           end
-          list = RDF::List.new(nil, nil, objects)
+          list = RDF::List.new(values: objects)
           list.each_statement do |statement|
             add_statement("collection", statement)
           end
@@ -503,9 +483,8 @@ module RDF::Turtle
 
     def prod(production, recover_to = [])
       @prod_stack << {prod: production, recover_to: recover_to}
-      @depth += 1
-      @recovering = false
-      progress("#{production}(start)") {"token: #{@lexer.first.inspect}"}
+      @options[:log_depth] += 1
+      log_recover("#{production}(start)") {"token: #{@lexer.first.inspect}"}
       yield
     rescue EBNF::LL1::Lexer::Error, SyntaxError, Recovery =>  e
       # Lexer encountered an illegal token or the parser encountered
@@ -525,13 +504,13 @@ module RDF::Turtle
         end
       end
       raise EOFError, "End of input found when recovering" if @lexer.first.nil?
-      debug("recovery", "current token: #{@lexer.first.inspect}", level: 4)
+      log_debug("recovery", "current token: #{@lexer.first.inspect}")
 
       unless e.is_a?(Recovery)
         # Get the list of follows for this sequence, this production and the stacked productions.
-        debug("recovery", "stack follows:", level: 4)
+        log_debug("recovery", "stack follows:")
         @prod_stack.reverse.each do |prod|
-          debug("recovery", level: 4) {"  #{prod[:prod]}: #{prod[:recover_to].inspect}"}
+          log_debug("recovery", level: 4) {"  #{prod[:prod]}: #{prod[:recover_to].inspect}"}
         end
       end
 
@@ -541,9 +520,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
-        progress("recovery") {"skip #{skipped.inspect}"}
+        log_debug("recovery") {"skip #{skipped.inspect}"}
       end
-      debug("recovery") {"found #{token.inspect} in follows"}
+      log_debug("recovery") {"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}
@@ -551,34 +530,15 @@ module RDF::Turtle
       # Skip that token to get something reasonable to start the next production with
       @lexer.shift
     ensure
-      progress("#{production}(finish)")
-      @depth -= 1
+      log_info("#{production}(finish)")
+      @options[:log_depth] -= 1
       @prod_stack.pop
     end
 
-    ##
-    # Warning information, used as level `1` debug messages.
-    #
-    # @param [String] node Relevant location associated with message
-    # @param [String] message Error string
-    # @param [Hash] options
-    # @option options [URI, #to_s] :production
-    # @option options [Token] :token
-    # @see {#debug}
-    def warn(node, message, options = {})
-      m = "WARNING "
-      m += "[line: #{@lineno}] " if @lineno
-      m += message
-      m += " (found #{options[:token].inspect})" if options[:token]
-      m += ", production = #{options[:production].inspect}" if options[:production]
-      @warnings << m unless @recovering
-      debug(node, m, options.merge(level: 1))
-    end
-
     ##
     # Error information, used as level `0` debug messages.
     #
-    # @overload debug(node, message, options)
+    # @overload error(node, message, options)
     #   @param [String] node Relevant location associated with message
     #   @param [String] message Error string
     #   @param [Hash] options
@@ -586,70 +546,15 @@ module RDF::Turtle
     #   @option options [Token] :token
     #   @see {#debug}
     def error(*args)
-      return if @recovering
-      options = args.last.is_a?(Hash) ? args.pop : {}
+      ctx = ""
+      ctx += "(found #{options[:token].inspect})" if options[:token]
+      ctx += ", production = #{options[:production].inspect}" if options[:production]
       lineno = @lineno || (options[:token].lineno if options[:token].respond_to?(:lineno))
-      message = "#{args.join(': ')}"
-      m = "ERROR "
-      m += "[line: #{lineno}] " if lineno
-      m += message
-      m += " (found #{options[:token].inspect})" if options[:token]
-      m += ", production = #{options[:production].inspect}" if options[:production]
-      @recovering = true
-      @errors << m
-      debug(m, options.merge(level: 0))
-      raise SyntaxError.new(m, lineno: lineno, token: options[:token], production: options[:production])
-    end
-
-    ##
-    # Progress output when debugging.
-    #
-    # The call is ignored, unless `@options[:debug]` is set, in which
-    # case it records tracing information as indicated. Additionally,
-    # if `@options[:debug]` is an Integer, the call is aborted if the
-    # `:level` option is less than than `:level`.
-    #
-    # @overload debug(node, message, options)
-    #   @param [Array<String>] args Relevant location associated with message
-    #   @param [Hash] options
-    #   @option options [Integer] :depth
-    #     Recursion depth for indenting output
-    #   @option options [Integer] :level
-    #     Level assigned to message, by convention, level `0` is for
-    #     errors, level `1` is for warnings, level `2` is for parser
-    #     progress information, and anything higher is for various levels
-    #     of debug information.
-    #
-    # @yieldparam [:trace] trace
-    # @yieldparam [Integer] level
-    # @yieldparam [Integer] lineno
-    # @yieldparam [Integer] depth Recursive depth of productions
-    # @yieldparam [Array<String>] args
-    # @yieldreturn [String] added to message
-    def debug(*args)
-      return unless @options[:debug]
-      options = args.last.is_a?(Hash) ? args.pop : {}
-      debug_level = options.fetch(:level, 3)
-      return if @options[:debug].is_a?(Integer) && debug_level > @options[:debug]
-
-      depth = options[:depth] || @depth
-      args << yield if block_given?
-
-      message = "#{args.join(': ')}"
-      d_str = depth > 100 ? ' ' * 100 + '+' : ' ' * depth
-      str = "[#{lineno}](#{debug_level})#{d_str}#{message}"
-      case @options[:debug]
-      when Array
-        @options[:debug] << str
-      when TrueClass
-        $stderr.puts str
-      when Integer
-        case debug_level
-        when 0 then return if @options[:errors]
-        when 1 then return if @options[:warnings]
-        end
-        $stderr.puts(str) if debug_level <= @options[:debug]
-      end
+      log_error(*args, ctx,
+        lineno:     lineno,
+        token:      options[:token],
+        production: options[:production],
+        exception:  SyntaxError)
     end
 
     # Used for internal error recovery

data/lib/rdf/turtle/writer.rb

@@ -57,11 +57,40 @@ module RDF::Turtle
   # @author [Gregg Kellogg](http://greggkellogg.net/)
   class Writer < RDF::Writer
     include StreamingWriter
+    include RDF::Util::Logger
     format RDF::Turtle::Format
 
     # @return [Graph] Graph of statements serialized
     attr_accessor :graph
-    
+
+    ##
+    # Writer options
+    # @see http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Writer#options-class_method
+    def self.options
+      super + [
+        RDF::CLI::Option.new(
+          symbol: :max_depth,
+          datatype: Integer,
+          on: ["--max-depth DEPTH"],
+          description: "Maximum depth for recursively defining resources, defaults to 3.") {true},
+        RDF::CLI::Option.new(
+          symbol: :stream,
+          datatype: TrueClass,
+          on: ["--stream"],
+          description: "Do not attempt to optimize graph presentation, suitable for streaming large graphs.") {true},
+        RDF::CLI::Option.new(
+          symbol: :default_namespace,
+          datatype: RDF::URI,
+          on: ["--default-namespace URI", :REQUIRED],
+          description: "URI to use as default namespace, same as prefixes.") {|arg| RDF::URI(arg)},
+        RDF::CLI::Option.new(
+          symbol: :literal_shorthand,
+          datatype: FalseClass,
+          on: ["--no-literal-shorthand"],
+          description: "Do not ttempt to use Literal shorthands fo numbers and boolean values.") {false},
+      ]
+    end
+
     ##
     # Initializes the Turtle writer instance.
     #
@@ -88,19 +117,19 @@ module RDF::Turtle
     # @option options [Boolean]  :unique_bnodes   (false)
     #   Use unique node identifiers, defaults to using the identifier which the node was originall initialized with (if any).
     # @option options [Boolean] :literal_shorthand (true)
-    #   Attempt to use Literal shorthands fo numbers and boolean values
+    #   Attempt to use Literal shorthands for numbers and boolean values
     # @yield  [writer] `self`
     # @yieldparam  [RDF::Writer] writer
     # @yieldreturn [void]
     # @yield  [writer]
     # @yieldparam [RDF::Writer] writer
     def initialize(output = $stdout, options = {}, &block)
-      reset
       @graph = RDF::Graph.new
       @uri_to_pname = {}
       @uri_to_prefix = {}
       options = {literal_shorthand: true}.merge(options)
       super do
+        reset
         if block_given?
           case block.arity
             when 0 then instance_eval(&block)
@@ -110,20 +139,6 @@ module RDF::Turtle
       end
     end
 
-    ##
-    # Adds a statement to be serialized
-    # @param  [RDF::Statement] statement
-    # @return [void]
-    def write_statement(statement)
-      case
-      when @options[:stream]
-        stream_statement(statement)
-      else
-        # Add to local graph and output in epilogue
-        @graph.insert(statement)
-      end
-    end
-
     ##
     # Adds a triple to be serialized
     # @param  [RDF::Resource] subject
@@ -131,7 +146,12 @@ module RDF::Turtle
     # @param  [RDF::Value]    object
     # @return [void]
     def write_triple(subject, predicate, object)
-      write_statement(Statement.new(subject, predicate, object))
+      statement = RDF::Statement.new(subject, predicate, object)
+      if @options[:stream]
+        stream_statement(statement)
+      else
+        @graph.insert(statement)
+      end
     end
 
     ##
@@ -159,7 +179,7 @@ module RDF::Turtle
 
         self.reset
 
-        debug("\nserialize") {"graph: #{@graph.size}"}
+        log_debug("\nserialize") {"graph: #{@graph.size}"}
 
         preprocess
         start_document
@@ -170,6 +190,7 @@ module RDF::Turtle
           end
         end
       end
+      super
     end
     
     # Return a QName for the URI, or nil. Adds namespace of QName to defined prefixes
@@ -193,14 +214,14 @@ module RDF::Turtle
         prefix = @uri_to_prefix[u]
         unless u.to_s.empty?
           prefix(prefix, u) unless u.to_s.empty?
-          debug("get_pname") {"add prefix #{prefix.inspect} => #{u}"}
+          log_debug("get_pname") {"add prefix #{prefix.inspect} => #{u}"}
           uri.sub(u.to_s, "#{prefix}:")
         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
-        debug("get_pname") {"add standard prefix #{prefix.inspect} => #{vocab.to_uri}"}
+        log_debug("get_pname") {"add standard prefix #{prefix.inspect} => #{vocab.to_uri}"}
         uri.sub(vocab.to_uri.to_s, "#{prefix}:")
       else
         nil
@@ -233,7 +254,7 @@ module RDF::Turtle
         prop_list << prop.to_s
       end
       
-      debug("sort_properties") {prop_list.join(', ')}
+      log_debug("sort_properties") {prop_list.join(', ')}
       prop_list
     end
 
@@ -244,7 +265,6 @@ module RDF::Turtle
     # @param  [Hash{Symbol => Object}] options
     # @return [String]
     def format_literal(literal, options = {})
-      literal = literal.dup.canonicalize! if @options[:canonicalize]
       case literal
       when RDF::Literal
         case @options[:literal_shorthand] && literal.valid? ? literal.datatype : false
@@ -271,7 +291,7 @@ module RDF::Turtle
     # @return [String]
     def format_uri(uri, options = {})
       md = uri.relativize(base_uri)
-      debug("relativize") {"#{uri.to_ntriples} => #{md.inspect}"} if md != uri.to_s
+      log_debug("relativize") {"#{uri.to_ntriples} => #{md.inspect}"} if md != uri.to_s
       md != uri.to_s ? "<#{md}>" : (get_pname(uri) || "<#{uri}>")
     end
     
@@ -290,7 +310,7 @@ module RDF::Turtle
     def start_document
       @output.write("#{indent}@base <#{base_uri}> .\n") unless base_uri.to_s.empty?
       
-      debug("start_document") {prefixes.inspect}
+      log_debug("start_document") {prefixes.inspect}
       prefixes.keys.sort_by(&:to_s).each do |prefix|
         @output.write("#{indent}@prefix #{prefix}: <#{prefixes[prefix]}> .\n")
       end
@@ -322,7 +342,7 @@ module RDF::Turtle
       # Add distinguished classes
       top_classes.each do |class_uri|
         graph.query(predicate:  RDF.type, object:  class_uri).map {|st| st.subject}.sort.uniq.each do |subject|
-          debug("order_subjects") {subject.to_ntriples}
+          log_debug("order_subjects") {subject.to_ntriples}
           subjects << subject
           seen[subject] = true
         end
@@ -359,7 +379,7 @@ module RDF::Turtle
     # prefixes.
     # @param [Statement] statement
     def preprocess_statement(statement)
-      #debug("preprocess") {statement.to_ntriples}
+      #log_debug("preprocess") {statement.to_ntriples}
       bump_reference(statement.object)
       @subjects[statement.subject] = true
 
@@ -374,12 +394,11 @@ module RDF::Turtle
     # @param [Integer] modifier Increase depth by specified amount
     # @return [String] A number of spaces, depending on current depth
     def indent(modifier = 0)
-      " " * (@depth + modifier)
+      " " * (@options.fetch(:log_depth, log_depth) * 2 + modifier)
     end
 
     # Reset internal helper instance variables
     def reset
-      @depth = 0
       @lists = {}
       @references = {}
       @serialized = {}
@@ -400,41 +419,21 @@ module RDF::Turtle
       end
     end
 
-    ##
-    # Add debug event to debug array, if specified
-    #
-    # @overload debug(message)
-    #   @param [String] message ("")
-    # @yieldreturn [String] added to message
-    def debug(*args)
-      return unless @options[:debug] || RDF::Turtle.debug?
-      options = args.last.is_a?(Hash) ? args.pop : {}
-      depth = options[:depth] || @depth
-      d_str = depth > 100 ? ' ' * 100 + '+' : ' ' * depth
-      message = args.pop
-      message = message.call if message.is_a?(Proc)
-      args << message if message
-      args << yield if block_given?
-      message = "#{d_str}#{args.join(': ')}"
-      @options[:debug] << message if @options[:debug].is_a?(Array)
-      $stderr.puts(message) if RDF::Turtle.debug?
-    end
-
     private
 
     # Checks if l is a valid RDF list, i.e. no nodes have other properties.
     def is_valid_list?(l)
-      #debug("is_valid_list?") {l.inspect}
-      return RDF::List.new(l, @graph).valid?
+      #log_debug("is_valid_list?") {l.inspect}
+      return RDF::List.new(subject: l, graph: @graph).valid?
     end
     
     def do_list(l)
-      list = RDF::List.new(l, @graph)
-      debug("do_list") {list.inspect}
+      list = RDF::List.new(subject: l, graph: @graph)
+      log_debug("do_list") {list.inspect}
       position = :subject
       list.each_statement do |st|
         next unless st.predicate == RDF.first
-        debug {" list this: #{st.subject} first: #{st.object}[#{position}]"}
+        log_debug {" list this: #{st.subject} first: #{st.object}[#{position}]"}
         path(st.object, position)
         subject_done(st.subject)
         position = :object
@@ -443,12 +442,10 @@ module RDF::Turtle
 
     def collection(node, position)
       return false if !is_valid_list?(node)
-      #debug("collection") {"#{node.to_ntriples}, #{position}"}
+      #log_debug("collection") {"#{node.to_ntriples}, #{position}"}
 
       @output.write(position == :subject ? "(" : " (")
-      @depth += 2
-      do_list(node)
-      @depth -= 2
+      log_depth {do_list(node)}
       @output.write(')')
     end
 
@@ -463,20 +460,20 @@ module RDF::Turtle
     def p_squared(resource, position)
       return false unless p_squared?(resource, position)
 
-      #debug("p_squared") {"#{resource.to_ntriples}, #{position}"}
+      #log_debug("p_squared") {"#{resource.to_ntriples}, #{position}"}
       subject_done(resource)
       @output.write(position == :subject ? '[' : ' [')
-      @depth += 2
-      num_props = predicateObjectList(resource, true)
-      @output.write(num_props > 1 ? "\n#{indent} ]" : "]")
-      @depth -= 2
+      log_depth do
+        num_props = predicateObjectList(resource, true)
+        @output.write(num_props > 1 ? "\n#{indent} ]" : "]")
+      end
       
       true
     end
 
     # Default singular resource representation.
     def p_default(resource, position)
-      #debug("p_default") {"#{resource.to_ntriples}, #{position}"}
+      #log_debug("p_default") {"#{resource.to_ntriples}, #{position}"}
       l = (position == :subject ? "" : " ") + format_term(resource, options)
       @output.write(l)
     end
@@ -484,7 +481,7 @@ module RDF::Turtle
     # Represent a resource in subject, predicate or object position.
     # Use either collection, blankNodePropertyList or singular resource notation.
     def path(resource, position)
-      debug("path") do
+      log_debug("path") do
         "#{resource.to_ntriples}, " +
         "pos: #{position}, " +
         "()?: #{is_valid_list?(resource)}, " +
@@ -495,7 +492,7 @@ module RDF::Turtle
     end
     
     def predicate(resource)
-      debug("predicate") {resource.to_ntriples}
+      log_debug("predicate") {resource.to_ntriples}
       if resource == RDF.type
         @output.write(" a")
       else
@@ -505,7 +502,7 @@ module RDF::Turtle
 
     # Render an objectList having a common subject and predicate
     def objectList(objects)
-      debug("objectList") {objects.inspect}
+      log_debug("objectList") {objects.inspect}
       return if objects.empty?
 
       objects.each_with_index do |obj, i|
@@ -527,7 +524,7 @@ module RDF::Turtle
       end
 
       prop_list = sort_properties(properties) - [RDF.first.to_s, RDF.rest.to_s]
-      debug("predicateObjectList") {prop_list.inspect}
+      log_debug("predicateObjectList") {prop_list.inspect}
       return 0 if prop_list.empty?
 
       @output.write("\n#{indent(2)}") if properties.keys.length > 1 && from_bpl
@@ -550,11 +547,9 @@ module RDF::Turtle
     def blankNodePropertyList(subject)
       return false unless blankNodePropertyList?(subject)
       
-      debug("blankNodePropertyList") {subject.to_ntriples}
+      log_debug("blankNodePropertyList") {subject.to_ntriples}
       @output.write("\n#{indent} [")
-      @depth += 1
-      num_props = predicateObjectList(subject, true)
-      @depth -= 1
+      num_props = log_depth {predicateObjectList(subject, true)}
       @output.write(num_props > 1 ? "\n#{indent} ] ." : "] .")
       true
     end
@@ -569,7 +564,7 @@ module RDF::Turtle
     end
     
     def statement(subject)
-      debug("statement") {"#{subject.to_ntriples}, bnodePL?: #{blankNodePropertyList?(subject)}"}
+      log_debug("statement") {"#{subject.to_ntriples}, bnodePL?: #{blankNodePropertyList?(subject)}"}
       subject_done(subject)
       blankNodePropertyList(subject) || triples(subject)
       @output.puts

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: rdf-turtle
 version: !ruby/object:Gem::Version
-  version: 1.99.0
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +37,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +47,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1.beta
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -70,58 +82,82 @@ dependencies:
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +193,7 @@ files:
 - lib/rdf/turtle/writer.rb
 homepage: http://ruby-rdf.github.com/rdf-turtle
 licenses:
-- Public Domain
+- Unlicense
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -167,17 +203,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: rdf-turtle
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Turtle reader/writer for Ruby.
 test_files: []
-has_rdoc: false