ipaddr_list 0.0.1 → 0.0.2

data/ChangeLog

@@ -1,4 +1,35 @@
-== 0.0.1 / 2008-09-05
+commit 0c9a5e72de5b4cb1739e93964448318be4facf8b
+Author: Keiji, Yoshimi <walf443@gmail.com>
+Date:   Sat Sep 13 06:52:05 2008 +0900
 
-* initial release
+    added documentation.
 
+commit 95f2be45d872dc2222982cd4953b88c733405842
+Author: Keiji, Yoshimi <walf443@gmail.com>
+Date:   Sat Sep 13 06:51:47 2008 +0900
+
+    added development_dependency.
+
+commit 92e40373def8978b74f87ef5ce80e215a445edb6
+Author: Keiji, Yoshimi <walf443@gmail.com>
+Date:   Sat Sep 13 06:34:19 2008 +0900
+
+    fixed warnings.
+
+commit 6b144d023d387993daa4ad7db3f2945c55a4a590
+Author: Keiji, Yoshimi <walf443@gmail.com>
+Date:   Fri Sep 5 09:17:58 2008 +0900
+
+    added algorithm Linear search.
+
+commit 9143d6eea71c652cb4bd6d9869f3c876aeebcfd0
+Author: Keiji, Yoshimi <walf443@gmail.com>
+Date:   Fri Sep 5 09:16:29 2008 +0900
+
+    added benchmark.
+
+commit 3474ddd98bbaa710a10d020c66fa0b0b3a040a47
+Author: Keiji, Yoshimi <walf443@gmail.com>
+Date:   Fri Sep 5 01:36:37 2008 +0900
+
+    initial import.

data/Rakefile

@@ -17,7 +17,7 @@ DESCRIPTION       = <<-"END_DESCRIPTION"
 
 END_DESCRIPTION
 BIN_FILES         = %w(  )
-VERS              = "0.0.1"
+VERS              = "0.0.2"
 
 EXTRA_RDOC_FILES = []
 HECKLE_ROOT_MODULES = ["IPAddrList"]

data/lib/ipaddr_list.rb

@@ -134,12 +134,17 @@ class IPAddrList
       # binary search
       # SEE ALSO: http://dsas.blog.klab.org/archives/51293334.html
       def binary_search ip, &block
-        ipaddr = IPAddr.new(ip)
+        ipaddr = nil
+        if ip.kind_of? IPAddr
+          ipaddr = ip
+        else
+          ipaddr = IPAddr.new(ip)
+        end
         min_idx = 0
         max_idx = @ip_list.size - 1
-        if @ip_list[max_idx] > ipaddr
+        if @ip_list[max_idx] < ipaddr
           min_idx = max_idx
-        elsif @ip_list[min_idx] < ipaddr
+        elsif @ip_list[min_idx] > ipaddr
           max_idx = min_idx
         else
           span = max_idx - min_idx

data/spec/ipaddr_list_spec.rb

@@ -2,4 +2,27 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 require 'ipaddr_list'
 
 describe IPAddrList do
+  before do
+    @ipaddr_list = %w( 192.168.0.1 127.0.0.1 )
+  end
+
+  it 'should include? in :BinarySearch' do
+    ipaddr_list = IPAddrList.new(@ipaddr_list, :BinarySearch)
+    ipaddr_list.should include('127.0.0.1')
+  end
+
+  it 'should not include? in :BinarySearch' do
+    ipaddr_list = IPAddrList.new(@ipaddr_list, :BinarySearch)
+    ipaddr_list.should_not include('192.168.1.1')
+  end
+
+  it 'should include? in :LinearSearch' do
+    ipaddr_list = IPAddrList.new(@ipaddr_list, :LinearSearch)
+    ipaddr_list.should include('127.0.0.1')
+  end
+
+  it 'should include? in :LinearSearch' do
+    ipaddr_list = IPAddrList.new(@ipaddr_list, :LinearSearch)
+    ipaddr_list.should_not include('192.168.1.1')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ipaddr_list
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Keiji, Yoshimi