astrotrain 0.4.3 → 0.4.4

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/astrotrain.gemspec

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

data/lib/astrotrain/message.rb

@@ -7,7 +7,7 @@ module Astrotrain
   # Wrapper around a TMail object
   class Message
     attr_accessor :body
-    attr_reader :mail, :attachments
+    attr_reader :mail
 
     class << self
       attr_reader   :queue_path, :archive_path
@@ -184,17 +184,15 @@ module Astrotrain
     end
 
     def body
-      @body ||= begin
-        process_message_body
-        @body
-      end
+      @body ||= process_message_body(:body)
     end
 
     def html
-      @html ||= begin
-        process_message_body
-        @html
-      end
+      @html ||= process_message_body(:html)
+    end
+
+    def attachments
+      @attachments ||= process_message_body(:attachments)
     end
 
     def raw
@@ -202,28 +200,15 @@ module Astrotrain
     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]
+      headers[key]
     end
 
     def headers
       @headers ||= begin
         h = {}
         @mail.header.each do |key, value|
-          header_value = header(key)
-          h[key] = header_value if header_value
+          next if self.class.skipped_headers.include?(key)
+          h[key] = read_header(key) 
         end
         h
       end
@@ -280,7 +265,16 @@ module Astrotrain
     end
 
   protected
-    def process_message_body
+    def read_header(key)
+      header = @mail.header[key]
+      begin
+        header.to_s
+      rescue
+        header.raw_body
+      end
+    end
+
+    def process_message_body(var = nil)
       if @mail.multipart?
         @attachments.clear
         @body, @html = [], []
@@ -295,6 +289,7 @@ module Astrotrain
         @body = convert_to_utf8(@body)
         @html = convert_to_utf8(@html)
       end
+      instance_variable_get "@#{var}" if var
     end
 
     def scan_parts(message)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astrotrain
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - technoweenie
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-27 00:00:00 -07:00
+date: 2009-10-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency