ip2location_ruby 7.0.0 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 184b7cf7691c597f947ed45601a088bc55929d80
-  data.tar.gz: 1b9f7048300d59e28550bfe0fc63e531faac7e2f
+  metadata.gz: 6498bb18d849412de400120c7e71a6f1f4fe7bfa
+  data.tar.gz: fc922eede3355f2223b152d491194f654c9a56fb
 SHA512:
-  metadata.gz: bc59483ab9481fb41466cfaa3b11f1cda97c859dd085d3ba178244d75e73a69b4c062b14225f00cf206827502e84720e53744e15e434721a4938115e939b790a
-  data.tar.gz: 41845e31fca4badeffdede70df4a6f25a93cf6a030f52a034d989504c9ca488067115c748536420997dcc78b601e7d832fd80501687bdad1d54768d097060c57
+  metadata.gz: 4730d2e28e3b5815ccb9949ca64d7d7918e3228b1ce2942f9d46313c1020527cc6a3042a0c8410fc750360627bb5467116aac6efdbd8351103ebbe670f60983a
+  data.tar.gz: 9bc77be32a4edf9480a8e13cdc40d5802747e1bc448a837a398db956229c0a1de638b28a666dea75c523302c787f4d87bfe5a3a0f0a102f5f4dadb3492ecc302

data/README.rdoc

@@ -1,4 +1,11 @@
-= ip2location
+= IP2Location Ruby Library
+This is IP2Location Ruby library that enables the user to find the country, region or state, city, latitude and longitude, US ZIP code, time zone, Internet Service Provider (ISP) or company name, domain name, net speed, area code, weather station code, weather station name, mobile country code (MCC), mobile network code (MNC) and carrier brand, elevation, and usage type by IP address or hostname originates from.  The library reads the geo location information
+from **IP2Location BIN data** file.
+
+Supported IPv4 and IPv6 address.
+
+For more details, please visit:
+[http://www.ip2location.com/developers/ruby](http://www.ip2location.com/developers/ruby)
 
 == Usage
 
@@ -17,8 +24,12 @@
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-== Copyright
+== Sample BIN Databases
+
+* Download free IP2Location LITE databases at [http://lite.ip2location.com](http://lite.ip2location.com)  
+* Download IP2Location sample databases at [http://www.ip2location.com/developers](http://www.ip2location.com/developers)
 
-Copyright (c) 2013 Vincent.Z. See LICENSE.txt for
-further details.
+== Support
 
+Email: support@ip2location.com  
+URL: [http://www.ip2location.com](http://www.ip2location.com)

data/Rakefile

@@ -15,11 +15,11 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "ip2location_ruby"
-  gem.homepage = "http://github.com/zhu1230/ip2location"
+  gem.homepage = "https://github.com/ip2location/ip2location-ruby"
   gem.license = "MIT"
   gem.summary = %Q{the ip2location ruby library}
-  gem.description = %Q{the ip2location ruby library}
-  gem.email = "zhu1230@gmail.com"
+  gem.description = %Q{ip2location ruby library}
+  gem.email = "support@ip2location.com"
   gem.authors = ["Vincent.Z"]
   # dependencies defined in Gemfile
 end

data/VERSION

@@ -1 +1 @@
-7.0.0
+8.0.1

data/ip2location_ruby.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: ip2location_ruby 7.0.0 ruby lib
+# stub: ip2location_ruby 8.0.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ip2location_ruby"
-  s.version = "7.0.0"
+  s.version = "8.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Vincent.Z"]
-  s.date = "2014-08-13"
-  s.description = "the ip2location ruby library"
-  s.email = "zhu1230@gmail.com"
+  s.date = "2016-07-25"
+  s.description = "ip2location ruby library"
+  s.email = "support@ip2location.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
     "spec/ip2location_ruby_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/zhu1230/ip2location"
+  s.homepage = "https://github.com/ip2location/ip2location-ruby"
   s.licenses = ["MIT"]
   s.rubygems_version = "2.4.1"
   s.summary = "the ip2location ruby library"

data/lib/ip2location_ruby/ip2location_config.rb

@@ -12,4 +12,6 @@ class Ip2locationConfig < BinData::Record
   uint32 :ipv4databaseaddr
   uint32 :ipv6databasecount
   uint32 :ipv6databaseaddr
+  uint32 :ipv4indexbaseaddr
+  uint32 :ipv6indexbaseaddr
 end

data/lib/ip2location_ruby.rb

@@ -9,7 +9,7 @@ require 'ip2location_ruby/i2l_ip_data'
 require 'ip2location_ruby/ip2location_record'
 
 class Ip2location
-  attr_accessor :record_class, :v4, :file, :db_index, :count, :base_addr, :ipno, :count, :record, :database, :columns, :ip_version, :ipv4databasecount, :ipv4databaseaddr, :ipv6databasecount, :ipv6databaseaddr
+  attr_accessor :record_class4, :record_class6, :v4, :file, :db_index, :count, :base_addr, :ipno, :count, :record, :database, :columns, :ip_version, :ipv4databasecount, :ipv4databaseaddr, :ipv4indexbaseaddr, :ipv6databasecount, :ipv6databaseaddr, :ipv6indexbaseaddr
   
   def open(url)
     self.file = File.open(File.expand_path url, 'rb')
@@ -21,6 +21,10 @@ class Ip2location
     self.ipv4databaseaddr = i2l.ipv4databaseaddr
     self.ipv6databasecount = i2l.ipv6databasecount
     self.ipv6databaseaddr = i2l.ipv6databaseaddr
+    self.ipv4indexbaseaddr = i2l.ipv4indexbaseaddr
+    self.ipv6indexbaseaddr = i2l.ipv6indexbaseaddr
+	self.record_class4 = (Ip2LocationRecord.init database, 4)
+	self.record_class6 = (Ip2LocationRecord.init database, 6)
     self
   end
   
@@ -30,45 +34,167 @@ class Ip2location
     self.v4 = ipno.ipv4?
     self.count = ipno.ipv4? ? self.ipv4databasecount + 0 : self.ipv6databasecount + 0
     self.base_addr = (ipno.ipv4? ? self.ipv4databaseaddr - 1 : self.ipv6databaseaddr - 1)
-    self.record_class = (Ip2LocationRecord.init database, self.ip_version)
-    
+	
     ipnum = ipno.to_i + 0
     col_length = columns * 4
-
-    return self.record = bsearch(0, self.count, ipnum, self.base_addr, col_length)
+	
+	if ipv4indexbaseaddr > 0 || ipv6indexbaseaddr > 0
+		indexpos = 0
+		case ip_version
+		when 4
+			ipnum1_2 = (ipnum >> 16)
+			indexpos = ipv4indexbaseaddr + (ipnum1_2 << 3)
+		when 6
+			ipnum1 = (ipnum / (2**112))
+			indexpos = ipv6indexbaseaddr + (ipnum1 << 3)
+		end
+		low = read32(indexpos)
+		high = read32(indexpos + 4)
+		return self.record = bsearch(low, high, ipnum, self.base_addr, col_length)
+	else
+		return self.record = bsearch(0, self.count, ipnum, self.base_addr, col_length)
+	end
+  end
+  
+  def get_country_short(ip)
+	rec = get_all(ip)
+	return rec.country_short
+  end
+  
+  def get_country_long(ip)
+	rec = get_all(ip)
+	return rec.country_long
+  end
+  
+  def get_region(ip)
+	rec = get_all(ip)
+	return rec.region
+  end
+  
+  def get_city(ip)
+	rec = get_all(ip)
+	return rec.city
+  end
+  
+  def get_latitude(ip)
+	rec = get_all(ip)
+	return rec.latitude
+  end
+  
+  def get_longitude(ip)
+	rec = get_all(ip)
+	return rec.longitude
+  end
+  
+  def get_isp(ip)
+	rec = get_all(ip)
+	return rec.isp
+  end
+  
+  def get_domain(ip)
+	rec = get_all(ip)
+	return rec.domain
+  end
+  
+  def get_zipcode(ip)
+	rec = get_all(ip)
+	return rec.zipcode
+  end
+  
+  def get_timezone(ip)
+	rec = get_all(ip)
+	return rec.timezone
+  end
+  
+  def get_netspeed(ip)
+	rec = get_all(ip)
+	return rec.netspeed
+  end
+  
+  def get_iddcode(ip)
+	rec = get_all(ip)
+	return rec.iddcode
+  end
+  
+  def get_areacode(ip)
+	rec = get_all(ip)
+	return rec.areacode
+  end
+  
+  def get_weatherstationcode(ip)
+	rec = get_all(ip)
+	return rec.weatherstationcode
+  end
+  
+  def get_weatherstationname(ip)
+	rec = get_all(ip)
+	return rec.weatherstationname
+  end
+  
+  def get_mcc(ip)
+	rec = get_all(ip)
+	return rec.mcc
+  end
+  
+  def get_mnc(ip)
+	rec = get_all(ip)
+	return rec.mnc
+  end
+  
+  def get_mobilebrand(ip)
+	rec = get_all(ip)
+	return rec.mobilebrand
+  end
+  
+  def get_elevation(ip)
+	rec = get_all(ip)
+	return rec.elevation
+  end
+  
+  def get_usagetype(ip)
+	rec = get_all(ip)
+	return rec.usagetype
+  end
+  
+  def bsearch(low, high, ipnum, base_addr, col_length)
+    while low <= high do
+		mid = (low + high) >> 1
+		ip_from, ip_to = get_from_to(mid, base_addr, col_length)
+		if ipnum >= ip_from && ipnum < ip_to
+			from_base = ( base_addr + mid * (col_length + (self.v4 ? 0 : 12)))
+			file.seek(from_base)
+			if v4
+				return self.record_class4.read(file)
+			else
+				return self.record_class6.read(file)
+			end
+		else
+			if ipnum < ip_from
+				high = mid - 1
+			else
+				low = mid + 1
+			end
+		end
+	end	
   end
   
   def get_from_to(mid, base_addr, col_length)
     from_base = ( base_addr + mid * (col_length + (v4 ? 0 : 12)))
     file.seek(from_base)
-    ip_from =  v4 ? BinData::Uint32le.read(file) : BinData::Uint128le.read(file)
+	ip_from = v4 ? file.read(4).unpack('V').first : readipv6(file)
     file.seek(from_base + col_length + (v4 ? 0 : 12))
-    ip_to = v4 ? BinData::Uint32le.read(file) : BinData::Uint128le.read(file)
+	ip_to = v4 ? file.read(4).unpack('V').first : readipv6(file)
     [ip_from, ip_to]
   end
   
-  def bsearch(low, high, ipnum, base_addr, col_length) 
-    mid = (high + low)/2
-    return nil if low == mid
-    ip_from, ip_to = get_from_to(mid, base_addr, col_length)
-    if ipnum < ip_from
-      low = low
-      high = mid
-      return bsearch(low, high, ipnum, base_addr, col_length)
-    elsif ipnum >= ip_to
-      low = mid
-      high = high
-      return bsearch(low, high, ipnum, base_addr, col_length) 
-    else
-      from_base = ( base_addr + mid * (col_length + (self.v4 ? 0 : 12)))
-      file.seek(from_base)  
-      return self.record_class.read(file)
-    end
+  def read32(indexp)
+	file.seek(indexp - 1)
+	return file.read(4).unpack('V').first
+  end
+  
+  def readipv6(filer)
+	parts = filer.read(16).unpack('V*')
+	return parts[0] + parts[1] * 4294967296 + parts[2] * 4294967296**2 + parts[3] * 4294967296**3
   end
     
-end
-
-
-
-
-
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ip2location_ruby
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 8.0.1
 platform: ruby
 authors:
 - Vincent.Z
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -108,8 +108,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: the ip2location ruby library
-email: zhu1230@gmail.com
+description: ip2location ruby library
+email: support@ip2location.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -137,7 +137,7 @@ files:
 - spec/assets/IP-COUNTRY-SAMPLE.BIN
 - spec/ip2location_ruby_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/zhu1230/ip2location
+homepage: https://github.com/ip2location/ip2location-ruby
 licenses:
 - MIT
 metadata: {}
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: the ip2location ruby library