cells-mailer 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83f7e7d1776d36365534b7d138b15fa29de2ddeb
-  data.tar.gz: 5c2a36aba0182cf3f70ca97cd914e2e2e0d319aa
+  metadata.gz: 1fa72606b6e77402bfd9832e65298688b4dfd34b
+  data.tar.gz: 57edcc147640ec4e0912f7ac4b59ec9434d20bf0
 SHA512:
-  metadata.gz: 1295b6794f28f77da5e842e403b20295f910e1f3175b9d90025bc859c4ab5e8a7f50d1faa8cf422285c5fac4e946169b5c10d2efc95856c3ba28970a71a3445b
-  data.tar.gz: 7a16e2ad3076e5d8896b8948e0dd5963da9ed0a8a1a29d418ff4ec99310f89845a0127a3da37c1e55a5a0ae9c9816ada6ea9c18c616982af8174f9aa74b621e8
+  metadata.gz: c3fd1ef9e49f420b4a0d443a0376cebc7fa86cb7c63fb011f14ed03e628000e7b8204e2195b0d9725f44790b97a4a38924deb6f8cbfccbb113da51b28900ccd8
+  data.tar.gz: bbc350a8bb1c75e0787585844bf0eb71b302881bdd684cf32a518f42ae74d477a7135ec2b72aa426e4b5e925aa9d8238418c36d8341705513a71de233bda8de8

data/.travis.yml

@@ -2,5 +2,8 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
+  - 1.9
+  - 2.0
+  - 2.1
   - 2.2
 before_install: gem update bundler

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.4.1 [☰](https://github.com/timoschilling/cells-mailer/compare/v0.4.0...v0.4.1)
+
+* fix a bug with `delivery_method` handling
+
 ## v0.4.0 [☰](https://github.com/timoschilling/cells-mailer/compare/v0.3.0...v0.4.0)
 
 * global configuration

data/Gemfile

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem "guard-rspec"
-gem "pry"
+gem "pry-plusplus"

data/bin/console

@@ -7,8 +7,8 @@ require "cells-mailer"
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+require "pry"
+Pry.start
 
-require "irb"
-IRB.start
+# require "irb"
+# IRB.start

data/lib/cell/mailer/version.rb

@@ -1,5 +1,5 @@
 module Cell
   module Mailer
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/lib/cell/mailer.rb

@@ -22,12 +22,23 @@ module Cell
     end
 
     def deliver(options = {})
-      mail = Mail.new process_mail_options(options)
-      mail.deliver
+      build_mail(options).deliver
     end
 
     private
 
+    def build_mail(options)
+      options, delivery_method = process_mail_options(options)
+
+      mail = Mail.new options
+      mail.delivery_method *delivery_method
+      mail
+    end
+
+    def mail_delivery_method
+      self.class.mailer.mail_options[:delivery_method]
+    end
+
     def process_mail_options(options)
       if options[:body] && options[:method]
         raise ArgumentError, "You can't pass in `:method` and `:body` at once!"
@@ -41,14 +52,14 @@ module Cell
         options[field] ||= self.class.mailer.send(field)
       end
 
-      (self.class.mailer.mail_options || {}).each do |key, value|
+      self.class.mailer.mail_options.each do |key, value|
         options[key] = value
       end
 
       state = options.delete(:method) || :show
       options[:body] ||= call(state)
 
-      options
+      [options, options.delete(:delivery_method)]
     end
 
     module ClassMethods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cells-mailer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Timo Schilling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-08 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cells