Merge branch 'master' of https://github.com/bjoernalbers/mail into bj…

…oernalbers-master

lib/mail/network/retriever_methods/imap.rb

@@ -139,7 +139,13 @@ def start(config=Mail::Configuration.instance, &block)
         raise ArgumentError.new("Mail::Retrievable#imap_start takes a block") unless block_given?
 
         imap = Net::IMAP.new(settings[:address], settings[:port], settings[:enable_ssl], nil, false)
-        imap.login(settings[:user_name], settings[:password])
+        if settings[:authentication].nil?
+          imap.login(settings[:user_name], settings[:password])
+        else
+          # Note that Net::IMAP#authenticate('LOGIN', ...) is not equal with Net::IMAP#login(...)!
+          # (see also http://www.ensta.fr/~diam/ruby/online/ruby-doc-stdlib/libdoc/net/imap/rdoc/classes/Net/IMAP.html#M000718)
+          imap.authenticate(settings[:authentication], settings[:user_name], settings[:password])
+        end
 
         yield imap
       ensure

spec/mail/network/retriever_methods/imap_spec.rb

@@ -226,6 +226,29 @@
       MockIMAP.should be_disconnected
     end
   end
+
+  describe "authentication mechanism" do
+    before(:each) do
+      @imap = MockIMAP.new
+      MockIMAP.stub!(:new).and_return(@imap)
+    end
+    it "should be login by default" do
+      @imap.should_not_receive(:authenticate)
+      @imap.should_receive(:login).with('foo', 'secret')
+      Mail.defaults do
+        retriever_method :imap, {:user_name => 'foo', :password => 'secret'}
+      end
+      messages = Mail.find
+    end
+    it "should be changeable" do
+      @imap.should_receive(:authenticate).with('CRAM-MD5', 'foo', 'secret')
+      @imap.should_not_receive(:login)
+      Mail.defaults do
+        retriever_method :imap, {:authentication => 'CRAM-MD5', :user_name => 'foo', :password => 'secret'}
+      end
+      messages = Mail.find
+    end
+  end
 
 end