geo_location 0.3.3 → 0.4.0

data/README.rdoc

@@ -20,12 +20,13 @@ config/initializers/geo_location_config.rb:
 
 == HostIP Example
 
-  location = GeoLocation.find('24.24.24.24') # => {:ip=>"24.24.24.24", :city=>"Liverpool", :region=>"NY", :country=>"US", :latitude=>"43.1059", :longitude=>"-76.2099", :timezone=>"America/New_York"}
+  location = GeoLocation.find('24.24.24.24') # => {:ip=>"24.24.24.24", :city=>"Liverpool", :region=>"NY", :country=>"United States", :country_code=>"US", :latitude=>"43.1059", :longitude=>"-76.2099", :timezone=>"America/New_York"}
   
   puts location[:ip] # => 24.24.24.24
   puts location[:city] # => Liverpool
   puts location[:region] # => NY
-  puts location[:country] # => US
+  puts location[:country] # => United States
+  puts location[:country_code] # => US
   puts location[:latitude] # => 43.1059
   puts location[:longitude] # => -76.2099
   puts location[:timezone] # => America/New_York
@@ -51,12 +52,13 @@ config/initializers/geo_location_config.rb:
 
   GeoLocation::use = :maxmind
   GeoLocation::key = 'YOUR MaxMind.COM LICENSE KEY'
-  location = GeoLocation.find('24.24.24.24') # => {:ip=>"24.24.24.24", :city=>"Jamaica", :region=>"NY", :country=>"US", :latitude=>"40.676300", :longitude=>"-73.775200", :timezone=>"America/New_York"}
+  location = GeoLocation.find('24.24.24.24') # => {:ip=>"24.24.24.24", :city=>"Jamaica", :region=>"NY", :country=>"United States", :country_code=>"US", :latitude=>"40.676300", :longitude=>"-73.775200", :timezone=>"America/New_York"}
 
   puts location[:ip] # => 24.24.24.24
   puts location[:city] # => Jamaica
   puts location[:region] # => NY
-  puts location[:country] # => US
+  puts location[:country] # => United States
+  puts location[:country_code] # => US
   puts location[:latitude] # => 40.676300
   puts location[:longitude] # => -73.775200
   puts location[:timezone] # => America/New_York

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

data/geo_location.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geo_location}
-  s.version = "0.3.3"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Your"]
-  s.date = %q{2010-08-26}
+  s.date = %q{2010-08-29}
   s.description = %q{Geo-locate your users using their IP address via hostip.info or maxmind.com.}
   s.email = %q{chris@ignitionindustries.com}
   s.extra_rdoc_files = [
@@ -25,10 +25,12 @@ Gem::Specification.new do |s|
      "VERSION",
      "geo_location.gemspec",
      "lib/geo_location.rb",
+     "lib/geo_location/countries.rb",
+     "lib/geo_location/countries.txt",
      "lib/geo_location/geo_location.rb",
+     "lib/geo_location/setup.rb",
      "lib/geo_location/timezones.rb",
      "lib/geo_location/timezones.txt",
-     "lib/geo_location/variables.rb",
      "lib/geo_location/version.rb",
      "test/helper.rb",
      "test/test_geo_location.rb"

data/lib/geo_location/countries.rb

@@ -0,0 +1,33 @@
+module GeoLocation
+  
+  class << self
+    
+    def country(country_code)
+      return nil if GeoLocation::countries.empty?
+      GeoLocation::countries[country_code.to_sym]
+    end
+    
+    def build_countries
+      if GeoLocation::countries.empty?
+        data = {}
+        
+        file = File.join(File.dirname(__FILE__), 'countries.txt')
+        File.open(file, "r") do |infile|
+          while (line = infile.gets)
+            countries = line.split("\n")
+            countries.each do |c|
+              c = c.split("  ")
+              code = c[0].to_sym
+              country = c[1]
+              data[code] = country
+            end # end countries.each
+          end # end while
+        end # end file.open
+        
+        GeoLocation::countries = data
+      end # end if
+    end
+    
+  end
+  
+end

data/lib/geo_location/countries.txt

@@ -0,0 +1,249 @@
+A1  Anonymous Proxy
+A2  Satellite Provider
+O1  Other Country
+AD  Andorra
+AE  United Arab Emirates
+AF  Afghanistan
+AG  Antigua and Barbuda
+AI  Anguilla
+AL  Albania
+AM  Armenia
+AN  Netherlands Antilles
+AO  Angola
+AP  Asia/Pacific Region
+AQ  Antarctica
+AR  Argentina
+AS  American Samoa
+AT  Austria
+AU  Australia
+AW  Aruba
+AX  Aland Islands
+AZ  Azerbaijan
+BA  Bosnia and Herzegovina
+BB  Barbados
+BD  Bangladesh
+BE  Belgium
+BF  Burkina Faso
+BG  Bulgaria
+BH  Bahrain
+BI  Burundi
+BJ  Benin
+BM  Bermuda
+BN  Brunei Darussalam
+BO  Bolivia
+BR  Brazil
+BS  Bahamas
+BT  Bhutan
+BV  Bouvet Island
+BW  Botswana
+BY  Belarus
+BZ  Belize
+CA  Canada
+CC  Cocos (Keeling) Islands
+CD  Congo, The Democratic Republic of the
+CF  Central African Republic
+CG  Congo
+CH  Switzerland
+CI  Cote d'Ivoire
+CK  Cook Islands
+CL  Chile
+CM  Cameroon
+CN  China
+CO  Colombia
+CR  Costa Rica
+CU  Cuba
+CV  Cape Verde
+CX  Christmas Island
+CY  Cyprus
+CZ  Czech Republic
+DE  Germany
+DJ  Djibouti
+DK  Denmark
+DM  Dominica
+DO  Dominican Republic
+DZ  Algeria
+EC  Ecuador
+EE  Estonia
+EG  Egypt
+EH  Western Sahara
+ER  Eritrea
+ES  Spain
+ET  Ethiopia
+EU  Europe
+FI  Finland
+FJ  Fiji
+FK  Falkland Islands (Malvinas)
+FM  Micronesia, Federated States of
+FO  Faroe Islands
+FR  France
+GA  Gabon
+GB  United Kingdom
+GD  Grenada
+GE  Georgia
+GF  French Guiana
+GG  Guernsey
+GH  Ghana
+GI  Gibraltar
+GL  Greenland
+GM  Gambia
+GN  Guinea
+GP  Guadeloupe
+GQ  Equatorial Guinea
+GR  Greece
+GS  South Georgia and the South Sandwich Islands
+GT  Guatemala
+GU  Guam
+GW  Guinea-Bissau
+GY  Guyana
+HK  Hong Kong
+HM  Heard Island and McDonald Islands
+HN  Honduras
+HR  Croatia
+HT  Haiti
+HU  Hungary
+ID  Indonesia
+IE  Ireland
+IL  Israel
+IM  Isle of Man
+IN  India
+IO  British Indian Ocean Territory
+IQ  Iraq
+IR  Iran, Islamic Republic of
+IS  Iceland
+IT  Italy
+JE  Jersey
+JM  Jamaica
+JO  Jordan
+JP  Japan
+KE  Kenya
+KG  Kyrgyzstan
+KH  Cambodia
+KI  Kiribati
+KM  Comoros
+KN  Saint Kitts and Nevis
+KP  Korea, Democratic People's Republic of
+KR  Korea, Republic of
+KW  Kuwait
+KY  Cayman Islands
+KZ  Kazakhstan
+LA  Lao People's Democratic Republic
+LB  Lebanon
+LC  Saint Lucia
+LI  Liechtenstein
+LK  Sri Lanka
+LR  Liberia
+LS  Lesotho
+LT  Lithuania
+LU  Luxembourg
+LV  Latvia
+LY  Libyan Arab Jamahiriya
+MA  Morocco
+MC  Monaco
+MD  Moldova, Republic of
+ME  Montenegro
+MG  Madagascar
+MH  Marshall Islands
+MK  Macedonia
+ML  Mali
+MM  Myanmar
+MN  Mongolia
+MO  Macao
+MP  Northern Mariana Islands
+MQ  Martinique
+MR  Mauritania
+MS  Montserrat
+MT  Malta
+MU  Mauritius
+MV  Maldives
+MW  Malawi
+MX  Mexico
+MY  Malaysia
+MZ  Mozambique
+NA  Namibia
+NC  New Caledonia
+NE  Niger
+NF  Norfolk Island
+NG  Nigeria
+NI  Nicaragua
+NL  Netherlands
+NO  Norway
+NP  Nepal
+NR  Nauru
+NU  Niue
+NZ  New Zealand
+OM  Oman
+PA  Panama
+PE  Peru
+PF  French Polynesia
+PG  Papua New Guinea
+PH  Philippines
+PK  Pakistan
+PL  Poland
+PM  Saint Pierre and Miquelon
+PN  Pitcairn
+PR  Puerto Rico
+PS  Palestinian Territory
+PT  Portugal
+PW  Palau
+PY  Paraguay
+QA  Qatar
+RE  Reunion
+RO  Romania
+RS  Serbia
+RU  Russian Federation
+RW  Rwanda
+SA  Saudi Arabia
+SB  Solomon Islands
+SC  Seychelles
+SD  Sudan
+SE  Sweden
+SG  Singapore
+SH  Saint Helena
+SI  Slovenia
+SJ  Svalbard and Jan Mayen
+SK  Slovakia
+SL  Sierra Leone
+SM  San Marino
+SN  Senegal
+SO  Somalia
+SR  Suriname
+ST  Sao Tome and Principe
+SV  El Salvador
+SY  Syrian Arab Republic
+SZ  Swaziland
+TC  Turks and Caicos Islands
+TD  Chad
+TF  French Southern Territories
+TG  Togo
+TH  Thailand
+TJ  Tajikistan
+TK  Tokelau
+TL  Timor-Leste
+TM  Turkmenistan
+TN  Tunisia
+TO  Tonga
+TR  Turkey
+TT  Trinidad and Tobago
+TV  Tuvalu
+TW  Taiwan
+TZ  Tanzania, United Republic of
+UA  Ukraine
+UG  Uganda
+UM  United States Minor Outlying Islands
+US  United States
+UY  Uruguay
+UZ  Uzbekistan
+VA  Holy See (Vatican City State)
+VC  Saint Vincent and the Grenadines
+VE  Venezuela
+VG  Virgin Islands, British
+VI  Virgin Islands, U.S.
+VN  Vietnam
+VU  Vanuatu
+WF  Wallis and Futuna
+WS  Samoa
+YE  Yemen
+YT  Mayotte
+ZA  South Africa
+ZM  Zambia
+ZW  Zimbabwe

data/lib/geo_location/geo_location.rb

@@ -72,13 +72,14 @@ module GeoLocation
     def data_from_maxmind_http_response(ip, body)
       location = body.split(',')
       data = {}
-      data[:country] = location[0]
+      data[:country_code] = location[0]
+      data[:country] = country(location[0])
       data[:region] = location[1]
       data[:city] = location[2]
       data[:latitude] = location[3]
       data[:longitude] = location[4]
       data[:ip] = ip
-      data[:timezone] = timezone(data[:country], data[:region])
+      data[:timezone] = timezone(data[:country_code], data[:region])
       data
     end
     
@@ -99,7 +100,8 @@ module GeoLocation
             data[:city] = element.text.split(', ')[0].titleize
             data[:region] = element.text.split(', ')[1]
           when 'countryAbbrev'
-            data[:country] = element.text
+            data[:country_code] = element.text
+            data[:country] = country(element.text)
         end
       end
       
@@ -114,7 +116,7 @@ module GeoLocation
       end
       
       data[:ip] = ip
-      data[:timezone] = timezone(data[:country], data[:region])
+      data[:timezone] = timezone(data[:country_code], data[:region])
       
       data
     end

data/lib/geo_location/{variables.rb → setup.rb}

@@ -4,8 +4,9 @@ module GeoLocation
   @@dev = nil
   @@dev_ip = nil
   @@timezones = {}
+  @@countries = {}
 
-  [:use, :key, :dev, :dev_ip, :timezones].each do |sym|
+  [:use, :key, :dev, :dev_ip, :timezones, :countries].each do |sym|
     class_eval <<-EOS, __FILE__, __LINE__
       def self.#{sym}
         if defined?(#{sym.to_s.upcase})
@@ -21,4 +22,7 @@ module GeoLocation
     EOS
   end
   
+  GeoLocation.build_countries
+  GeoLocation.build_timezones
+  
 end

data/lib/geo_location/timezones.rb

@@ -3,18 +3,16 @@ module GeoLocation
   class << self
     
     def timezone(country, region=nil)
-      build_timezones
       return nil if GeoLocation::timezones.empty?
       (region.nil? || region.empty?) ? GeoLocation::timezones[country.to_sym] : GeoLocation::timezones[country.to_sym][region.to_sym]
     end
     
-  private
-    
     def build_timezones
       if GeoLocation::timezones.empty?
         data = {}
         
-        File.open("lib/geo_location/timezones.txt", "r") do |infile|
+        file = File.join(File.dirname(__FILE__), 'timezones.txt')
+        File.open(file, "r") do |infile|
           while (line = infile.gets)
             zones = line.split("\n")
             zones.each do |z|
@@ -22,20 +20,20 @@ module GeoLocation
               country = zone[0].to_sym
               region = zone[1].to_sym
               value = zone[2]
-
+              
               data[country] = {} if data[country].nil?
               if region.to_s.empty?
                 data[country] = value
               else
                 data[country][region] = value
               end
-
+              
             end # end zones.each
           end # end while
         end # end file.open
-
+        
         GeoLocation::timezones = data
-      end # end unless
+      end # end if
     end
     
   end

data/lib/geo_location.rb

@@ -1,6 +1,7 @@
 require 'active_support/inflector'
 
 require 'geo_location/version'
+require 'geo_location/countries'
 require 'geo_location/timezones'
+require 'geo_location/setup'
 require 'geo_location/geo_location'
-require 'geo_location/variables'

data/test/test_geo_location.rb

@@ -20,8 +20,12 @@ class TestGeoLocation < Test::Unit::TestCase
       assert_equal '24.24.24.24', @location[:ip]
     end
     
-    should "find US country" do
-      assert_equal 'US', @location[:country]
+    should "find US country_code" do
+      assert_equal 'US', @location[:country_code]
+    end
+    
+    should "find United States country" do
+      assert_equal 'United States', @location[:country]
     end
     
     should "find NY region" do
@@ -64,8 +68,12 @@ class TestGeoLocation < Test::Unit::TestCase
       assert_equal '24.24.24.24', @location[:ip]
     end
     
+    should "find US country_code" do
+      assert_equal 'US', @location[:country_code]
+    end
+    
     should "find US country" do
-      assert_equal 'US', @location[:country]
+      assert_equal 'United States', @location[:country]
     end
     
     should "find NY region" do
@@ -121,4 +129,20 @@ class TestGeoLocation < Test::Unit::TestCase
     
   end
   
+  context 'on countries' do
+    
+    should "find country Canada" do
+      assert_equal 'Canada', GeoLocation.country('CA')
+    end
+    
+    should "find country United States" do
+      assert_equal 'United States', GeoLocation.country('US')
+    end
+    
+    should "find country United Kingdom" do
+      assert_equal 'United Kingdom', GeoLocation.country('GB')
+    end
+    
+  end
+  
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Chris Your
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 -06:00
+date: 2010-08-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,10 +48,12 @@ files:
 - VERSION
 - geo_location.gemspec
 - lib/geo_location.rb
+- lib/geo_location/countries.rb
+- lib/geo_location/countries.txt
 - lib/geo_location/geo_location.rb
+- lib/geo_location/setup.rb
 - lib/geo_location/timezones.rb
 - lib/geo_location/timezones.txt
-- lib/geo_location/variables.rb
 - lib/geo_location/version.rb
 - test/helper.rb
 - test/test_geo_location.rb