astrotrain 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/astrotrain.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{astrotrain}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["technoweenie"]

data/lib/astrotrain/message.rb

@@ -173,7 +173,7 @@ module Astrotrain
     end
 
     def message_id
-      @message_id ||= mail.header('message-id').to_s.gsub(/^<|>$/, '')
+      @message_id ||= header('message-id').to_s.gsub(/^<|>$/, '')
     end
 
     def body

data/test/message_test.rb

@@ -145,6 +145,10 @@ class Astrotrain::MessageTest < Astrotrain::TestCase
         @message = Astrotrain::Message.parse(@raw)
       end
 
+      it "parses message-id" 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>'}

data/test/transport_test.rb

@@ -58,53 +58,55 @@ class Astrotrain::TransportTest < Astrotrain::TestCase
     end
   end
 
-  describe "jabber" do
-    before :all do
-      @dest    = 'foo@bar.com'
-      @message = Astrotrain::Message.parse(mail(:custom))
-      @mapping = Astrotrain::Mapping.new(:destination => @dest, :transport => 'jabber')
-    end
-
-    before do
-      @trans   = Astrotrain::Mapping::Jabber.new(@message, @mapping, @message.recipients(%w(delivered_to)).first)
-    end
-
-    it "sets #content" do
-      expected = "From: %s\nTo: %s\nSubject: %s\nEmails: %s\n%s" % [@message.sender, @message.recipients(%w(delivered_to)).first, @message.subject, @message.recipients(%w(original_to to)) * ", ", @message.body]
-      assert_equal expected, @trans.content
-    end
-
-    it "sets content with mapping separator set" do
-      @message = Astrotrain::Message.parse(mail(:reply))
-      @mapping.separator = "=" * 5
-      @trans   = Astrotrain::Mapping::Jabber.new(@message, @mapping, @message.recipients(%w(delivered_to)).first)
-      expected = "From: %s\nTo: %s\nSubject: %s\nEmails: %s\n%s" % [@message.sender, @message.recipients(%w(delivered_to)).first, @message.subject, '', "blah blah"]
-      assert_equal expected, @trans.content
-    end
-
-    describe "when processing" do
-      before do
-        @conn = Object.new
-        stub(@trans).connection { @conn }
-        stub(Astrotrain::Mapping::Jabber).new { @trans }
+  if Astrotrain::Mapping.const_defined?(:Jabber)
+    describe "jabber" do
+      before :all do
+        @dest    = 'foo@bar.com'
+        @message = Astrotrain::Message.parse(mail(:custom))
+        @mapping = Astrotrain::Mapping.new(:destination => @dest, :transport => 'jabber')
       end
 
-      it "makes jabber delivery" do
-        mock(@conn).deliver(@mapping.destination, @trans.content)
-        @trans.process
+      before do
+        @trans   = Astrotrain::Mapping::Jabber.new(@message, @mapping, @message.recipients(%w(delivered_to)).first)
       end
 
-      it "makes jabber delivery from Transport" do
-        mock(@conn).deliver(@mapping.destination, @trans.content)
-        Astrotrain::Mapping::Transport.process(@message, @mapping, @message.recipients(%w(delivered_to)).first)
+      it "sets #content" do
+        expected = "From: %s\nTo: %s\nSubject: %s\nEmails: %s\n%s" % [@message.sender, @message.recipients(%w(delivered_to)).first, @message.subject, @message.recipients(%w(original_to to)) * ", ", @message.body]
+        assert_equal expected, @trans.content
       end
 
-      before :all do
-        Astrotrain::Mapping::Transport.processing = true
+      it "sets content with mapping separator set" do
+        @message = Astrotrain::Message.parse(mail(:reply))
+        @mapping.separator = "=" * 5
+        @trans   = Astrotrain::Mapping::Jabber.new(@message, @mapping, @message.recipients(%w(delivered_to)).first)
+        expected = "From: %s\nTo: %s\nSubject: %s\nEmails: %s\n%s" % [@message.sender, @message.recipients(%w(delivered_to)).first, @message.subject, '', "blah blah"]
+        assert_equal expected, @trans.content
       end
 
-      after :all do
-        Astrotrain::Mapping::Transport.processing = false
+      describe "when processing" do
+        before do
+          @conn = Object.new
+          stub(@trans).connection { @conn }
+          stub(Astrotrain::Mapping::Jabber).new { @trans }
+        end
+
+        it "makes jabber delivery" do
+          mock(@conn).deliver(@mapping.destination, @trans.content)
+          @trans.process
+        end
+
+        it "makes jabber delivery from Transport" do
+          mock(@conn).deliver(@mapping.destination, @trans.content)
+          Astrotrain::Mapping::Transport.process(@message, @mapping, @message.recipients(%w(delivered_to)).first)
+        end
+
+        before :all do
+          Astrotrain::Mapping::Transport.processing = true
+        end
+
+        after :all do
+          Astrotrain::Mapping::Transport.processing = false
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astrotrain
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - technoweenie