no_notifier_needed 2.2.3 → 2.2.4

data/VERSION

@@ -1 +1 @@
-2.2.3
+2.2.4

data/lib/no_notifier_needed/translate.rb

@@ -1,27 +1,29 @@
 module NoNotifierNeeded
   module Translate
     def get_send_hash(template)
-      send_hash = base_send_hash(template)
+      send_hash = {}
+      NoNotifierNeeded::Config::VALID_OPTIONS_KEYS.each do |k|
+        send_hash[k] = NoNotifierNeeded.send(k)
+      end
+
+
+
       send_hash[:subject] = render_template_subject_type(@template)
+
       send_hash[:to] = @to if @to
       send_hash[:to] ||= @user.email if @user
+      send_hash[:to] ||= template.sent_to.split(',')
+
       send_hash[:from] = @from unless @from.blank?
+      send_hash[:from] ||= "#{send_hash.delete(:from_name)} <#{send_hash.delete(:from_email)}>"
+      send_hash[:from] ||= "#{template.from_name} <#{template.from_email}>" unless template.from_name.blank? || template.from_email.blank?
+
       send_hash[:cc] = @cc.nil? ? nil : @cc
-      send_hash[:reply_to] = @reply_to unless @reply_to.blank?
-      send_hash
-    end
 
-    def base_send_hash(template)
-      base = {}
-      NoNotifierNeeded::Config::VALID_OPTIONS_KEYS.each do |k|
-        base[k] = NoNotifierNeeded.send(k)
-      end
+      send_hash[:reply_to] = @reply_to unless @reply_to.blank?
+      send_hash[:reply_to] ||= "#{template.reply_to}" unless template.reply_to.blank?
 
-      base[:from] = "#{base.delete(:from_name)} <#{base.delete(:from_email)}>"
-      base[:from] = "#{template.from_name} <#{template.from_email}>" unless template.from_name.blank? || template.from_email.blank?
-      base[:to] ||= template.sent_to.split(',')
-      base[:reply_to] = "#{template.reply_to}" unless template.reply_to.blank?
-      base
+      send_hash
     end
 
     def args_to_instance_vars(args)

data/no_notifier_needed.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "no_notifier_needed"
-  s.version = "2.2.3"
+  s.version = "2.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robert R. Meyer"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: no_notifier_needed
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -258,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2111440459372589073
+      hash: -1858574740547094975
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: