malone 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b1ca8f31cc283952e8c8695856e8d23b786989f
-  data.tar.gz: 590735c66084e4ac868cc84134bf8ada90e1658e
+  metadata.gz: f4b3229ea37426d098ec276c2dd39d4ae51c4d82
+  data.tar.gz: 431a420d9f22ff479644b25ea934a680b96db326
 SHA512:
-  metadata.gz: 4e970f1a1cc960d86a770eefa0ebecaee36acff06b0bf84e1d58829fbf79b4db501e777016f8b78f68be5550626e4f611dee887183a3680042c2aa2c075f600b
-  data.tar.gz: 88545a350e515bca0f72043aaa918ea09d77384e7b50f84ab375121373ff8877982c52e3f484cfd19820035526912b467d15016c8ec88a2be8ef2d9ced31f503
+  metadata.gz: 5d4f178cc9c09b5eaabbc99afb8450a7b7e8648dc0df33c2ad10adb6e4671f07b96ed597115b6d832de3b067ad2861a6ed4cc514d97a37edb910f20159cef028
+  data.tar.gz: 172b40dda19aebe92679fa3b961242dee49b66da5d33a056f79505130d595ba4f99e7fe9f57c092e22ccf876ca45e0dbf60d96305150ada58e996d1e7a311cb3

data/lib/malone.rb

@@ -33,7 +33,12 @@ class Malone
     yield mail if block_given?
 
     smtp = Net::SMTP.new(config.host, config.port)
-    smtp.enable_starttls_auto if config.tls
+
+    if config.force_tls
+      smtp.enable_starttls
+    elsif config.tls
+      smtp.enable_starttls_auto
+    end
 
     begin
       smtp.start(config.domain, config.user, config.password, config.auth)
@@ -67,7 +72,7 @@ class Malone
     attr_accessor :password
     attr_accessor :domain
     attr_accessor :tls
-    
+    attr_accessor :force_tls
     attr :auth
 
     def initialize(options)
@@ -84,6 +89,14 @@ class Malone
         opts[:port]     ||= uri.port.to_i
         opts[:user]     ||= unescaped(uri.user)
         opts[:password] ||= unescaped(uri.password)
+
+        additional_opts = Hash[uri.query.to_s.split('&').map { |e| e.split('=')}]
+
+        if additional_opts.has_key?('force_tls')
+          @force_tls = true
+        elsif additional_opts.has_key?('tls')
+          @tls = true
+        end
       end
 
       opts.each do |key, val|

data/malone.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'malone'
-  s.version = "1.2.0"
+  s.version = "1.2.1"
   s.summary = %{The Mailman}
   s.description = %{Dead-simple Ruby mailing solution which always delivers.}
   s.date = "2011-01-10"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: malone
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Cyril David
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: The Mailman