gmail_sender 0.4.0 → 1.0.0

data/.gitignore

@@ -1,3 +1,4 @@
+*~
 *.sw?
 .DS_Store
 coverage

data/README.rdoc

@@ -7,7 +7,14 @@ A simple gem to send email through gmail
 
   g = GmailSender.new("gmail_account_user_name", "gmail_account_password")
   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")
+  g.send(:to => "someone@domain.com", :subject => "The subject", :content => "The mail body")
+
+You can specify the content type which is text/plain by default.
+
+  g.send(:to => "someone@domain.com",
+         :subject => "The subject",
+         :content => "<img src='http://upload.wikimedia.org/wikipedia/en/0/0d/Simpsons_FamilyPicture.png'/>", 
+         :content_type => 'text/html')
 
 To use your google apps domain instead of gmail.com include the complete sender email instead of just the user name:
 
@@ -36,7 +43,15 @@ You can specify some parameters like in this example which doesn't use pipes:
 You can send attachments by using the -a option (this example assumes that you have a receiver_email set in the ~/.gmail file so the -t is not needed):
 
   gmail -c "hi, I'm sending some attachments" -a ./VERSION ./gmail_sender.gemspec
-  
+
+To send html content use the ct option
+
+  gmail -c "<img src='http://upload.wikimedia.org/wikipedia/en/0/0d/Simpsons_FamilyPicture.png'/>" -ct text/html
+
+== Installation
+
+  sudo gem install gmail_sender
+
 == Requirements
 
 tlsmail if running Ruby 1.8.6

data/VERSION

@@ -1 +1 @@
-0.4.0
+1.0.0

data/bin/gmail

@@ -26,6 +26,12 @@ Choice.options do
     desc 'Body of the email, uses STDIN if omitted'
   end
 
+  option :content_type do
+    short '-ct'
+    long '--content_type=CONTENT_TYPE'
+    desc 'Content Type, text/plain by default, use text/html for html'
+  end
+
 option :attachments do
     short '-a'
     long '--attachments *ATTACHMENTS'
@@ -48,7 +54,8 @@ def params
   end
 
   defaults = {'subject' => 'Sent from command line',
-              'sender_domain' => 'gmail.com'}
+              'sender_domain' => 'gmail.com',
+              'content_type' => 'text/plain'}
 
   @params = defaults.merge(YAML.load_file(config_file_path)).merge(Choice.choices)
 end
@@ -61,4 +68,4 @@ if params['attachments']
   end
 end
 content = params['content'] || (params['attachments'] && params['attachments'].join("\n"))
-mailer.send(params['receiver_email'], params['subject'], content || STDIN.read)
+mailer.send(:to => params['receiver_email'], :subject => params['subject'], :content => content || STDIN.read, :content_type => params['content_type'])

data/gmail_sender.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gmail_sender}
-  s.version = "0.4.0"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Cadenas"]
-  s.date = %q{2010-02-21}
+  s.date = %q{2010-02-28}
   s.default_executable = %q{gmail}
   s.email = %q{dcadenas@gmail.com}
   s.executables = ["gmail"]
@@ -27,7 +27,9 @@ Gem::Specification.new do |s|
      "bin/gmail",
      "gmail_sender.gemspec",
      "lib/gmail_sender.rb",
+     "lib/gmail_sender/error.rb",
      "lib/gmail_sender/message_stream_writer.rb",
+     "lib/gmail_sender/utils.rb",
      "lib/tls_smtp_patch.rb",
      "test/gmail_sender_test.rb",
      "test/message_stream_writer_test.rb",
@@ -36,7 +38,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/dcadenas/gmail_sender}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A simple gem to send email through gmail}
   s.test_files = [
     "test/gmail_sender_test.rb",

data/lib/gmail_sender/error.rb

@@ -0,0 +1,4 @@
+class GmailSender
+  class Error < StandardError
+  end
+end

data/lib/gmail_sender/message_stream_writer.rb

@@ -10,9 +10,9 @@ class GmailSender
       @boundary = rand(2**256).to_s(16)
     end
 
-    def write(msg_stream, to, subject, content)
+    def write(msg_stream, to, subject, content, content_type)
       write_headers(msg_stream, to, subject)
-      write_content(msg_stream, content)
+      write_content(msg_stream, content, content_type)
       write_attachments(msg_stream)
     end
 
@@ -21,19 +21,19 @@ class GmailSender
       msg_stream.puts "From: #{@sender_email}"
       msg_stream.puts "To: #{to}"
       msg_stream.puts "Subject: #{subject}"
+      msg_stream.puts 'MIME-Version: 1.0'
       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)
+    def write_content(msg_stream, content, content_type)
       unless @attachments.empty?
         msg_stream.puts "--#{@boundary}" unless @attachments.empty?
-        msg_stream.puts 'Content-Type: text/plain'
       end
 
+      msg_stream.puts "Content-Type: #{content_type}"
+      msg_stream.puts
       msg_stream.puts content
     end
 

data/lib/gmail_sender/utils.rb

@@ -0,0 +1,7 @@
+class GmailSender
+  module Utils
+    def self.blank?(string)
+      string.nil? || string.strip == ""
+    end
+  end
+end

data/lib/gmail_sender.rb

@@ -1,6 +1,8 @@
 require 'base64'
 require 'tls_smtp_patch'
 require 'gmail_sender/message_stream_writer'
+require 'gmail_sender/utils'
+require 'gmail_sender/error'
 
 class GmailSender
   def initialize(user_or_email, password, net_smtp_class = Net::SMTP, message_stream_writer_class = MessageStreamWriter)
@@ -19,10 +21,17 @@ class GmailSender
     @message_stream_writer.attachments << file if File.exist?(file)
   end
 
-  def send(to, subject = "", content = "")
+  def send(options = {})
+    to = options[:to]
+    subject = options[:subject] || ""
+    content = options[:content] || ""
+    content_type = options[:content_type] || "text/plain; charset='utf-8'"
+
+    raise(Error, "Missing receiver (:to => 'someone@somehost.com')") if Utils.blank?(to)
+
     @net_smtp.start(@sender_domain, @sender_email, @sender_password, :plain) do |smtp|
       smtp.open_message_stream(@sender_email, [to]) do |msg_stream|
-        @message_stream_writer.write(msg_stream, to, subject, content)
+        @message_stream_writer.write(msg_stream, to, subject, content, content_type)
       end
     end
   end

data/test/gmail_sender_test.rb

@@ -23,15 +23,20 @@ class FakedNetSMTP
 end
 
 Expectations do
-  expect "From: me@gmail.com\nTo: someone@somehost.com\nSubject: hi!\n\nho\n" do
+  expect "From: me@gmail.com\nTo: someone@somehost.com\nSubject: hi!\nMIME-Version: 1.0\nContent-Type: text/plain; charset='utf-8'\n\nho\n" do
     gmail_sender = GmailSender.new("me", "password", FakedNetSMTP)
-    gmail_sender.send("someone@somehost.com", "hi!", "ho")
+    gmail_sender.send(:to => "someone@somehost.com", :subject => "hi!", :content => "ho")
     FakedNetSMTP.sent_email
   end
 
-  expect "From: me@somehost.com\nTo: someone@someotherhost.com\nSubject: hi!\n\nho\n" do
+  expect "From: me@somehost.com\nTo: someone@someotherhost.com\nSubject: hi!\nMIME-Version: 1.0\nContent-Type: text/plain; charset='utf-8'\n\nho\n" do
     gmail_sender = GmailSender.new("me@somehost.com", "password", FakedNetSMTP)
-    gmail_sender.send("someone@someotherhost.com", "hi!", "ho")
+    gmail_sender.send(:to => "someone@someotherhost.com", :subject => "hi!", :content => "ho")
     FakedNetSMTP.sent_email
   end
+
+  expect GmailSender::Error do
+    gmail_sender = GmailSender.new("me@somehost.com", "password", FakedNetSMTP)
+    gmail_sender.send(:subject => "hi!", :content => "ho")
+  end
 end

data/test/message_stream_writer_test.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
 
 Expectations do
-  expect "From: sender@gmail.com\nTo: to@gmail.com\nSubject: subject\n\nbody\n" do
+  expect "From: sender@gmail.com\nTo: to@gmail.com\nSubject: subject\nMIME-Version: 1.0\nContent-Type: text/plain\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")
+    message_stream_writer.write(string_io, "to@gmail.com", "subject", "body", "text/plain")
     string_io.string
   end
 
@@ -14,9 +14,9 @@ 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"
@@ -40,7 +40,7 @@ MAIL_WITH_ATTACHMENT_REGEXP
     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")
+      message_stream_writer.write(string_io, "to@gmail.com", "subject", "body", "text/plain")
     end
 
     string_io.string

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: gmail_sender
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Daniel Cadenas
@@ -9,29 +14,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-21 00:00:00 -02:00
+date: 2010-02-28 00:00:00 -02:00
 default_executable: gmail
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: expectations
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: filetesthelper
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 description: 
 email: dcadenas@gmail.com
 executables: 
@@ -51,7 +60,9 @@ files:
 - bin/gmail
 - gmail_sender.gemspec
 - lib/gmail_sender.rb
+- lib/gmail_sender/error.rb
 - lib/gmail_sender/message_stream_writer.rb
+- lib/gmail_sender/utils.rb
 - lib/tls_smtp_patch.rb
 - test/gmail_sender_test.rb
 - test/message_stream_writer_test.rb
@@ -69,18 +80,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A simple gem to send email through gmail