rdf-n3 1.99.0 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9b52d4f54d09368875b654dad895204b3fe645c
-  data.tar.gz: ab49163f1b25a7deb4982273c7ef698504624d4f
+  metadata.gz: fe956e29cb0b37c4312d36cecd9bb0ec6f31804b
+  data.tar.gz: dd3873a8d7fb00e530beec9f2cdef6ac7784f13b
 SHA512:
-  metadata.gz: 8308ad1b87c6905d0e6ab9551adc67f851c689d0a21713e22da310fddf66c241ca46752c0468de1778fe5a27235d8dc826c6172894db21a149155451c3842a7a
-  data.tar.gz: bed77496be0b312dbaa8ac1a63a2647bfefbd4c0e542ff64fe3389a84eb15d31be45c4e8653626a6ce129a43f2129319809e4addd492216dd4825aabb139729f
+  metadata.gz: 46a8c8d72bebde3675a64b0b4f405e200c0fc5bba2f75d705766d44a6c9fcab24d9ef1d596266dba13715d1dba134359261f302e0d4b50c8ea4404a2f28bb3e6
+  data.tar.gz: 2d2c2fbad6f9bdf55fd82a753aef7eeaad0fd7ce15e99b381ea837b06258f968ab854eb6e7a12cf328f7f31bb5cb74e09cdb13e6a7e1b9b103da98ce09d1f3f3

data/README.md

@@ -19,7 +19,7 @@ RDF::N3 parses [Notation-3][N3], [Turtle][Turtle] and [N-Triples][N-Triples] int
 Install with `gem install rdf-n3`
 
 ## Limitations
-* Full support of Unicode input requires Ruby version 1.9 or greater.
+* Full support of Unicode input requires Ruby version 2.0 or greater.
 * Support for Variables in Formulae dependent on underlying repository. Existential variables are quantified to RDF::Node instances, Universals to RDF::Query::Variable, with the URI of the variable target used as the variable name.
 * No support for N3 Reification. If there were, it would be through a :reify option to the reader.
 
@@ -64,7 +64,7 @@ results in:
 
     h = RDF::Query::Variable.new(<#h>)
     g = RDF::Node.new()
-    RDF::Statement.new(f, <#loves>, h)
+    RDF::Statement(f, <#loves>, h)
 
 ## Implementation Notes
 The parser is driven through a rules table contained in lib/rdf/n3/reader/meta.rb. This includes
@@ -84,7 +84,7 @@ http://www.w3.org/2000/10/swap/grammar/n3.n3 (along with bnf-rules.n3) using cwm
 * Create equivalent to `--think` to iterate on solutions.
 
 ## Dependencies
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.1)
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 2.0)
 
 ## Documentation
 Full documentation available on [RubyDoc.info](http://rubydoc.info/github/ruby-rdf/rdf-n3/frames)

data/VERSION

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

data/lib/rdf/n3.rb

@@ -28,8 +28,5 @@ module RDF
     autoload :Reader,  'rdf/n3/reader'
     autoload :VERSION, 'rdf/n3/version'
     autoload :Writer,  'rdf/n3/writer'
-    
-    def self.debug?; @debug; end
-    def self.debug=(value); @debug = value; end
   end
 end

data/lib/rdf/n3/format.rb

@@ -22,21 +22,10 @@ module RDF::N3
 
     reader { RDF::N3::Reader }
     writer { RDF::N3::Writer }
-  end
-  
-  # Alias for N3 format
-  #
-  # This allows the following:
-  #
-  # @example Obtaining an Notation3 format class
-  #     RDF::Format.for(:ttl)         #=> RDF::N3::Notation3
-  #     RDF::Format.for(:ttl).reader  #=> RDF::N3::Reader
-  #     RDF::Format.for(:ttl).writer  #=> RDF::N3::Writer
-  class Notation3 < RDF::Format
-    content_type     'text/n3',             extension: :n3
-    content_encoding 'utf-8'
 
-    reader { RDF::N3::Reader }
-    writer { RDF::N3::Writer }
+    # Symbols which may be used to lookup this format
+    def self.symbols
+      [:n3, :notation3]
+    end
   end
 end

data/lib/rdf/n3/reader.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 module RDF::N3
   ##
   # A Notation-3/Turtle parser in Ruby
@@ -16,6 +17,7 @@ module RDF::N3
   class Reader < RDF::Reader
     format Format
 
+    include RDF::Util::Logger
     include Meta
     include Parser
     
@@ -26,8 +28,6 @@ module RDF::N3
     #
     # @param  [IO, File, String] input
     #   the input stream to read
-    # @option options [Array] :debug
-    #   Array to place debug messages
     # @option options [#to_s]    :base_uri     (nil)
     #   the base URI to use when resolving relative URIs (not supported by
     #   all readers)
@@ -65,12 +65,12 @@ module RDF::N3
         @variables = {}    # variable definitions along with defining formula
 
         if options[:base_uri]
-          add_debug("@uri") { base_uri.inspect}
+          log_debug("@uri") { base_uri.inspect}
           namespace(nil, uri("#{base_uri}#"))
         end
-        add_debug("validate") {validate?.inspect}
-        add_debug("canonicalize") {canonicalize?.inspect}
-        add_debug("intern") {intern?.inspect}
+        log_debug("validate") {validate?.inspect}
+        log_debug("canonicalize") {canonicalize?.inspect}
+        log_debug("intern") {intern?.inspect}
 
         if block_given?
           case block.arity
@@ -96,6 +96,10 @@ module RDF::N3
         @callback = block
 
         parse(START.to_sym)
+
+        if validate? && log_statistics[:error]
+          raise RDF::ReaderError, "Errors found during processing"
+        end
       end
       enum_for(:each_triple)
     end
@@ -121,7 +125,7 @@ module RDF::N3
     # Start of production
     def onStart(prod)
       handler = "#{prod}Start".to_sym
-      add_debug("#{handler}(#{respond_to?(handler, true)})", prod)
+      log_debug("#{handler}(#{respond_to?(handler, true)})", prod)
       @productions << prod
       send(handler, prod) if respond_to?(handler, true)
     end
@@ -130,7 +134,7 @@ module RDF::N3
     def onFinish
       prod = @productions.pop()
       handler = "#{prod}Finish".to_sym
-      add_debug("#{handler}(#{respond_to?(handler, true)})") {"#{prod}: #{@prod_data.last.inspect}"}
+      log_debug("#{handler}(#{respond_to?(handler, true)})") {"#{prod}: #{@prod_data.last.inspect}"}
       send(handler) if respond_to?(handler, true)
     end
 
@@ -139,7 +143,7 @@ module RDF::N3
       unless @productions.empty?
         parentProd = @productions.last
         handler = "#{parentProd}Token".to_sym
-        add_debug("#{handler}(#{respond_to?(handler, true)})") {"#{prod}, #{tok}: #{@prod_data.last.inspect}"}
+        log_debug("#{handler}(#{respond_to?(handler, true)})") {"#{prod}, #{tok}: #{@prod_data.last.inspect}"}
         send(handler, prod, tok) if respond_to?(handler, true)
       else
         error("Token has no parent production")
@@ -186,9 +190,9 @@ module RDF::N3
         # This means that <#foo> can be written :foo and using @keywords one can reduce that to foo.
         
         namespace(nil, uri.match(/[\/\#]$/) ? base_uri : process_uri("#{uri}#"))
-        add_debug("declarationFinish[@base]") {"@base=#{base_uri}"}
+        log_debug("declarationFinish[@base]") {"@base=#{base_uri}"}
       when "@keywords"
-        add_debug("declarationFinish[@keywords]") {@keywords.inspect}
+        log_debug("declarationFinish[@keywords]") {@keywords.inspect}
         # Keywords are handled in tokenizer and maintained in @keywords array
         if (@keywords & N3_KEYWORDS) != @keywords
           error("Undefined keywords used: #{(@keywords - N3_KEYWORDS).to_sentence}") if validate?
@@ -238,7 +242,7 @@ module RDF::N3
       # If we're in teh middle of a pathtail, append
       if @prod_data.last[:pathtail] && expression[:pathitem] && expression[:pathtail]
         path_list = [expression[:pathitem]] + expression[:pathtail]
-        add_debug("expressionFinish(pathtail)") {"set pathtail to #{path_list.inspect}"}
+        log_debug("expressionFinish(pathtail)") {"set pathtail to #{path_list.inspect}"}
         @prod_data.last[:pathtail] = path_list
 
         dir_list = [expression[:direction]] if expression[:direction]
@@ -402,7 +406,7 @@ module RDF::N3
       properties.each do |p|
         predicate = p[:verb]
         next unless predicate
-        add_debug("simpleStatementFinish(pred)") {predicate.to_s}
+        log_debug("simpleStatementFinish(pred)") {predicate.to_s}
         error(%(Illegal statment: "#{predicate}" missing object)) unless p.has_key?(:object)
         objects = Array(p[:object])
         objects.each do |object|
@@ -505,14 +509,14 @@ module RDF::N3
     ###################
 
     def process_anonnode(anonnode)
-      add_debug("process_anonnode") {anonnode.inspect}
+      log_debug("process_anonnode") {anonnode.inspect}
       
       if anonnode[:propertylist]
         properties = anonnode[:propertylist]
         bnode = RDF::Node.new
         properties.each do |p|
           predicate = p[:verb]
-          add_debug("process_anonnode(verb)") {predicate.inspect}
+          log_debug("process_anonnode(verb)") {predicate.inspect}
           objects = Array(p[:object])
           objects.each { |object| add_triple("anonnode", bnode, predicate, object) }
         end
@@ -535,7 +539,7 @@ module RDF::N3
     #
     # Create triple and return property used for next iteration
     def process_path(expression)
-      add_debug("process_path") {expression.inspect}
+      log_debug("process_path") {expression.inspect}
 
       pathitem = expression[:pathitem]
       pathtail = expression[:pathtail]
@@ -579,17 +583,17 @@ module RDF::N3
       end
 
       uri = if prefix(prefix)
-        add_debug('process_qname(ns)') {"#{prefix(prefix)}, #{name}"}
+        log_debug('process_qname(ns)') {"#{prefix(prefix)}, #{name}"}
         ns(prefix, name)
       elsif prefix == '_'
-        add_debug('process_qname(bnode)', name)
+        log_debug('process_qname(bnode)', name)
         bnode(name)
       else
-        add_debug('process_qname(default_ns)', name)
+        log_debug('process_qname(default_ns)', name)
         namespace(nil, uri("#{base_uri}#")) unless prefix(nil)
         ns(nil, name)
       end
-      add_debug('process_qname') {uri.inspect}
+      log_debug('process_qname') {uri.inspect}
       uri
     end
     
@@ -619,18 +623,6 @@ module RDF::N3
       RDF::Query::Variable.new(label.to_s)
     end
 
-    # Add debug event to debug array, if specified
-    #
-    # @param [any] node string for showing graph_name
-    # @param [String] message
-    # @yieldreturn [String] appended to message, to allow for lazy-evaulation of message
-    def add_debug(node, message = "")
-      return unless ::RDF::N3.debug? || @options[:debug]
-      message = message + yield if block_given?
-      puts "[#{@lineno},#{@pos}]#{' ' * @productions.length}#{node}: #{message}" if ::RDF::N3::debug?
-      @options[:debug] << "[#{@lineno},#{@pos}]#{' ' * @productions.length}#{node}: #{message}" if @options[:debug].is_a?(Array)
-    end
-
     # add a statement, object can be literal or URI or bnode
     #
     # @param [any] node string for showing graph_name
@@ -642,8 +634,8 @@ module RDF::N3
     def add_triple(node, subject, predicate, object)
       graph_name_opts = @formulae.last ? {graph_name: @formulae.last} : {}
       
-      statement = RDF::Statement.new(subject, predicate, object, graph_name_opts)
-      add_debug(node) {statement.to_s}
+      statement = RDF::Statement(subject, predicate, object, graph_name_opts)
+      log_debug(node) {statement.to_s}
       @callback.call(statement)
     end
 
@@ -652,7 +644,7 @@ module RDF::N3
       if uri == '#'
         uri = prefix(nil).to_s + '#'
       end
-      add_debug("namespace") {"'#{prefix}' <#{uri}>"}
+      log_debug("namespace") {"'#{prefix}' <#{uri}>"}
       prefix(prefix, uri(uri))
     end
 
@@ -682,7 +674,7 @@ module RDF::N3
     def ns(prefix, suffix)
       base = prefix(prefix).to_s
       suffix = suffix.to_s.sub(/^\#/, "") if base.index("#")
-      add_debug("ns") {"base: '#{base}', suffix: '#{suffix}'"}
+      log_debug("ns") {"base: '#{base}', suffix: '#{suffix}'"}
       uri(base + suffix.to_s)
     end
   end

data/lib/rdf/n3/reader/meta.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 # This file is automatically generated by script/build_meta
 # Branch and Regexp tables derived from http://www.w3.org/2000/10/swap/grammar/n3-selectors.n3
 module RDF::N3::Meta

data/lib/rdf/n3/reader/parser.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 # Simple parser to go through productions without attempting evaluation
 module RDF::N3
   module Parser
@@ -9,7 +10,7 @@ module RDF::N3
     NOT_NAME_CHARS = NOT_QNAME_CHARS + ":"
     
     def error(str)
-      raise RDF::ReaderError, "\n#{@line}\n#{'-' * @pos}^\nError on line #{@lineno} at offset #{@pos}: #{str}"
+      log_error(str, lineno: @lineno, exception: RDF::ReaderError)
     end
     
     def parse(prod)
@@ -19,7 +20,7 @@ module RDF::N3
         if todo_stack.last[:terms].nil?
           todo_stack.last[:terms] = []
           tok = self.token
-          #puts "parse tok: '#{tok}', prod #{todo_stack.last[:prod]}"
+          #log_debug("parse tok: '#{tok}'") {"prod #{todo_stack.last[:prod]}"}
           
           # Got an opened production
           onStart(abbr(todo_stack.last[:prod]))
@@ -34,15 +35,15 @@ module RDF::N3
             expected = prod_branch.values.uniq.map {|u| u.map {|v| abbr(v).inspect}.join(",")}
             error("Found '#{tok}' when parsing a #{abbr(cur_prod)}. expected #{expected.join(' | ')}")
           end
-          #puts "sequence: #{sequence.inspect}"
+          #log_debug("sequence") {sequence.inspect}
           todo_stack.last[:terms] += sequence
         end
         
-        #puts "parse: #{todo_stack.last.inspect}"
+        #log_debug("parse") {todo_stack.last.inspect}
         while !todo_stack.last[:terms].to_a.empty?
           term = todo_stack.last[:terms].shift
           if term.is_a?(String)
-            puts "parse term(string): #{term}" if $verbose
+            log_debug("parse term(string)") {term.to_s}
             word = buffer[0, term.length]
             if word == term
               onToken(term, word)
@@ -59,28 +60,28 @@ module RDF::N3
               string = '"""'
               consume(3)
               next_line = buffer
-              #puts "ml-str(start): #{next_line.dump}" if $verbose
+              #log_debug("ml-str(start)") {next_line.dump}
               until md = R_MLSTRING.match(next_line)
                 begin
                   string += next_line
                   next_line = readline
-                rescue EOFError => e
+                rescue EOFError
                   error("EOF reached searching for end of multi-line comment")
                 end
               end
               string += md[0].to_s
               consume(md[0].to_s.length)
               onToken('string', string)
-              #puts "ml-str now #{buffer.dump}"
+              #log_debug("ml-str now") {buffer.dump}
             else
               md = regexp.match(buffer)
               error("Token(#{abbr(term)}) '#{buffer[0, 10]}...' should match #{regexp}") unless md
-              puts "parse term(#{abbr(term)}:regexp): #{term}, #{regexp}.match('#{buffer[0, 10]}...') => '#{md.inspect}'" if $verbose
+              log_debug("parse") {"term(#{abbr(term)}:regexp): #{term}, #{regexp}.match('#{buffer[0, 10]}...') => '#{md.inspect.force_encoding(Encoding::UTF_8)}'"}
               onToken(abbr(term), md.to_s)
               consume(md[0].length)
             end
           else
-            puts "parse term(push): #{term}" if $verbose
+            log_debug("parse term(push)") {term}
             todo_stack << {prod: term, terms: nil}
             pushed = true
             break
@@ -104,7 +105,7 @@ module RDF::N3
       unless @memo.has_key?(@pos)
         tok = self.get_token
         @memo[@pos] = tok
-        puts "token: '#{tok}'('#{buffer[0, 10]}...')" if buffer && $verbose
+        log_debug("token") {"'#{tok}'('#{buffer[0, 10]}...')"} if buffer
       end
       @memo[@pos]
     end
@@ -158,7 +159,7 @@ module RDF::N3
       while buffer && md = R_WHITESPACE.match(buffer)
         return unless md[0].length > 0
         consume(md[0].length)
-        #puts "ws: '#{md[0]}', pos=#{@pos}"
+        #log_debug("ws") {"'#{md[0]}', pos=#{@pos}"}
       end
     end
     
@@ -166,10 +167,10 @@ module RDF::N3
       @line = @input.readline
       @lineno += 1
       @line.force_encoding(Encoding::UTF_8)
-      puts "readline[#{@lineno}]: #{@line.dump}" if $verbose
+      log_debug("readline[#{@lineno}]") {@line.dump}
       @pos = 0
       @line
-    rescue EOFError => e
+    rescue EOFError
       @line, @pos = nil, 0
     end
     
@@ -183,7 +184,7 @@ module RDF::N3
       @memo = {}
       @pos += n
       readline while @line && @line.length <= @pos
-      #puts "consume[#{n}]: '#{buffer}'" if $verbose
+      #log_debug("consume[#{n}]") {buffer}
     end
     
     def abbr(prodURI)

data/lib/rdf/n3/writer.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 module RDF::N3
   ##
   # A Turtle serialiser in Ruby
@@ -50,13 +51,32 @@ module RDF::N3
   # @author [Gregg Kellogg](http://greggkellogg.net/)
   class Writer < RDF::Writer
     format RDF::N3::Format
+    include RDF::Util::Logger
     QNAME = Meta::REGEXPS[:"http://www.w3.org/2000/10/swap/grammar/n3#qname"]
 
     # @return [Graph] Graph of statements serialized
     attr_accessor :graph
     # @return [URI] Base URI used for relativizing URIs
     attr_accessor :base_uri
-    
+
+    ##
+    # N3 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"],
+          description: "Maximum depth for recursively defining resources, defaults to 3.") {|arg| arg.to_i},
+        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)},
+      ]
+    end
+
     ##
     # Initializes the Turtle writer instance.
     #
@@ -99,23 +119,6 @@ module RDF::N3
       end
     end
 
-    ##
-    # Write whole graph
-    #
-    # @param  [Graph] graph
-    # @return [void]
-    def write_graph(graph)
-      @graph = graph
-    end
-
-    ##
-    # Addes a statement to be serialized
-    # @param  [RDF::Statement] statement
-    # @return [void]
-    def write_statement(statement)
-      @graph.insert(statement)
-    end
-
     ##
     # Addes a triple to be serialized
     # @param  [RDF::Resource] subject
@@ -125,7 +128,7 @@ module RDF::N3
     # @raise  [NotImplementedError] unless implemented in subclass
     # @abstract
     def write_triple(subject, predicate, object)
-      @graph.insert(Statement.new(subject, predicate, object))
+      @graph.insert(RDF::Statement(subject, predicate, object))
     end
 
     ##
@@ -136,11 +139,10 @@ module RDF::N3
     def write_epilogue
       @max_depth = @options[:max_depth] || 3
       @base_uri = RDF::URI(@options[:base_uri])
-      @debug = @options[:debug]
 
       self.reset
 
-      add_debug {"\nserialize: graph: #{@graph.size}"}
+      log_debug {"\nserialize: graph: #{@graph.size}"}
 
       preprocess
       start_document
@@ -150,6 +152,8 @@ module RDF::N3
           statement(subject)
         end
       end
+
+      super
     end
     
     # Return a QName for the URI, or nil. Adds namespace of QName to defined prefixes
@@ -165,7 +169,7 @@ module RDF::N3
         return nil
       end
 
-      add_debug {"get_qname(#{resource}), std?}"}
+      log_debug {"get_qname(#{resource}), std?}"}
       qname = case
       when @uri_to_qname.has_key?(uri)
         return @uri_to_qname[uri]
@@ -173,13 +177,13 @@ module RDF::N3
         # Use a defined prefix
         prefix = @uri_to_prefix[u]
         prefix(prefix, u) unless u.to_s.empty? # Define for output
-        add_debug {"get_qname: add prefix #{prefix.inspect} => #{u}"}
+        log_debug {"get_qname: add prefix #{prefix.inspect} => #{u}"}
         uri.sub(u.to_s, "#{prefix}:")
       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
-        add_debug {"get_qname: add standard prefix #{prefix.inspect} => #{vocab.to_uri}"}
+        log_debug {"get_qname: add standard prefix #{prefix.inspect} => #{vocab.to_uri}"}
         uri.sub(vocab.to_uri.to_s, "#{prefix}:")
       else
         nil
@@ -214,7 +218,7 @@ module RDF::N3
         prop_list << prop.to_s
       end
       
-      add_debug {"sort_properties: #{prop_list.join(', ')}"}
+      log_debug {"sort_properties: #{prop_list.join(', ')}"}
       prop_list
     end
 
@@ -252,7 +256,7 @@ module RDF::N3
     # @return [String]
     def format_uri(uri, options = {})
       md = relativize(uri)
-      add_debug {"relativize(#{uri.inspect}) => #{md.inspect}"} if md != uri.to_s
+      log_debug {"relativize(#{uri.inspect}) => #{md.inspect}"} if md != uri.to_s
       md != uri.to_s ? "<#{md}>" : (get_qname(uri) || "<#{uri}>")
     end
     
@@ -273,7 +277,7 @@ module RDF::N3
       
       @output.write("#{indent}@base <#{base_uri}> .\n") unless base_uri.to_s.empty?
       
-      add_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
@@ -309,17 +313,17 @@ module RDF::N3
         subjects << base_uri
         seen[base_uri] = true
       end
-      add_debug {"subjects1: #{subjects.inspect}"}
+      log_debug {"subjects1: #{subjects.inspect}"}
       
       # 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|
-          add_debug {"order_subjects: #{subject.inspect}"}
+          log_debug {"order_subjects: #{subject.inspect}"}
           subjects << subject
           seen[subject] = true
         end
       end
-      add_debug {"subjects2: #{subjects.inspect}"}
+      log_debug {"subjects2: #{subjects.inspect}"}
       
       # Sort subjects by resources over bnodes, ref_counts and the subject URI itself
       recursable = @subjects.keys.
@@ -327,9 +331,9 @@ module RDF::N3
         map {|r| [r.node? ? 1 : 0, ref_count(r), r]}.
         sort
       
-      add_debug {"subjects3: #{subjects.inspect}"}
+      log_debug {"subjects3: #{subjects.inspect}"}
       subjects += recursable.map{|r| r.last}
-      add_debug {"subjects4: #{subjects.inspect}"}
+      log_debug {"subjects4: #{subjects.inspect}"}
       subjects
     end
     
@@ -350,7 +354,7 @@ module RDF::N3
     # prefixes.
     # @param [Statement] statement
     def preprocess_statement(statement)
-      #add_debug {"preprocess: #{statement.inspect}"}
+      #log_debug {"preprocess: #{statement.inspect}"}
       references = ref_count(statement.object) + 1
       @references[statement.object] = references
       @subjects[statement.subject] = true
@@ -405,30 +409,19 @@ module RDF::N3
 
     private
     
-    # Add debug event to debug array, if specified
-    #
-    # @param [String] message
-    # @yieldreturn [String] appended to message, to allow for lazy-evaulation of message
-    def add_debug(message = "")
-      return unless ::RDF::N3.debug? || @debug
-      message = message + yield if block_given?
-      STDERR.puts message if ::RDF::N3::debug?
-      @debug << message if @debug.is_a?(Array)
-    end
-
     # Checks if l is a valid RDF list, i.e. no nodes have other properties.
     def is_valid_list(l)
-      #add_debug {"is_valid_list: #{l.inspect}"}
-      return (l.node? && RDF::List.new(l, @graph).valid?) || l == RDF.nil
+      #log_debug {"is_valid_list: #{l.inspect}"}
+      return (l.node? && RDF::List.new(subject: l, graph: @graph).valid?) || l == RDF.nil
     end
     
     def do_list(l)
-      list = RDF::List.new(l, @graph)
-      add_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
-        add_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
@@ -437,7 +430,7 @@ module RDF::N3
     
     def p_list(node, position)
       return false if !is_valid_list(node)
-      #add_debug {"p_list: #{node.inspect}, #{position}"}
+      #log_debug {"p_list: #{node.inspect}, #{position}"}
 
       @output.write(position == :subject ? "(" : " (")
       @depth += 2
@@ -455,7 +448,7 @@ module RDF::N3
     def p_squared(node, position)
       return false unless p_squared?(node, position)
 
-      #add_debug {"p_squared: #{node.inspect}, #{position}"}
+      #log_debug {"p_squared: #{node.inspect}, #{position}"}
       subject_done(node)
       @output.write(position == :subject ? '[' : ' [')
       @depth += 2
@@ -467,13 +460,13 @@ module RDF::N3
     end
     
     def p_default(node, position)
-      #add_debug {"p_default: #{node.inspect}, #{position}"}
+      #log_debug {"p_default: #{node.inspect}, #{position}"}
       l = (position == :subject ? "" : " ") + format_term(node, options)
       @output.write(l)
     end
     
     def path(node, position)
-      add_debug do
+      log_debug do
         "path: #{node.inspect}, " +
         "pos: #{position}, " +
         "[]: #{is_valid_list(node)}, " +
@@ -484,7 +477,7 @@ module RDF::N3
     end
     
     def verb(node)
-      add_debug {"verb: #{node.inspect}"}
+      log_debug {"verb: #{node.inspect}"}
       if node == RDF.type
         @output.write(" a")
       else
@@ -493,7 +486,7 @@ module RDF::N3
     end
     
     def object_list(objects)
-      add_debug {"object_list: #{objects.inspect}"}
+      log_debug {"object_list: #{objects.inspect}"}
       return if objects.empty?
 
       objects.each_with_index do |obj, i|
@@ -510,7 +503,7 @@ module RDF::N3
       end
 
       prop_list = sort_properties(properties) - [RDF.first.to_s, RDF.rest.to_s]
-      add_debug {"predicate_list: #{prop_list.inspect}"}
+      log_debug {"predicate_list: #{prop_list.inspect}"}
       return if prop_list.empty?
 
       prop_list.each_with_index do |prop, i|
@@ -519,7 +512,7 @@ module RDF::N3
           verb(prop[0, 2] == "_:" ? RDF::Node.intern(prop.split(':').last) : RDF::URI.intern(prop))
           object_list(properties[prop])
         rescue Addressable::URI::InvalidURIError => e
-          add_debug {"Predicate #{prop.inspect} is an invalid URI: #{e.message}"}
+          log_debug {"Predicate #{prop.inspect} is an invalid URI: #{e.message}"}
         end
       end
     end
@@ -531,7 +524,7 @@ module RDF::N3
     def s_squared(subject)
       return false unless s_squared?(subject)
       
-      add_debug {"s_squared: #{subject.inspect}"}
+      log_debug {"s_squared: #{subject.inspect}"}
       @output.write("\n#{indent} [")
       @depth += 1
       predicate_list(subject)
@@ -549,7 +542,7 @@ module RDF::N3
     end
     
     def statement(subject)
-      add_debug {"statement: #{subject.inspect}, s2?: #{s_squared?(subject)}"}
+      log_debug {"statement: #{subject.inspect}, s2?: #{s_squared?(subject)}"}
       subject_done(subject)
       s_squared(subject) || s_default(subject)
       @output.write("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-n3
 version: !ruby/object:Gem::Version
-  version: 1.99.0
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Gregg
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 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: open-uri-cached
   requirement: !ruby/object:Gem::Requirement
@@ -49,86 +55,90 @@ dependencies:
   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: '1.99'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.99'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.99'
-- !ruby/object:Gem::Dependency
-  name: rdf-rdfxml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +175,7 @@ files:
 - lib/rdf/n3/writer.rb
 homepage: http://ruby-rdf.github.com/rdf-n3
 licenses:
-- Public Domain
+- Unlicense
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -175,15 +185,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: rdf-n3
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Notation3 reader/writer for RDF.rb.