ipcat 1.0.1 → 1.2.0

data/README.md

@@ -2,6 +2,9 @@
 
 A ruby port of the [ipcat](https://github.com/client9/ipcat) library to classify IP addresses from known datacenters
 
+[![Build Status](https://travis-ci.org/kickstarter/ipcat-ruby.png?branch=master)](https://travis-ci.org/kickstarter/ipcat-ruby)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/kickstarter/ipcat-ruby)
+
 ## Installation
 
 With bundler:
@@ -26,3 +29,8 @@ For example,
 
     IPCat.datacenter?('127.0.0.1') # => nil
 
+## License
+
+Copyright (c) 2013 Kickstarter, Inc
+
+Released under an [MIT License](http://opensource.org/licenses/MIT)

data/Rakefile

@@ -2,12 +2,15 @@ require "rubygems"
 require "bundler/setup"
 require 'rake/testtask'
 
+$:.unshift './lib'
+require 'ipcat'
 Rake::TestTask.new do |t|
-    t.pattern = "spec/*_spec.rb"
+  t.pattern = "spec/*_spec.rb"
 end
 
 task :default => :test
 
+desc 'Regenerate data/datacenters'
 task :generate_dataset do
 
   $:.unshift './lib'
@@ -15,3 +18,17 @@ task :generate_dataset do
   IPCat.load_csv!
   File.open("data/datacenters", 'w') {|f| f << Marshal.dump(IPCat.ranges) }
 end
+
+desc "Run benchmark"
+task :bench do
+
+  require 'benchmark'
+  # random ips
+  ips = 100_000.times.map{ rand(2**32) }
+  Benchmark.bm do |x|
+    x.report("IPCat.bsearch (100k)") {
+      ips.each { |ip| IPCat.bsearch(ip) }
+    }
+
+  end
+end

data/lib/ipcat.rb

@@ -12,7 +12,7 @@ class IPCat
     def datacenter?(ip)
       bsearch(ip_to_integer(ip))
     end
-    alias_method :matches?, :datacenter?
+    alias_method :classify, :datacenter?
 
     def ip_to_integer(ip)
       Integer === ip ? ip : IPAddr.new(ip).to_i
@@ -55,13 +55,13 @@ class IPCat
       return nil if last < first # not found, or empty range
 
       cur = first + (last - first)/2
-      case ranges[cur] <=> needle
+      case haystack[cur] <=> needle
       when -1 # needle is larger than cur value
         bsearch(needle, haystack, cur+1, last)
       when 1 # needle is smaller than cur value
         bsearch(needle, haystack, first, cur-1)
       when 0
-        ranges[cur]
+        haystack[cur]
       end
     end
   end

data/lib/ipcat/version.rb

@@ -1,3 +1,3 @@
 class IPCat
-  VERSION = '1.0.1'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ipcat
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -64,7 +64,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.3
   type: :development
@@ -72,7 +72,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.3
 description: ! 'A ruby port of the ipcat library: https://github.com/client9/ipcat/'