ruby-gmail 0.2.0 → 0.2.1

data/README.markdown

@@ -90,8 +90,8 @@ A Rubyesque interface to Gmail, with all the tools you'll need. Search, read and
     # Save all attachments in the "Faxes" label to a folder
     folder = "/where/ever"
     gmail.mailbox("Faxes").emails.each do |email|
-      if !email.message.attachments.empty?
-        email.message.save_attachments_to(folder)
+      if !email.attachments.empty?
+        email.save_attachments_to(folder)
       end
     end
 
@@ -111,14 +111,28 @@ A Rubyesque interface to Gmail, with all the tools you'll need. Search, read and
 
 ### 5) Create new emails!
 
-    new_email = MIME::Message.generate
-    new_email.to "email@example.com"
-    new_email.subject "Having fun in Puerto Rico!"
-    plain, html = new_email.generate_multipart('text/plain', 'text/html')
-    plain.content = "Text of plain message."
-    html.content = "<p>Text of <em>html</em> message.</p>"
-    new_email.attach_file('some_image.dmg')
-    gmail.send_email(new_email)
+Creating emails now uses the amazing [Mail](http://rubygems.org/gems/mail) rubygem. See its [documentation here](http://github.com/mikel/mail). Ruby-gmail will automatically configure your Mail emails to be sent via your Gmail account's SMTP, so they will be in your Gmail's "Sent" folder. Also, no need to specify the "From" email either, because ruby-gmail will set it for you.
+
+    gmail.deliver do
+      to "email@example.com"
+      subject "Having fun in Puerto Rico!"
+      text_part do
+        body "Text of plaintext message."
+      end
+      html_part do
+        body "<p>Text of <em>html</em> message.</p>"
+      end
+      add_file "/path/to/some_image.jpg"
+    end
+    # Or, generate the message first and send it later
+    email = gmail.generate_message do
+      to "email@example.com"
+      subject "Having fun in Puerto Rico!"
+      body "Spent the day on the road..."
+    end
+    email.deliver!
+    # Or...
+    gmail.deliver(email)
 
 ## Requirements
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/gmail.rb

@@ -119,7 +119,7 @@ class Gmail
       end
       return value
     else
-      mailboxes[name] ||= Mailbox.new(self, mailbox)
+      mailboxes[mailbox] ||= Mailbox.new(self, mailbox)
     end
   end
   alias :in_label :in_mailbox

data/lib/gmail/message.rb

@@ -83,6 +83,10 @@ class Gmail
       move_to('[Gmail]/All Mail')
     end
 
+    def save_attachments_to(path=nil)
+      attachments.each {|a| a.save_to_file(path) }
+    end
+
     private
 
     # Parsed MIME message object

data/lib/mail/part.rb

@@ -0,0 +1,24 @@
+module Mail
+  class Message
+    def attachment?
+      !!find_attachment
+    end
+  end
+  class Part < Message
+    def save_to_file(path=nil)
+      return false unless attachment?
+      fname = path if path && !File.exists?(path) # If path doesn't exist, assume it's a filename
+      fname ||= path + '/' + filename if path && File.directory?(path) # If path does exist, and we're saving an attachment, use the attachment filename
+      fname ||= (path || filename) # Use the path, or the attachment filename
+      if File.directory?(fname)
+        i = 0
+        begin
+          i += 1
+          fname = fname + "/attachment-#{i}"
+        end until !File.exists(fname)
+      end
+      # After all that trouble to get a filename to save to...
+      File.open(fname, 'w') { |f| f << read }
+    end
+  end
+end

data/ruby-gmail.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-gmail}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["BehindLogic"]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "lib/gmail.rb",
      "lib/gmail/mailbox.rb",
      "lib/gmail/message.rb",
+     "lib/mail/part.rb",
      "lib/smtp_tls.rb",
      "ruby-gmail.gemspec",
      "test/test_gmail.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - BehindLogic
@@ -62,6 +62,7 @@ files:
 - lib/gmail.rb
 - lib/gmail/mailbox.rb
 - lib/gmail/message.rb
+- lib/mail/part.rb
 - lib/smtp_tls.rb
 - ruby-gmail.gemspec
 - test/test_gmail.rb