ruby-ip 0.9.0 → 0.9.1

data/README.rdoc

@@ -1,6 +1,14 @@
-== ruby-ip library
+= ruby-ip library
 
-This is a library for manipulating IP addresses. Feature overview:
+This is a library for manipulating IP addresses.
+
+== Installation
+
+Gem:: <tt>gem install ruby-ip</tt>
+Source:: <tt>git clone git://github.com/deploy2/ruby-ip.git</tt>
+Docs:: http://deploy2.github.com/ruby-ip/
+
+== Feature overview
 
 * Create from string and to string
 

data/Rakefile

@@ -1,5 +1,10 @@
 require 'rake/clean'
 
+task :gem => :build
+task :build do
+  system "gem build ruby-ip.gemspec"
+end
+
 #### TESTING ####
 require 'rake/testtask'
 task :default => :test
@@ -24,7 +29,7 @@ rescue LoadError
 end
 
 #### DOCUMENTATION ####
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc/rdoc'
   rdoc.template = ENV['template'] if ENV['template']

data/lib/ip/base.rb

@@ -175,12 +175,19 @@ class IP
     self
   end
   
-  def to_range
+  def to_irange
     a1 = @addr & ~mask
     a2 = a1 | mask
     (a1..a2)
   end
 
+  # QUERY: IPAddr (1.9) turns 1.2.3.0/24 into 1.2.3.0/24..1.2.3.255/24
+  # Here I turn it into 1.2.3.0..1.2.3.255. Which is better?
+  def to_range
+    self.class.new(@addr & ~mask, self.class::ADDR_BITS, @ctx) ..
+    self.class.new(@addr | mask, self.class::ADDR_BITS, @ctx)
+  end
+
   # The number of IP addresses in subnet
   #    IP.new("1.2.3.4/24").size   => 256
   def size
@@ -211,8 +218,12 @@ class IP
     self.class.new(~@addr & self.class::MASK, @pfxlen, @ctx)
   end
 
+  def succ
+    self.class.new(@addr + size, @pfxlen, @ctx)
+  end
+
   def succ!
-    @addr += 1
+    @addr += size
     self
   end
 
@@ -236,6 +247,11 @@ class IP
     to_a.hash
   end
 
+  def freeze
+    mask
+    super
+  end
+
   def eql?(other)
     to_a.eql?(other.to_a)
   end
@@ -328,11 +344,15 @@ class IP
         "::#{native.to_addr}"
       elsif ipv4_mapped?
         "::ffff:#{native.to_addr}"
+      elsif @addr.zero?
+        "::"
       else
         res = to_hex.scan(/..../).join(':')
         res.gsub!(/\b0{1,3}/,'')
-        res.gsub!(/(\A|:)(0:)+/,'::')
-        res.gsub!(/::0\z/, '::')
+        res.sub!(/\b0:0:0:0(:0)*\b/,':') ||
+          res.sub!(/\b0:0:0\b/,':') ||
+          res.sub!(/\b0:0\b/,':')
+        res.sub!(/:::+/,'::')
         res
       end
     end

data/test/ip_test.rb

@@ -121,8 +121,12 @@ class IPTest < Test::Unit::TestCase
         assert_equal "v4", @addr.proto
       end
       
+      should "have to_irange" do
+        assert_equal((0x01020300 .. 0x010203ff), @addr.to_irange)
+      end
+      
       should "have to_range" do
-        assert_equal((0x01020300 .. 0x010203ff), @addr.to_range)
+        assert_equal IP.new("1.2.3.0@foo")..IP.new("1.2.3.255@foo"), @addr.to_range
       end
       
       should "have size" do
@@ -419,6 +423,11 @@ class IPTest < Test::Unit::TestCase
     end
   end
 
+  should "convert v6 addresses unambiguously" do
+    assert_equal "1:0:2::", IP.new('1:0:2:0:0:0:0:0').to_s
+    assert_equal "1::2:0", IP.new('1:0:0:0:0:0:2:0').to_s
+  end
+  
   context "comparing" do
     setup do
       @a1 = IP.new("1.2.3.4")
@@ -467,6 +476,55 @@ class IPTest < Test::Unit::TestCase
     end
   end
 
+  context "freezing" do
+    setup do
+      @addr = IP.new('1.2.3.4/24@foo').freeze
+    end
+
+    should "be able to get values without a TypeError" do
+      assert_nothing_raised(TypeError) do
+        @addr.to_s
+        @addr.to_addrlen
+        @addr.to_addr
+        @addr.to_i
+        @addr.to_a
+        @addr.to_ah
+        @addr.to_hex
+        @addr.pfxlen
+        @addr.proto
+        @addr.to_irange
+        @addr.to_range
+        @addr.size
+        @addr.ctx
+        @addr.network
+        @addr.broadcast
+        @addr.mask
+        @addr.netmask
+        @addr.wildmask
+        @addr.offset
+      end
+    end
+  end
+
+  context "range between two IPs" do
+    should "be able to iterate" do
+      r = IP.new("10.0.0.6")..IP.new("10.0.0.8")
+      a = []
+      r.each { |x| a << x.to_s }
+      assert_equal ["10.0.0.6","10.0.0.7","10.0.0.8"], a
+    end
+
+    should "iterate when prefix present" do
+      # Spec question: should this increment in blocks of /30 or single IPs?
+      # Iteration of single IPs is not really useful for v6; but then again,
+      # having an off-base start IP isn't really useful either.
+      r = IP.new("10.0.0.6/30")..IP.new("10.0.0.11/29")
+      a = []
+      r.each { |x| a << x.to_s }
+      assert_equal ["10.0.0.6/30","10.0.0.10/30"], a
+    end
+  end
+  
   PARSE_TESTS = [
     # ipv4
     [["v4", 0x01020304, 32],				"1.2.3.4"],

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-ip
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Brian Candler
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 +00:00
+date: 2011-12-13 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -22,12 +27,12 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- lib/ip/cpal.rb
 - lib/ip/base.rb
+- lib/ip/cpal.rb
 - lib/ip/socket.rb
 - lib/ip.rb
-- test/ip_test.rb
 - test/ip_cpal_test.rb
+- test/ip_test.rb
 - test/test_helper.rb
 - README.rdoc
 - Rakefile
@@ -47,18 +52,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: ruby-ip
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: IP address manipulation library