gmail_sender 0.3.1 → 0.4.0

data/README.rdoc

@@ -9,6 +9,10 @@ A simple gem to send email through gmail
   g.attach('/path/to/document.hz') # you can attach any number of files, but there are limits for total attachments size
   g.send("someone@domain.com", "The subject", "The mail body")
 
+To use your google apps domain instead of gmail.com include the complete sender email instead of just the user name:
+
+  g = GmailSender.new("gmail_account_user_name@yourdomain.com", "gmail_account_password")
+
 == Command line usage
 
 You can also use gmail_sender from the command line. First you need to create ~/.gmail with this content (YAML):

data/Rakefile

@@ -9,6 +9,8 @@ begin
     gem.email = "dcadenas@gmail.com"
     gem.homepage = "http://github.com/dcadenas/gmail_sender"
     gem.authors = ["Daniel Cadenas"]
+    gem.add_development_dependency "expectations"
+    gem.add_development_dependency "filetesthelper"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/bin/gmail

@@ -54,7 +54,7 @@ def params
 end
 
 
-mailer = GmailSender.new(params['sender_user'], params['sender_password'], params['sender_domain'])
+mailer = GmailSender.new("#{params['sender_user']}@#{params['sender_domain']}", params['sender_password'])
 if params['attachments']
   params['attachments'].each do |attachment|
     mailer.attach(attachment)

data/gmail_sender.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gmail_sender}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Cadenas"]
-  s.date = %q{2010-01-14}
+  s.date = %q{2010-02-21}
   s.default_executable = %q{gmail}
   s.email = %q{dcadenas@gmail.com}
   s.executables = ["gmail"]
@@ -27,8 +27,10 @@ Gem::Specification.new do |s|
      "bin/gmail",
      "gmail_sender.gemspec",
      "lib/gmail_sender.rb",
+     "lib/gmail_sender/message_stream_writer.rb",
      "lib/tls_smtp_patch.rb",
      "test/gmail_sender_test.rb",
+     "test/message_stream_writer_test.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/dcadenas/gmail_sender}
@@ -38,6 +40,7 @@ Gem::Specification.new do |s|
   s.summary = %q{A simple gem to send email through gmail}
   s.test_files = [
     "test/gmail_sender_test.rb",
+     "test/message_stream_writer_test.rb",
      "test/test_helper.rb"
   ]
 
@@ -46,9 +49,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<expectations>, [">= 0"])
+      s.add_development_dependency(%q<filetesthelper>, [">= 0"])
     else
+      s.add_dependency(%q<expectations>, [">= 0"])
+      s.add_dependency(%q<filetesthelper>, [">= 0"])
     end
   else
+    s.add_dependency(%q<expectations>, [">= 0"])
+    s.add_dependency(%q<filetesthelper>, [">= 0"])
   end
 end
 

data/lib/gmail_sender.rb

@@ -1,68 +1,28 @@
 require 'base64'
-require "tls_smtp_patch"
+require 'tls_smtp_patch'
+require 'gmail_sender/message_stream_writer'
 
 class GmailSender
-
-  ATTACHMENT_READ_PORTION = 150360 # you may change this, but must be multiply to 3
-
-  def initialize(user, password, domain="gmail.com")
-    @sender_domain   = domain
+  def initialize(user_or_email, password, net_smtp_class = Net::SMTP, message_stream_writer_class = MessageStreamWriter)
+    user, domain = user_or_email.split("@")
+    @sender_domain = domain || "gmail.com"
+    @sender_email = "#{user}@#{@sender_domain}"
     @sender_password = password
-    @sender_email     = "#{user}@#{domain}"
-    @net_smtp = Net::SMTP.new("smtp.gmail.com", 587)
+
+    @net_smtp = net_smtp_class.new("smtp.gmail.com", 587)
     @net_smtp.enable_starttls
-    @attachments = []
-    @boundary = rand(2**256).to_s(16)
+
+    @message_stream_writer = message_stream_writer_class.new(@sender_email)
   end
 
   def attach(file)
-    @attachments << file if File.exist?(file)
+    @message_stream_writer.attachments << file if File.exist?(file)
   end
 
   def send(to, subject = "", content = "")
     @net_smtp.start(@sender_domain, @sender_email, @sender_password, :plain) do |smtp|
       smtp.open_message_stream(@sender_email, [to]) do |msg_stream|
-        set_message_stream(msg_stream, to, subject, content)
-      end
-    end
-  end
-
-  def set_message_stream(msg_stream, to, subject, content)
-    set_headers(msg_stream, to, subject)
-    set_content(msg_stream, content)
-    set_attachments(msg_stream)
-  end
-
-private
-  def set_headers(msg_stream, to, subject)
-    msg_stream.puts "From: #{@sender_email}"
-    msg_stream.puts "To: #{to}"
-    msg_stream.puts "Subject: #{subject}"
-    unless @attachments.empty?
-      msg_stream.puts 'MIME-Version: 1.0'
-      msg_stream.puts %{Content-Type: multipart/mixed; boundary="#{@boundary}"}
-    end
-    msg_stream.puts
-    unless @attachments.empty?
-      msg_stream.puts "--#{@boundary}"
-      msg_stream.puts 'Content-Type: text/plain'
-    end
-  end
-
-  def set_content(msg_stream, content)
-    msg_stream.puts content
-  end
-
-  def set_attachments(msg_stream)
-    @attachments.each do |file|
-      msg_stream.puts "--#{@boundary}"
-      msg_stream.puts %{Content-Type: application/octet-stream; name="#{File.basename(file)}"}
-      msg_stream.puts %{Content-Disposition: attachment; filename="#{File.basename(file)}"}
-      msg_stream.puts 'Content-Transfer-Encoding: base64'
-      msg_stream.puts "Content-ID: <#{File.basename(file)}>"
-      msg_stream.puts
-      File.open(file) do |fd|
-        msg_stream.puts Base64.encode64(fd.read(ATTACHMENT_READ_PORTION)) until fd.eof?
+        @message_stream_writer.write(msg_stream, to, subject, content)
       end
     end
   end

data/lib/gmail_sender/message_stream_writer.rb

@@ -0,0 +1,54 @@
+class GmailSender
+  class MessageStreamWriter
+    ATTACHMENT_READ_PORTION = 150360 # you may change this, but must be multiply to 3
+
+    attr_reader :attachments
+
+    def initialize(sender_email)
+      @sender_email = sender_email
+      @attachments = []
+      @boundary = rand(2**256).to_s(16)
+    end
+
+    def write(msg_stream, to, subject, content)
+      write_headers(msg_stream, to, subject)
+      write_content(msg_stream, content)
+      write_attachments(msg_stream)
+    end
+
+    private
+    def write_headers(msg_stream, to, subject)
+      msg_stream.puts "From: #{@sender_email}"
+      msg_stream.puts "To: #{to}"
+      msg_stream.puts "Subject: #{subject}"
+      unless @attachments.empty?
+        msg_stream.puts 'MIME-Version: 1.0'
+        msg_stream.puts %{Content-Type: multipart/mixed; boundary="#{@boundary}"}
+      end
+      msg_stream.puts
+    end
+
+    def write_content(msg_stream, content)
+      unless @attachments.empty?
+        msg_stream.puts "--#{@boundary}" unless @attachments.empty?
+        msg_stream.puts 'Content-Type: text/plain'
+      end
+
+      msg_stream.puts content
+    end
+
+    def write_attachments(msg_stream)
+      @attachments.each do |file|
+        msg_stream.puts "--#{@boundary}"
+        msg_stream.puts %{Content-Type: application/octet-stream; name="#{File.basename(file)}"}
+        msg_stream.puts %{Content-Disposition: attachment; filename="#{File.basename(file)}"}
+        msg_stream.puts 'Content-Transfer-Encoding: base64'
+        msg_stream.puts "Content-ID: <#{File.basename(file)}>"
+        msg_stream.puts
+        File.open(file) do |fd|
+          msg_stream.puts Base64.encode64(fd.read(ATTACHMENT_READ_PORTION)) until fd.eof?
+        end
+      end
+    end
+  end
+end

data/test/gmail_sender_test.rb

@@ -1,10 +1,37 @@
 require 'test_helper'
 
+class FakedNetSMTP
+  def initialize(*args)
+  end
+
+  def start(*args)
+    yield self
+  end
+
+  def enable_starttls
+  end
+
+  def open_message_stream(*args)
+    stream = StringIO.new
+    yield stream
+    @@sent_email = stream.string
+  end
+
+  def self.sent_email
+    @@sent_email
+  end
+end
+
 Expectations do
-  expect "From: gmail_account_name@gmail.com\nTo: to@gmail.com\nSubject: subject\n\nbody\n" do
-    gmail_sender = GmailSender.new("gmail_account_name", "gmail_account_password")
-    string_io = StringIO.new
-    gmail_sender.set_message_stream(string_io, "to@gmail.com", "subject", "body")
-    string_io.string
+  expect "From: me@gmail.com\nTo: someone@somehost.com\nSubject: hi!\n\nho\n" do
+    gmail_sender = GmailSender.new("me", "password", FakedNetSMTP)
+    gmail_sender.send("someone@somehost.com", "hi!", "ho")
+    FakedNetSMTP.sent_email
+  end
+
+  expect "From: me@somehost.com\nTo: someone@someotherhost.com\nSubject: hi!\n\nho\n" do
+    gmail_sender = GmailSender.new("me@somehost.com", "password", FakedNetSMTP)
+    gmail_sender.send("someone@someotherhost.com", "hi!", "ho")
+    FakedNetSMTP.sent_email
   end
 end

data/test/message_stream_writer_test.rb

@@ -0,0 +1,48 @@
+require 'test_helper'
+
+Expectations do
+  expect "From: sender@gmail.com\nTo: to@gmail.com\nSubject: subject\n\nbody\n" do
+    string_io = StringIO.new
+    message_stream_writer = GmailSender::MessageStreamWriter.new("sender@gmail.com")
+    message_stream_writer.write(string_io, "to@gmail.com", "subject", "body")
+    string_io.string
+  end
+
+  expect eval(<<-MAIL_WITH_ATTACHMENT_REGEXP) do
+/From: sender@gmail.com
+To: to@gmail.com
+Subject: subject
+MIME-Version: 1.0
+Content-Type: multipart\\/mixed; boundary="([a-f0-9]+)"
+
+--\\1
+Content-Type: text\\/plain
+body
+--\\1
+Content-Type: application\\/octet-stream; name="first_file.txt"
+Content-Disposition: attachment; filename="first_file.txt"
+Content-Transfer-Encoding: base64
+Content-ID: <first_file.txt>
+
+dGhpcyBpcyB0aGUgZmlyc3QgZmlsZSBjb250ZW50
+--\\1
+Content-Type: application\\/octet-stream; name="second_file.txt"
+Content-Disposition: attachment; filename="second_file.txt"
+Content-Transfer-Encoding: base64
+Content-ID: <second_file.txt>
+
+YW5kIHRoaXMgaXMgdGhlIHNlY29uZCBmaWxlIGNvbnRlbnQ=
+/
+MAIL_WITH_ATTACHMENT_REGEXP
+    string_io = StringIO.new
+    message_stream_writer = GmailSender::MessageStreamWriter.new("sender@gmail.com")
+    message_stream_writer.attachments << "first_file.txt"
+    message_stream_writer.attachments << "second_file.txt"
+
+    with_files("first_file.txt" => "this is the first file content", "second_file.txt" => "and this is the second file content") do
+      message_stream_writer.write(string_io, "to@gmail.com", "subject", "body")
+    end
+
+    string_io.string
+  end
+end

data/test/test_helper.rb

@@ -1,5 +1,7 @@
 require 'rubygems'
 require 'expectations'
+require 'filetesthelper'
+include FileTestHelper
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gmail_sender
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Daniel Cadenas
@@ -9,10 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 -02:00
+date: 2010-02-21 00:00:00 -02:00
 default_executable: gmail
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: expectations
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: filetesthelper
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: dcadenas@gmail.com
 executables: 
@@ -32,8 +51,10 @@ files:
 - bin/gmail
 - gmail_sender.gemspec
 - lib/gmail_sender.rb
+- lib/gmail_sender/message_stream_writer.rb
 - lib/tls_smtp_patch.rb
 - test/gmail_sender_test.rb
+- test/message_stream_writer_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/dcadenas/gmail_sender
@@ -65,4 +86,5 @@ specification_version: 3
 summary: A simple gem to send email through gmail
 test_files: 
 - test/gmail_sender_test.rb
+- test/message_stream_writer_test.rb
 - test/test_helper.rb