entp-astrotrain 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/astrotrain.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{astrotrain}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["technoweenie"]
-  s.date = %q{2009-09-21}
+  s.date = %q{2009-09-23}
   s.email = %q{technoweenie@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/astrotrain/message.rb

@@ -190,12 +190,29 @@ module Astrotrain
       @mail.port.to_s
     end
 
+    def header(key)
+      @headers ||= {}
+      if !@headers.key?(key)
+        @headers[key] = if self.class.skipped_headers.include?(key)
+          nil
+        else
+          header = @mail.header[key]
+          begin
+            header.to_s
+          rescue
+            header.raw_body
+          end
+        end
+      end
+      @headers[key]
+    end
+
     def headers
       @headers ||= begin
         h = {}
         @mail.header.each do |key, value|
-          next if self.class.skipped_headers.include?(key)
-          h[key] = value.to_s
+          header_value = header(key)
+          h[key] = header_value if header_value
         end
         h
       end

data/lib/astrotrain/tmail.rb

@@ -45,4 +45,14 @@ module Astrotrain
       end
     end
   end
+end
+
+module TMail
+  # small tweak to provide the raw body of headers in case they're unable to 
+  # be parsed properly
+  class HeaderField
+    def raw_body
+      @body
+    end
+  end
 end

data/test/message_test.rb

@@ -123,6 +123,22 @@ class Astrotrain::MessageTest < Astrotrain::TestCase
       @body = "---------- Forwarded message ----------\nblah blah"
     end
 
+    describe "basic, with bad content type header" do
+      before :all do
+        @raw = mail(:bad_content_type)
+        @message = Astrotrain::Message.parse(@raw)
+      end
+
+      it "parses body" do
+        expected = "--====boundary====\nContent-Type: text/plain; charset=\"us-ascii\"\n\nThis message is being generated automatically to notify you\nthat PowerMTA has crashed on mtasv.net.\n\nAs the information below is likely to be essential for debugging\nthe problem, please forward this message to <support@port25.com>.\nThank you.\n\n--====boundary====\nContent-Type: text/plain; charset=\"us-ascii\"\n\nYo\n--====boundary====--"
+        assert_equal expected, @message.body
+      end
+
+      it "attempts parsing bad header" do
+        assert_equal "multipart/mixed; boundary=\"====boundary=\"===\"\"", @message.header('content-type')
+      end
+    end
+
     describe "basic, single sender/recipient" do
       before :all do
         @raw     = mail(:basic)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: entp-astrotrain
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - technoweenie
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-21 00:00:00 -07:00
+date: 2009-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: []