Merge remote-tracking branch 'upstream/pull/5335'

[rails.git] / lib / country.rb

diff --git a/lib/country.rb b/lib/country.rb
index 48a721a49cf48a3fddc9e1101a5beea0ec55fa90..ca547a972d7df72ccb9bd9c6dc03823b648ee50e 100644 (file)
--- a/lib/country.rb
+++ b/lib/country.rb
@@ -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(Rails.root.join("config/countries.xml").read)
 
     xml.elements.each("geonames/country") do |ele|
       code = ele.get_text("countryCode").to_s