don't require has_errors? in Source objects

Properly speaking that's a function of a Recoverable object, not of a
source, so only call that method when it's availably.

diff --git a/lib/sup/message.rb b/lib/sup/message.rb
index 0ee46fb25d7ecbb97807910c9fa0785337bccc2c..3c21a437dc664a6f6090630cdb24177389c28535 100644 (file)
--- a/lib/sup/message.rb
+++ b/lib/sup/message.rb
@@ -198,7 +198,7 @@ class Message
   ## this is called when the message body needs to actually be loaded.
   def load_from_source!
     @chunks ||=
-      if @source.has_errors?
+      if @source.respond_to?(:has_errors?) && @source.has_errors?
         [Chunk::Text.new(error_message(@source.error.message).split("\n"))]
       else
         begin
@@ -372,6 +372,7 @@ private
     [notice, sig, children].flatten.compact
   end
 
+  ## takes a RMail::Message, breaks it into Chunk:: classes.
   def message_to_chunks m, encrypted=false, sibling_types=[]
     if m.multipart?
       chunks =

diff --git a/lib/sup/poll.rb b/lib/sup/poll.rb
index d766587f58815f27ec07b485c07ca6ec5204542a..220fee38c6acf8f1b9a8435046a4b40af50873b0 100644 (file)
--- a/lib/sup/poll.rb
+++ b/lib/sup/poll.rb
@@ -86,7 +86,7 @@ EOS
       Index.usual_sources.each do |source|
 #        yield "source #{source} is done? #{source.done?} (cur_offset #{source.cur_offset} >= #{source.end_offset})"
         begin
-          yield "Loading from #{source}... " unless source.done? || source.has_errors?
+          yield "Loading from #{source}... " unless source.done? || (source.respond_to?(:has_errors?) && source.has_errors?)
         rescue SourceError => e
           Redwood::log "problem getting messages from #{source}: #{e.message}"
           Redwood::report_broken_sources :force_to_top => true

diff --git a/test/dummy_source.rb b/test/dummy_source.rb
index f3afa31e51a648da767c56e18cfb6fcaca635fe8..e0fbf812527acb8536d3a3bb465f6c53ea8a0519 100644 (file)
--- a/test/dummy_source.rb
+++ b/test/dummy_source.rb
@@ -53,13 +53,6 @@ class DummySource < Source
       yield f.gets
     end
   end
-
-  # FIXME: this one was not mentioned in the source documentation, but
-  # it's still required
-  def has_errors?
-
-  end
-
 end
 
 end