domain_name 0.5.20190701 → 0.6.20240107

data/lib/domain_name/version.rb

@@ -1,3 +1,3 @@
 class DomainName
-  VERSION = '0.5.20190701'
+  VERSION = '0.6.20240107'
 end

data/lib/domain_name.rb

@@ -8,7 +8,6 @@
 require 'domain_name/version'
 require 'domain_name/punycode'
 require 'domain_name/etld_data'
-require 'unf'
 require 'ipaddr'
 
 # Represents a domain name ready for extracting its registered domain
@@ -284,9 +283,13 @@ class DomainName
 
   class << self
     # Normalizes a _domain_ using the Punycode algorithm as necessary.
+    # Input must be strictly ASCII-only or unicode.
     # The result will be a downcased, ASCII-only string.
     def normalize(domain)
-      DomainName::Punycode.encode_hostname(domain.chomp(DOT).to_nfc).downcase
+      chomped = domain.chomp(DOT)
+      normalized = chomped.ascii_only? ? chomped : chomped.unicode_normalize(:nfc)
+
+      DomainName::Punycode.encode_hostname(normalized).downcase
     end
   end
 end

data/test/test_domain_name-punycode.rb

@@ -91,7 +91,7 @@ class TestDomainName < Test::Unit::TestCase
         '-> $1.00 <--']
     ].each { |title, cps, punycode|
       assert_equal punycode, DomainName::Punycode.encode(cps.pack('U*')), title
-      assert_equal cps.pack('U*').to_nfc, DomainName::Punycode.decode(punycode), title
+      assert_equal cps.pack('U*').unicode_normalize(:nfc), DomainName::Punycode.decode(punycode), title
     }
   end
 end

data/test/test_domain_name.rb

@@ -35,6 +35,10 @@ class TestDomainName < Test::Unit::TestCase
     }
   end
 
+  test "accept ASCII-only 'binary' encoded hostnames" do
+    assert_equal "example.com", DomainName.new("example.com".force_encoding("ASCII-8BIT")).hostname
+  end
+
   test "parse canonical domain names correctly" do
     [
       # Mixed case.

metadata

@@ -1,49 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: domain_name
 version: !ruby/object:Gem::Version
-  version: 0.5.20190701
+  version: 0.6.20240107
 platform: ruby
 authors:
 - Akinori MUSHA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-05 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: unf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -100,8 +80,8 @@ extra_rdoc_files:
 - README.md
 files:
 - ".document"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -132,14 +112,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Domain Name manipulation library for Ruby

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-rvm:
-  - 1.8.7
-  - ree
-  - 1.9.3
-  - 2.0.0
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
-  - ruby-head
-  - jruby-1.7.20
-  - jruby-9.0.5.0
-  - jruby-head
-  - rbx-2
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: rbx-2
-before_install:
-  - gem update bundler