ipcat 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21e54956ca41119389b62903d6872e7dce742272
-  data.tar.gz: 3d56004a1f23edcd06cd9f31dcf16d538217a433
+  metadata.gz: 504383114dd0844a4a5f91ebb4afa296fe098003
+  data.tar.gz: f818cb7072a8c8882198751871283a91ddc1cdca
 SHA512:
-  metadata.gz: 9de9057240544f1235e4e8d3bb6c6bf4dccde402149e00935b3e18992c9b39c1f8467e4634f448a00c5a1fa10d0f3ad0a4d8a173d990c7e7ff21b9c784447c2f
-  data.tar.gz: 991115aea5bc04680de0370c281098c3ec63756382b714ae17848c333f960c118fb7a7c3356baeea7cbcf0e8dfa961b74c9f1f61aea72fa2b324b5425e0d576e
+  metadata.gz: 1aed19167372bb4b8d18e035783ee8d0130c2ed50791e708cec1add11310825a18a215f009ef1ecbef20201001799684a4a07f153ba0111e9fd6b20d2f073d2c
+  data.tar.gz: 981cb897772de0aa94732fc3caf968b289879e2b82016e7a9ef350b0b9eed103b33fd5f8fbf2e9dce13afca439a940e5a63cdc43ce02494e2afc051927ffb7e2

data/Rakefile

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

data/lib/ipcat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ##
 # IPCat
 # Ruby lib for https://github.com/client9/ipcat/
@@ -6,13 +8,12 @@ require 'ipaddr'
 require 'ipcat/iprange'
 require 'ipcat/version'
 
-
 class IPCat
   class << self
     def datacenter?(ip)
       bsearch(ip_to_integer(ip))
     end
-    alias_method :classify, :datacenter?
+    alias classify datacenter?
 
     def ip_to_integer(ip)
       Integer === ip ? ip : IPAddr.new(ip).to_i
@@ -26,15 +27,15 @@ class IPCat
       @ranges = new_ranges
     end
 
-    def load_csv!(path='https://raw.github.com/client9/ipcat/master/datacenters.csv')
+    def load_csv!(path = 'https://raw.github.com/client9/ipcat/master/datacenters.csv')
       reset_ranges!
 
       require 'open-uri'
       open(path).readlines.each do |line|
         first, last, name, url = line.split(',')
-        self.ranges << IPRange.new(first, last, name, url).freeze
+        ranges << IPRange.new(first, last, name, url).freeze
       end
-      self.ranges.freeze
+      ranges.freeze
     end
 
     def load!
@@ -50,15 +51,15 @@ class IPCat
     end
 
     # Assume ranges is an array of comparable objects
-    def bsearch(needle, haystack=ranges, first=0, last=ranges.size-1)
+    def bsearch(needle, haystack = ranges, first = 0, last = ranges.size - 1)
       return nil if last < first # not found, or empty range
 
-      cur = first + (last - first)/2
+      cur = first + (last - first) / 2
       case haystack[cur] <=> needle
       when -1 # needle is larger than cur value
-        bsearch(needle, haystack, cur+1, last)
+        bsearch(needle, haystack, cur + 1, last)
       when 1 # needle is smaller than cur value
-        bsearch(needle, haystack, first, cur-1)
+        bsearch(needle, haystack, first, cur - 1)
       when 0
         haystack[cur]
       end

data/lib/ipcat/iprange.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 class IPCat
   class IPRange
-
     attr_accessor :first, :last, :name, :url
 
-    def initialize(first, last, name=nil, url=nil)
+    def initialize(first, last, name = nil, url = nil)
       @first = IPCat.ip_to_integer(first)
       @last  = IPCat.ip_to_integer(last)
-      @name, @url = name, url
-      raise ArgumentError.new("first must be <= last") if @first > @last
+      @name = name
+      @url = url
+      raise ArgumentError, 'first must be <= last' if @first > @last
     end
 
     def <=>(obj)
@@ -21,6 +23,7 @@ class IPCat
     end
 
     protected
+
     def compare_with_integer(i)
       if first > i
         1

data/lib/ipcat/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class IPCat
-  VERSION = '2.0.6'
+  VERSION = '2.0.7'
 end

data/spec/benchmark_spec.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 require_relative 'spec_helper'
 require 'minitest/benchmark'
 
 describe 'IPCat.bsearch Benchmark' do
-
   # Makes +n+ IPRanges
   def make_ranges(n)
-    ips = (n*2).times.map{ rand(2**32) }.sort
+    ips = Array.new((n * 2)) { rand(2**32) }.sort
     ranges = []
     ips.each_slice(2) do |first, last|
       ranges << IPCat::IPRange.new(first, last)
@@ -15,20 +16,18 @@ describe 'IPCat.bsearch Benchmark' do
   end
 
   before do
-    @ips = 1000.times.map{ rand(2**32) }
-    @ranges = bench_range.inject({}) {|h, n|
+    @ips = Array.new(1000) { rand(2**32) }
+    @ranges = bench_range.each_with_object({}) do |n, h|
       h[n] = make_ranges(n)
-      h
-    }
+    end
   end
 
-  it("should be logarithmic") do
+  it('should be logarithmic') do
     assert_performance_logarithmic 0.95 do |n|
       IPCat.reset_ranges!(@ranges[n])
-      @ips.each { |ip|
+      @ips.each do |ip|
         10.times { IPCat.bsearch(ip) }
-      }
+      end
     end
   end
-
 end

data/spec/ipcat_iprange_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'spec_helper'
 
 describe 'IPCat::IPRange' do
@@ -11,16 +13,15 @@ describe 'IPCat::IPRange' do
   end
 
   describe '#initialize' do
-    it "should fail if last < first" do
-      ->{ IPCat::IPRange.new(2, 1) }.must_raise ArgumentError
+    it 'should fail if last < first' do
+      -> { IPCat::IPRange.new(2, 1) }.must_raise ArgumentError
     end
   end
 
   describe '#<=> for integers' do
-    it("should match first")   { (range <=> range.first).must_equal 0 }
-    it("should match last")    { (range <=> range.last).must_equal 0 }
-    it("should match first-1") { (range <=> range.first - 1).must_equal 1 }
-    it("should match last+1")  { (range <=> range.last + 1).must_equal(-1) }
+    it('should match first')   { (range <=> range.first).must_equal 0 }
+    it('should match last')    { (range <=> range.last).must_equal 0 }
+    it('should match first-1') { (range <=> range.first - 1).must_equal 1 }
+    it('should match last+1')  { (range <=> range.last + 1).must_equal(-1) }
   end
 end
-

data/spec/ipcat_spec.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require_relative 'spec_helper'
 
 describe 'IPCat' do
-
   before do
     IPCat.reset_ranges!
     start = IPAddr.new('1.2.3.0').to_i
@@ -10,15 +11,14 @@ describe 'IPCat' do
   end
 
   describe '#ranges' do
-   it("has a range") { IPCat.ranges.size.must_equal 1 }
+    it('has a range') { IPCat.ranges.size.must_equal 1 }
   end
 
   describe '#datacenter?' do
-    it("should match 1.2.3.0") { IPCat.datacenter?('1.2.3.0').must_be_instance_of IPCat::IPRange }
-    it("should match 1.2.3.1") { IPCat.datacenter?('1.2.3.1').must_be_instance_of IPCat::IPRange }
-    it("should match 1.2.3.1") { IPCat.datacenter?('1.2.3.1').must_be_instance_of IPCat::IPRange }
-    it("should not match 1.1.1.1") { IPCat.datacenter?('1.1.1.1').must_be_nil }
-    it("should not match 2.2.2.2") { IPCat.datacenter?('2.2.2.2').must_be_nil }
+    it('should match 1.2.3.0') { IPCat.datacenter?('1.2.3.0').must_be_instance_of IPCat::IPRange }
+    it('should match 1.2.3.1') { IPCat.datacenter?('1.2.3.1').must_be_instance_of IPCat::IPRange }
+    it('should match 1.2.3.1') { IPCat.datacenter?('1.2.3.1').must_be_instance_of IPCat::IPRange }
+    it('should not match 1.1.1.1') { IPCat.datacenter?('1.1.1.1').must_be_nil }
+    it('should not match 2.2.2.2') { IPCat.datacenter?('2.2.2.2').must_be_nil }
   end
-
 end

data/spec/spec_helper.rb

@@ -1,7 +1,9 @@
-require "rubygems"
-require "bundler/setup"
+# frozen_string_literal: true
 
-require "minitest/autorun"
-require "minitest/pride"
+require 'rubygems'
+require 'bundler/setup'
 
-require "ipcat"
+require 'minitest/autorun'
+require 'minitest/pride'
+
+require 'ipcat'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ipcat
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Aaron Suggs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2017-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: dataset for categorizing IP addresses in ruby