cells-mailer 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fa72606b6e77402bfd9832e65298688b4dfd34b
-  data.tar.gz: 57edcc147640ec4e0912f7ac4b59ec9434d20bf0
+  metadata.gz: 5394e6bb558b2c4ed6dcc733dabeddf7d6a03fbe
+  data.tar.gz: 8eb5a40c6abfae10f051465cfecab3924c2898a0
 SHA512:
-  metadata.gz: c3fd1ef9e49f420b4a0d443a0376cebc7fa86cb7c63fb011f14ed03e628000e7b8204e2195b0d9725f44790b97a4a38924deb6f8cbfccbb113da51b28900ccd8
-  data.tar.gz: bbc350a8bb1c75e0787585844bf0eb71b302881bdd684cf32a518f42ae74d477a7135ec2b72aa426e4b5e925aa9d8238418c36d8341705513a71de233bda8de8
+  metadata.gz: 2ecb6653f391fe6e62f9602a02ba0a913f804cace4b767154c126a740f93b50ef983b69c7c1fea6fc791c525db3c85f9e01db554fcf5635737354d67c407aa7e
+  data.tar.gz: 72edc3556b6a151d9556f906dbbef36ea0ed16b4e3b6d9ee2ad1f6dced4f9cc61294b88fd7751b42f4de3f33e3387fc65747b02960dda4e751e860fd88306244

data/.travis.yml

@@ -6,4 +6,5 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - jruby
 before_install: gem update bundler

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.5.0 [☰](https://github.com/timoschilling/cells-mailer/compare/v0.4.1...v0.5.0)
+
+* support for setting one format (still no multiformat support yet)
+* fix a bug with fields via instance methods
+
 ## v0.4.1 [☰](https://github.com/timoschilling/cells-mailer/compare/v0.4.0...v0.4.1)
 
 * fix a bug with `delivery_method` handling

data/Gemfile

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

data/README.md

@@ -100,6 +100,7 @@ class UserNotificationCell < Cell::ViewModel
     from "nick@trailblazer.to"
     subject "nick loves good code!"
     mail_options delivery_method: :smtp
+    format :html # or :text
   end
 end
 
@@ -110,4 +111,5 @@ This configurations will be inherited.
 
 ## Roadmap
 
-* making a real config object
+* multipart emails
+* attachments

data/lib/cell/mailer.rb

@@ -35,21 +35,17 @@ module Cell
       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!"
       end
 
-      [:to, :subject, :from].each do |field|
-        options[field] = send(options[field]) if options[field].is_a? Symbol
-      end
+      # TODO: this should handel by Configuration
+      options = self.class.mailer.store.delete_if{ |_, v| v == nil }.merge options
+      options = Cell::Mailer.configuration.store.delete_if{ |_, v| v == nil }.merge options
 
-      [:to, :subject, :from].each do |field|
-        options[field] ||= self.class.mailer.send(field)
+      [:to, :from, :subject].each do |field|
+        options[field] = send(options[field]) if options[field].is_a? Symbol
       end
 
       self.class.mailer.mail_options.each do |key, value|
@@ -59,6 +55,13 @@ module Cell
       state = options.delete(:method) || :show
       options[:body] ||= call(state)
 
+      options[:content_type] = case options.delete(:format) || :text
+      when :html
+        "text/html"
+      when :text
+        "text/plain"
+      end
+
       [options, options.delete(:delivery_method)]
     end
 

data/lib/cell/mailer/configuration.rb

@@ -3,7 +3,7 @@ module Cell
     class Configuration
       class << self
         def attributes
-          { to: nil, from: nil, subject: nil, mail_options: {} }
+          { to: nil, from: nil, subject: nil, format: nil, mail_options: {} }
         end
       end
 
@@ -37,8 +37,6 @@ module Cell
         self.class.new cloned_store
       end
 
-      private
-
       attr_reader :store
     end
   end

data/lib/cell/mailer/version.rb

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

metadata

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