From: William Morgan <wmorgan-sup@masanjin.net>
Date: Wed, 13 May 2009 20:53:47 +0000 (-0700)
Subject: Merge branch 'string-split-fixes' into next
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=6f3137cf6ace7001355e75f54f37b6f36b34b446;p=sup

Merge branch 'string-split-fixes' into next

Conflicts:
	lib/sup/index.rb
---

6f3137cf6ace7001355e75f54f37b6f36b34b446
diff --cc lib/sup/index.rb
index c66a24e,853bf76..c7838eb
--- a/lib/sup/index.rb
+++ b/lib/sup/index.rb
@@@ -408,16 -409,14 +408,16 @@@ EO
          "date" => Time.at(doc[:date].to_i),
          "subject" => unwrap_subj(doc[:subject]),
          "from" => doc[:from],
-         "to" => doc[:to].split(/\s+/).join(", "), # reformat
+         "to" => doc[:to].split.join(", "), # reformat
          "message-id" => doc[:message_id],
-         "references" => doc[:refs].split(/\s+/).map { |x| "<#{x}>" }.join(" "),
+         "references" => doc[:refs].split.map { |x| "<#{x}>" }.join(" "),
        }
  
 -      Message.new :source => source, :source_info => doc[:source_info].to_i,
 +      m = Message.new :source => source, :source_info => doc[:source_info].to_i,
-                   :labels => doc[:label].split(" ").map { |s| s.intern },
+                   :labels => doc[:label].symbolistize,
 -                  :snippet => doc[:snippet], :header => fake_header
 +                  :snippet => doc[:snippet]
 +      m.parse_header fake_header
 +      m
      end
    end