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

[rails.git] / lib / country.rb

diff --git a/lib/country.rb b/lib/country.rb
index ea52efd77ccb59c91326f87a82ad4c12cf16b918..ca547a972d7df72ccb9bd9c6dc03823b648ee50e 100644 (file)
--- a/lib/country.rb
+++ b/lib/country.rb
@@ -9,19 +9,17 @@ class Country
     @max_lon = max_lon
   end
 
     @max_lon = max_lon
   end
 

-  def self.find_by_code(code)
+  def self.find(code)

     countries[code]
   end
 
     countries[code]
   end
 

-private
-

   def self.countries
   def self.countries

-    @@countries ||= load_countries
+    @countries ||= load_countries

   end
 
   def self.load_countries
   end
 
   def self.load_countries

-    countries = Hash.new
-    xml = REXML::Document.new(File.read("config/countries.xml"))
+    countries = {}
+    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
 
     xml.elements.each("geonames/country") do |ele|
       code = ele.get_text("countryCode").to_s