Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:dball/mail

Conflicts:
	lib/mail/encodings.rb
	lib/mail/utilities.rb
	spec/mail/network/retriever_methods/pop3_spec.rb
  • Loading branch information...
commit 9f8bf65158c85591134c734dea1b631eb61fafde 2 parents 6cbfd9b + c0d843c
@dball dball authored
Showing with 14 additions and 0 deletions.
  1. +1 −0  lib/mail/utilities.rb
  2. +13 −0 test.rb
View
1  lib/mail/utilities.rb
@@ -177,6 +177,7 @@ def underscoreize( str )
str.to_s.downcase.gsub('-', '_')
end
+<<<<<<< HEAD
if RUBY_VERSION <= '1.8.6'
def map_lines( str, &block )
View
13 test.rb
@@ -0,0 +1,13 @@
+require 'rubygems'
+require 'mail'
+require 'ruby-debug'
+
+smtp = { :address => 'mail.fiendz.org', :port => 587, :domain => 'fiendz.org', :user_name => 'test@fiendz.org', :password => 'foobar', :enable_starttls_auto => true, :openssl_verify_mode => 'none' }
+Mail.defaults { delivery_method :smtp, smtp }
+mail = Mail.new do
+ from 'test@fiendz.org'
+ to 'donald.ball@gmail.com'
+ subject 'subject'
+ body 'body'
+end
+mail.deliver!
Please sign in to comment.
Something went wrong with that request. Please try again.