geoip 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0fbea1dc4ed77b0dbdb77c24bbea36c3157648a
-  data.tar.gz: 2bd5fcf48e46090d0b78383822d547304f4cbacd
+  metadata.gz: c3520d7b15c106de43cc9c269bcec4cb371016f9
+  data.tar.gz: 0e88256388fb9550337811db7662a8c3bec6a57d
 SHA512:
-  metadata.gz: 5be733f5691c1c1096e638ecbd9831cb7387aaf55ae118a9bf7c1bb7eaee1c5f0eab890e3c172286f345029bc19df63584f8eeb5bdea01539592aa94768d36d1
-  data.tar.gz: 5a808dc0dfc62714d422b6f75e35b2b3123e58357c79ef34714d1f78a0f8d5b4d8285aa8db5f29b1864eb7cfaed4dbe917f6c9f4afe55d09ff4d6e76248972af
+  metadata.gz: f583b543af13df3e630880c81be10f7a958e2fcd91aab4d7b1842b6322104c35bd60abb9c124b03fb8202a55ee0c5817505890dd22d5f633fe420a097aab6393
+  data.tar.gz: 3a32e4572920f66b226ec59f9fd997271d6ba92faadc08fbcd3b12a6eb62c412610fd1a4427766582e2c14abc15b0c8911d5e9e8377b1c2b291115ee6964e391

data/lib/geoip.rb

@@ -58,7 +58,7 @@ require 'yaml'
 class GeoIP
 
   # The GeoIP GEM version number
-  VERSION = "1.6.2"
+  VERSION = "1.6.3"
 
   # The +data/+ directory for geoip
   DATA_DIR = File.expand_path(File.join(File.dirname(__FILE__),'..','data','geoip'))
@@ -228,7 +228,8 @@ class GeoIP
     end
 
     @use_pread = IO.respond_to?(:pread) && !options[:preload]
-
+    @contents = nil
+    @iter_pos = nil
     @options = options
     @database_type = Edition::COUNTRY
     @record_length = STANDARD_RECORD_LENGTH
@@ -272,12 +273,12 @@ class GeoIP
     when Edition::COUNTRY, Edition::PROXY, Edition::COUNTRY_V6
       ip = lookup_ip(hostname)
       if @ip_bits > 32
-	ipaddr = IPAddr.new ip
-	code = (seek_record(ipaddr.to_i) - COUNTRY_BEGIN)
+        ipaddr = IPAddr.new ip
+        code = (seek_record(ipaddr.to_i) - COUNTRY_BEGIN)
       else
-	# Convert numeric IP address to an integer
-	ipnum = iptonum(ip)
-	code = (seek_record(ipnum) - @database_segments[0])
+        # Convert numeric IP address to an integer
+        ipnum = iptonum(ip)
+        code = (seek_record(ipnum) - @database_segments[0])
       end
       read_country(code, hostname, ip)
     else
@@ -395,18 +396,18 @@ class GeoIP
 
     case @database_type
     when Edition::ORG,
-	 Edition::ISP,
-	 Edition::DOMAIN,
-	 Edition::ASNUM,
-	 Edition::ACCURACYRADIUS,
-	 Edition::NETSPEED,
-	 Edition::USERTYPE,
-	 Edition::REGISTRAR,
-	 Edition::LOCATIONA,
-	 Edition::CITYCONF,
-	 Edition::COUNTRYCONF,
-	 Edition::REGIONCONF,
-	 Edition::POSTALCONF
+     Edition::ISP,
+     Edition::DOMAIN,
+     Edition::ASNUM,
+     Edition::ACCURACYRADIUS,
+     Edition::NETSPEED,
+     Edition::USERTYPE,
+     Edition::REGISTRAR,
+     Edition::LOCATIONA,
+     Edition::CITYCONF,
+     Edition::COUNTRYCONF,
+     Edition::REGIONCONF,
+     Edition::POSTALCONF
       pos = seek_record(ipnum)
       read_isp(pos-@database_segments[0])
     else
@@ -430,14 +431,17 @@ class GeoIP
   def asn(hostname)
     ip = lookup_ip(hostname)
 
-    # Convert numeric IP address to an integer
-    ipnum = iptonum(ip)
-
-    if ![Edition::ASNUM, Edition::ASNUM_V6].include? @database_type
+    if (@database_type == Edition::ASNUM)
+      # Convert numeric IP address to an integer
+      ipnum = iptonum(ip)
+      pos = seek_record(ipnum)
+    elsif (@database_type == Edition::ASNUM_V6)
+      ipaddr = IPAddr.new ip
+      pos = seek_record(ipaddr.to_i)
+    else
       throw "Invalid GeoIP database type #{@database_type}, can't look up ASN by IP"
     end
 
-    pos = seek_record(ipnum)
     read_asn(pos-@database_segments[0])
   end
 
@@ -546,11 +550,11 @@ class GeoIP
     0.upto(STRUCTURE_INFO_MAX_SIZE - 1) do |i|
       if @file.read(3).bytes.all? { |byte| byte == 255 }
         @database_type =
-	  if @file.respond_to?(:getbyte)
-	    @file.getbyte
-	  else
-	    @file.getc
-	  end
+          if @file.respond_to?(:getbyte)
+            @file.getbyte
+          else
+            @file.getc
+          end
 
         @database_type -= 105 if @database_type >= 106
 
@@ -566,20 +570,20 @@ class GeoIP
                @database_type == Edition::ORG_V6 ||
                @database_type == Edition::ISP ||
                @database_type == Edition::ISP_V6 ||
-	       @database_type == Edition::REGISTRAR ||
-	       @database_type == Edition::REGISTRAR_V6 ||
-	       @database_type == Edition::USERTYPE ||	    # Many of these files mis-identify as ASNUM files
-	       @database_type == Edition::USERTYPE_V6 ||
+               @database_type == Edition::REGISTRAR ||
+               @database_type == Edition::REGISTRAR_V6 ||
+               @database_type == Edition::USERTYPE ||     # Many of these files mis-identify as ASNUM files
+               @database_type == Edition::USERTYPE_V6 ||
                @database_type == Edition::DOMAIN ||
                @database_type == Edition::DOMAIN_V6 ||
                @database_type == Edition::ASNUM ||
                @database_type == Edition::ASNUM_V6 ||
-	       @database_type == Edition::NETSPEED_REV1 ||
-	       @database_type == Edition::NETSPEED_REV1_V6 ||
-	       @database_type == Edition::LOCATIONA ||
-	       # @database_type == Edition::LOCATIONA_V6 ||
-	       @database_type == Edition::ACCURACYRADIUS ||
-	       @database_type == Edition::ACCURACYRADIUS_V6 ||
+               @database_type == Edition::NETSPEED_REV1 ||
+               @database_type == Edition::NETSPEED_REV1_V6 ||
+               @database_type == Edition::LOCATIONA ||
+               # @database_type == Edition::LOCATIONA_V6 ||
+               @database_type == Edition::ACCURACYRADIUS ||
+               @database_type == Edition::ACCURACYRADIUS_V6 ||
                @database_type == Edition::CITYCONF ||
                @database_type == Edition::COUNTRYCONF ||
                @database_type == Edition::REGIONCONF ||
@@ -594,46 +598,46 @@ class GeoIP
 
         end
 
-	case @database_type
-	when Edition::COUNTRY
-	when Edition::NETSPEED_REV1
-	when Edition::ASNUM
-	when Edition::CITY_REV0
-	when Edition::CITY_REV1
-	when Edition::REGION_REV0
-	when Edition::REGION_REV1
-	  @ip_bits = 32
-	  @record_length = 3
-
-	when Edition::ORG,
-	    Edition::DOMAIN,
-	    Edition::ISP
-	  @ip_bits = 32
-	  @record_length = 4
-
-	when Edition::ASNUM_V6,
-	    Edition::CITY_REV0_V6,
-	    Edition::CITY_REV1_V6,
-	    Edition::NETSPEED_REV1_V6,
-	    Edition::COUNTRY_V6,
-	    Edition::PROXY
-	  @ip_bits = 128
-	  @record_length = 3
-
-	when Edition::ACCURACYRADIUS_V6,
-	    Edition::DOMAIN_V6,
-	    Edition::ISP_V6,
-	    Edition::LARGE_COUNTRY_V6,
-	    Edition::LOCATIONA_V6,
-	    Edition::ORG_V6,
-	    Edition::REGISTRAR_V6,
-	    Edition::USERTYPE_V6
-	  @ip_bits = 128
-	  @record_length = 4
-
-	else
-	  raise "unimplemented database type"
-	end
+        case @database_type
+        when Edition::COUNTRY
+        when Edition::NETSPEED_REV1
+        when Edition::ASNUM
+        when Edition::CITY_REV0
+        when Edition::CITY_REV1
+        when Edition::REGION_REV0
+        when Edition::REGION_REV1
+          @ip_bits = 32
+          @record_length = 3
+
+        when Edition::ORG,
+            Edition::DOMAIN,
+            Edition::ISP
+          @ip_bits = 32
+          @record_length = 4
+
+        when Edition::ASNUM_V6,
+            Edition::CITY_REV0_V6,
+            Edition::CITY_REV1_V6,
+            Edition::NETSPEED_REV1_V6,
+            Edition::COUNTRY_V6,
+            Edition::PROXY
+          @ip_bits = 128
+          @record_length = 3
+
+        when Edition::ACCURACYRADIUS_V6,
+            Edition::DOMAIN_V6,
+            Edition::ISP_V6,
+            Edition::LARGE_COUNTRY_V6,
+            Edition::LOCATIONA_V6,
+            Edition::ORG_V6,
+            Edition::REGISTRAR_V6,
+            Edition::USERTYPE_V6
+          @ip_bits = 128
+          @record_length = 4
+
+        else
+          raise "unimplemented database type"
+        end
 
         break
       else
@@ -697,7 +701,7 @@ class GeoIP
       CountryCode3[code],         # ISO3166-2 alpha-3 code
       CountryName[code],          # Country name, per ISO 3166
       CountryContinent[code],     # Continent code.
-      region_code,		  # Unfortunately this is called region_name in the City structure
+      region_code,                # Unfortunately this is called region_name in the City structure
       lookup_region_name(CountryCode[code], region_code),
       (TimeZone["#{CountryCode[code]}#{region_code}"] || TimeZone["#{CountryCode[code]}"])
     )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoip
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Clifford Heath
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2017-01-07 00:00:00.000000000 Z
 dependencies: []
 description: |-
   GeoIP searches a GeoIP database for a given host or IP address, and