astrotrain 0.4.4 → 0.4.5

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.6

data/astrotrain.gemspec

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

data/lib/astrotrain.rb

@@ -1,4 +1,6 @@
 module Astrotrain
+  class ProcessingCancelled < StandardError; end
+
   CALLBACK_TYPES = [:pre_mapping, :pre_processing, :post_processing]
   class << self
     attr_accessor :root, :lib_root, :callbacks

data/lib/astrotrain/mapping.rb

@@ -45,7 +45,11 @@ module Astrotrain
           if mapping
             logged.recipient = recipient
             logged.mapping   = mapping
-            mapping.process(message, recipient)
+            begin
+              mapping.process(message, recipient)
+            rescue Astrotrain::ProcessingCancelled
+              logged.error_message = "Cancelled."
+            end
             logged.delivered_at = Time.now.utc
           end
           LoggedMail.log_processed # save successfully processed messages?
@@ -61,6 +65,7 @@ module Astrotrain
     def process(message, recipient)
       Astrotrain.callback(:pre_processing, message, self)
       Transport.process(message, self, recipient)
+    
     end
 
     # returns true if the email matches this mapping.  Wildcards in the name are allowed.

data/lib/astrotrain/message.rb

@@ -54,6 +54,7 @@ module Astrotrain
       Astrotrain.callback(:pre_mapping, message)
       Mapping.process(message, file)
       message
+    rescue Astrotrain::ProcessingCancelled
     end
 
     # Processes the given file.  It parses it by reading the contents, and optionally
@@ -282,8 +283,13 @@ module Astrotrain
         @body = @body.join("\n")
         @html = @html.join("\n")
       else
-        @body = @mail.body
-        @html = ''
+        if @mail.content_type == 'text/html'
+          @html = @mail.body
+          @body = ''
+        else
+          @body = @mail.body
+          @html = ''
+        end
       end
       if !@mail.charset
         @body = convert_to_utf8(@body)

data/test/fixtures/html.txt

@@ -4,13 +4,7 @@ To: xyz@astrotrain.com
 Message-ID: <11644553.1741252281981737.JavaMail.root@astrotrain>
 Subject: ABC DEF
 MIME-Version: 1.0
-Content-Type: multipart/mixed; 
-    boundary="----=_Part_1695_189596019.1252281981305"
-X-Mailer: Railo Mail
-
-------=_Part_1695_189596019.1252281981305
 Content-Type: text/html; charset=UTF-8
 Content-Transfer-Encoding: quoted-printable
 
-<p>ABC</p>
-------=_Part_1695_189596019.1252281981305--
+<p>ABC</p>

data/test/message_test.rb

@@ -42,6 +42,16 @@ class Astrotrain::MessageTest < Astrotrain::TestCase
           assert_equal callback_msg, @msg
         end
 
+        it "it allows pre_mapping callback to cancel processing" do
+          Astrotrain::LoggedMail.log_processed = true
+          Astrotrain.callback(:pre_mapping) do |message|
+            raise Astrotrain::ProcessingCancelled
+          end
+
+          @msg = Astrotrain::Message.receive(mail(:mapped))
+          assert_equal 0, Astrotrain::LoggedMail.count
+        end
+
         it "calls pre_processing callback" do
           Astrotrain::LoggedMail.log_processed = true
           callback_msg, callback_map = nil
@@ -56,6 +66,17 @@ class Astrotrain::MessageTest < Astrotrain::TestCase
           assert_equal callback_map, @log.mapping
         end
 
+        it "it allows pre_processing callback to cancel processing" do
+          Astrotrain::LoggedMail.log_processed = true
+          Astrotrain.callback(:pre_processing) do |message, mapping|
+            raise Astrotrain::ProcessingCancelled
+          end
+
+          @msg = Astrotrain::Message.receive(mail(:mapped))
+          @log = Astrotrain::LoggedMail.first
+          assert_equal "Cancelled.", @log.error_message
+        end
+
         it "calls post_processing callback" do
           Astrotrain::LoggedMail.log_processed = true
           callback_msg, callback_map, callback_log = nil
@@ -145,11 +166,8 @@ class Astrotrain::MessageTest < Astrotrain::TestCase
         @message = Astrotrain::Message.parse(@raw)
       end
 
-      it "parses message-id" do
+      it "parses message-id and headers" do
         assert_equal 'a16be7390810161014n52b603e9k1aa6bb803c6735aa@mail.gmail.com', @message.message_id
-      end
-
-      it "parses TMail::Mail headers" do
         expected = {'mime-version' => '1.0', 'content-type' => 'text/plain; charset=ISO-8859-1', 'to' => 'Processor <processor@astrotrain.com>',
           'x-custom' => 'reply', 'content-transfer-encoding' => '7bit', 'content-disposition' => 'inline', 'message-id' => '<a16be7390810161014n52b603e9k1aa6bb803c6735aa@mail.gmail.com>'}
         assert_equal expected, @message.headers
@@ -369,6 +387,21 @@ class Astrotrain::MessageTest < Astrotrain::TestCase
       end
     end
 
+    describe "with only HTML body in a multipart message" do
+      before :all do
+        @raw     = mail(:html_multipart)
+        @message = Astrotrain::Message.parse(@raw)
+      end
+
+      it "parses emtpy body" do
+        assert_equal '', @message.body
+      end
+
+      it "parses HTML body" do
+        assert_equal "<p>ABC</p>\n------", @message.html
+      end
+    end
+
     describe "with only HTML body" do
       before :all do
         @raw     = mail(:html)
@@ -380,7 +413,7 @@ class Astrotrain::MessageTest < Astrotrain::TestCase
       end
 
       it "parses HTML body" do
-        assert_equal "<p>ABC</p>\n------", @message.html
+        assert_equal "<p>ABC</p>", @message.html
       end
     end
 

metadata

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