better_ipaddr 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6da20bca129dcd3612daf2fab3514185f4afe3a5
-  data.tar.gz: 648d2d1ddbc3f441ce9a2e1c8819105e9fd902d7
+  metadata.gz: 7331f1ceb9efec5d87562f785d12963e96239579
+  data.tar.gz: 821dd58b4ef97f9348d82e488ae10db4a93c31db
 SHA512:
-  metadata.gz: 3b02d16f6d4b03f3ab668f13cab5a3f9ad983a28a8535d8643a9f0cbf1234930ec2358ef1a814622937ad53e31d64aeea6519643eb593913c2875d9505c7bd95
-  data.tar.gz: 95770066db8bc6725faa929c9274ac620aaa3bd83d7f08307b578f9446bfdb133a5b065aae9e281e6b01f18483fb1f374c7b2bcac7d4ba09834eb1113235141c
+  metadata.gz: b35e338ab45746641792dd3a94b507b8b8581cafa4ce0225dbafd804fe01e382415081c8391fad1db585042b442bc4c56c2ddea66023f6cbe2c01673e144b2c2
+  data.tar.gz: 5d29730ae82e1d9e21259d15ea2732e01198cd603a3a9a6db321d813486c0a4e50c0b44a2f2f81f8da0f722f4052ed762f1deeec51811f69c885fdc9b09ee6eb

data/lib/better_ipaddr/classes.rb

@@ -1,5 +1,6 @@
 require "better_ipaddr/constants"
 require "better_ipaddr/methods"
+require "better_ipaddr/host_methods"
 
 class IPAddr
   class Base < IPAddr
@@ -53,6 +54,21 @@ class IPAddr
       end
     end
 
+    # Create an IPAddr host subclass from the given object, guessing the type of
+    # address given based on its type and content.
+    #
+    # Uses .from internally, so the same concerns apply, though the returned
+    # object is guaranteed to be of a Host class or nil.
+
+    def self.host_from(address)
+      ip = from(address)
+      if ip.ipv4?
+        V4::Host[ip]
+      elsif ip.ipv6?
+        V6::Host[ip]
+      end
+    end
+
     # Create an IPAddr from an Integer.
     #
     # @param address [Integer]
@@ -193,6 +209,8 @@ class IPAddr
       const_set(:PREFIX_LENGTH_TO_NETMASK,
                 PREFIX_LENGTH_TO_NETMASK.fetch(self::FAMILY))
       const_set(:MAX_INT, 2**self::BIT_LENGTH - 1)
+      const_set(:HOST_NETMASK,
+                self::PREFIX_LENGTH_TO_NETMASK.fetch(self::BIT_LENGTH))
     end
 
     def address_family_bit_length
@@ -212,12 +230,20 @@ class IPAddr
     specialize_constants Family::IPV4
 
     REGEX = Regex::IPV4
+
+    class Host < V4
+      include BetterIpaddr::HostMethods
+    end
   end
 
   class V6 < Base
     specialize_constants Family::IPV6
 
     REGEX = Regex::IPV6
+
+    class Host < V6
+      include BetterIpaddr::HostMethods
+    end
   end
 
   class MAC < Base

data/lib/better_ipaddr/constants.rb

@@ -47,6 +47,7 @@ module BetterIpaddr
         /#{LEADING_QUAD}{7,7}#{QUAD}/,
 
         # zero-compressed
+        /::/,
         /#{LEADING_QUAD}{1,7}:/,
         /:#{TRAILING_QUAD}{1,7}/,
         /#{LEADING_QUAD}{1,6}#{TRAILING_QUAD}{1,1}/,

data/lib/better_ipaddr/host_methods.rb

@@ -0,0 +1,66 @@
+module BetterIpaddr
+  module HostMethods
+    def initialize(*)
+      super
+      @mask_addr = netmask.to_i
+    end
+
+    # Returns true if the argument is the same as the receiver, false otherwise.
+
+    def cover?(other)
+      self == other
+    end
+
+    # @overload each
+    #   Yield the object. Returns the object.
+    #   @yield [IPAddr]
+    #   @return [IPAddr]
+
+    # @overload each
+    #   Return an enumerator with the behavior described above.
+    #   @return [Enumerator]
+
+    def each
+      if block_given?
+        yield self
+      else
+        enum_for(:each)
+      end
+    end
+
+    # Returns the object.
+    # @return [IPAddr]
+
+    def first
+      self
+    end
+
+    # Returns true.
+
+    def host?
+      true
+    end
+
+    # Returns the object.
+    # @return [IPAddr]
+
+    def last
+      self
+    end
+
+    # Returns the netmask for a host address.
+    def netmask
+      self.class::HOST_NETMASK
+    end
+
+    # Returns the number of bits in the address.
+    def prefix_length
+      self.class::BIT_LENGTH
+    end
+
+    # Returns 1.
+    def size
+      1
+    end
+  end
+end

data/lib/better_ipaddr/kernel_method.rb

@@ -5,3 +5,9 @@ module Kernel
     IPAddr::Base.from(object)
   end
 end
+
+class IPAddr
+  def self.Host(object)
+    Base.host_from(object)
+  end
+end

data/lib/better_ipaddr/version.rb

@@ -1,3 +1,3 @@
 module BetterIpaddr
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_ipaddr
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Ben Miller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ files:
 - lib/better_ipaddr/classes.rb
 - lib/better_ipaddr/constants.rb
 - lib/better_ipaddr/core_extension.rb
+- lib/better_ipaddr/host_methods.rb
 - lib/better_ipaddr/kernel_method.rb
 - lib/better_ipaddr/methods.rb
 - lib/better_ipaddr/space.rb
@@ -97,8 +98,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: IPAddr enhancements for network management.
 test_files: []
+has_rdoc: