global search and replace: raw_full_message -> raw_message

git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@587 5c8cc53c-5e98-4d25-b20a-d8db53a31250

diff --git a/bin/sup-sync-back b/bin/sup-sync-back
index ff4aa3a02360bb8040d004d54560787e2800dec4..57bebbe839d0ad638dd003e35f868a8aeb1458b2 100644 (file)
--- a/bin/sup-sync-back
+++ b/bin/sup-sync-back
@@ -8,7 +8,7 @@ require "sup"
 
 ## save a message 'm' to an open file pointer 'fp'
 def save m, fp
-  m.source.each_raw_full_message_line(m.source_info) { |l| fp.print l }
+  m.source.each_raw_message_line(m.source_info) { |l| fp.print l }
 end
 def die msg
   $stderr.puts "Error: #{msg}"

diff --git a/lib/sup/draft.rb b/lib/sup/draft.rb
index 8a303b434d17e10212f92b04ed890877c4b930b4..d5d61ee9ea7b6fd401e90fe5ac3a329d8a34b982 100644 (file)
--- a/lib/sup/draft.rb
+++ b/lib/sup/draft.rb
@@ -99,7 +99,7 @@ class DraftLoader < Source
     ret
   end
 
-  def raw_full_message offset
+  def raw_message offset
     IO.readlines(fn_for_offset(offset)).join
   end
 

diff --git a/lib/sup/imap.rb b/lib/sup/imap.rb
index 24b4e6e0bda426b57ba4e79681541a288d79af4f..42937bd6e04e06b9abd75fd134313c61f6a3b53c 100644 (file)
--- a/lib/sup/imap.rb
+++ b/lib/sup/imap.rb
@@ -106,7 +106,7 @@ class IMAP < Source
   end
 
   def load_message id
-    RMail::Parser.read raw_full_message(id)
+    RMail::Parser.read raw_message(id)
   end
 
   def raw_header id
@@ -118,11 +118,11 @@ class IMAP < Source
   end
   synchronized :raw_header
 
-  def raw_full_message id
+  def raw_message id
     unsynchronized_scan_mailbox
     get_imap_fields(id, 'RFC822').first.gsub(/\r\n/, "\n")
   end
-  synchronized :raw_full_message
+  synchronized :raw_message
 
   def connect
     return if @imap

diff --git a/lib/sup/maildir.rb b/lib/sup/maildir.rb
index df1ee8c602c5e00b217f1deb2bc1417f3bb1301a..976dabb175939f6e3cb1382937ddbb25ef3c359c 100644 (file)
--- a/lib/sup/maildir.rb
+++ b/lib/sup/maildir.rb
@@ -60,7 +60,7 @@ class Maildir < Source
     ret
   end
 
-  def raw_full_message id
+  def raw_message id
     scan_mailbox
     with_file_for(id) { |f| f.readlines.join }
   end

diff --git a/lib/sup/mbox/loader.rb b/lib/sup/mbox/loader.rb
index 29ca62b78f33e15dea5a1557338fdf34bcb48b98..84752281b63091d5887cb470091340dc61d3ca25 100644 (file)
--- a/lib/sup/mbox/loader.rb
+++ b/lib/sup/mbox/loader.rb
@@ -86,19 +86,19 @@ class Loader < Source
     ret
   end
 
-  def raw_full_message offset
+  def raw_message offset
     ret = ""
-    each_raw_full_message_line(offset) { |l| ret += l }
+    each_raw_message_line(offset) { |l| ret += l }
     ret
   end
 
   ## apparently it's a million times faster to call this directly if
   ## we're just moving messages around on disk, than reading things
-  ## into memory with raw_full_message.
+  ## into memory with raw_message.
   ##
   ## i hoped never to have to move shit around on disk but
   ## sup-sync-back has to do it.
-  def each_raw_full_message_line offset
+  def each_raw_message_line offset
     @mutex.synchronize do
       @f.seek offset
       yield @f.gets

diff --git a/lib/sup/mbox/ssh-loader.rb b/lib/sup/mbox/ssh-loader.rb
index bea585e87e08adf6263fe8e0261311b28076c0e8..e422a481b5c3a5639ac023d0aa264b30509f465d 100644 (file)
--- a/lib/sup/mbox/ssh-loader.rb
+++ b/lib/sup/mbox/ssh-loader.rb
@@ -65,7 +65,7 @@ class SSHLoader < Source
     end
   end
 
-  [:start_offset, :load_header, :load_message, :raw_header, :raw_full_message].each do |meth|
+  [:start_offset, :load_header, :load_message, :raw_header, :raw_message].each do |meth|
     define_method(meth) { |*a| safely { @loader.send meth, *a } }
   end
 end

diff --git a/lib/sup/message.rb b/lib/sup/message.rb
index cf3e826c292416bf771eb6350a35f7eaf04af6ad..cb4b5b6d2d0e2c5ba16c2c20449f87957ee4b46d 100644 (file)
--- a/lib/sup/message.rb
+++ b/lib/sup/message.rb
@@ -308,13 +308,13 @@ EOS
     with_source_errors_handled { @source.raw_header @source_info }
   end
 
-  def raw_full_message
-    with_source_errors_handled { @source.raw_full_message @source_info }
+  def raw_message
+    with_source_errors_handled { @source.raw_message @source_info }
   end
 
-  ## much faster than raw_full_message
-  def each_raw_full_message_line &b
-    with_source_errors_handled { @source.each_raw_full_message_line(@source_info, &b) }
+  ## much faster than raw_message
+  def each_raw_message_line &b
+    with_source_errors_handled { @source.each_raw_message_line(@source_info, &b) }
   end
 
   def content

diff --git a/lib/sup/modes/thread-view-mode.rb b/lib/sup/modes/thread-view-mode.rb
index adf4c0b6dd47b913674c79136a84511da6c0c2f1..897850cfe57d9a2c1b3eef437ad4a964116e4f1e 100644 (file)
--- a/lib/sup/modes/thread-view-mode.rb
+++ b/lib/sup/modes/thread-view-mode.rb
@@ -210,7 +210,7 @@ class ThreadViewMode < LineCursorMode
       fn = BufferManager.ask_for_filename :filename, "Save message to file: "
       return unless fn
       save_to_file(fn) do |f|
-        m.each_raw_full_message_line { |l| f.print l }
+        m.each_raw_message_line { |l| f.print l }
       end
     end
   end

diff --git a/lib/sup/source.rb b/lib/sup/source.rb
index d56f25a642f4889b212ccad8a2dca7c9861ef602..50fc16327720a784c1442ab68a0b604d34991e1b 100644 (file)
--- a/lib/sup/source.rb
+++ b/lib/sup/source.rb
@@ -31,7 +31,7 @@ class Source
   ## - load_header offset
   ## - load_message offset
   ## - raw_header offset
-  ## - raw_full_message offset
+  ## - raw_message offset
   ## - check
   ## - next (or each, if you prefer): should return a message and an
   ##   array of labels.