better_ipaddr 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7331f1ceb9efec5d87562f785d12963e96239579
-  data.tar.gz: 821dd58b4ef97f9348d82e488ae10db4a93c31db
+  metadata.gz: 871dfdaf9d8e064ae09988a53d3e991544d414a9
+  data.tar.gz: 3d3229104847532b1713497982473e6f08520ee1
 SHA512:
-  metadata.gz: b35e338ab45746641792dd3a94b507b8b8581cafa4ce0225dbafd804fe01e382415081c8391fad1db585042b442bc4c56c2ddea66023f6cbe2c01673e144b2c2
-  data.tar.gz: 5d29730ae82e1d9e21259d15ea2732e01198cd603a3a9a6db321d813486c0a4e50c0b44a2f2f81f8da0f722f4052ed762f1deeec51811f69c885fdc9b09ee6eb
+  metadata.gz: d24bedd14d52e7f729af783387d2fe956b9ad4da55bbbfc624ec041046da05854dfcb573b855d131bc727aaa5f74cf879ff3dee01b592b635403c7ce60c5c4a3
+  data.tar.gz: 90bcb07ddb3ee7899fa8d8c53d193806004c016e4bf9cc21a1ed3160155edc944f420be46284e4a441cfbc361477a3fe9c447fa751b1ecd24dbcc5aab293b7f9

data/lib/better_ipaddr/classes.rb

@@ -224,6 +224,10 @@ class IPAddr
     def prefix_length
       self.class::NETMASK_TO_PREFIX_LENGTH[mask_addr]
     end
+
+    def to_s(cidr: false, full: false)
+      better_to_s(cidr: cidr, full: full)
+    end
   end
 
   class V4 < Base

data/lib/better_ipaddr/methods.rb

@@ -45,6 +45,13 @@ module BetterIpaddr
   module InstanceMethods
     include Constants
 
+    def self.included(base)
+      return unless base <= IPAddr
+      base.class_eval do
+        define_method :stdlib_to_s, IPAddr.instance_method(:to_s)
+      end
+    end
+
     # Return the magic number representing the address family.
     # @return [Integer]
     attr_reader :family
@@ -149,17 +156,28 @@ module BetterIpaddr
     #
     # @return [String]
 
-    def base
-      _to_string(@addr)
+    def base(full: false)
+      if full
+        to_string
+      else
+        stdlib_to_s
+      end
+    end
+
+    def better_to_s(cidr: false, full: false)
+      if cidr
+        "#{base(full: full)}/#{prefix_length}"
+      else
+        base(full: full)
+      end
     end
 
     # Return a string containing the CIDR representation of the address.
     #
     # @return [String]
 
-    def cidr
-      return _to_string(@addr) unless ipv4? || ipv6?
-      "#{_to_string(@addr)}/#{prefixlen}"
+    def cidr(cidr: nil, full: false)
+      better_to_s(cidr: true, full: full)
     end
 
     # Test whether or not this address completely encloses the other address.

data/lib/better_ipaddr/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_ipaddr
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ben Miller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,4 +103,3 @@ signing_key:
 specification_version: 4
 summary: IPAddr enhancements for network management.
 test_files: []
-has_rdoc: