Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #11 puunycode url with trailing xn-- match fixed #12

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion init.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module ValidatesUrlFormatOf
\A
https?:// # http:// or https://
([^\s:@]+:[^\s:@]*@)? # optional username:pw@
( ((#{ALNUM}+\.)*xn---*)?#{ALNUM}+([-.]#{ALNUM}+)*\.[a-z]{2,6}\.? | # domain (including Punycode/IDN)...
( ((#{ALNUM}+\.)*xn---*)?#{ALNUM}+([-.]#{ALNUM}+)*\.[a-z]{2,6}\.?(--#{ALNUM}*)? | # domain (including Punycode/IDN)...
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for this PR, and sorry for not getting to it sooner.

On a minor note, does the below proposed change make sense? I assume we want one-or-more rather than zero-or-more.

Suggested change
( ((#{ALNUM}+\.)*xn---*)?#{ALNUM}+([-.]#{ALNUM}+)*\.[a-z]{2,6}\.?(--#{ALNUM}*)? | # domain (including Punycode/IDN)...
( ((#{ALNUM}+\.)*xn---*)?#{ALNUM}+([-.]#{ALNUM}+)*\.[a-z]{2,6}\.?(--#{ALNUM}+)? | # domain (including Punycode/IDN)...

#{IPv4_PART}(\.#{IPv4_PART}){3} ) # or IPv4
(:\d{1,5})? # optional port
([/?]\S*)? # optional /whatever or ?whatever
Expand Down
1 change: 1 addition & 0 deletions test/validates_url_format_of_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ def test_should_allow_valid_urls
'http://www.xn--rksmrgs-5wao1o.nu',
'http://foo.bar.xn--rksmrgs-5wao1o.nu',
'https://www.xn----ylbbafnbqebomc7ds.com.gr',
'http://xn--80agkgigub5kqa.xn--p1ai',
'http://example.com.', # Explicit TLD root period
'http://example.com./foo'
].each do |url|
Expand Down