ipparse 0.0.2 → 0.0.3

data/ipparse.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ipparse}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zhang Jinzhu"]

data/lib/ipparse.rb

@@ -12,8 +12,8 @@ class IPParse
       @@data[f] ||= File.exist?(file) ? File.new(file).to_a : false
 
       if @@data[f]
-        addr = dichotomizing(@@data[f],f == 0 ? ip : ip[4,ip.length])
-        return addr.strip if addr
+        addr = dichotomizing(@@data[f],ip)
+        return addr if addr
       end
     end
 
@@ -22,21 +22,18 @@ class IPParse
 
   protected
   def self.dichotomizing(arg,ip)
-    size = arg.size
-    cen  = size/2
+    cen  = arg.size/2
+    cur  = arg[cen]
 
-    # '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]
+    return (cur[0,15]..cur[16,15]).include?(ip) ? cur[32...-1] : false  if cen == 0
+    return dichotomizing(arg[0...cen],ip)        if cur[0,15]  > ip
+    return dichotomizing(arg[cen..-1],ip)        if cur[16,15] < ip
+    return arg[cen][32...-1]
   end
 
   def self.format(ip)
     ip.to_s.split('.').inject([]) do |s,x|
-      s << [('%03s' % x).gsub(/ /,'0')]
+      s << x.rjust(3,'0')
     end.join('.')
   end
 end

data/lib/version.rb

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

data/test/test_ipparse.rb

@@ -5,9 +5,9 @@ class TestIPParse < Test::Unit::TestCase
   def test_parse
     assert_equal IPParse.parse('222.153.3'),false
     ips = {
-      "178.61.84.32 " => "Unknown",
+      "178.61.84.32"  => "Unknown",
       "218.58.88.175" => "山东省青岛市开发区",
-      "212.1.1.1    " => "意大利",
+      "212.1.1.1"     => "意大利",
       "192.245.148.0" => "阿尔及利亚",
       "116.254.254.0" => "广东省广州市",
       "116.254.254.0" => "广东省广州市",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ipparse
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Zhang Jinzhu