cidrmergerb 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61a72484791fa6a70fabda31cfad10454b80aa03
-  data.tar.gz: 0583b3315b9829f120e562ba10d2d310b4feda92
+  metadata.gz: 9d1eaf7bb0f73fddd4c5c1832e75ae5201f801d8
+  data.tar.gz: 7eebdcd2ccf434e84cf62ca0e06395abacf0a936
 SHA512:
-  metadata.gz: eb8e08e2f82f7b83c080fa7ecb126d66d25cb50112ac5a8979d91524dcc068463b5716b28a2b9ad034d1194614cc487246ff8cccb7b8e1a2bc9d674830d4d41e
-  data.tar.gz: 2d1180a36337d7de672bbd3178d600d380b57a892c0b7c1173376c40f2d0066d2874f2dffd96013afc9048297997c040f7414795960ecc296b40b8e632be10b6
+  metadata.gz: ee282dcf4819ecb41e03962ad7138e463cf9adb4bf0115e88048aec666a84b9b60f5c0deb3e665e9e12874002c7dc57badd72a911e108921c3d2ea0372600d26
+  data.tar.gz: 3bed5a3f733d7e020bd64ccb309d1abed9f24ada62a9d40fedce6b332f7af3aadbceb0b37d17c5a922b076134df9ab658eb763828299a7c237643dd39a6bfffe

data/CHANGELOG.md

@@ -0,0 +1,16 @@
+0.1.3
+
++ Add helper methods(.netmask_to_int, .host_size_for_netmask, .netmask_valid?, .ip_to_int, .int_to_ip, .cidr_to_ip_netmask, .cidr_to_range)
++ Add CIDR Random test
+
+0.1.2
+
++ Degrade ffi dependency version
+
+0.1.1
+
++ bugfix: catch IPAddr::Error
+
+0.1.0
+
++ support #optimize

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cidrmergerb (0.1.1)
+    cidrmergerb (0.1.3)
       ffi (~> 1.0)
 
 GEM
@@ -9,6 +9,7 @@ GEM
   specs:
     ffi (1.9.10)
     minitest (5.9.0)
+    netaddr (1.5.1)
     rake (10.5.0)
 
 PLATFORMS
@@ -18,6 +19,7 @@ DEPENDENCIES
   bundler (~> 1.11)
   cidrmergerb!
   minitest (~> 5.0)
+  netaddr
   rake (~> 10.0)
 
 BUNDLED WITH

data/README.md

@@ -20,6 +20,8 @@ Or install it yourself as:
 
 ## Usage
 
+```
 Cidrmergerb.optimize(["10.1.1.0/24", "10.1.1.1/32", "192.1.4.5/32", "192.1.4.4/32"]) #=> ['10.1.1.0/24', '192.1.4.4/31']
+```
 
 more example: [cidrmergerb_test.rb](./test/cidrmergerb_test.rb)

data/Rakefile

@@ -7,10 +7,15 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
+Rake::TestTask.new(:bench) do |t|
+  t.libs = %w(lib test)
+  t.pattern = 'test/**/*_benchmark.rb'
+end
+
 desc "clean shared library"
 task :clean_library do
   FileUtils.cd(File.join(File.dirname(__FILE__), 'ext/cidrmergerb'))
   %x{make clean}
 end
 
-task :default => [:clean_library, :spec]
+task :default => :test

data/cidrmergerb.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "netaddr"
 end

data/lib/cidrmergerb/cidr.rb

@@ -0,0 +1,24 @@
+module Cidrmergerb
+  module Cidr
+
+    # Split CIDR to ip & netmask
+    #
+    # @example
+    #   cidr_to_ip_netmask('1.2.3.0/24')  #=> ['1.2.3.0', 24]
+    def cidr_to_ip_netmask(cidr)
+      ip, netmask = cidr.split('/')
+      return [ip, netmask.to_i]
+    end
+
+    # Convert CIDR to IP Range with int format
+    #
+    # @example
+    #   cidr_to_range('1.2.3.0/24') #=> 16909056...16909312
+    #   cidr_to_range('1.2.3.4/24') #=> 16909056...16909312
+    def cidr_to_range(cidr)
+      ip, netmask = cidr_to_ip_netmask(cidr)
+      first = ip_to_int(ip) & netmask_to_int(netmask)
+      return first...(first + host_size_for_netmask(netmask))
+    end
+  end
+end

data/lib/cidrmergerb/ip.rb

@@ -0,0 +1,25 @@
+require 'ipaddr'
+
+module Cidrmergerb
+  module Ip
+    # Convert ip from str to int
+    def ip_to_int(ip)
+      IPAddr.new(ip).to_i
+    end
+
+    # Convert ip from int to str
+    #
+    # Benchmark: test/ip_benchmark.rb
+    #   bench_ipaddr_ip_convert    0.000031    0.000021    0.000015    0.000021    0.000016
+    #   bench_simple_ip_convert    0.000010    0.000009    0.000010    0.000007    0.000006
+    #
+    # @return [ip]
+    def int_to_ip(int)
+      ip1 = (int & 0xff000000) >> 24
+      ip2 = (int & 0x00ff0000) >> 16
+      ip3 = (int & 0x0000ff00) >> 8
+      ip4 = (int & 0x000000ff)
+      "#{ip1}.#{ip2}.#{ip3}.#{ip4}"
+    end
+  end
+end

data/lib/cidrmergerb/netmask.rb

@@ -0,0 +1,41 @@
+module Cidrmergerb
+  module Netmask
+    class NetmaskInvalidError < StandardError; end
+
+    # Convert netmask to integer
+    #
+    # @example
+    #   netmask_to_int(24) #=> 4294967040
+    def netmask_to_int(netmask)
+      validate(netmask)
+      ('1' * netmask).to_i(2) << (32 - netmask)
+    end
+
+    # Get most host size base on netmask
+    #
+    # @example
+    #   host_size_for_netmask(24) #=> 256
+    #   host_size_for_netmask(32) #=> 1
+    #
+    def host_size_for_netmask(netmask)
+      validate(netmask)
+      2**(32 - netmask)
+    end
+
+    # Check netmask valid is or not
+    #
+    # @example
+    #   netmask_valid?(100) #=> false
+    #   netmask_valid?(24) #=> true
+    def netmask_valid?(netmask)
+      netmask.between?(1, 32)
+    end
+
+    private
+    def validate(netmask)
+      fail NetmaskInvalidError, "netmask must between [1, 32]" unless netmask_valid?(netmask)
+    end
+
+  end
+end
+

data/lib/cidrmergerb/version.rb

@@ -1,3 +1,3 @@
 module Cidrmergerb
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/cidrmergerb.rb

@@ -1,11 +1,21 @@
 require "cidrmergerb/version"
 require 'cidrmergerb/ext'
+require 'cidrmergerb/ip'
+require 'cidrmergerb/cidr'
+require 'cidrmergerb/netmask'
 require 'ipaddr'
 require 'ffi'
 
 module Cidrmergerb
+  extend Ip
+  extend Cidr
+  extend Netmask
 
   class << self
+    # Optimize CIDRs
+    #
+    # @example
+    #   optimize(['1.2.4.0/24', '1.2.5.0/24']) #=> ['1.2.4.0/23']
     def optimize(cidrs)
       pointer = build_pointer_to_cidrs(cidrs)
       optimize_length = Cidrmergerb::Ext.optimize(pointer, cidrs.length, 1)
@@ -22,18 +32,18 @@ module Cidrmergerb
       entries = wrap_with_struct(pointer, Cidrmergerb::Ext::Entry, cidrs.length)
 
       cidrs.each_with_index do |cidr, index|
-        ip, netmask = cidr.split('/')
-        entries[index][:network] = IPAddr.new(ip).to_i
-        entries[index][:prefix] = netmask.to_i
+        ip, netmask = cidr_to_ip_netmask(cidr)
+        entries[index][:network] = ip_to_int(ip)
+        entries[index][:prefix] = netmask
       end
 
       pointer
     end
 
     def cidr_valid?(cidr)
-      ip, netmask = cidr.split('/')
+      ip, netmask = cidr_to_ip_netmask(cidr)
       ipaddr = IPAddr.new(ip)
-      ipaddr && netmask.to_i.between?(1, 32)
+      ipaddr && netmask_valid?(netmask)
     rescue IPAddr::Error => e
       false
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cidrmergerb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Newell Zhu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: netaddr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CIDR Merge toolkit -- Wrapping for Daniele's CIDR Optimization library.
 email:
 - newell.zhu@kingaxis.com
@@ -74,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -86,7 +101,10 @@ files:
 - ffi/libcidrmerge.c
 - ffi/optimized-sort.h
 - lib/cidrmergerb.rb
+- lib/cidrmergerb/cidr.rb
 - lib/cidrmergerb/ext.rb
+- lib/cidrmergerb/ip.rb
+- lib/cidrmergerb/netmask.rb
 - lib/cidrmergerb/version.rb
 homepage: https://github.com/kingaxis/cidrmergerb
 licenses: []