ipaddress_2 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cda18a11bce6a923e0471a7d08d6f8df8dae71d1ff768c6e0978772124be6f50
-  data.tar.gz: 47c24c1776bb9de0dedbec3179e42c22ed8ff4da96db53bcd95d8cb328bf2ca5
+  metadata.gz: 359df425a73931023ee0026c8fdb2819f43117e24e1aa24b5ff7bb3d7f6121f6
+  data.tar.gz: db06b07d89444432225af2e82529a0eca395cda6e42ed59bf0cf443befc914c8
 SHA512:
-  metadata.gz: f9c69847cbf37301f1ded22d7bd4e97f0ab1040ff14d8f14993c414908872de88d06d6c25eecf1d153aaa22644038dcf3fb0fc2e4febf8be93e339b379b1f480
-  data.tar.gz: dbd02e8ed7d482b51873b45f443d92d7d11c78545ac20b9ba970745d3029c3d66c90aeb526dbf87f7bf95bd8a138ceb87e8621fba8d3e71dfadd591988b1fb35
+  metadata.gz: b537db60dfaf772c2162d3c1f52c0066b0737af5811fa0ac1894aa86414ce86950f4bba00c8aa3c3a1c1171937de26848933020ce428f5b7df04611a08bcf19f
+  data.tar.gz: e2632e98d23618da97172f711d1736d7b6845105cb53412c42db5caa6326edc66b9e1f1ec2319f61855d1c54f3fa743df02cd653a6fd86f933b4f5d9944392f3

data/.travis.yml

@@ -4,6 +4,8 @@ rvm:
 - 2.4
 - 2.5
 - 2.6
+- 2.7
+- 3.0
 install:
 - gem install bundler
 - gem install rake

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## 0.14.0
+
+### Enhancements
+* include? will now accept a string. Will also work for include_all?
+
 ## 0.13.0
 
 ### Enhancements

data/VERSION

@@ -1 +1 @@
-0.13.0
+0.14.0

data/ipaddress_2.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.version = IPAddress::VERSION
   s.require_paths = ["lib"]
   s.authors = ["bluemonk", "mikemackintosh"]
-  s.description = "IPAddress2 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."
+  s.description = "IPAddress2 is a Ruby library designed to make manipulation\n      of IPv4 and IPv6 addresses both powerful and simple. It maintains\n      a layer of compatibility with Ruby's own IPAddr, while\n      addressing many of its issues."
   s.email = "adam@21eleven.com"
   s.extra_rdoc_files = [
     "CHANGELOG.rdoc",

data/lib/ipaddress_2/ipv4.rb

@@ -640,7 +640,7 @@ module IPAddress;
     #
     # Checks whether a subnet includes the given IP address.
     #
-    # Accepts an IPAddress::IPv4 object.
+    # Accepts an IPAddress::IPv4 object or a string.
     #
     #   ip = IPAddress("192.168.10.100/24")
     #
@@ -652,13 +652,19 @@ module IPAddress;
     #   ip.include? IPAddress("172.16.0.48/16")
     #     #=> false
     #
+    #   ip.include? "192.168.10.50"
+    #     #=> true
+    #
     def include?(oth)
+      unless oth.is_a? IPAddress::IPv4
+        oth = IPv4.new(oth)
+      end
       @prefix <= oth.prefix and network_u32 == (oth.to_u32 & @prefix.to_u32)
     end
 
     #
     # Checks whether a subnet includes all the 
-    # given IPv4 objects.
+    # given IPv4 objects or strings.
     #
     #   ip = IPAddress("192.168.10.100/24")
     #
@@ -668,6 +674,9 @@ module IPAddress;
     #   ip.include_all?(addr1,addr2)
     #     #=> true
     #
+    #   ip.include_all?("192.168.10.102/24", "192.168.10.103/24")
+    #     #=> true
+    #
     def include_all?(*others)
       others.all? {|oth| include?(oth)}
     end

data/lib/ipaddress_2/ipv6.rb

@@ -612,13 +612,19 @@ module IPAddress;
     #   ip6.include? IPAddress("2001:db8:1::8:800:200c:417a/76")
     #     #=> false
     #
+    #   ip6.include? "2001:db8::8:800:200c:1"
+    #     #=> true
+    #
     def include?(oth)
+      unless oth.is_a? IPAddress::IPv6
+        oth = IPv6.new(oth)
+      end
       @prefix <= oth.prefix and network_u128 == self.class.new(oth.address+"/#@prefix").network_u128
     end
 
     #
     # Checks whether a subnet includes all the
-    # given IPv4 objects.
+    # given IPv4 objects or strings.
     #
     #   ip = IPAddress("2001:db8:8:800::1/64")
     #
@@ -628,6 +634,9 @@ module IPAddress;
     #   ip.include_all?(addr1,addr2)
     #     #=> true
     #
+    #   ip.include_all?("2001:db8:8:800::2/64", "2001:db8:8:800::8/64")
+    #     #=> true
+    #
     def include_all?(*others)
       others.all? {|oth| include?(oth)}
     end

data/lib/ipaddress_2/version.rb

@@ -1,3 +1,3 @@
 module IPAddress
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

data/test/ipaddress_2/ipv4_test.rb

@@ -327,7 +327,10 @@ class IPv4Test < Minitest::Test
     assert_equal false, ip.include?(@klass.new("5.5.5.5/32"))
     assert_equal false, ip.include?(@klass.new("11.0.0.0/8"))
     ip = @klass.new("13.13.0.0/13")
-    assert_equal false, ip.include?(@klass.new("13.16.0.0/32"))    
+    assert_equal false, ip.include?(@klass.new("13.16.0.0/32"))
+    ip = @klass.new("10.10.10.0/24")
+    assert_equal true, ip.include?("10.10.10.100")
+    assert_equal false, ip.include?("10.10.9.100")
   end
 
   def test_method_include_all?
@@ -336,6 +339,8 @@ class IPv4Test < Minitest::Test
     addr2 = @klass.new("192.168.10.103/24")    
     assert_equal true, ip.include_all?(addr1,addr2)
     assert_equal false, ip.include_all?(addr1, @klass.new("13.16.0.0/32"))
+    assert_equal true, ip.include_all?("192.168.10.102/24", "192.168.10.103/24")
+    assert_equal false, ip.include_all?(addr1, "13.16.0.0/32")
   end
 
   def test_method_ipv4?

data/test/ipaddress_2/ipv6_test.rb

@@ -352,6 +352,9 @@ class IPv6Test < Minitest::Test
     not_included = @klass.new "2001:db8:1::8:800:200c:417a/76"
     assert_equal true, @ip.include?(included)
     assert_equal false, @ip.include?(not_included)
+    # string test
+    assert_equal true, @ip.include?("2001:db8::8:800:200c:2")
+    assert_equal false, @ip.include?("2001:db8:1::8:800:200c:417a")
   end
 
   def test_method_include_all?
@@ -360,6 +363,8 @@ class IPv6Test < Minitest::Test
     addr2 = @klass.new("2001:db8:8:800::8/64")
     assert_equal true, ip.include_all?(addr1,addr2)
     assert_equal false, ip.include_all?(addr1, @klass.new("2002:db8:8:800::2/64"))
+    assert_equal true, ip.include_all?("2001:db8:8:800::2/64", "2001:db8:8:800::8/64")
+    assert_equal false, ip.include_all?(addr1, "2002:db8:8:800::2/64")
   end
 
   def test_method_to_hex

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ipaddress_2
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - bluemonk
 - mikemackintosh
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-08 00:00:00.000000000 Z
+date: 2021-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
 description: |-
   IPAddress2 is a Ruby library designed to make manipulation
-        of IPv4 and IPv6 addresses both powerful and simple. It mantains
+        of IPv4 and IPv6 addresses both powerful and simple. It maintains
         a layer of compatibility with Ruby's own IPAddr, while
         addressing many of its issues.
 email: adam@21eleven.com
@@ -172,7 +172,7 @@ homepage: https://github.com/ipaddress2-gem/ipaddress_2
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -187,9 +187,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: IPv4/IPv6 address manipulation library
 test_files: []