ip_address_validator 1.0.1 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: db0a7b1739ea1d25b0acc928c0b5ba6352bb64e13f5338c0ce5906b7a229404a
+  data.tar.gz: e5250255f4e377d10c638156aad4b80b1fa5913bc386f764e44ded225c8182da
+SHA512:
+  metadata.gz: 9c3e940aaa1d893353a21616e5ea48682dacd029771a24879666ac83bfd3f191a11ab34c21e57583aac7d971f2385f33eb5739b252011316529441ca93f9dc8e
+  data.tar.gz: 54952b376c8b9bd6495dbc1b8fd9a80655b015dd72e3742bdfdc014eed7190be2ff0510460006928051db06aad4dfede63048a51eef0062256caeabab62dc030

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format=documentation
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,12 @@
+inherit_from:
+  - ~/.rubocop.yml
+  - ~/.rubocop-rspec.yml
+
+inherit_mode:
+  merge:
+    - Include
+    - Exclude
+    - Environments
+
+AllCops:
+  NewCops: enable

data/.ruby-gemset

@@ -0,0 +1 @@
+lev

data/.ruby-version

@@ -0,0 +1 @@
+ruby-4.0.3

data/CHANGELOG.md

@@ -0,0 +1,44 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [2.0.0] - 2026-05-14
+
+### Breaking
+- Bumped minimum Ruby to **3.1**.
+- Bumped `activemodel` runtime dependency to **>= 6.1**. `activerecord` is no
+  longer a (transitive) dependency; the validator only needs ActiveModel.
+- `localized_each_validator` runtime dependency bumped to **>= 2.0**.
+- CIDR strings (e.g. `"10.0.0.0/24"`) are **no longer accepted by default**.
+  In 1.x they silently passed because `IPAddr.new` accepts them, so subnets
+  validated as "IP addresses". Pass `allow_cidr: true` to restore the old
+  behavior.
+- Non-`String` values are now explicitly rejected.
+
+### Added
+- `:allow_cidr` option (default `false`) — opt back in to CIDR notation.
+- `:no_loopback` option — rejects `127.0.0.0/8` and `::1`.
+- `:no_private` option — rejects RFC 1918 ranges and IPv6 unique local
+  (`fc00::/7`).
+- `:no_reserved` option — rejects link-local, multicast, broadcast,
+  documentation, benchmarking, TEST-NET and other reserved blocks.
+- `:allow_blank` is now documented (it was already inherited from
+  `LocalizedEachValidator`).
+- `IpAddressValidator::VERSION` constant in `lib/ip_address_validator/version.rb`.
+- Real test suite (`spec/ip_address_validator_spec.rb`) — previously zero
+  tests shipped with the gem.
+
+### Changed
+- Replaced jeweler-generated gemspec with a hand-written one using
+  `git ls-files` and modern `spec.metadata` (including
+  `rubygems_mfa_required`).
+- Replaced jeweler-flavored Rakefile with a small RSpec + bundler/gem_tasks
+  Rakefile.
+- Modernized README; removed Rails-3-era framing.
+- Added GitHub Actions matrix (Ruby 3.1–3.4 × activemodel 7.0–8.0).
+
+### Removed
+- `jeweler`, `yard`, and `RedCloth`/`redcarpet` dev dependencies.
+- `.travis.yml`.
+- Stale `README.textile` references.
+- The duplicate `add_dependency` lines in the old gemspec.

data/README.md

@@ -0,0 +1,85 @@
+# ip_address_validator
+
+[![CI](https://github.com/RISCfuture/ip_address_validator/actions/workflows/ci.yml/badge.svg)](https://github.com/RISCfuture/ip_address_validator/actions/workflows/ci.yml)
+[![Gem Version](https://img.shields.io/gem/v/ip_address_validator.svg)](https://rubygems.org/gems/ip_address_validator)
+[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
+
+A localizable `EachValidator` for IPv4 and IPv6 address fields, with optional
+restrictions on CIDR, loopback, private, and reserved ranges. Works with any
+class that uses `ActiveModel::Validations` (Rails models, plain Ruby objects
+that `include ActiveModel::Validations`, etc.).
+
+## Installation
+
+```ruby
+gem "ip_address_validator", "~> 2.0"
+```
+
+Requires Ruby 3.1 or newer and `activemodel >= 6.1`.
+
+## Usage
+
+```ruby
+class User
+  include ActiveModel::Validations
+  attr_accessor :last_login_ip
+
+  validates :last_login_ip, ip_address: true
+end
+```
+
+### Options
+
+| Option         | Default | Description                                                                                                |
+|:---------------|:-------:|:-----------------------------------------------------------------------------------------------------------|
+| `:ipv4_only`   | `false` | If `true`, IPv6 addresses are considered invalid.                                                          |
+| `:ipv6_only`   | `false` | If `true`, IPv4 addresses are considered invalid.                                                          |
+| `:allow_cidr`  | `false` | If `true`, CIDR notation (e.g. `10.0.0.0/24`) is accepted. Otherwise any value containing `/` is rejected. |
+| `:no_loopback` | `false` | If `true`, loopback addresses (`127.0.0.0/8`, `::1`) are rejected.                                         |
+| `:no_private`  | `false` | If `true`, RFC 1918 ranges and IPv6 unique local (`fc00::/7`) are rejected.                                |
+| `:no_reserved` | `false` | If `true`, link-local, multicast, broadcast, documentation, and other reserved blocks are rejected.        |
+| `:message`     | —       | Custom error message.                                                                                      |
+| `:allow_nil`   | `false` | If `true`, `nil` values are allowed.                                                                       |
+| `:allow_blank` | `false` | If `true`, blank values are allowed.                                                                       |
+
+### Examples
+
+```ruby
+# Only allow public, non-CIDR IPv4 addresses.
+validates :webhook_source_ip, ip_address: {
+  ipv4_only: true,
+  no_loopback: true,
+  no_private: true,
+  no_reserved: true
+}
+
+# Allow a CIDR block (e.g. for an IP allowlist field).
+validates :allowlist_entry, ip_address: { allow_cidr: true }
+
+# Custom message.
+validates :remote_ip, ip_address: { message: "must be a valid IP" }
+```
+
+### Localization
+
+The error key is `invalid_ip`. Define it under the usual ActiveModel
+errors hierarchy:
+
+```yaml
+en:
+  activemodel:
+    errors:
+      messages:
+        invalid_ip: "is not a valid IP address"
+```
+
+## Development
+
+```sh
+bin/setup
+bundle exec rspec
+```
+
+## License
+
+Released under the MIT License. See `LICENSE`.

data/Rakefile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/ip_address_validator.gemspec

@@ -1,51 +1,47 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "ip_address_validator"
-  s.version = "1.0.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tim Morgan"]
-  s.date = "2012-03-20"
-  s.description = "A simple, localizable EachValidator for IPv4 and IPv6 address fields in ActiveRecord 3.0."
-  s.email = "git@timothymorgan.info"
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.textile"
-  ]
-  s.files = [
-    "LICENSE",
-    "README.textile",
-    "ip_address_validator.gemspec",
-    "lib/ip_address_validator.rb"
-  ]
-  s.homepage = "http://github.com/riscfuture/ip_address_validator"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.17"
-  s.summary = "Simple IP address validation in Rails 3"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<localized_each_validator>, [">= 1.0.1"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<RedCloth>, [">= 0"])
-    else
-      s.add_dependency(%q<localized_each_validator>, [">= 1.0.1"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<RedCloth>, [">= 0"])
+# frozen_string_literal: true
+
+require_relative "lib/ip_address_validator/version"
+
+Gem::Specification.new do |spec|
+  spec.name        = "ip_address_validator"
+  spec.version     = IpAddressValidatorGem::VERSION
+  spec.authors     = ["Tim Morgan"]
+  spec.email       = ["git@timothymorgan.info"]
+
+  spec.summary     = "Simple IP address validator for ActiveModel"
+  spec.description = "A localizable EachValidator for IPv4 and IPv6 address fields, with optional " \
+                     "restrictions on CIDR, loopback, private, and reserved ranges."
+  spec.homepage    = "https://github.com/RISCfuture/ip_address_validator"
+  spec.license     = "MIT"
+
+  spec.required_ruby_version = ">= 3.1"
+
+  spec.metadata = {
+    "source_code_uri"       => "https://github.com/RISCfuture/ip_address_validator",
+    "changelog_uri"         => "https://github.com/RISCfuture/ip_address_validator/blob/master/CHANGELOG.md",
+    "bug_tracker_uri"       => "https://github.com/RISCfuture/ip_address_validator/issues",
+    "rubygems_mfa_required" => "true"
+  }
+
+  spec.files = Dir.chdir(__dir__) do
+    tracked =
+      begin
+        `git ls-files -z`.split("\x0")
+      rescue StandardError
+        []
+      end
+    candidates = tracked.empty? ? Dir["**/*"] : tracked
+    candidates.select { |f| File.file?(f) }.reject do |f|
+      (File.expand_path(f) == __FILE__) ||
+        f.start_with?(*%w[bin/ test/ spec/ features/ .git .github .idea Gemfile])
     end
-  else
-    s.add_dependency(%q<localized_each_validator>, [">= 1.0.1"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<RedCloth>, [">= 0"])
   end
-end
+  spec.require_paths = ["lib"]
 
+  spec.add_dependency "activemodel", ">= 6.1"
+  spec.add_dependency "localized_each_validator", ">= 2.0"
+
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "standard", ">= 1.0"
+end

data/lib/ip_address_validator/version.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# Bare version constant. Lives in its own module so this file can be required
+# from the gemspec without pulling in the rest of the gem (or its runtime
+# dependencies). `lib/ip_address_validator.rb` re-exposes this as
+# `IpAddressValidator::VERSION` once the validator class is defined.
+module IpAddressValidatorGem
+  VERSION = "2.0.0"
+end

data/lib/ip_address_validator.rb

@@ -1,33 +1,110 @@
-require 'localized_each_validator'
-require 'ipaddr'
+# frozen_string_literal: true
 
-# Validates IPv4 and IPv6 addresses. Uses the @invalid_ip@ error message key.
+require "ipaddr"
+require "localized_each_validator"
+
+require_relative "ip_address_validator/version"
+
+# `IpAddressValidator` is defined here (not in `version.rb`) because its
+# superclass `LocalizedEachValidator` isn't loaded until this file runs.
+
+# Validates IPv4 and IPv6 addresses. Uses the `invalid_ip` error message key.
 #
 # @example
 #   validates :last_login_ip, ip_address: true
 #
-# h2. Options
+# Options
+# -------
 #
-# | @:ipv4_only@ | If @true@, IPv6 addresses are considered invalid. |
-# | @:ipv6_only@ | If @true@, IPv4 addresses are considered invalid. |
-# | @:message@ | A custom message to use if the IP is invalid. |
-# | @:allow_nil@ | If true, @nil@ values are allowed. |
+# |                 |                                                              |
+# |:----------------|:-------------------------------------------------------------|
+# | `:ipv4_only`    | If `true`, IPv6 addresses are considered invalid.            |
+# | `:ipv6_only`    | If `true`, IPv4 addresses are considered invalid.            |
+# | `:allow_cidr`   | If `true`, CIDR notation (e.g. `10.0.0.0/24`) is allowed.    |
+# |                 | Defaults to `false`, so values containing `/` are rejected.  |
+# | `:no_loopback`  | If `true`, loopback addresses (e.g. `127.0.0.1`, `::1`)      |
+# |                 | are considered invalid.                                      |
+# | `:no_private`   | If `true`, RFC 1918 / unique local addresses (e.g.           |
+# |                 | `10.0.0.0/8`, `fc00::/7`) are considered invalid.            |
+# | `:no_reserved`  | If `true`, reserved addresses (link-local, multicast,        |
+# |                 | unspecified, etc.) are considered invalid.                   |
+# | `:message`      | A custom message to use if the IP is invalid.                |
+# | `:allow_nil`    | If `true`, `nil` values are allowed.                         |
+# | `:allow_blank`  | If `true`, blank values are allowed.                         |
 
 class IpAddressValidator < LocalizedEachValidator
+  VERSION = IpAddressValidatorGem::VERSION
+
   error_key :invalid_ip
 
   # @private
-  def valid?(_, _, value)
-    ip = nil
-    begin
-      ip = IPAddr.new(value)
-    rescue ArgumentError
-      return false
+  def valid?(_record, _attribute, value)
+    return false unless value.is_a?(String)
+    return false if !options[:allow_cidr] && value.include?("/")
+
+    ip =
+      begin
+        IPAddr.new(value)
+      rescue IPAddr::Error, ArgumentError
+        return false
+      end
+
+    return false if ip.ipv4? && options[:ipv6_only]
+    return false if ip.ipv6? && options[:ipv4_only]
+
+    return false if options[:no_loopback] && ip.loopback?
+    return false if options[:no_private] && private_ip?(ip)
+    return false if options[:no_reserved] && reserved_ip?(ip)
+
+    true
+  end
+
+  private
+
+  def private_ip?(ip)
+    return true if ip.respond_to?(:private?) && ip.private?
+
+    # Fallback for older Ruby versions: cover RFC 1918 + unique local IPv6.
+    if ip.ipv4?
+      %w[10.0.0.0/8 172.16.0.0/12 192.168.0.0/16].any? { |r| IPAddr.new(r).include?(ip) }
+    elsif ip.ipv6?
+      IPAddr.new("fc00::/7").include?(ip)
+    else
+      false
+    end
+  end
+
+  def reserved_ip?(ip)
+    return true if ip.link_local?
+    return true if ip.respond_to?(:multicast?) ? ip.multicast? : false
+    return true if ip.to_s == "0.0.0.0" || ip.to_s == "::"
+
+    if ip.ipv4?
+      reserved_v4 = %w[
+        0.0.0.0/8
+        100.64.0.0/10
+        169.254.0.0/16
+        192.0.0.0/24
+        192.0.2.0/24
+        198.18.0.0/15
+        198.51.100.0/24
+        203.0.113.0/24
+        224.0.0.0/4
+        240.0.0.0/4
+        255.255.255.255/32
+      ]
+      reserved_v4.any? { |r| IPAddr.new(r).include?(ip) }
+    elsif ip.ipv6?
+      reserved_v6 = %w[
+        ::/128
+        ::1/128
+        ff00::/8
+        2001:db8::/32
+        100::/64
+      ]
+      reserved_v6.any? { |r| IPAddr.new(r).include?(ip) }
+    else
+      false
     end
-    
-    return false if ip.ipv4? and options[:ipv6_only]
-    return false if ip.ipv6? and options[:ipv4_only]
-    
-    return true
   end
 end

metadata

@@ -1,98 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: ip_address_validator
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Tim Morgan
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: localized_each_validator
-  requirement: &70167736537100 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70167736537100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70167736536520 !ruby/object:Gem::Requirement
-    none: false
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
-  version_requirements: *70167736536520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &70167736535900 !ruby/object:Gem::Requirement
-    none: false
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70167736535900
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: RedCloth
-  requirement: &70167736535380 !ruby/object:Gem::Requirement
-    none: false
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70167736535380
-description: A simple, localizable EachValidator for IPv4 and IPv6 address fields
-  in ActiveRecord 3.0.
-email: git@timothymorgan.info
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+description: A localizable EachValidator for IPv4 and IPv6 address fields, with optional
+  restrictions on CIDR, loopback, private, and reserved ranges.
+email:
+- git@timothymorgan.info
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.textile
+extra_rdoc_files: []
 files:
+- ".document"
+- ".rspec"
+- ".rubocop.yml"
+- ".ruby-gemset"
+- ".ruby-version"
+- CHANGELOG.md
 - LICENSE
-- README.textile
+- README.md
+- Rakefile
 - ip_address_validator.gemspec
 - lib/ip_address_validator.rb
-homepage: http://github.com/riscfuture/ip_address_validator
-licenses: []
-post_install_message: 
+- lib/ip_address_validator/version.rb
+homepage: https://github.com/RISCfuture/ip_address_validator
+licenses:
+- MIT
+metadata:
+  source_code_uri: https://github.com/RISCfuture/ip_address_validator
+  changelog_uri: https://github.com/RISCfuture/ip_address_validator/blob/master/CHANGELOG.md
+  bug_tracker_uri: https://github.com/RISCfuture/ip_address_validator/issues
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1752075545823890085
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.17
-signing_key: 
-specification_version: 3
-summary: Simple IP address validation in Rails 3
+rubygems_version: 4.0.11
+specification_version: 4
+summary: Simple IP address validator for ActiveModel
 test_files: []

data/README.textile

@@ -1,40 +0,0 @@
-h1. ip_address_validator -- Simple IP validator for Rails 3
-
-| *Author* | Tim Morgan |
-| *Version* | 1.0.1 (Mar 19, 2012) |
-| *License* | Released under the MIT license. |
-
-h2. About
-
-This gem adds a very simple IP address format validator to be used with
-ActiveRecord models in Rails 3.0. It supports localized error messages.
-
-h2. Installation
-
-Add the gem to your project's @Gemfile@:
-
-<pre><code>
-gem 'ip_address_validator'
-</code></pre>
-
-h2. Usage
-
-This gem is an @EachValidator@, and thus is used with the @validates@ method:
-
-<pre><code>
-class User < ActiveRecord::Base
-  validates :last_login_ip,
-			ip_address: true
-end
-</code></pre>
-
-The localization key is @invalid_ip@, and can be specified in the localized
-YAML file like so:
-
-<pre><code>
-en:
-  activerecord:
-	errors:
-	  messages:
-	    invalid_ip: IP address is invalid.
-</code></pre>