geoip 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1308c6df3d48989479c7b279f0be0672c3519000
-  data.tar.gz: 076311dc57ceadec5ef1969f95200f330c9a230c
+  metadata.gz: a0fbea1dc4ed77b0dbdb77c24bbea36c3157648a
+  data.tar.gz: 2bd5fcf48e46090d0b78383822d547304f4cbacd
 SHA512:
-  metadata.gz: 2f36bf2d10008d34ded5a186932337deacd52de0d6ac0d3c9846ad3e5ba60267a5ef0447eed2bb4decdb3d4de10176cc4aa077fbcb7758afe94dfe8d7f0023b2
-  data.tar.gz: e711b0dca011d1e088498f4b27a74080d42154b4e5568335d5f309b0e42045c00a6caac487e0296ae09c638572dc93fb59849aff0371ad7ccc72f14b1c524ddd
+  metadata.gz: 5be733f5691c1c1096e638ecbd9831cb7387aaf55ae118a9bf7c1bb7eaee1c5f0eab890e3c172286f345029bc19df63584f8eeb5bdea01539592aa94768d36d1
+  data.tar.gz: 5a808dc0dfc62714d422b6f75e35b2b3123e58357c79ef34714d1f78a0f8d5b4d8285aa8db5f29b1864eb7cfaed4dbe917f6c9f4afe55d09ff4d6e76248972af

data/README.rdoc

@@ -10,6 +10,8 @@ and the city, ISP and other information, if you have that database version.
 
 == FEATURES/PROBLEMS:
 
+Does not support the new Maxmind v2 database formats.
+
 Includes support for ASN data files, thanks to Roland Matiz.
 This release adds support for timezone names, thanks to Tonni Aagesen.
 
@@ -62,6 +64,17 @@ region_name, city_name, postal_code, latitude, longitude, dma_code, area_code, t
   GeoIP.new('GeoIPASNum.dat').asn("www.fsb.ru")
   => ["AS8342", "RTComm.RU Autonomous System"]
 
+For testing or other purposes, you might wish to treat localhost IP addresses as
+some other address - an external one. You can do this by assigning the desired
+external IP address to the attribute local_ip_alias:
+
+  g = GeoIP.new('GeoIP.dat')
+  g.city("127.0.0.1")
+  => nil
+  g.local_ip_alias = "173.194.112.35"
+  g.city("127.0.0.1") 
+  #<struct GeoIP::City request="127.0.0.1", ip="173.194.112.35", country_code2="US", country_code3="USA", country_name="United States", continent_code="NA", region_name="CA", city_name="Mountain View", postal_code="94043", latitude=37.41919999999999, longitude=-122.0574, dma_code=807, area_code=650, timezone="America/Los_Angeles", real_region_name="California">
+
 == REQUIREMENTS:
 
 You need one of the free GeoLite country, city or ASN databases, or a subscription database version.

data/geoip.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: geoip 1.6.1 ruby lib
+# stub: geoip 1.6.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "geoip"
-  s.version = "1.6.1"
+  s.version = "1.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Clifford Heath", "Roland Moriz"]
-  s.date = "2015-06-24"
+  s.date = "2016-08-03"
   s.description = "GeoIP searches a GeoIP database for a given host or IP address, and\nreturns information about the country where the IP address is allocated,\nand the city, ISP and other information, if you have that database version."
   s.email = ["clifford.heath@gmail.com", "rmoriz@gmail.com"]
   s.executables = ["geoip"]
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/cjheath/geoip"
   s.licenses = ["LGPL"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.5"
   s.summary = "GeoIP searches a GeoIP database for a given host or IP address, and returns information about the country where the IP address is allocated, and the city, ISP and other information, if you have that database version."
 end
 

data/lib/geoip.rb

@@ -58,7 +58,7 @@ require 'yaml'
 class GeoIP
 
   # The GeoIP GEM version number
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 
   # The +data/+ directory for geoip
   DATA_DIR = File.expand_path(File.join(File.dirname(__FILE__),'..','data','geoip'))
@@ -709,9 +709,10 @@ class GeoIP
     record.slice!(record.index("\0")..-1)
 
     # AS####, Description
-    # REVISIT: Text is in Latin-1 (ISO8859-1)
     if record =~ /^(AS\d+)(?:\s(.*))?$/
-      ASN.new($1, $2)
+      # set the correct encoding in ruby 1.9 compatible environments:
+      asn = $2.respond_to?(:force_encoding) ? $2.force_encoding('iso-8859-1').encode('utf-8') : $2
+      ASN.new($1, asn)
     else
       record
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoip
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Clifford Heath
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies: []
 description: |-
   GeoIP searches a GeoIP database for a given host or IP address, and
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: GeoIP searches a GeoIP database for a given host or IP address, and returns