ipaddr-ext 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84e45c02d4f47c83919da49e0ed33015bec5b70b0f520925ae08e5a7fb2005c3
-  data.tar.gz: 3c146451e5fc613b3aacf1fd5db662c253b2653b12c32a40c9f91fc18b11f67f
+  metadata.gz: 4fb5976cf49eb88720a9e1eb813f40f8ad390130f7095b5c9729368117ca37ad
+  data.tar.gz: 673d199fa8a14c42138accc2d9c39d3fc558f36781f38d311ad627f2618af8a4
 SHA512:
-  metadata.gz: 9860c9fa616cd56c56094f563410aae1f2ea4a956c63c7b520fa13503b8245af5934075b817df5c2f18d8a6db79182d24abfba4f1b011778b1e120754ed8b371
-  data.tar.gz: a80046f2c50c372008890e3ca8095b60d1189ee00182bb3a95784167a58d1c7456d1e26b41baee6b0de58dd97efb76b9b6584d4b664e085f672c52d70a4e9fb0
+  metadata.gz: 4619358ca982d7d672f875b3c1dd590283056459fd6e13aa6b505587dfc42f0df4b757597c1ab17dc10cb70b184eebf93f8c98e9d22abcb6dc1c3e6eb562ef63
+  data.tar.gz: d10d7ac3cb147c017f3b31aecb1563b3b6a4cf9482037d93a0e6990258375cebb04b3bb126c35d877d5acbc2902f7bc8ba5b313fd6d18a4330dee01fe8e8857b

data/README.md

@@ -58,6 +58,12 @@ ipaddr5.to_host.succ.to_s_with_prefix
 # to_json: export with prefix string
 IPAddr.new("3ffe:505:2::/64").to_json
 => "\"3ffe:505:2::/64\""
+
+# ==: Fix to compare with address prefix
+IPAddr.new("192.168.1.0/24") == IPAddr.new("192.168.1.0/24")
+=> true
+IPAddr.new("192.168.1.0/24") == IPAddr.new("192.168.1.0/25")
+=> false # different behavior with pure IPAddr class
 ```
 
 ## Development

data/lib/ipaddr-ext/extensions.rb

@@ -36,6 +36,16 @@ module IPAddrExt
       _to_string(mask)
     end
 
+    # Returns true if two ipaddrs are equal.
+    # Overwrite original == method, fixing to compare address with prefix
+    def ==(other)
+      other = coerce_other(other)
+    rescue
+      false
+    else
+      @family == other.family && @addr == other.to_i && prefix == other.prefix
+    end
+
     # Returns a address greater than the original address by offset
     # @param offset [Integer]
     def +(offset)

data/lib/ipaddr-ext/json.rb

@@ -2,13 +2,25 @@
 
 module IPAddrExt
   module JSON
+    # Fix ActiveSupport::JSON.encode which remove the prefix address when encode with IPAddr/CIDR
+    # https://github.com/rails/rails/issues/46006
+    def self.remove_as_json
+      if IPAddr.method_defined? :as_json
+        IPAddr.remove_method :as_json
+      end
+    end
+
     def to_json
+      format("\"%s\"", as_json)
+    end
+
+    def as_json(options = nil)
       if ipv4? && prefix == 32
-        format("\"%s\"", to_s)
+        to_s
       elsif ipv6? && prefix == 128
-        format("\"%s\"", to_s)
+        to_s
       else
-        format("\"%s/%s\"", to_s, prefix)
+        format("%s/%s", to_s, prefix)
       end
     end
   end

data/lib/ipaddr-ext/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IPAddrExt
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

data/lib/ipaddr-ext.rb

@@ -5,5 +5,7 @@ require "ipaddr-ext/version"
 require "ipaddr-ext/extensions"
 require "ipaddr-ext/json"
 
-IPAddr.send(:include, IPAddrExt::Extensions)
+IPAddr.send(:prepend, IPAddrExt::Extensions)
+
+IPAddrExt::JSON.remove_as_json
 IPAddr.send(:include, IPAddrExt::JSON)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ipaddr-ext
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Taketo Takashima
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-15 00:00:00.000000000 Z
+date: 2024-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Extensions for IPAddr Class