fixed bug. it should be test!!.

walf443 · Sep 12, 2008 · 66d08b3 · 66d08b3
1 parent 01925a3
commit 66d08b3
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/lib/ipaddr_list.rb b/lib/ipaddr_list.rb
@@ -134,12 +134,17 @@ def include? ip
       # 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

diff --git a/spec/ipaddr_list_spec.rb b/spec/ipaddr_list_spec.rb
@@ -2,4 +2,27 @@
 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