lib/world_flags/helper/geo.rb in world-flags-0.4.7 vs lib/world_flags/helper/geo.rb in world-flags-0.4.8.2

@@ -1,25 +1,25 @@
 module WorldFlags
   class GeoIPError < StandardError; end
 
   module Helper
   	module Geo
-  		def self.ip_country_code ip = nil
+  		def self.country_code_from_ip ip = nil
         ip ||= request.remote_ip
         raise WorldFlags::GeoIPError, "IP address #{ip} is a localhost address" if local_ip?(ip)
         
-        @geoip ||= GeoIP.new WorldFlags.geo_ip_db_path
+        @geoip ||= ::GeoIP.new WorldFlags.geo_ip_db_path
         country = @geoip.country(ip)
         return country[2] unless country.nil?
         raise WorldFlags::GeoIPError, "No country code could be found for IP: #{ip}"
       end
 
       def self.local_ip? ip
         WorldFlags.localhost_list.include?(ip)
       end
 
-  		def ip_country_code ip = nil
-      	WorldFlags::Helper::Geo.ip_country_code ip
+  		def country_code_from_ip ip = nil
+      	WorldFlags::Helper::Geo.country_code_from_ip ip
       end
     end
   end
 end
\ No newline at end of file