idlemailer 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cc834e63c8ea6672e0994a01d0443523dafd5f27
-  data.tar.gz: 756db93875c86f865d330f1eee5c6a1a1724f337
+SHA256:
+  metadata.gz: ad91007cd0d5f336f443b3107e150dc865e52cd7048642a388e9d3b476fd180c
+  data.tar.gz: 822bbb3f19ffb0878d568574672fca4a6ad531c9b73f51935ce1ecae9ff77a7d
 SHA512:
-  metadata.gz: 4726efb741bd15359ec79c3ae8825f05cfcf6cb5a0b3abac25e1bb05a78186725688479f1bc4d18ffb5d7f9a46dc9e90729e7718ca776ea1409788c44548e174
-  data.tar.gz: 89679a1c6df53140a4e7e21011c8dd9d20cddab9ea641addfd21d92434b83e9d0c89faa6270e07324ca81c6dc240a4d199564c75d54e46ecd7ef7709fc9e5be7
+  metadata.gz: dc64bf86b25a4fc15d99d9d3a38b99c48a759816ed73e90182169236de159e003a2e44b473c09d079ad4f06eb0ba5fcf2b3c980c3cb7630585a3c7139c7a2f14
+  data.tar.gz: 2291ccedc03e3d310c59eda8e98d153560221ef22d71e47898942e7b9d3adef053c5a235a41f3a58eb26ef2b0fbcc01b4665f2df2887b111db3b2a807c2fd4b1

data/README.md

@@ -21,6 +21,8 @@ class WidgetMailer
     @widget = widget
     mail.to = user.email
     mail.subject = "Widget #{widget.sku}"
+    # 'mail' is just a Mail object from the mail gem, so you can use the
+    # full Mail api here, e.g. to, subject, attachments, etc.
   end
 end
 
@@ -33,12 +35,15 @@ WidgetMailer.new(current_user, widget).deliver
 
 ### Inline templates
 
-Instead of creating template files, you can embed your ERB templates right inside your Ruby class.
+If you prefer, you can embed your ERB templates right inside your Ruby class, instead of making separate template files. Slick amiright?
 
 ```ruby
 class WidgetMailer
   include IdleMailer::Mailer
 
+  # optionally override the default layout
+  self.layout = "widget_layout"
+
   def initialize(user, widget)
     @widget = widget
     mail.to = user.email
@@ -71,7 +76,7 @@ IdleMailer.config do |config|
   # Pre-cache all templates and layouts (instead of re-loading them on each delivery)
   config.cache_templates = true
 
-  # Name of the layout template. Here, the file(s) would be named
+  # Name of the default layout template. Here, the file(s) would be named
   # mailer_layout.html.erb and/or mailer_layout.text.erb.
   config.layout = 'mailer_layout'
 

data/lib/idlemailer/config.rb

@@ -1,7 +1,7 @@
 module IdleMailer
   # Struct for holding IdleMailer config
   #   templates A Pathname object pointing to the mail templates directory (defaults to ./templates)
-  #   layout Name of layout file, minus extention (defaults to mailer_layout)
+  #   layout Name of default layout file, minus extention (defaults to mailer_layout)
   #   delivery_method Symbol like :smtp or :test (see the mail gem for all options)
   #   delivery_options Hash of delivery options (see the mail gem for all options)
   #   default_from Default "from" address if it's left blank

data/lib/idlemailer/mailer.rb

@@ -4,6 +4,9 @@ module IdleMailer
   #  class WidgetMailer
   #    include IdleMailer::Mailer
   #
+  #    # optionally override the default layout
+  #    self.layout = "widget_layout"
+  #
   #    def initialize(address, widget)
   #      mail.to = address
   #      mail.subject = "Widget #{widget.sku}"

data/lib/idlemailer/template_manager.rb

@@ -6,7 +6,7 @@ module IdleMailer
         class << self
           attr_reader :layouts, :templates
         end
-        @layouts, @templates = {}, {}
+        @custom_layout, @layouts, @templates = nil, {}, {}
       end
       klass.cache_templates! if IdleMailer.config.cache_templates
     end
@@ -24,7 +24,13 @@ module IdleMailer
     end
 
     def layout(type)
-      layouts[type] || ERB.new(template_path(IdleMailer.config.layout, type).read.chomp)
+      layouts[type] || ERB.new(template_path(layout_name, type).read.chomp)
+    end
+
+    def layout=(new_name)
+      @custom_layout = new_name
+      layouts.clear
+      cache_templates! if IdleMailer.config.cache_templates
     end
 
     def has_template?(type)
@@ -32,7 +38,7 @@ module IdleMailer
     end
 
     def has_layout?(type)
-      layouts.has_key?(type) || template_path(IdleMailer.config.layout, type).exist?
+      layouts.has_key?(type) || template_path(layout_name, type).exist?
     end
 
     def template_name
@@ -43,15 +49,19 @@ module IdleMailer
         downcase
     end
 
+    def layout_name
+      @custom_layout || IdleMailer.config.layout
+    end
+
     def template_path(name, type)
       IdleMailer.config.templates.join("#{name}.#{type}.erb")
     end
 
     def cache_templates!
-      layouts['text'] = layout 'text' if has_layout? 'text'
-      layouts['html'] = layout 'html' if has_layout? 'html'
-      templates['text'] = template 'text' if has_template? 'text'
-      templates['html'] = template 'html' if has_template? 'html'
+      layouts['text'] ||= layout 'text' if has_layout? 'text'
+      layouts['html'] ||= layout 'html' if has_layout? 'html'
+      templates['text'] ||= template 'text' if has_template? 'text'
+      templates['html'] ||= template 'html' if has_template? 'html'
     end
   end
 end

data/lib/idlemailer/version.rb

@@ -1,5 +1,5 @@
 # IdleMailer module
 module IdleMailer
   # Version number
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: idlemailer
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-29 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A lightweight alternative to ActionMailer