ruby-gmail 0.0.4 → 0.0.5

data/History.txt

@@ -1,10 +1,23 @@
+=== 0.0.5 / 2009-12-16
+
+* 1 bugfix
+
+  * Fixed IMAP initializer to work with Ruby 1.9's net/imap
+
+* 4 minor enhancements
+
+  * Better logout depending on the IMAP connection itself
+  * Added MIME::Message#text and MIME::Message#html for easier access to an email body
+  * Improved the MIME-parsing API slightly
+  * Added some tests
+
 === 0.0.4 / 2009-11-30
 
 * 4 minor enhancement
 
   * Added label creation (thanks to Justin Perkins / http://github.com/justinperkins)
   * Made the gem login automatically when first needed
-  * Added an optional block on the Gmail.new object that will login and logout for you.
+  * Added an optional block on the Gmail.new object that will login and logout for you
   * Added several search options (thanks to Mikkel Malmberg / http://github.com/mikker)
 
 === 0.0.3 / 2009-11-19
@@ -21,7 +34,7 @@
 
 * 1 minor enhancement
 
-  * Made all of the examples in the README possible.
+  * Made all of the examples in the README possible
 
 === 0.0.1 / 2009-11-18
 

data/lib/gmail.rb

@@ -3,7 +3,7 @@ require 'net/smtp'
 require 'smtp_tls'
 
 class Gmail
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 
   class NoLabel < RuntimeError; end
 
@@ -18,9 +18,9 @@ class Gmail
     end
     meta.username = username =~ /@/ ? username : username + '@gmail.com'
     meta.password = password
-    @imap = Net::IMAP.new('imap.gmail.com',993,true)
+    @imap = Net::IMAP.new('imap.gmail.com',993,true,nil,false)
     if block_given?
-      @connected = true if @imap.login(username, password)
+      @imap.login(username, password)
       yield self
       logout
     end
@@ -37,16 +37,16 @@ class Gmail
   end
   # Accessor for @imap, but ensures that it's logged in first.
   def imap
-    if !@connected
+    if @imap.disconnected?
       meta = class << self; self end
-      @connected = true if @imap.login(meta.username, meta.password)
-      at_exit { logout if @connected } # Set up auto-logout for later.
+      @imap.login(meta.username, meta.password)
+      at_exit { logout } # Set up auto-logout for later.
     end
     @imap
   end
   # Log out of gmail
   def logout
-    @connected = false if @imap.logout
+    @imap.logout unless @imap.disconnected?
   end
 
   def create_label(name)

data/lib/gmail/message.rb

@@ -6,6 +6,7 @@ class Gmail
       @mailbox = mailbox
       @uid = uid
     end
+
     def inspect
       "<#Message:#{object_id} mailbox=#{@mailbox.name}#{' uid='+@uid.to_s if @uid}#{' message_id='+@message_id.to_s if @message_id}>"
     end
@@ -14,6 +15,7 @@ class Gmail
     def uid
       @uid ||= @gmail.imap.uid_search(['HEADER', 'Message-ID', message_id])[0]
     end
+
     def message_id
       @message_id || begin
         @gmail.in_mailbox(@mailbox) do
@@ -22,6 +24,7 @@ class Gmail
       end
       @message_id
     end
+
     def body
       @body ||= @gmail.in_mailbox(@mailbox) do
         @gmail.imap.uid_fetch(uid, "RFC822")[0].attr["RFC822"]
@@ -39,6 +42,7 @@ class Gmail
         @gmail.imap.uid_store(uid, "+FLAGS", [flg])
       end
     end
+
     def unflag(flg)
       @gmail.in_mailbox(@mailbox) do
         @gmail.imap.uid_store(uid, "-FLAGS", [flg])
@@ -58,10 +62,12 @@ class Gmail
         move_to('[Gmail]/Spam')
       end
     end
+
     def delete!
       @mailbox.messages.delete(uid)
       flag(:Deleted)
     end
+
     def label(name)
       @gmail.in_mailbox(@mailbox) do
         begin
@@ -71,6 +77,7 @@ class Gmail
         end
       end
     end
+
     def label!(name)
       @gmail.in_mailbox(@mailbox) do
         begin
@@ -82,13 +89,16 @@ class Gmail
         end
       end
     end
+
     # We're not sure of any 'labels' except the 'mailbox' we're in at the moment.
     # Research whether we can find flags that tell which other labels this email is a part of.
     # def remove_label(name)
     # end
+
     def move_to(name)
       label(name) && delete!
     end
+
     def archive!
       move_to('[Gmail]/All Mail')
     end

data/lib/mime/entity.rb

@@ -12,7 +12,7 @@ module MIME
   class Entity
     def initialize(arg=nil)
       if arg.is_a?(String)
-        @raw = arg
+        @raw = arg.gsub(/\r\r+/, "\r").gsub(/([^\r])\n/, "\\1\r\n") # normalizes end-of-line characters
         from_parsed(IETF::RFC2045.parse_rfc2045_from(@raw))
       elsif arg.is_a?(Hash)
         @headers = arg
@@ -98,7 +98,7 @@ module MIME
         $1
       end
     end
-    attr_accessor :encoding
+    attr_writer :encoding
     def encoding
       @encoding ||= headers['content-transfer-encoding'] || nil
     end
@@ -158,6 +158,8 @@ module MIME
         @content.unpack('M')[0]
       when 'base64'
         @content.unpack('m')[0]
+      # when '7bit'
+      #   # should get this 7bit encoding done too...
       else
         @content
       end

data/test/test_gmail.rb

@@ -0,0 +1,72 @@
+require 'test_helper'
+
+class GmailTest < Test::Unit::TestCase
+  def test_initialize
+    imap = mock('imap')
+    Net::IMAP.expects(:new).with('imap.gmail.com', 993, true, nil, false).returns(imap)
+    gmail = Gmail.new('test', 'password')
+  end
+  
+  def test_imap_does_login
+    setup_mocks(:at_exit => true)
+
+    @imap.expects(:disconnected?).at_least_once.returns(true).then.returns(false)
+    @imap.expects(:login).with('test@gmail.com', 'password')
+    @gmail.imap
+  end
+
+  def test_imap_does_login_only_once
+    setup_mocks(:at_exit => true)
+
+    @imap.expects(:disconnected?).at_least_once.returns(true).then.returns(false)
+    @imap.expects(:login).with('test@gmail.com', 'password')
+    @gmail.imap
+    @gmail.imap
+    @gmail.imap
+  end
+
+  def test_imap_does_login_without_appending_gmail_domain
+    setup_mocks(:at_exit => true)
+
+    @imap.expects(:disconnected?).at_least_once.returns(true).then.returns(false)
+    @imap.expects(:login).with('test@gmail.com', 'password')
+    @gmail.imap
+  end
+  
+  def test_imap_logs_out
+    setup_mocks(:at_exit => true)
+
+    @imap.expects(:disconnected?).at_least_once.returns(true).then.returns(false)
+    @imap.expects(:login).with('test@gmail.com', 'password')
+    @gmail.imap
+    @imap.expects(:logout).returns(true)
+    @gmail.logout
+  end
+
+  def test_imap_logout_does_nothing_if_not_logged_in
+    setup_mocks
+
+    @imap.expects(:disconnected?).returns(true)
+    @imap.expects(:logout).never
+    @gmail.logout
+  end
+  
+  def test_imap_calls_create_label
+    setup_mocks(:at_exit => true)
+    @imap.expects(:disconnected?).at_least_once.returns(true).then.returns(false)
+    @imap.expects(:login).with('test@gmail.com', 'password')
+    @imap.expects(:create).with('foo')
+    @gmail.create_label('foo')
+  end
+  
+  private
+  def setup_mocks(options = {})
+    options = {:at_exit => false}.merge(options)
+    @imap = mock('imap')
+    Net::IMAP.expects(:new).with('imap.gmail.com', 993, true, nil, false).returns(@imap)
+    @gmail = Gmail.new('test@gmail.com', 'password')
+    
+    # need this for the at_exit block that auto-exits after this test method completes
+    @imap.expects(:logout).at_least(0) if options[:at_exit]
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+require 'test/unit'
+require 'rubygems'
+require 'mocha'
+require 'gmail'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-gmail
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Daniel Parker
@@ -30,7 +30,7 @@ cert_chain:
   teST6sOe8lUhZQ==
   -----END CERTIFICATE-----
 
-date: 2009-12-10 00:00:00 -05:00
+date: 2009-12-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,5 +108,6 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A Rubyesque interface to Gmail, with all the tools you'll need
-test_files: []
-
+test_files: 
+- test/test_gmail.rb
+- test/test_helper.rb