From 7452d73dc40eb06d49ae3c2a6806d0dcd00cd41b Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Sat, 21 Nov 2015 10:24:36 -0800
Subject: [PATCH] Logging updates.

---
 .gitignore               | 1 +
 lib/rdf/rdfxml/reader.rb | 5 +++--
 lib/rdf/rdfxml/writer.rb | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index edaa948..d991f7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /.rbx/
 /spec/w3c-rdf
 *.lock
+*.byebug_history
diff --git a/lib/rdf/rdfxml/reader.rb b/lib/rdf/rdfxml/reader.rb
index cb8b7a0..757a293 100644
--- a/lib/rdf/rdfxml/reader.rb
+++ b/lib/rdf/rdfxml/reader.rb
@@ -157,9 +157,10 @@ def initialize(input = $stdin, options = {}, &block)
         end
         self.extend(@implementation)
 
+        input.rewind if input.respond_to?(:rewind)
         initialize_xml(input, options) rescue log_fatal($!.message)
 
-        log_fatal("Empty document", exception: RDF::ReaderError) if root.nil? && validate?
+        log_error("Empty document") if root.nil?
         log_error("Synax errors") {doc_errors} if !doc_errors.empty?
 
         block.call(self) if block_given?
@@ -182,8 +183,8 @@ def each_statement(&block)
       if block_given?
         # Block called from add_statement
         @callback = block
+        return unless root
 
-        
         log_fatal "root must be a proxy not a #{root.class}" unless root.is_a?(@implementation::NodeProxy)
 
         add_debug(root, "base_uri: #{base_uri.inspect}")
diff --git a/lib/rdf/rdfxml/writer.rb b/lib/rdf/rdfxml/writer.rb
index 4312178..b350b61 100644
--- a/lib/rdf/rdfxml/writer.rb
+++ b/lib/rdf/rdfxml/writer.rb
@@ -266,7 +266,7 @@ def render_property(predicate, objects, options = {}, &block)
           object:     objects.first,
           predicate:  predicate,
           property:   get_qname(predicate),
-          recurse:    @options[:log_depth] <= @max_depth
+          recurse:    log_depth <= @max_depth
         }.merge(options)
         hamlify(template, options, &block)
       end
@@ -293,7 +293,7 @@ def render_collection(predicate, list, options = {}, &block)
         list:       list,
         predicate:  predicate,
         property:   get_qname(predicate),
-        recurse:    @options[:log_depth] <= @max_depth,
+        recurse:    log_depth <= @max_depth,
       }.merge(options)
       hamlify(template, options) do |object|
         yield object