ip2location_ruby 0.3.2 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d572eaea90429a8a3eff55e48f0986a58ef371db
-  data.tar.gz: 4e4de29d32aa884a910948d5844a2bf05fcd0ed5
+  metadata.gz: 184b7cf7691c597f947ed45601a088bc55929d80
+  data.tar.gz: 1b9f7048300d59e28550bfe0fc63e531faac7e2f
 SHA512:
-  metadata.gz: e4b287394f962b7a620fbb770408b0d50af2dafaaff80d946395f29a073dae97b2dbbf6e2981e48de93ec8d9eb156ec933900c76c509e4596f66141ef46c0071
-  data.tar.gz: 06ecd794eba9697f7f3035de7579e8021e76a7415cacea7be9c78307d64d9ba9e8943d8b5a4a698e6f003150e69533485983da0a53b23bc6d9f7bd6dee082f0e
+  metadata.gz: bc59483ab9481fb41466cfaa3b11f1cda97c859dd085d3ba178244d75e73a69b4c062b14225f00cf206827502e84720e53744e15e434721a4938115e939b790a
+  data.tar.gz: 41845e31fca4badeffdede70df4a6f25a93cf6a030f52a034d989504c9ca488067115c748536420997dcc78b601e7d832fd80501687bdad1d54768d097060c57

data/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     addressable (2.3.5)
     awesome_print (1.2.0)
-    bindata (1.8.0)
+    bindata (2.1.0)
     builder (3.2.2)
     diff-lcs (1.1.3)
     docile (1.1.1)

data/VERSION

@@ -1 +1 @@
-0.3.2
+7.0.0

data/ip2location_ruby.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: ip2location_ruby 0.3.2 ruby lib
+# stub: ip2location_ruby 7.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ip2location_ruby"
-  s.version = "0.3.2"
+  s.version = "7.0.0"
 
   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-07-04"
+  s.date = "2014-08-13"
   s.description = "the ip2location ruby library"
   s.email = "zhu1230@gmail.com"
   s.extra_rdoc_files = [
@@ -35,13 +35,15 @@ Gem::Specification.new do |s|
     "lib/ip2location_ruby/i2l_string_data.rb",
     "lib/ip2location_ruby/ip2location_config.rb",
     "lib/ip2location_ruby/ip2location_record.rb",
+    "spec/assets/DB24.DEMO4.BIN",
+    "spec/assets/DB24.DEMO6.BIN",
     "spec/assets/IP-COUNTRY-SAMPLE.BIN",
     "spec/ip2location_ruby_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/zhu1230/ip2location"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.1"
   s.summary = "the ip2location ruby library"
 
   if s.respond_to? :specification_version then

data/lib/ip2location_ruby.rb

@@ -9,50 +9,47 @@ 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
+  attr_accessor :record_class, :v4, :file, :db_index, :count, :base_addr, :ipno, :count, :record, :database, :columns, :ip_version, :ipv4databasecount, :ipv4databaseaddr, :ipv6databasecount, :ipv6databaseaddr
   
   def open(url)
     self.file = File.open(File.expand_path url, 'rb')
     i2l = Ip2locationConfig.read(file)
     self.db_index = i2l.databasetype
-    self.count = i2l.databasecount + 0
-    self.base_addr = i2l.databaseaddr - 1
     self.columns = i2l.databasecolumn + 0
     self.database = DbConfig.setup_database(self.db_index)
-    self.ip_version = (i2l.ipversion == 0 ? 4 : 6)
-    self.record_class = (Ip2LocationRecord.init database, self.ip_version)
+    self.ipv4databasecount = i2l.ipv4databasecount
+    self.ipv4databaseaddr = i2l.ipv4databaseaddr
+    self.ipv6databasecount = i2l.ipv6databasecount
+    self.ipv6databaseaddr = i2l.ipv6databaseaddr
     self
   end
   
   def get_all(ip)
     ipno = IPAddr.new(ip, Socket::AF_UNSPEC)
-    self.v4 = ipno.ipv4? && self.ip_version == 4
+    self.ip_version = ipno.ipv4? ? 4 : 6
+    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
-    mid =  self.count/2
     col_length = columns * 4
-    low = 0
-    high = count
-    return self.record = bsearch(low, high, ipnum, self.base_addr, col_length)
+
+    return self.record = bsearch(0, self.count, ipnum, self.base_addr, col_length)
   end
   
   def get_from_to(mid, base_addr, col_length)
-    if v4
-      from_base = ( base_addr + mid * col_length)
-    else
-      from_base = ( base_addr + mid * (col_length + 12))
-    end
-    
+    from_base = ( base_addr + mid * (col_length + (v4 ? 0 : 12)))
     file.seek(from_base)
-    ip_from =  file.read(4).unpack('L')[0]
-    file.seek(from_base + col_length)
-    ip_to = file.read(4).unpack('L')[0]
+    ip_from =  v4 ? BinData::Uint32le.read(file) : BinData::Uint128le.read(file)
+    file.seek(from_base + col_length + (v4 ? 0 : 12))
+    ip_to = v4 ? BinData::Uint32le.read(file) : BinData::Uint128le.read(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
@@ -63,7 +60,7 @@ class Ip2location
       high = high
       return bsearch(low, high, ipnum, base_addr, col_length) 
     else
-      from_base = ( base_addr + mid * col_length)
+      from_base = ( base_addr + mid * (col_length + (self.v4 ? 0 : 12)))
       file.seek(from_base)  
       return self.record_class.read(file)
     end

data/lib/ip2location_ruby/ip2location_config.rb

@@ -5,7 +5,11 @@ class Ip2locationConfig < BinData::Record
 	uint8 :databaseday
 	uint8 :databasemonth
 	uint8 :databaseyear
-	uint32 :databasecount
-	uint32 :databaseaddr
-	uint32 :ipversion
+	# uint32 :databasecount
+	# uint32 :databaseaddr
+	# uint32 :ipversion
+  uint32 :ipv4databasecount
+  uint32 :ipv4databaseaddr
+  uint32 :ipv6databasecount
+  uint32 :ipv6databaseaddr
 end

data/lib/ip2location_ruby/ip2location_record.rb

@@ -4,9 +4,8 @@ class Ip2LocationRecord
     cls.class_eval {
       endian :little
       i2l_ip_data :ip_from, :ip_version => ip_version
-      
       database.each do |col|
-        if [:latitude, :longitude,:elevation].include? col.first
+        if [:latitude, :longitude].include? col.first
           i2l_float_data col.first
         elsif col.first == :country
           i2l_string_data :country_short

data/spec/ip2location_ruby_spec.rb

@@ -8,6 +8,41 @@ describe "Ip2location" do
     record.country_short.should == 'US'
   end
 
+  it "work correctly with ipv4 with new library" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/DB24.DEMO4.bin")
+    record = i2l.get_all('13.5.10.6')
+    record.should_not be_nil
+    record.country_short.should == 'KR'
+  end
+
+  it "work correctly with ipv6 with new library" do
+    i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/DB24.DEMO6.bin")
+    record = i2l.get_all('2a01:04f8:0d16:26c2::')
+    record.should_not be_nil
+    record.country_short.should == 'DE'
+  end
+
+  # it "profile ipv6 in IPV6.BIN" do
+  #   i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IPV6-COUNTRY-REGION-CITY-LATITUDE-LONGITUDE-ZIPCODE-TIMEZONE-ISP-DOMAIN-NETSPEED-AREACODE-WEATHER-MOBILE-ELEVATION-USAGETYPE.BIN")
+  #   File.new(File.dirname(__FILE__) + "/assets/ipv6_ip.txt").readlines.each do |line|
+  #     record = i2l.get_all(line.split(' ').first)
+  #   end
+  # end
+
+  # it "profile ipv4 in IPV6.BIN" do
+  #   i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IPV6-COUNTRY-REGION-CITY-LATITUDE-LONGITUDE-ZIPCODE-TIMEZONE-ISP-DOMAIN-NETSPEED-AREACODE-WEATHER-MOBILE-ELEVATION-USAGETYPE.BIN")
+  #   File.new(File.dirname(__FILE__) + "/assets/ipv4_ip.txt").readlines.each do |line|
+  #     record = i2l.get_all(line.split(' ').first)
+  #   end
+  # end
+
+  # it "profile ipv4 in IPV4.BIN" do
+  #   i2l = Ip2location.new.open(File.dirname(__FILE__) + "/assets/IP-COUNTRY-REGION-CITY-LATITUDE-LONGITUDE-ZIPCODE-TIMEZONE-ISP-DOMAIN-NETSPEED-AREACODE-WEATHER-MOBILE-ELEVATION-USAGETYPE.BIN")
+  #   File.new(File.dirname(__FILE__) + "/assets/ipv4_ip.txt").readlines.each do |line|
+  #     record = i2l.get_all(line.split(' ').first)
+  #   end
+  # end
+
   # this need spec/assets/IP2LOCATION-LITE-DB5.bin file which too big to include in this test.
 
   # it "should get float value of attitude" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ip2location_ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 7.0.0
 platform: ruby
 authors:
 - Vincent.Z
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -132,6 +132,8 @@ files:
 - lib/ip2location_ruby/i2l_string_data.rb
 - lib/ip2location_ruby/ip2location_config.rb
 - lib/ip2location_ruby/ip2location_record.rb
+- spec/assets/DB24.DEMO4.BIN
+- spec/assets/DB24.DEMO6.BIN
 - spec/assets/IP-COUNTRY-SAMPLE.BIN
 - spec/ip2location_ruby_spec.rb
 - spec/spec_helper.rb
@@ -155,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: the ip2location ruby library