zip-code-info.rb in zip-code-info-0.2.0

- old
+ new
@@ -1,38 +1,36 @@
 require 'yaml'
 require 'singleton'
 
 class ZipCodeInfo
-  include Singleton 
-  
+  include Singleton
+
   attr_reader :code
-    
+
   def initialize
     @data = YAML.load(File.open(File.join(File.dirname(__FILE__), '..', 'data', 'data.yml')))
-  end 
-  
-  def scf_city_for(code = "")
+  end
+
+  def scf_city_for(code = '')
     return false unless assign_and_validate_code(code)
     @data[code_to_key][:city]
   end
-  
-  def state_for(code = "")
+
+  def state_for(code = '')
     return false unless assign_and_validate_code(code)
     @data[code_to_key][:state]
   end
 
-  
+
   private
-  
+
   def assign_and_validate_code(code)
     @code = code.to_s
-    return @code.match(/^[0-9]{5}$/i) && @data.has_key?(code_to_key)
+    return @code.match(/^\d{5}(-\d{4})?$/i) && @data.has_key?(code_to_key)
   end
-  
+
   # To look up information we only need the first three digits of the zip code
   def code_to_key
     @code[0..2]
   end
-  
+end
 
-  
-end
\ No newline at end of file