Completely restructing yaml and now showing proper names in select box

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/sms_fu.rb b/lib/sms_fu.rb
index 3ba2c21..b8b56bd 100644
--- a/lib/sms_fu.rb
+++ b/lib/sms_fu.rb
@@ -71,7 +71,7 @@ module SMSFu
 
   def determine_sms_email(phone_number, carrier)
     if @@carriers.has_key?(carrier.downcase)
-      "#{phone_number}#{@@carriers[carrier.downcase]}"
+      "#{phone_number}#{@@carriers[carrier.downcase]['value']}"
     else 
       raise SMSFuException.new("Specified carrier, #{carrier} is not supported.")
     end
diff --git a/lib/sms_fu_helper.rb b/lib/sms_fu_helper.rb
index fdc67c1..849f0e2 100644
--- a/lib/sms_fu_helper.rb
+++ b/lib/sms_fu_helper.rb
@@ -2,7 +2,7 @@ module SMSFuHelper
   # Returns a collection of carriers to be used in your own select tag
   # e.g., <%= f.select :mobile_carrier, carrier_collection %>
   def carrier_collection
-    SMSFu.carriers.sort.collect{ |carrier| [carrier[0].titleize, carrier[0]] }
+    SMSFu.carriers.sort.collect{ |carrier| [carrier[0]['name'].titleize, carrier[0]] }
   end
   
   # Returns a formatted select box filled with carriers