better_ipaddr 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cd953909cfae8bb5422a297acdd4592ec96957c262072587add707a78ca9dd3
-  data.tar.gz: 32ff0ee9fb1aa6fc91a1fd2db3802add0d9b10af29c97ecbb066b3805ca5dcf3
+  metadata.gz: 8d0d8d41449838fe7c125436fb675ae3facbcae5552afbdefc57c0a595f1f980
+  data.tar.gz: dc8c7339f8a3787e336882cb812fcb86b3cc62b3d8d492eecd95de87c2f7134d
 SHA512:
-  metadata.gz: 4ac0277a9876f20973dd0418547093ec41342ecbd1186c2da235c2463a0cd70f9cf39c623242ebad8cb2aa2156528a1d9735317c82a04310385ae93624beec75
-  data.tar.gz: 2d8f9e58dc03ea59d6af81995345e37395fd259bb1a615ef6ad9cd0d6e19a5b9cfb5f1ef3cc2891574861e99ae9280ee72288ed5d29308483b4d909041f7dba1
+  metadata.gz: f13615231d765762a13b41abc77ba161c6ea7c0552fd461477e907d7715c1ac7f7e678045974bf2fd90aec64d0001e99f73f499c9c2abf878b3158494f391689
+  data.tar.gz: 93fe51274de41a9cdcb7cd5e3ecff333e66000294117ef14f0c9fa04bfbc6a511fc97e8d136587e8d1b681889445e93e7db0327dd72fe1280b04374dd6153176

data/.github/workflows/ruby.yml

@@ -0,0 +1,38 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version:
+        - '2.3'
+        - '2.4'
+        - '2.5'
+        - '2.6'
+        - '2.7'
+        - '3.0'
+        - '3.1'
+        - jruby-9.1.17.0
+        - jruby-9.2.21.0
+        - jruby-9.3.6.0
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      # https://github.com/ruby/setup-ruby#versioning
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/better_ipaddr.gemspec

@@ -20,10 +20,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.0"
-  spec.add_development_dependency "ipaddr", ">= 1.2.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "ipaddr", ">= 1.2.4"
+  spec.add_development_dependency "minitest", "~> 5.0", "< 5.11"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rubocop", "~> 0.54" if RUBY_VERSION > '2.1'
   spec.add_development_dependency "test-unit"
 end

data/lib/better_ipaddr/classes.rb

@@ -33,6 +33,8 @@ class IPAddr
       end
     end
 
+    # rubocop: disable CyclomaticComplexity
+
     # Create an IPAddr from the given object, guessing the type of address given
     # based on its type and content.
     #
@@ -50,6 +52,10 @@ class IPAddr
     # @param classful [Boolean] see Base.from_string
     # @return [IPAddr, Nil]
     def self.from(address, exception: false, classful: false)
+      if class_converter?(address)
+        return class_convert(address, classful: classful, exception: exception)
+      end
+
       case address
       when IPAddr
         specialize address
@@ -59,7 +65,62 @@ class IPAddr
         V6[address]
       end || (
         if exception
-          raise TypeError, "can't convert #{address.inspect} to #{self}"
+          (raise TypeError, "can't convert #{address.inspect} to #{self}")
+        end
+      )
+    end
+
+    # rubocop: enable CyclomaticComplexity
+
+    # A Hash of classes and class names which can be converted to IPAddr::Base
+    # subclasses, but which are not necessarily loaded at the same time as this
+    # file.
+    #
+    # Conversion callables for custom classes can be registered here, e.g., with
+    # custom class Foo:
+    #
+    #   IPAddr::Base.class_converters[Foo] = proc { |foo, _| foo.to_ipaddr }
+    #
+    # The arguments passed to the callable will be the same as the parameters of
+    # Kernel#IPAddr.
+    #
+    # @return [Hash{String, Class => Proc, Method}]
+    def self.class_converters
+      @class_converters ||= {
+        'Resolv::IPv4' => V4.method(:from_string_representable),
+        'Resolv::IPv6' => V6.method(:from_string_representable)
+      }
+    end
+
+    # Return the class_converter for the given object, if one exists.
+    #
+    # Checks by both class identity and class name so that every class with a
+    # converter doesn't need to be loaded for this file to load.
+    #
+    # @return [Proc, Method, Nil]
+    def self.class_converter(address)
+      class_converters[address.class] ||= class_converters[address.class.name]
+      class_converters[address.class]
+    end
+
+    def self.class_converter?(address)
+      class_converters.key?(address.class) ||
+        class_converters.key?(address.class.name)
+    end
+
+    # Convert the given object using its class_converter, if one exists.
+    #
+    # @return [IPAddr, Nil]
+    def self.class_convert(address, mask = nil, classful: nil, exception: false)
+      converter = class_converter(address)
+      converter && converter.call(
+        address,
+        mask,
+        classful: classful,
+        exception: exception
+      ) || (
+        if exception
+          (raise TypeError, "can't convert #{address.inspect} to #{self}")
         end
       )
     end
@@ -132,6 +193,29 @@ class IPAddr
       end
     end
 
+    # Create an IPAddr from an object that can be converted to a String via
+    # #to_s.
+    #
+    #
+    # @param address [#to_s]
+    # @param mask [Integer, String] a netmask or prefix length
+    # @param family [Integer, Nil]
+    # @param classful [Boolean] controls the conversion of IPv4 addresses
+    #   without a prefix length in CIDR notation. When false, these are assumed
+    #   to be host networks (/32). When true, these are assumed to be classful
+    #   (rfc791) networks, with an implicit prefix length. Has no effect on IPv6
+    #   addresses.
+    # @return [IPAddr]
+    def self.from_string_representable(
+      address,
+      mask = nil,
+      family: self::FAMILY,
+      classful: false,
+      exception: false
+    )
+      from_string(address.to_s, mask, family: family, classful: classful)
+    end
+
     # Convert an object to a prefix length.
     #
     # @param mask [Integer, String]

data/lib/better_ipaddr/methods.rb

@@ -172,6 +172,12 @@ module BetterIpaddr
     # The first host address in the network.
     # @return [IPAddr]
 
+    def hash
+      # see https://github.com/jruby/jruby/issues/4460
+      # remove this override when specs still pass without it
+      [self.class, @addr, @mask_addr, @family].hash
+    end
+
     def first
       self[0]
     end

data/lib/better_ipaddr/version.rb

@@ -1,3 +1,3 @@
 module BetterIpaddr
-  VERSION = "0.6.0".freeze
+  VERSION = "0.8.0".freeze
 end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: better_ipaddr
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Ben Miller
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ipaddr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.4
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,20 +41,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -94,16 +86,16 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - bmiller@rackspace.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -125,7 +117,7 @@ homepage: https://github.com/bjmllr/better_ipaddr
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -140,9 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: IPAddr enhancements for network management.
 test_files: []

data/.travis.yml

@@ -1,15 +0,0 @@
-language: ruby
-rvm:
-  - 2.0.0
-  - 2.1.10
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
-  - jruby-9.1.16.0
-matrix:
-  include:
-    - rvm: jruby
-      env: JRUBY_OPTS='-Xcompat.version=2.0'
-before_install:
-  - if [ "jruby" != "$TRAVIS_RUBY_VERSION"  ]; then gem install bundler; fi