ipparse 0.0.5 → 0.1.0

data/README

@@ -1,6 +1,17 @@
 = IPParse
+== Install
+  $ sudo gem install ipparse
+
 == Usage
+  require 'rubygems'
+  require 'ipparse'
   IPParse.parse('218.58.88.175')
 
 == Shell
   $ ipparse 218.58.88.175 212.1.1.1 192.245.148.0 116.254.254.0
+
+
+Copyright (c) 2009  MIT-LICENSE
+Author : Jinzhu Zhang
+Web    : http://www.zhangjinzhu.com
+Email  : wosmvp (no-spam) gmail (no-spam) com

data/bin/ipparse

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2009. GPL3.
+# Copyright (c) 2009. MIT-LICENSE.
 # Author: Zhang Jinzhu
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))

data/ipparse.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ipparse}
-  s.version = "0.0.5"
+  s.version = "0.1.0"
 
   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-19}
+  s.date = %q{2009-02-22}
   s.default_executable = %q{ipparse}
   s.description = %q{IP Parse}
   s.email = %q{wosmvp@gmail.com}

data/lib/ipparse.rb

@@ -5,19 +5,9 @@ class IPParse
 
   def self.parse(ip)
     return false unless ip.to_s =~ /(\d+\.){3}\d+/
-    ip,addr = format(ip) , ''
+    ip = ip.scan(/\d+/).map{|x| x.rjust(3, '0')}.join('.')
 
-    [ip[0,3].to_i,0].each do |f|
-      file        = "#{File.dirname(__FILE__)}/../data/#{f.to_s}.txt"
-      @@data[f] ||= File.exist?(file) ? File.open(file){|m| m.to_a} : false
-
-      if @@data[f]
-        addr = dichotomizing(@@data[f],ip)
-        return addr if addr
-      end
-    end
-
-    return "UNKNOW"
+    return dichotomizing(@@data[ip[0,3].to_i] ||= file_to_a("#{File.dirname(__FILE__)}/../data/#{ip[0,3].to_i}.txt"),ip) || dichotomizing(@@data[0] ||= file_to_a("#{File.dirname(__FILE__)}/../data/0.txt"),ip) || "Unknown"
   end
 
   protected
@@ -25,13 +15,14 @@ class IPParse
     cen  = arg.size/2
     cur  = arg[cen]
 
-    return (cur[0,15]..cur[16,15]).include?(ip) ? cur[32...-1] : false  if cen == 0
+    # arg.size = 0 || 1
+    return (cur && (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 dichotomizing(arg[cen+1..-1],ip)      if cur[16,15] < ip
     return arg[cen][32...-1]
   end
 
-  def self.format(ip)
-    ip.to_s.scan(/\d+/).map{|x| x.rjust(3, '0')}.join('.')
+  def self.file_to_a(f)
+    File.exist?(f) ? File.open(f){|m| m.to_a} : []
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module IPParse
-  VERSION = '0.0.5'
+  VERSION = '0.1.0'
 end

data/test/test_ipparse.rb

@@ -13,12 +13,9 @@ class TestIPParse < Test::Unit::TestCase
       "116.254.254.0" => "广东省广州市",
       "16.34.110.150" => "美国",
       "222.15.153.3"  => "江西省云南市",
-      "24.38.192.2"   => "美国"
+      "24.38.192.2"   => "美国",
+      "222.249.31.53" => "北京市"
     }
     ips.map {|k,v| assert_equal IPParse.parse(k),v}
   end
-
-  def test_format
-    assert_equal IPParse.format('12.3.4.23'),'012.003.004.023'
-  end
 end

metadata

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