Merge remote-tracking branch 'upstream/pull/2134'
[rails.git] / lib / country.rb
index 48a721a49cf48a3fddc9e1101a5beea0ec55fa90..ab88072ecd048d9b86faadcc198f653ae29ffc98 100644 (file)
@@ -9,7 +9,7 @@ class Country
     @max_lon = max_lon
   end
 
-  def self.find_by_code(code)
+  def self.find(code)
     countries[code]
   end
 
@@ -19,7 +19,7 @@ class Country
 
   def self.load_countries
     countries = {}
-    xml = REXML::Document.new(File.read("config/countries.xml"))
+    xml = REXML::Document.new(File.read(Rails.root.join("config", "countries.xml")))
 
     xml.elements.each("geonames/country") do |ele|
       code = ele.get_text("countryCode").to_s