ipaddr-ext 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb5976cf49eb88720a9e1eb813f40f8ad390130f7095b5c9729368117ca37ad
-  data.tar.gz: 673d199fa8a14c42138accc2d9c39d3fc558f36781f38d311ad627f2618af8a4
+  metadata.gz: 3aa51bb31b861615ca35b891193aadd6ef6bae73cf52ca3793a83778acb9029c
+  data.tar.gz: 599314c4ea8c6bb731ee8336b7e2f90533b3ce04ab5195e1753432d9b2cfbb2c
 SHA512:
-  metadata.gz: 4619358ca982d7d672f875b3c1dd590283056459fd6e13aa6b505587dfc42f0df4b757597c1ab17dc10cb70b184eebf93f8c98e9d22abcb6dc1c3e6eb562ef63
-  data.tar.gz: d10d7ac3cb147c017f3b31aecb1563b3b6a4cf9482037d93a0e6990258375cebb04b3bb126c35d877d5acbc2902f7bc8ba5b313fd6d18a4330dee01fe8e8857b
+  metadata.gz: b6da8fcb2121fc1fc847d9c6819f8c6d12993f1282c620da21ab8170448dedb92e9ae4f2b8cc3accbdffe83e9779cc504c29529021d225be4cc75ff1929c776b
+  data.tar.gz: e0ce190b061be6832d12d226d786e7268c0a3ded3b13f9b86c96c4b65db20d2f4531774c5c485ad22f9f510df07d7bbcaf60d5f08a311f6031b345c3cfbe707b

data/Gemfile

@@ -3,3 +3,14 @@
 source "https://rubygems.org"
 
 gemspec
+
+if ENV['CI'].nil?
+  # for development
+  gem "actionview"
+
+else
+  # for CI
+  unless ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] == ''
+    gem "actionview", "~> #{ENV['RAILS_VERSION']}"
+  end
+end

data/lib/ipaddr-ext/actionview/tag_helper.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'action_view'
+
+module ActionView
+  module Helpers
+    module TagHelper
+      class TagBuilder
+        # Overwrite to fix FormHelper#text_field build value attribute of IPAddr without prefix
+        # https://github.com/rails/rails/pull/52365
+        def tag_option(key, value, escape)
+          key = ERB::Util.xml_name_escape(key) if escape
+
+          case value
+          when Array, Hash
+            value = TagHelper.build_tag_values(value) if key.to_s == "class"
+            value = escape ? safe_join(value, " ") : value.join(" ")
+          when Regexp
+            value = escape ? ERB::Util.unwrapped_html_escape(value.source) : value.source
+          when IPAddr
+            addr = value.to_s
+            unless (value.ipv4? && value.prefix == 32) || (value.ipv6? && value.prefix == 128)
+              addr = format("%s/%s", value.to_s, value.prefix)
+            end
+
+            value = escape ? ERB::Util.unwrapped_html_escape(addr) : addr
+          else
+            value = escape ? ERB::Util.unwrapped_html_escape(value) : value.to_s
+          end
+          value = value.gsub('"', """) if value.include?('"')
+
+          %(#{key}="#{value}")
+        end
+      end
+    end
+  end
+end

data/lib/ipaddr-ext/extensions.rb

@@ -21,19 +21,20 @@ module IPAddrExt
       end
     end
 
-    # Returns the wildcard mask in string format e.g. 0.0.255.255
-    # ref: https://github.com/ruby/ipaddr/pull/44
-    def wildcard_mask
-      case @family
-      when Socket::AF_INET
-        mask = IPAddr::IN4MASK ^ @mask_addr
-      when Socket::AF_INET6
-        mask = IPAddr::IN6MASK ^ @mask_addr
-      else
-        raise AddressFamilyError, "unsupported address family"
-      end
+    unless defined?(IPAddr::VERSION) && Gem::Version.new(IPAddr::VERSION) >= Gem::Version.new("1.2.7") # Ruby 3.4+ default gem
+      # Returns the wildcard mask in string format e.g. 0.0.255.255
+      def wildcard_mask
+        case @family
+        when Socket::AF_INET
+          mask = IPAddr::IN4MASK ^ @mask_addr
+        when Socket::AF_INET6
+          mask = IPAddr::IN6MASK ^ @mask_addr
+        else
+          raise AddressFamilyError, "unsupported address family"
+        end
 
-      _to_string(mask)
+        _to_string(mask)
+      end
     end
 
     # Returns true if two ipaddrs are equal.
@@ -72,7 +73,11 @@ module IPAddrExt
 
     # Returns the address with prefix
     def to_s_with_prefix
-      "#{self.to_s}/#{prefix}"
+      if defined?(IPAddr::VERSION) && Gem::Version.new(IPAddr::VERSION) >= Gem::Version.new("1.2.7") # Ruby 3.4+ default gem
+        cidr
+      else
+        "#{self.to_s}/#{prefix}"
+      end
     end
   end
 end

data/lib/ipaddr-ext/version.rb

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

data/lib/ipaddr-ext.rb

@@ -1,5 +1,4 @@
 require "ipaddr"
-require 'json'
 
 require "ipaddr-ext/version"
 require "ipaddr-ext/extensions"
@@ -9,3 +8,7 @@ IPAddr.send(:prepend, IPAddrExt::Extensions)
 
 IPAddrExt::JSON.remove_as_json
 IPAddr.send(:include, IPAddrExt::JSON)
+
+if defined?(::ActionView) && ActionView.version >= Gem::Version.new("6.1.0")
+  require "ipaddr-ext/actionview/tag_helper"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ipaddr-ext
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Taketo Takashima
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-16 00:00:00.000000000 Z
+date: 2024-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,6 +52,7 @@ files:
 - Rakefile
 - ipaddr-ext.gemspec
 - lib/ipaddr-ext.rb
+- lib/ipaddr-ext/actionview/tag_helper.rb
 - lib/ipaddr-ext/extensions.rb
 - lib/ipaddr-ext/json.rb
 - lib/ipaddr-ext/version.rb
@@ -78,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Extensions for IPAddr Class