ipaddress 0.8.0 → 0.8.3

data/test/ipaddress/prefix_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
  
-class Prefix32Test < Test::Unit::TestCase
+class Prefix32Test < Minitest::Test
 
   def setup
     @netmask0  = "0.0.0.0"
@@ -89,12 +89,9 @@ class Prefix32Test < Test::Unit::TestCase
   end
 
   def test_initialize
-    assert_raise (ArgumentError) do
+    assert_raises (ArgumentError) do
       @klass.new 33
     end
-    assert_nothing_raised do
-      @klass.new 8
-    end
     assert_instance_of @klass, @klass.new(8)
   end
 
@@ -122,7 +119,7 @@ class Prefix32Test < Test::Unit::TestCase
 end # class Prefix32Test
 
   
-class Prefix128Test < Test::Unit::TestCase
+class Prefix128Test < Minitest::Test
   
   def setup
     @u128_hash = {
@@ -135,12 +132,9 @@ class Prefix128Test < Test::Unit::TestCase
   end
 
   def test_initialize
-    assert_raise (ArgumentError) do
+    assert_raises (ArgumentError) do
       @klass.new 129
     end
-    assert_nothing_raised do
-      @klass.new 64
-    end
     assert_instance_of @klass, @klass.new(64)
   end
 

data/test/ipaddress_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class IPAddressTest < Test::Unit::TestCase
+class IPAddressTest < Minitest::Test
 
   def setup
     @valid_ipv4   = "172.16.10.1/24"
@@ -11,25 +11,50 @@ class IPAddressTest < Test::Unit::TestCase
     @invalid_ipv6   = ":1:2:3:4:5:6:7"
     @invalid_mapped = "::1:2.3.4"
 
+    @valid_ipv4_uint32 = [4294967295, # 255.255.255.255
+                          167772160,  # 10.0.0.0
+                          3232235520, # 192.168.0.0
+                          0]
+
+    @invalid_ipv4_uint32 = [4294967296, # 256.0.0.0
+                          "A294967295", # Invalid uINT
+                          -1]           # Invalid 
+
+
     @ipv4class   = IPAddress::IPv4
     @ipv6class   = IPAddress::IPv6
     @mappedclass = IPAddress::IPv6::Mapped
+    
+    @invalid_ipv4 = ["10.0.0.256",
+                     "10.0.0.0.0",
+                     "10.0.0",
+                     "10.0"]
+
+    @valid_ipv4_range = ["10.0.0.1-254",
+                         "10.0.1-254.0",
+                         "10.1-254.0.0"]
 
     @method = Module.method("IPAddress")
   end
 
   def test_method_IPAddress
-    assert_nothing_raised {@method.call(@valid_ipv4)}
-    assert_nothing_raised {@method.call(@valid_ipv6)} 
-    assert_nothing_raised {@method.call(@valid_mapped)}
 
     assert_instance_of @ipv4class, @method.call(@valid_ipv4) 
     assert_instance_of @ipv6class, @method.call(@valid_ipv6) 
     assert_instance_of @mappedclass, @method.call(@valid_mapped)
 
-    assert_raise(ArgumentError) {@method.call(@invalid_ipv4)}
-    assert_raise(ArgumentError) {@method.call(@invalid_ipv6)}
-    assert_raise(ArgumentError) {@method.call(@invalid_mapped)}
+    assert_raises(ArgumentError) {@method.call(@invalid_ipv4)}
+    assert_raises(ArgumentError) {@method.call(@invalid_ipv6)}
+    assert_raises(ArgumentError) {@method.call(@invalid_mapped)}
+
+    assert_instance_of @ipv4class, @method.call(@valid_ipv4_uint32[0]) 
+    assert_instance_of @ipv4class, @method.call(@valid_ipv4_uint32[1]) 
+    assert_instance_of @ipv4class, @method.call(@valid_ipv4_uint32[2]) 
+    assert_instance_of @ipv4class, @method.call(@valid_ipv4_uint32[3]) 
+
+    assert_raises(ArgumentError) {@method.call(@invalid_ipv4_uint32[0])}
+    assert_raises(ArgumentError) {@method.call(@invalid_ipv4_uint32[1])}
+    assert_raises(ArgumentError) {@method.call(@invalid_ipv4_uint32[2])}
 
   end
 
@@ -43,6 +68,8 @@ class IPAddressTest < Test::Unit::TestCase
     assert_equal false, IPAddress::valid?("10.0.0")
     assert_equal false, IPAddress::valid?("10.0")
     assert_equal false, IPAddress::valid?("2002:::1")
+    assert_equal false, IPAddress::valid?("2002:516:2:200")
+
   end
 
   def test_module_method_valid_ipv4_netmark?

data/test/test_helper.rb

@@ -1,13 +1,20 @@
 require 'rubygems'
-require 'test/unit'
+require 'minitest/autorun'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'ipaddress'
 
-module Test::Unit
+if Minitest.const_defined?('Test')
+  # We're on Minitest 5+. Nothing to do here.
+else
+  # Minitest 4 doesn't have Minitest::Test yet.
+  Minitest::Test = MiniTest::Unit::TestCase
+end
+
+module Minitest
   
-  class TestCase
+  class Test
     
     def self.must(name, &block)
       test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym

metadata

@@ -1,67 +1,102 @@
 --- !ruby/object:Gem::Specification
 name: ipaddress
 version: !ruby/object:Gem::Version
-  version: 0.8.0
-  prerelease: 
+  version: 0.8.3
 platform: ruby
 authors:
-- Marco Ceresa
+- bluemonk
+- mikemackintosh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-17 00:00:00.000000000 +02: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
+date: 2016-02-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: "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."
+email:
+- ceresa@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
 files:
-- .document
+- ".document"
+- ".gitignore"
+- ".rock.yml"
 - CHANGELOG.rdoc
-- LICENSE
+- Gemfile
+- LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION
 - ipaddress.gemspec
 - lib/ipaddress.rb
 - lib/ipaddress/ipv4.rb
 - lib/ipaddress/ipv6.rb
+- lib/ipaddress/mongoid.rb
 - lib/ipaddress/prefix.rb
+- lib/ipaddress/version.rb
 - test/ipaddress/ipv4_test.rb
 - test/ipaddress/ipv6_test.rb
+- test/ipaddress/mongoid_test.rb
 - test/ipaddress/prefix_test.rb
 - test/ipaddress_test.rb
 - test/test_helper.rb
-has_rdoc: true
-homepage: http://github.com/bluemonk/ipaddress
-licenses: []
+homepage: https://github.com/bluemonk/ipaddress
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
-summary: IPv4/IPv6 addresses manipulation library
-test_files: []
+specification_version: 4
+summary: IPv4/IPv6 address manipulation library
+test_files:
+- test/ipaddress/ipv4_test.rb
+- test/ipaddress/ipv6_test.rb
+- test/ipaddress/mongoid_test.rb
+- test/ipaddress/prefix_test.rb
+- test/ipaddress_test.rb
+- test/test_helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.8.0