Adding ability to specify custom from address per mailing

2 files changed, 8 insertions, 10 deletions

diff --git a/lib/sms_fu.rb b/lib/sms_fu.rb
index 9533341..2aa2dea 100644
--- a/lib/sms_fu.rb
+++ b/lib/sms_fu.rb
@@ -23,22 +23,23 @@ require 'sms_notifier'
 
 module SMSFu
   RAILS_CONFIG_ROOT = defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/config" : "#{File.dirname(__FILE__)}/../templates" unless defined?(RAILS_CONFIG_ROOT)
-  @config ||= YAML::load(File.open("#{RAILS_CONFIG_ROOT}/sms_fu.yml"))
-  @@carriers ||= @config['carriers']
+  @config     ||= YAML::load(File.open("#{RAILS_CONFIG_ROOT}/sms_fu.yml"))
+  @@carriers  ||= @config['carriers'] 
+  @@from_address = @config['config']['from_address']
   
   def self.carriers
     @@carriers.dup
   end
   
   def deliver_sms(number,carrier,message,options={})
-    number = format_number(number)
-    raise SMSFuException.new("Cannot deliver an empty message to #{number}") if message.nil? or message.empty?
+    raise SMSFuException.new("Cannot deliver an empty message to #{format_number(number)}") if message.nil? or message.empty?
     
     options[:limit] ||= message.length
+    options[:from]  ||= @@from_address
     message = message[0..options[:limit]-1]
     sms_email = determine_sms_email(format_number(number),carrier)
     
-    SmsNotifier.deliver_sms_message(sms_email,message)
+    SmsNotifier.deliver_sms_message(sms_email,message,options[:from])
   rescue SMSFuException => exception
     raise exception
   end
@@ -53,7 +54,6 @@ module SMSFu
   def format_number(number)
     pre_formatted = number.gsub("-","").strip
     formatted =  (pre_formatted.length == 11 && pre_formatted[0,1] == "1") ? pre_formatted[1..pre_formatted.length] : pre_formatted
-
     return is_valid?(formatted) ? formatted : (raise SMSFuException.new("Phone number (#{number}) is not formatted correctly"))
   end
   
diff --git a/lib/sms_notifier.rb b/lib/sms_notifier.rb
index 1dff814..5d960c6 100644
--- a/lib/sms_notifier.rb
+++ b/lib/sms_notifier.rb
@@ -22,13 +22,11 @@ require 'yaml'
 
 class SmsNotifier < ActionMailer::Base
   @config = YAML::load(File.open("#{RAILS_ROOT}/config/sms_fu.yml"))
-  @@from_address = @config['config']['from_address']
-  cattr_accessor :from_address
 
-  def sms_message(recipient, message)
+  def sms_message(recipient, message, sender_email)
     content_type      "text/plain"
     recipients        recipient
-    from              from_address
+    from              sender_email
     
     body['message'] = message
   end