ipparse 0.0.1 → 0.0.2

data/ipparse.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ipparse}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zhang Jinzhu"]
-  s.date = %q{2009-02-17}
+  s.date = %q{2009-02-18}
   s.default_executable = %q{ipparse}
   s.description = %q{IP Parse}
   s.email = %q{wosmvp@gmail.com}

data/lib/ipparse.rb

@@ -22,13 +22,16 @@ class IPParse
 
   protected
   def self.dichotomizing(arg,ip)
-   cen = (arg.length/2).to_i
-   x = arg[cen].split(/\s+/,3)
+    size = arg.size
+    cen  = size/2
 
-   return (x[0]..x[1]).include?(ip) ? x[2] : false if arg.size == 1
-   return dichotomizing(arg[0...cen],ip)           if x[0] > ip
-   return dichotomizing(arg[cen...arg.length],ip)  if x[1] < ip
-   return x[2]
+    # '001.053.000.000 001.153.255.255 IANA' < '001.053.000.000' + '1'
+    # reduce 'string'.split call
+    return dichotomizing(arg[0...cen],ip)           if size != 1 && (arg[cen] > ip + '1')
+    x = arg[cen].split(/\s+/,3)
+    return (x[0]..x[1]).include?(ip) ? x[2] : false if size == 1
+    return dichotomizing(arg[cen...size],ip)        if x[1] < ip
+    return x[2]
   end
 
   def self.format(ip)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module IPParse
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/test/test_ipparse.rb

@@ -4,8 +4,18 @@ require 'test/unit'
 class TestIPParse < Test::Unit::TestCase
   def test_parse
     assert_equal IPParse.parse('222.153.3'),false
-    assert_equal IPParse.parse('222.15.153.3'),"江西省云南市"
-    assert_equal IPParse.parse('24.38.192.2'),"美国"
+    ips = {
+      "178.61.84.32 " => "Unknown",
+      "218.58.88.175" => "山东省青岛市开发区",
+      "212.1.1.1    " => "意大利",
+      "192.245.148.0" => "阿尔及利亚",
+      "116.254.254.0" => "广东省广州市",
+      "116.254.254.0" => "广东省广州市",
+      "16.34.110.150" => "美国",
+      "222.15.153.3"  => "江西省云南市",
+      "24.38.192.2"   => "美国"
+    }
+    ips.map {|k,v| assert_equal IPParse.parse(k),v}
   end
 
   def test_format

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ipparse
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Zhang Jinzhu
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-17 00:00:00 +08:00
+date: 2009-02-18 00:00:00 +08:00
 default_executable: 
 dependencies: []