blackwinter-ipaddress 0.8.0 → 0.8.0.1

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 $:.unshift(File.expand_path('../lib', __FILE__))
 require 'ipaddress'
@@ -22,6 +22,7 @@ begin
       a layer of compatibility with Ruby's own IPAddr, while
       addressing many of its issues.
     EOD
+    gem.add_dependency 'ruby-nuggets', '>= 0.8.9'
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.0.1

data/lib/ipaddress.rb

@@ -13,7 +13,7 @@
 #++
 
 require 'ipaddress/conversions'
-require 'ipaddress/lazy'
+require 'nuggets/util/lazy_attr'
 
 class IPAddress
 
@@ -23,12 +23,12 @@ class IPAddress
   include Conversions
   extend  Conversions
 
-  include Lazy
+  include Util::LazyAttr
 
-  VERSION = '0.8.0'
+  VERSION = '0.8.0.1'
   NAME    = 'IPAddress'
-  GEM     = 'ipaddress'
-  AUTHORS = ['Marco Ceresa <ceresa@ieee.org>']
+  GEM     = 'blackwinter-ipaddress'
+  AUTHORS = ['Marco Ceresa <ceresa@ieee.org>', 'Jens Wille <jens.wille@uni-koeln.de>']
 
   class << self
 
@@ -309,7 +309,7 @@ class IPAddress
   #     #=> "0010000000000001000011011011100000 [...] "
   #
   def bits
-    lazy(:bits) { data2bits(data) }
+    lazy_attr(:bits) { data2bits(data) }
   end
 
   #
@@ -336,7 +336,7 @@ class IPAddress
   #     #=> true
   #
   def network?
-    lazy(:network_p) { i = prefix.to_i; to_i | i == i }
+    lazy_attr(:network_p) { i = prefix.to_i; to_i | i == i }
   end
 
   #
@@ -354,7 +354,7 @@ class IPAddress
   #     #=> "2001:db8::/32"
   #
   def network
-    lazy(:network, false) { network? ? self : at(0) }
+    lazy_attr(:network, false) { network? ? self : at(0) }
   end
 
   #
@@ -371,7 +371,7 @@ class IPAddress
   #     #=> 42540766411282592856903984951653826560
   #
   def network_i
-    lazy(:network_i) { to_i & prefix.to_i }
+    lazy_attr(:network_i) { to_i & prefix.to_i }
   end
 
   #
@@ -383,7 +383,7 @@ class IPAddress
   #     #=> "172.16.10.255"
   #
   def broadcast
-    lazy(:broadcast, false) { at(-1) }
+    lazy_attr(:broadcast, false) { at(-1) }
   end
 
   #
@@ -404,7 +404,7 @@ class IPAddress
   # a helper to other functions.
   #
   def broadcast_i
-    lazy(:broadcast_i) { network_i + size - 1 }
+    lazy_attr(:broadcast_i) { network_i + size - 1 }
   end
 
   #
@@ -423,7 +423,7 @@ class IPAddress
   #     #=> 18446744073709551616
   #
   def size
-    lazy(:size) { 2 ** prefix.host_prefix }
+    lazy_attr(:size) { 2 ** prefix.host_prefix }
   end
 
   #
@@ -595,8 +595,9 @@ class IPAddress
   #
   # If +new_prefix+ is less than 1, returns 0.0.0.0/0
   #
-  def supernet(num)
-    new_prefix(prefix.superprefix(num)).network
+  def supernet(num, relax = false)
+    superprefix = prefix.superprefix(num, relax)
+    new_prefix(superprefix).network if superprefix
   end
 
   def exact_supernet(*other)
@@ -685,16 +686,41 @@ class IPAddress
 
   alias_method :+, :summarize
 
-  def range
-    lazy(:range) { network_i..broadcast_i }
+  def range(other)
+    raise TypeError, 'must be same version' if other.version != version
+
+    return [self] unless other > self
+
+    nets, n, l, m = [], to_i, other.to_i, self.class::MAX_PREFIX
+
+    until n > l
+      i = self.class.parse_i(n, m)
+      f = i.bits.rindex('1') || -1
+
+      while s = i.supernet(f += 1, true)
+        unless s.broadcast_i > l
+          i = s
+          break
+        end
+      end
+
+      nets << i
+      n = i.broadcast_i + 1
+    end
+
+    nets
   end
 
-  def range_i
-    lazy(:range_i) { range.to_a }
+  def span
+    lazy_attr(:span) { network_i..broadcast_i }
+  end
+
+  def span_i
+    lazy_attr(:span_i) { span.to_a }
   end
 
   def boundaries
-    lazy(:boundaries) { [(r = range).first, r.last] }
+    lazy_attr(:boundaries) { [(s = span).first, s.last] }
   end
 
   def each_i(first = nil, last = nil)
@@ -768,10 +794,10 @@ class IPAddress
   end
 
   def at(index)
-    r = range
+    s = span
 
-    index += index < 0 ? r.last + 1 : r.first
-    each(index) { |i| return i } if r.include?(index)
+    index += index < 0 ? s.last + 1 : s.first
+    each(index) { |i| return i } if s.include?(index)
 
     nil
   end
@@ -797,7 +823,7 @@ class IPAddress
   #     #=> "192.168.100.1"
   #
   def first
-    lazy(:first, false) { at(1) }
+    lazy_attr(:first, false) { at(1) }
   end
 
   #
@@ -822,7 +848,11 @@ class IPAddress
   #     #=> "192.168.100.254"
   #
   def last
-    lazy(:last, false) { at(-2) }
+    lazy_attr(:last, false) { at(-2) }
+  end
+
+  def succ
+    lazy_attr(:succ, false) { self.class.parse_i(to_i + 1, prefix) }
   end
 
   #
@@ -840,7 +870,7 @@ class IPAddress
   #     #=>  "10.0.0.6"]
   #
   def hosts
-    lazy(:hosts) { hosts = []; each_host { |i| hosts << i }; hosts }
+    lazy_attr(:hosts) { hosts = []; each_host { |i| hosts << i }; hosts }
   end
 
   def mapped
@@ -900,7 +930,7 @@ class IPAddress
   end
 
   def hash
-    lazy(:hash) { [to_i, prefix.hash].hash }
+    lazy_attr(:hash) { [to_i, prefix.hash].hash }
   end
 
   alias_method :eql?, :==

data/lib/ipaddress/ipv4.rb

@@ -27,7 +27,7 @@ class IPAddress
       24 => /\A110/   # Class C, D and E, from 192.0.0.0 to 255.255.255.254
     }
 
-    part = %r{(?: 25[0-5] | 2[0-4]\d | 1\d\d | [1-9]\d | \d )}x
+    part = %r{ (?: 25[0-5] | 2[0-4]\d | 1\d\d | [1-9]\d | \d ) }x
 
     INTERNAL_RE = %r{ (?: #{part} \. ){3} #{part} }xo
 
@@ -40,7 +40,7 @@ class IPAddress
 
     MAX_PREFIX = Prefix::MAX
 
-    PREFIX_RE = %r{\A(?:[12]?\d|3[0-2])\z}
+    PREFIX_RE = %r{ \A (?: [12]?\d | 3[0-2] ) \z }x
 
     class << self
 
@@ -181,6 +181,10 @@ class IPAddress
       @address, @octets = ip, addr2ary(ip)
     end
 
+    def version
+      4
+    end
+
     #
     # Returns the address portion of the IPv4 object
     # as a string.
@@ -191,7 +195,7 @@ class IPAddress
     #     #=> "172.16.100.4"
     #
     def address
-      lazy(:address) { ary2addr(octets) }
+      lazy_attr(:address) { ary2addr(octets) }
     end
 
     #
@@ -207,7 +211,7 @@ class IPAddress
     #     #=> IPAddress::Prefix32
     #
     def prefix
-      lazy(:prefix, false) { Prefix.new(@_prefix) }
+      lazy_attr(:prefix, false) { Prefix.new(@_prefix) }
     end
 
     #
@@ -219,7 +223,7 @@ class IPAddress
     #     #=> "255.255.252.0"
     #
     def netmask
-      lazy(:netmask) { prefix.to_ip }
+      lazy_attr(:netmask) { prefix.to_ip }
     end
 
     #
@@ -250,7 +254,7 @@ class IPAddress
     #     #=> [172, 16, 100, 4]
     #
     def octets
-      lazy(:octets) { int2ary(to_i) }
+      lazy_attr(:octets) { int2ary(to_i) }
     end
 
     alias_method :groups, :octets
@@ -282,7 +286,7 @@ class IPAddress
     #     #=> 167772160
     #
     def to_i
-      lazy(:int) { ary2int(octets) }
+      lazy_attr(:int) { ary2int(octets) }
     end
 
     alias_method :u32, :to_i
@@ -308,7 +312,7 @@ class IPAddress
     #   a.puts binary_data
     #
     def data
-      lazy(:data) { int2data(to_i) }
+      lazy_attr(:data) { int2data(to_i) }
     end
 
     #
@@ -346,7 +350,7 @@ class IPAddress
     #     #=> "50.100.16.172.in-addr.arpa"
     #
     def reverse
-      lazy(:reverse) { "#{ary2addr(octets.reverse)}.in-addr.arpa" }
+      lazy_attr(:reverse) { "#{ary2addr(octets.reverse)}.in-addr.arpa" }
     end
 
     alias_method :arpa, :reverse
@@ -362,7 +366,7 @@ class IPAddress
     #     #=> true
     #
     def private?
-      lazy(:private_p) { self.class.private_nets.any? { |i| i.include?(self) } }
+      lazy_attr(:private_p) { self.class.private_nets.any? { |i| i.include?(self) } }
     end
 
     #
@@ -378,7 +382,7 @@ class IPAddress
     #     #=> true
     #
     def a?
-      lazy(:a_p) { CLASSFUL[8] === bits }
+      lazy_attr(:a_p) { CLASSFUL[8] === bits }
     end
 
     #
@@ -394,7 +398,7 @@ class IPAddress
     #     #=> true
     #
     def b?
-      lazy(:b_p) { CLASSFUL[16] === bits }
+      lazy_attr(:b_p) { CLASSFUL[16] === bits }
     end
 
     #
@@ -410,7 +414,7 @@ class IPAddress
     #     #=> true
     #
     def c?
-      lazy(:c_p) { CLASSFUL[24] === bits }
+      lazy_attr(:c_p) { CLASSFUL[24] === bits }
     end
 
     #
@@ -425,7 +429,7 @@ class IPAddress
     #     #=> "ac10:0a01"
     #
     def to_ipv6
-      lazy(:to_ipv6) { '%.4x:%.4x' % int2data(to_i).unpack('n2') }
+      lazy_attr(:to_ipv6) { '%.4x:%.4x' % int2data(to_i).unpack('n2') }
     end
 
   end

data/lib/ipaddress/ipv6.rb

@@ -75,7 +75,7 @@ class IPAddress
     #
     # Format string to pretty print IPv6 addresses
     #
-    IN6FORMAT = ('%.4x:' * 8).chop
+    IN6FORMAT = Array.new(8, '%.4x').join(':')
 
     Prefix = Prefix128
 
@@ -205,6 +205,10 @@ class IPAddress
       end
     end
 
+    def version
+      6
+    end
+
     #
     # Returns the IPv6 address in uncompressed form:
     #
@@ -214,7 +218,7 @@ class IPAddress
     #     #=> "2001:0db8:0000:0000:0008:0800:200c:417a"
     #
     def address
-      lazy(:address) { IN6FORMAT % groups }
+      lazy_attr(:address) { IN6FORMAT % groups }
     end
 
     #
@@ -226,7 +230,7 @@ class IPAddress
     #     #=> "2001:db8::8:800:200c:417a"
     #
     def compressed
-      lazy(:compressed) {
+      lazy_attr(:compressed) {
         r1, r2, q = /\b0(?::0)+\b/, /:{3,}/, '::'
 
         a, b = [s = groups.map { |i| i.to_s(16) }.join(':'), s.reverse].map! { |t|
@@ -246,7 +250,7 @@ class IPAddress
     #     #=> 64
     #
     def prefix
-      lazy(:prefix, false) { Prefix.new(@netmask) }
+      lazy_attr(:prefix, false) { Prefix.new(@netmask) }
     end
 
     #
@@ -259,7 +263,7 @@ class IPAddress
     #     #=> [8193, 3512, 0, 0, 8, 2048, 8204, 16762]
     #
     def groups
-      lazy(:groups) { self.class.groups(@ip) }
+      lazy_attr(:groups) { self.class.groups(@ip) }
     end
 
     #
@@ -274,7 +278,7 @@ class IPAddress
     # Not to be confused with the similar IPv6#to_hex method.
     #
     def hexs
-      lazy(:hexs) { address.split(':') }
+      lazy_attr(:hexs) { address.split(':') }
     end
 
     #
@@ -287,7 +291,7 @@ class IPAddress
     #     #=> "20010db80000000000080800200c417a"
     #
     def to_hex
-      lazy(:to_hex) { hexs.join('') }
+      lazy_attr(:to_hex) { hexs.join('') }
     end
 
     #
@@ -326,7 +330,7 @@ class IPAddress
     #     #=> 42540766411282592856906245548098208122
     #
     def to_i
-      lazy(:int) { to_hex.hex }
+      lazy_attr(:int) { to_hex.hex }
     end
 
     alias_method :u128, :to_i
@@ -351,7 +355,7 @@ class IPAddress
     #   a.puts binary_data
     #
     def data
-      lazy(:data) { groups.pack('n8') }
+      lazy_attr(:data) { groups.pack('n8') }
     end
 
     #
@@ -388,7 +392,7 @@ class IPAddress
     #     #=> "f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.5.0.5.0.e.f.f.3.ip6.arpa"
     #
     def reverse
-      lazy(:reverse) { "#{to_hex.gsub(/(?=.)/, '.').reverse}ip6.arpa" }
+      lazy_attr(:reverse) { "#{to_hex.gsub(/(?=.)/, '.').reverse}ip6.arpa" }
     end
 
     alias_method :arpa, :reverse
@@ -402,7 +406,7 @@ class IPAddress
     #     #=> "2001-0db8-0000-0000-0008-0800-200c-417a.ipv6-literal.net"
     #
     def literal
-      lazy(:literal) { "#{address.tr(':', '-')}.ipv6-literal.net" }
+      lazy_attr(:literal) { "#{address.tr(':', '-')}.ipv6-literal.net" }
     end
 
     #
@@ -411,7 +415,7 @@ class IPAddress
     # See IPAddress::IPv6::Unspecified for more information
     #
     def unspecified?
-      lazy(:unspecified_p) { prefix.max? && compressed == '::' }
+      lazy_attr(:unspecified_p) { prefix.max? && compressed == '::' }
     end
 
     #
@@ -420,7 +424,7 @@ class IPAddress
     # See IPAddress::IPv6::Loopback for more information
     #
     def loopback?
-      lazy(:loopback_p) { prefix.max? && compressed == '::1' }
+      lazy_attr(:loopback_p) { prefix.max? && compressed == '::1' }
     end
 
     #
@@ -429,7 +433,7 @@ class IPAddress
     # See IPAddress::IPv6::Mapped for more information
     #
     def mapped?
-      lazy(:mapped_p) { to_i >> 32 == 0xffff }
+      lazy_attr(:mapped_p) { to_i >> 32 == 0xffff }
     end
 
     #

data/lib/ipaddress/prefix.rb

@@ -25,7 +25,7 @@ class IPAddress
     include Conversions
     extend  Conversions
 
-    include Lazy
+    include Util::LazyAttr
 
     #
     # Creates a new prefix object for 32 bits IPv4 addresses /
@@ -74,7 +74,7 @@ class IPAddress
     #         "0000000000000000000000000000000000000000000000000000000000000000"
     #
     def bits
-      lazy(:bits) { '1' * prefix << '0' * host_prefix }
+      lazy_attr(:bits) { '1' * prefix << '0' * host_prefix }
     end
 
     #
@@ -92,7 +92,7 @@ class IPAddress
     #     #=> 340282366920938463444927863358058659840
     #
     def to_i
-      lazy(:int) { bits.to_i(2) }
+      lazy_attr(:int) { bits.to_i(2) }
     end
 
     #
@@ -140,39 +140,37 @@ class IPAddress
     #     #=> 32
     #
     def host_prefix
-      lazy(:host_prefix) { max - prefix }
+      lazy_attr(:host_prefix) { max - prefix }
     end
 
     def max
-      lazy(:max) { self.class::MAX }
+      lazy_attr(:max) { self.class::MAX }
     end
 
     def max?
-      lazy(:max_p) { prefix == max }
+      lazy_attr(:max_p) { prefix == max }
     end
 
     def prev
-      lazy(:prev) { prefix - 1 }
+      lazy_attr(:prev) { prefix - 1 }
     end
 
     def next
-      lazy(:next) { prefix + 1 unless max? }
+      lazy_attr(:next) { prefix + 1 unless max? }
     end
 
-    def superprefix(num)
-      validate_prefix(num = [0, num].max, nil, prev)
-      num
+    def superprefix(num, relax = false)
+      validate_prefix([0, num].max, nil, prev, relax) or return
     end
 
-    def subprefix(num)
-      validate_prefix(num, prefix)
+    def subprefix(num, relax = false)
+      validate_prefix(num, prefix, relax) or return
       [2 ** (max - num), 2 ** (num - prefix)]
     end
 
-    def validate_prefix(num, first = nil, last = nil)
-      unless (range = (first || 0)..(last || max)).include?(num)
-        raise ArgumentError, "Prefix must be in range #{range}, got: #{num}"
-      end
+    def validate_prefix(num, first = nil, last = nil, relax = false)
+      return num if (range = (first || 0)..(last || max)).include?(num)
+      raise ArgumentError, "Prefix must be in range #{range}, got: #{num}" unless relax
     end
 
   end
@@ -209,7 +207,7 @@ class IPAddress
     #     #=> "255.255.255.0"
     #
     def to_ip
-      lazy(:ip) { bits2addr(bits) }
+      lazy_attr(:ip) { bits2addr(bits) }
     end
 
     #
@@ -222,7 +220,7 @@ class IPAddress
     #     #=> [255, 255, 255, 0]
     #
     def octets
-      lazy(:octets) { addr2ary(to_ip) }
+      lazy_attr(:octets) { addr2ary(to_ip) }
     end
 
     #
@@ -251,7 +249,7 @@ class IPAddress
     #     #=> "0.0.0.255"
     #
     def hostmask
-      lazy(:hostmask) { int2addr(~to_i) }
+      lazy_attr(:hostmask) { int2addr(~to_i) }
     end
 
   end

metadata

@@ -1,23 +1,29 @@
 --- !ruby/object:Gem::Specification 
 name: blackwinter-ipaddress
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.0.1
 platform: ruby
 authors: 
 - Marco Ceresa
-- Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-07-20 00:00:00 +02:00
+date: 2012-11-30 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
-description: "      IPAddress is a Ruby library designed to make manipulation \n      of IPv4 and IPv6 addresses both powerful and simple. It mantains\n      a layer of compatibility with Ruby's own IPAddr, while \n      addressing many of its issues.\n"
-email: 
-- ceresa@gmail.com
-- jens.wille@uni-koeln.de
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: ruby-nuggets
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.8.9
+    version: 
+description: "      IPAddress is a Ruby library designed to make manipulation\n      of IPv4 and IPv6 addresses both powerful and simple. It mantains\n      a layer of compatibility with Ruby's own IPAddr, while\n      addressing many of its issues.\n"
+email: ceresa@gmail.com
 executables: []
 
 extensions: []
@@ -32,20 +38,18 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- ipaddress.gemspec
 - lib/ipaddress.rb
+- lib/ipaddress/conversions.rb
 - lib/ipaddress/ipv4.rb
 - lib/ipaddress/ipv6.rb
 - lib/ipaddress/prefix.rb
-- lib/ipaddress/conversions.rb
-- lib/ipaddress/lazy.rb
 - test/ipaddress/ipv4_test.rb
 - test/ipaddress/ipv6_test.rb
 - test/ipaddress/prefix_test.rb
 - test/ipaddress_test.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: https://github.com/blackwinter/ipaddress
+homepage: http://github.com/bluemonk/ipaddress
 licenses: []
 
 post_install_message: 
@@ -71,6 +75,6 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: IPv4/IPv6 addresses manipulation library [Incompatible fork]
+summary: IPv4/IPv6 addresses manipulation library
 test_files: []
 

data/ipaddress.gemspec

@@ -1,57 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{blackwinter-ipaddress}
-  s.version = "0.8.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ['Marco Ceresa', 'Jens Wille']
-  s.date = %q{2012-07-20}
-  s.description = %q{      IPAddress is a Ruby library designed to make manipulation 
-      of IPv4 and IPv6 addresses both powerful and simple. It mantains
-      a layer of compatibility with Ruby's own IPAddr, while 
-      addressing many of its issues.
-}
-  s.email = %w[ceresa@gmail.com jens.wille@uni-koeln.de]
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "CHANGELOG.rdoc",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "ipaddress.gemspec",
-    "lib/ipaddress.rb",
-    "lib/ipaddress/ipv4.rb",
-    "lib/ipaddress/ipv6.rb",
-    "lib/ipaddress/prefix.rb",
-    "lib/ipaddress/conversions.rb",
-    "lib/ipaddress/lazy.rb",
-    "test/ipaddress/ipv4_test.rb",
-    "test/ipaddress/ipv6_test.rb",
-    "test/ipaddress/prefix_test.rb",
-    "test/ipaddress_test.rb",
-    "test/test_helper.rb"
-  ]
-  s.homepage = %q{https://github.com/blackwinter/ipaddress}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{IPv4/IPv6 addresses manipulation library [Incompatible fork]}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end
-

data/lib/ipaddress/lazy.rb

@@ -1,19 +0,0 @@
-class IPAddress
-
-  module Lazy
-
-    private
-
-    def lazy(attr, freeze = true)
-      class << self; self; end.class_eval { attr_reader attr }
-
-      value =
-        instance_variable_get(name = "@#{attr}") ||
-        instance_variable_set(name, yield)
-
-      freeze ? value.freeze : value
-    end
-
-  end
-
-end