Merging in changes from gcnovus for fixing warnings and redundant YAML parsing when requiring sms_fu more than once.

1 files changed, 8 insertions, 4 deletions

diff --git a/lib/sms_fu.rb b/lib/sms_fu.rb
index 3e0e6d4..4f77735 100644
--- a/lib/sms_fu.rb
+++ b/lib/sms_fu.rb
@@ -21,10 +21,14 @@ require 'yaml'
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module SMSFu
-  RAILS_CONFIG_ROOT = defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/config" : "#{File.dirname(__FILE__)}/../templates"
-  @config = YAML::load(File.open("#{RAILS_CONFIG_ROOT}/sms_fu.yml"))
-  @@carriers = @config['carriers']
-
+  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']
+  
+  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?