geo_location 0.4.0 → 0.4.1

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in geo_location.gemspec
+gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Chris Your
+Copyright (c) 2010-2011 Chris Your
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,53 +1,2 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "geo_location"
-    gem.summary = %Q{Geo-locate your users using their IP address via hostip.info or maxmind.com.}
-    gem.description = %Q{Geo-locate your users using their IP address via hostip.info or maxmind.com.}
-    gem.email = "chris@ignitionindustries.com"
-    gem.homepage = "http://github.com/chrisyour/geo_location"
-    gem.authors = ["Chris Your"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "geo_location #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/geo_location.gemspec

@@ -1,61 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "geo_location/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{geo_location}
-  s.version = "0.4.0"
+  s.name        = "geo_location"
+  s.version     = GeoLocation::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Chris Your"]
+  s.email       = ["chris@ignitionindustries.com"]
+  s.homepage    = "http://github.com/chrisyour/geo_location"
+  s.summary     = %q{Geo Location allows you to geo-locate your users using their IP address via hostip.info or maxmind.com.}
+  s.description = %q{Geo Location allows you to geo-locate your users using their IP address via hostip.info or maxmind.com. This Ruby gem is dead simple to use and configure. Checkout the README and post any issue (or pull requests) to us on GitHub.}
+  
+  s.add_development_dependency "thoughtbot-shoulda"
+  s.add_development_dependency "nokogiri"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Chris Your"]
-  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 = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "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/version.rb",
-     "test/helper.rb",
-     "test/test_geo_location.rb"
-  ]
-  s.homepage = %q{http://github.com/chrisyour/geo_location}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Geo-locate your users using their IP address via hostip.info or maxmind.com.}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_geo_location.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "geo_location"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end
-

data/lib/geo_location/geo_location.rb

@@ -1,6 +1,5 @@
 require 'net/http'
-require 'rexml/document'
-include REXML
+require 'nokogiri'
 
 module GeoLocation
   
@@ -86,33 +85,24 @@ module GeoLocation
     # == Handle http response data from HostIP
     #   xml formatted body
     def data_from_hostip_http_response(ip, body)
-      xml = body
-      location = REXML::Document.new(xml)
+      location = Nokogiri::HTML.parse(body)
       
-      data = {}
-      
-      hostip = XPath.first( location, "//Hostip" )
+      hostip = location.at("hostip")
       return nil if hostip.nil?
       
-      hostip.elements.each do |element|
-        case element.name
-          when 'name'
-            data[:city] = element.text.split(', ')[0].titleize
-            data[:region] = element.text.split(', ')[1]
-          when 'countryAbbrev'
-            data[:country_code] = element.text
-            data[:country] = country(element.text)
-        end
-      end
+      data = {}
       
-      coords = XPath.first( location, "//gml:Point" )
-      coords.elements.each do |element|
-        case element.name
-          when 'coordinates'
-            coordinates = element.text.split(',')
-            data[:latitude] = coordinates[1]
-            data[:longitude] = coordinates[0]
-        end
+      element = hostip.at('name')
+      data[:city] = element.text.split(', ')[0].titleize
+      data[:region] = element.text.split(', ')[1]
+
+      element = hostip.at('countryabbrev')
+      data[:country_code] = element.text
+      data[:country] = country(element.text)
+
+      element = hostip.at( "point coordinates" )
+      if element
+        data[:longitude], data[:latitude] = element.text.split(',')
       end
       
       data[:ip] = ip
@@ -122,4 +112,4 @@ module GeoLocation
     end
     
   end
-end
+end

data/lib/geo_location/timezones.rb

@@ -18,7 +18,7 @@ module GeoLocation
             zones.each do |z|
               zone = z.split("  ")
               country = zone[0].to_sym
-              region = zone[1].to_sym
+              region = zone[1].empty? ? '' : zone[1].to_sym
               value = zone[2]
               
               data[country] = {} if data[country].nil?

data/lib/geo_location/timezones.txt

@@ -70,227 +70,6 @@ AU  05  Australia/South
 AU  06  Australia/Tasmania
 AU  07  Australia/Victoria
 AU  08  Australia/West
-AS    US/Samoa
-CI    Africa/Abidjan
-GH    Africa/Accra
-DZ    Africa/Algiers
-ER    Africa/Asmera
-ML    Africa/Bamako
-CF    Africa/Bangui
-GM    Africa/Banjul
-GW    Africa/Bissau
-CG    Africa/Brazzaville
-BI    Africa/Bujumbura
-EG    Africa/Cairo
-MA    Africa/Casablanca
-GN    Africa/Conakry
-SN    Africa/Dakar
-DJ    Africa/Djibouti
-SL    Africa/Freetown
-BW    Africa/Gaborone
-ZW    Africa/Harare
-ZA    Africa/Johannesburg
-UG    Africa/Kampala
-SD    Africa/Khartoum
-RW    Africa/Kigali
-NG    Africa/Lagos
-GA    Africa/Libreville
-TG    Africa/Lome
-AO    Africa/Luanda
-ZM    Africa/Lusaka
-GQ    Africa/Malabo
-MZ    Africa/Maputo
-LS    Africa/Maseru
-SZ    Africa/Mbabane
-SO    Africa/Mogadishu
-LR    Africa/Monrovia
-KE    Africa/Nairobi
-TD    Africa/Ndjamena
-NE    Africa/Niamey
-MR    Africa/Nouakchott
-BF    Africa/Ouagadougou
-ST    Africa/Sao_Tome
-LY    Africa/Tripoli
-TN    Africa/Tunis
-AI    America/Anguilla
-AG    America/Antigua
-AW    America/Aruba
-BB    America/Barbados
-BZ    America/Belize
-CO    America/Bogota
-VE    America/Caracas
-KY    America/Cayman
-CR    America/Costa_Rica
-DM    America/Dominica
-SV    America/El_Salvador
-GD    America/Grenada
-FR    Europe/Paris
-GP    America/Guadeloupe
-GT    America/Guatemala
-GY    America/Guyana
-CU    America/Havana
-JM    America/Jamaica
-BO    America/La_Paz
-PE    America/Lima
-NI    America/Managua
-MQ    America/Martinique
-UY    America/Montevideo
-MS    America/Montserrat
-BS    America/Nassau
-PA    America/Panama
-SR    America/Paramaribo
-PR    America/Puerto_Rico
-KN    America/St_Kitts
-LC    America/St_Lucia
-VC    America/St_Vincent
-HN    America/Tegucigalpa
-YE    Asia/Aden
-JO    Asia/Amman
-TM    Asia/Ashgabat
-IQ    Asia/Baghdad
-BH    Asia/Bahrain
-AZ    Asia/Baku
-TH    Asia/Bangkok
-LB    Asia/Beirut
-KG    Asia/Bishkek
-BN    Asia/Brunei
-IN    Asia/Calcutta
-MN    Asia/Choibalsan
-LK    Asia/Colombo
-BD    Asia/Dhaka
-AE    Asia/Dubai
-TJ    Asia/Dushanbe
-HK    Asia/Hong_Kong
-TR    Asia/Istanbul
-IL    Asia/Jerusalem
-AF    Asia/Kabul
-PK    Asia/Karachi
-NP    Asia/Katmandu
-KW    Asia/Kuwait
-MO    Asia/Macao
-PH    Asia/Manila
-OM    Asia/Muscat
-CY    Asia/Nicosia
-KP    Asia/Pyongyang
-QA    Asia/Qatar
-MM    Asia/Rangoon
-SA    Asia/Riyadh
-KR    Asia/Seoul
-SG    Asia/Singapore
-TW    Asia/Taipei
-GE    Asia/Tbilisi
-BT    Asia/Thimphu
-JP    Asia/Tokyo
-LA    Asia/Vientiane
-AM    Asia/Yerevan
-BM    Atlantic/Bermuda
-CV    Atlantic/Cape_Verde
-FO    Atlantic/Faeroe
-IS    Atlantic/Reykjavik
-GS    Atlantic/South_Georgia
-SH    Atlantic/St_Helena
-CL    Chile/Continental
-NL    Europe/Amsterdam
-AD    Europe/Andorra
-GR    Europe/Athens
-YU    Europe/Belgrade
-DE    Europe/Berlin
-SK    Europe/Bratislava
-BE    Europe/Brussels
-RO    Europe/Bucharest
-HU    Europe/Budapest
-DK    Europe/Copenhagen
-IE    Europe/Dublin
-GI    Europe/Gibraltar
-FI    Europe/Helsinki
-SI    Europe/Ljubljana
-GB    Europe/London
-LU    Europe/Luxembourg
-MT    Europe/Malta
-BY    Europe/Minsk
-MC    Europe/Monaco
-NO    Europe/Oslo
-CZ    Europe/Prague
-LV    Europe/Riga
-IT    Europe/Rome
-SM    Europe/San_Marino
-BA    Europe/Sarajevo
-MK    Europe/Skopje
-BG    Europe/Sofia
-SE    Europe/Stockholm
-EE    Europe/Tallinn
-AL    Europe/Tirane
-LI    Europe/Vaduz
-VA    Europe/Vatican
-AT    Europe/Vienna
-LT    Europe/Vilnius
-PL    Europe/Warsaw
-HR    Europe/Zagreb
-IR    Asia/Tehran
-MG    Indian/Antananarivo
-CX    Indian/Christmas
-CC    Indian/Cocos
-KM    Indian/Comoro
-MV    Indian/Maldives
-MU    Indian/Mauritius
-YT    Indian/Mayotte
-RE    Indian/Reunion
-FJ    Pacific/Fiji
-TV    Pacific/Funafuti
-GU    Pacific/Guam
-NR    Pacific/Nauru
-NU    Pacific/Niue
-NF    Pacific/Norfolk
-PW    Pacific/Palau
-PN    Pacific/Pitcairn
-CK    Pacific/Rarotonga
-WS    Pacific/Samoa
-KI    Pacific/Tarawa
-TO    Pacific/Tongatapu
-WF    Pacific/Wallis
-TZ    Africa/Dar_es_Salaam
-VN    Asia/Phnom_Penh
-KH    Asia/Phnom_Penh
-CM    Africa/Lagos
-DO    America/Santo_Domingo
-ET    Africa/Addis_Ababa
-FX    Europe/Paris
-HT    America/Port-au-Prince
-CH    Europe/Zurich
-AN    America/Curacao
-BJ    Africa/Porto-Novo
-EH    Africa/El_Aaiun
-FK    Atlantic/Stanley
-GF    America/Cayenne
-IO    Indian/Chagos
-MD    Europe/Chisinau
-MP    Pacific/Saipan
-MW    Africa/Blantyre
-NA    Africa/Windhoek
-NC    Pacific/Noumea
-PG    Pacific/Port_Moresby
-PM    America/Miquelon
-PS    Asia/Gaza
-PY    America/Asuncion
-SB    Pacific/Guadalcanal
-SC    Indian/Mahe
-SJ    Arctic/Longyearbyen
-SY    Asia/Damascus
-TC    America/Grand_Turk
-TF    Indian/Kerguelen
-TK    Pacific/Fakaofo
-TT    America/Port_of_Spain
-VG    America/Tortola
-VI    America/St_Thomas
-VU    Pacific/Efate
-RS    Europe/Belgrade
-ME    Europe/Podgorica
-AX    Europe/Mariehamn
-GG    Europe/Guernsey
-IM    Europe/Isle_of_Man
-JE    Europe/Jersey
-BL    America/St_Barthelemy
-MF    America/Marigot
 AR  01  America/Argentina/Buenos_Aires
 AR  02  America/Argentina/Catamarca
 AR  03  America/Argentina/Tucuman
@@ -671,5 +450,3 @@ UZ  10  Asia/Samarkand
 UZ  12  Asia/Samarkand
 UZ  13  Asia/Tashkent
 UZ  14  Asia/Tashkent
-TL    Asia/Dili
-PF    Pacific/Marquesas

data/lib/geo_location/version.rb

@@ -1,9 +1,3 @@
 module GeoLocation
-  file = File.join(File.dirname(__FILE__), '../../VERSION' )
-  File.open(file, "r") do |infile|
-    while (line = infile.gets)
-      VERSION = line.gsub(/\n/,"")
-      break
-    end
-  end
+  VERSION = "0.4.1"
 end

data/test/test_geo_location.rb

@@ -145,4 +145,21 @@ class TestGeoLocation < Test::Unit::TestCase
     
   end
   
+  context 'on localhost' do
+    
+    setup do
+      #GeoLocation::use = :hostip
+      GeoLocation::use = :maxmind
+      GeoLocation::key = 'sNHKg3eUWYoT'
+      GeoLocation::dev = nil
+      GeoLocation::dev_ip = nil
+      @location = GeoLocation.find('127.0.0.1')
+    end
+    
+    should "not work properly" do
+      puts @location.inspect
+      assert_equal "nothing", @location[:city]
+    end
+  end
+  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Chris Your
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-29 00:00:00 -06:00
+date: 2011-01-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,18 +30,31 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id001
-description: Geo-locate your users using their IP address via hostip.info or maxmind.com.
-email: chris@ignitionindustries.com
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+description: Geo Location allows you to geo-locate your users using their IP address via hostip.info or maxmind.com. This Ruby gem is dead simple to use and configure. Checkout the README and post any issue (or pull requests) to us on GitHub.
+email: 
+- chris@ignitionindustries.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .document
 - .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -62,8 +75,8 @@ homepage: http://github.com/chrisyour/geo_location
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -84,11 +97,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: geo_location
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Geo-locate your users using their IP address via hostip.info or maxmind.com.
+summary: Geo Location allows you to geo-locate your users using their IP address via hostip.info or maxmind.com.
 test_files: 
 - test/helper.rb
 - test/test_geo_location.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE