malone 1.0.5 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 801ac23610ff25c73bfee7491db4e6dd3579bb9d
-  data.tar.gz: dee85dd144618ce9d31c6a68f3d1bd030cc7c950
+  metadata.gz: f4b3229ea37426d098ec276c2dd39d4ae51c4d82
+  data.tar.gz: 431a420d9f22ff479644b25ea934a680b96db326
 SHA512:
-  metadata.gz: c4ffbd9bd6a2313c5955eef2af732b4af75b98d858e4ba1b282785c2fa8e7a2b98a98324519f39d2aea21ed3dcd853eae020342b2e8ce090ef95964de36ce6a8
-  data.tar.gz: e3180d5b36efcd71c50550356ea0c7c5b56401b64a14e94887faef1b123046db20688de3da6c1a52f11c7da5988341e2fd4a1199fc92c9fee98c663efcb141a7
+  metadata.gz: 5d4f178cc9c09b5eaabbc99afb8450a7b7e8648dc0df33c2ad10adb6e4671f07b96ed597115b6d832de3b067ad2861a6ed4cc514d97a37edb910f20159cef028
+  data.tar.gz: 172b40dda19aebe92679fa3b961242dee49b66da5d33a056f79505130d595ba4f99e7fe9f57c092e22ccf876ca45e0dbf60d96305150ada58e996d1e7a311cb3

data/.gems

@@ -0,0 +1,2 @@
+cutest -v 1.2.2
+kuvert -v 0.0.1

data/.gitignore

@@ -0,0 +1 @@
+/pkg

data/Makefile

@@ -0,0 +1,4 @@
+test: .PHONY
+	cutest test/*.rb
+
+.PHONY:

data/lib/malone.rb

@@ -1,5 +1,5 @@
 require "cgi"
-require "mailfactory"
+require "kuvert"
 require "net/smtp"
 require "uri"
 
@@ -30,39 +30,37 @@ class Malone
 
   def deliver(dict)
     mail = envelope(dict)
+    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)
-      smtp.send_message(mail.to_s, mail.from.first, *recipients(mail))
+      smtp.send_message(mail.to_s, mail.from.first, *mail.recipients)
     ensure
       smtp.finish if smtp.started?
     end
   end
 
-  def recipients(mail)
-    [].tap do |ret|
-      ret.push(*mail.to)
-      ret.push(*mail.cc)
-      ret.push(*mail.bcc)
-    end
-  end
-
   def envelope(dict)
-    envelope = Envelope.new
+    envelope = Kuvert.new
     envelope.from    = dict[:from]
     envelope.to      = dict[:to]
+    envelope.replyto = dict[:replyto]
     envelope.cc      = dict[:cc] if dict[:cc]
     envelope.bcc     = dict[:bcc] if dict[:bcc]
     envelope.text    = dict[:text]
     envelope.rawhtml = dict[:html] if dict[:html]
     envelope.subject = dict[:subject]
 
-    Array(dict[:attach]).each do |file|
-      envelope.attach(file)
-    end
+    envelope.attach(dict[:attach]) if dict[:attach]
+    envelope.add_attachment_as(*dict[:attach_as]) if dict[:attach_as]
 
     return envelope
   end
@@ -73,8 +71,9 @@ class Malone
     attr_accessor :user
     attr_accessor :password
     attr_accessor :domain
-    attr_accessor :auth
     attr_accessor :tls
+    attr_accessor :force_tls
+    attr :auth
 
     def initialize(options)
       opts = options.dup
@@ -90,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|
@@ -98,8 +105,7 @@ class Malone
     end
 
     def auth=(val)
-      @auth = val
-      @auth = @auth.to_sym if @auth
+      @auth = val && val.to_sym
     end
 
   private
@@ -109,18 +115,4 @@ class Malone
       CGI.unescape(val)
     end
   end
-
-  class Envelope < MailFactory
-    attr :bcc
-
-    def initialize
-      super
-
-      @bcc = []
-    end
-
-    def bcc=(bcc)
-      @bcc.push(bcc)
-    end
-  end
 end

data/lib/malone/test.rb

@@ -5,6 +5,10 @@ class Malone
     @deliveries ||= []
   end
 
+  def self.reset_deliveries
+    @deliveries = nil
+  end
+
   def deliver(*args)
     self.class.deliveries << OpenStruct.new(*args)
   end

data/malone.gemspec

@@ -1,23 +1,16 @@
 Gem::Specification.new do |s|
   s.name = 'malone'
-  s.version = "1.0.5"
-  s.summary = %{Dead-simple Ruby mailing solution which always delivers.}
+  s.version = "1.2.1"
+  s.summary = %{The Mailman}
+  s.description = %{Dead-simple Ruby mailing solution which always delivers.}
   s.date = "2011-01-10"
   s.author = "Cyril David"
   s.email = "cyx@cyx.is"
   s.homepage = "http://github.com/cyx/malone"
-
-  s.files = Dir[
-    "CHANGELOG",
-    "LICENSE",
-    "README.md",
-    "lib/**/*.rb",
-    "test/*.*",
-    "*.gemspec"
-  ]
-
+  s.files = `git ls-files`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency "mailfactory", "~> 1.4"
-  s.add_development_dependency "cutest"
+  s.add_dependency "kuvert", "~> 0.0"
+  s.add_development_dependency "cutest", "~> 1.2"
+  s.license = "MIT"
 end

data/test/malone.rb

@@ -89,13 +89,15 @@ test "#envelope" do
 
   mail = m.envelope(to: "recipient@me.com", from: "no-reply@mydomain.com",
                     subject: "SUB", text: "TEXT", html: "<h1>TEXT</h1>",
-                    cc: "cc@me.com", bcc: "bcc@me.com")
+                    cc: "cc@me.com", bcc: "bcc@me.com",
+                    replyto: "other@me.com")
 
   assert_equal ["recipient@me.com"], mail.to
   assert_equal ["cc@me.com"], mail.cc
   assert_equal ["bcc@me.com"], mail.bcc
   assert_equal ["no-reply@mydomain.com"], mail.from
   assert_equal ["=?utf-8?Q?SUB?="], mail.subject
+  assert_equal "other@me.com", mail.replyto
 
   assert_equal "TEXT", mail.instance_variable_get(:@text)
   assert_equal "<h1>TEXT</h1>", mail.instance_variable_get(:@html)
@@ -184,6 +186,15 @@ scope do
     assert $smtp[:finish]
   end
 
+  test "adding custom headers" do |m|
+    m.deliver(to: "recipient@me.com", from: "no-reply@mydomain.com",
+              subject: "Happy new year!", text: "TEXT") do |mail|
+      mail.add_header("X-MC-SendAt", "2016-01-01 00:00:00")
+    end
+
+    assert $smtp[:blob].include?("X-MC-SendAt: 2016-01-01 00:00:00")
+  end
+
   test "calls #finish even when it fails during send_message" do |m|
     class FakeSMTP
       def send_message(*args)
@@ -219,3 +230,18 @@ test "sandbox" do
   assert_equal "TEXT", mail.text
   assert_equal "<h1>TEXT</h1>", mail.html
 end
+
+test "resetting the test sandbox" do
+  require "malone/test"
+
+  m = Malone.connect
+
+  2.times do
+    m.deliver(to: "recipient@me.com", from: "no-reply@mydomain.com",
+              subject: "SUB", text: "test")
+  end
+
+  assert 1 < Malone.deliveries.size
+  Malone.reset_deliveries
+  assert_equal 0, Malone.deliveries.size
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: malone
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.2.1
 platform: ruby
 authors:
 - Cyril David
@@ -11,49 +11,53 @@ cert_chain: []
 date: 2011-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mailfactory
+  name: kuvert
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: cutest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: 
+        version: '1.2'
+description: Dead-simple Ruby mailing solution which always delivers.
 email: cyx@cyx.is
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gems"
+- ".gitignore"
 - CHANGELOG
 - LICENSE
+- Makefile
 - README.md
-- lib/malone/test.rb
 - lib/malone.rb
+- lib/malone/test.rb
+- malone.gemspec
 - test/helper.rb
 - test/malone.rb
-- malone.gemspec
 homepage: http://github.com/cyx/malone
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -61,18 +65,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
-summary: Dead-simple Ruby mailing solution which always delivers.
+summary: The Mailman
 test_files: []