From 99435dcd04bf057ca6bba0c94dbf744e246f5f80 Mon Sep 17 00:00:00 2001
From: Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
Date: Wed, 24 Jul 2024 23:34:44 +0200
Subject: [PATCH] Dropped support for "version_prefix" qualifier for "github",
 "gitlab" and "bitbucket" PURL types in "purl_to_urls" util

(giterlizzi/perl-URI-PackageURL#14)
---
 lib/URI/PackageURL.pm              |  6 ++---
 lib/URI/PackageURL/App.pm          |  2 +-
 lib/URI/PackageURL/Util.pm         | 43 +++++++++++++-----------------
 lib/URI/VersionRange.pm            |  2 +-
 lib/URI/VersionRange/App.pm        |  2 +-
 lib/URI/VersionRange/Constraint.pm |  2 +-
 6 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/lib/URI/PackageURL.pm b/lib/URI/PackageURL.pm
index 4d3c135..4f06157 100644
--- a/lib/URI/PackageURL.pm
+++ b/lib/URI/PackageURL.pm
@@ -13,7 +13,7 @@ use constant DEBUG => $ENV{PURL_DEBUG};
 
 use overload '""' => 'to_string', fallback => 1;
 
-our $VERSION = '2.20_2';
+our $VERSION = '2.20_3';
 our @EXPORT  = qw(encode_purl decode_purl);
 
 my $PURL_REGEXP = qr{^pkg:[A-Za-z\\.\\-\\+][A-Za-z0-9\\.\\-\\+]*/.+};
@@ -283,7 +283,7 @@ URI::PackageURL - Perl extension for Package URL (aka "purl")
     type      => cpan,
     namespace => 'GDT',
     name      => 'URI-PackageURL',
-    version   => '2.20'
+    version   => '2.20_3'
   );
   
   say $purl; # pkg:cpan/GDT/URI-PackageURL@2.20
@@ -296,7 +296,7 @@ URI::PackageURL - Perl extension for Package URL (aka "purl")
   $purl = decode_purl('pkg:cpan/GDT/URI-PackageURL@2.20');
   say $purl->type;  # cpan
 
-  $purl_string = encode_purl(type => cpan, name => 'URI::PackageURL', version => '2.20');
+  $purl_string = encode_purl(type => cpan, name => 'URI::PackageURL', version => '2.20_3');
   say $purl_string; # pkg:cpan/URI::PackageURL@2.20
 
 =head1 DESCRIPTION
diff --git a/lib/URI/PackageURL/App.pm b/lib/URI/PackageURL/App.pm
index a19efb9..4378c64 100644
--- a/lib/URI/PackageURL/App.pm
+++ b/lib/URI/PackageURL/App.pm
@@ -13,7 +13,7 @@ use Data::Dumper ();
 
 use URI::PackageURL ();
 
-our $VERSION = '2.20_2';
+our $VERSION = '2.20_3';
 
 sub cli_error {
     my ($error) = @_;
diff --git a/lib/URI/PackageURL/Util.pm b/lib/URI/PackageURL/Util.pm
index e824fe7..6140918 100644
--- a/lib/URI/PackageURL/Util.pm
+++ b/lib/URI/PackageURL/Util.pm
@@ -7,7 +7,7 @@ use warnings;
 
 use Exporter qw(import);
 
-our $VERSION = '2.20_2';
+our $VERSION = '2.20_3';
 our @EXPORT  = qw(purl_to_urls purl_components_normalize);
 
 sub purl_components_normalize {
@@ -221,12 +221,11 @@ sub _bitbucket_urls {
 
     my $purl = shift;
 
-    my $name           = $purl->name;
-    my $namespace      = $purl->namespace;
-    my $version        = $purl->version;
-    my $qualifiers     = $purl->qualifiers;
-    my $file_ext       = $qualifiers->{ext}            || 'tar.gz';
-    my $version_prefix = $qualifiers->{version_prefix} || '';
+    my $name       = $purl->name;
+    my $namespace  = $purl->namespace;
+    my $version    = $purl->version;
+    my $qualifiers = $purl->qualifiers;
+    my $file_ext   = $qualifiers->{ext} || 'tar.gz';
 
     my $urls = {};
 
@@ -235,7 +234,7 @@ sub _bitbucket_urls {
     }
 
     if ($version) {
-        $urls->{download} = "https://bitbucket.org/$namespace/$name/get/$version_prefix$version.$file_ext";
+        $urls->{download} = "https://bitbucket.org/$namespace/$name/get/$version.$file_ext";
     }
 
     return $urls;
@@ -360,12 +359,11 @@ sub _github_urls {
 
     my $purl = shift;
 
-    my $name           = $purl->name;
-    my $namespace      = $purl->namespace;
-    my $version        = $purl->version;
-    my $qualifiers     = $purl->qualifiers;
-    my $file_ext       = $qualifiers->{ext}            || 'tar.gz';
-    my $version_prefix = $qualifiers->{version_prefix} || '';
+    my $name       = $purl->name;
+    my $namespace  = $purl->namespace;
+    my $version    = $purl->version;
+    my $qualifiers = $purl->qualifiers;
+    my $file_ext   = $qualifiers->{ext} || 'tar.gz';
 
     my $urls = {};
 
@@ -381,8 +379,7 @@ sub _github_urls {
             $urls->{download} = "https://github.com/$namespace/$name/archive/$version.$file_ext";
         }
         else {
-            $urls->{download}
-                = "https://github.com/$namespace/$name/archive/refs/tags/$version_prefix$version.$file_ext";
+            $urls->{download} = "https://github.com/$namespace/$name/archive/refs/tags/$version.$file_ext";
         }
 
     }
@@ -395,12 +392,11 @@ sub _gitlab_urls {
 
     my $purl = shift;
 
-    my $name           = $purl->name;
-    my $namespace      = $purl->namespace;
-    my $version        = $purl->version;
-    my $qualifiers     = $purl->qualifiers;
-    my $file_ext       = $qualifiers->{ext}            || 'tar.gz';
-    my $version_prefix = $qualifiers->{version_prefix} || '';
+    my $name       = $purl->name;
+    my $namespace  = $purl->namespace;
+    my $version    = $purl->version;
+    my $qualifiers = $purl->qualifiers;
+    my $file_ext   = $qualifiers->{ext} || 'tar.gz';
 
     my $urls = {};
 
@@ -409,8 +405,7 @@ sub _gitlab_urls {
     }
 
     if ($version) {
-        $urls->{download}
-            = "https://gitlab.com/$namespace/$name/-/archive/$version_prefix$version/$name-$version_prefix$version.$file_ext";
+        $urls->{download} = "https://gitlab.com/$namespace/$name/-/archive/$version/$name-$version.$file_ext";
     }
 
     return $urls;
diff --git a/lib/URI/VersionRange.pm b/lib/URI/VersionRange.pm
index 0ca7b96..dcd74d7 100644
--- a/lib/URI/VersionRange.pm
+++ b/lib/URI/VersionRange.pm
@@ -18,7 +18,7 @@ use constant FALSE => !!0;
 
 use overload '""' => 'to_string', fallback => 1;
 
-our $VERSION = '2.20_2';
+our $VERSION = '2.20_3';
 our @EXPORT  = qw(encode_vers decode_vers);
 
 my $VERS_REGEXP = qr{^vers:[a-z\\.\\-\\+][a-z0-9\\.\\-\\+]*/.+};
diff --git a/lib/URI/VersionRange/App.pm b/lib/URI/VersionRange/App.pm
index 1f377ad..f182c21 100644
--- a/lib/URI/VersionRange/App.pm
+++ b/lib/URI/VersionRange/App.pm
@@ -13,7 +13,7 @@ use Data::Dumper ();
 
 use URI::VersionRange ();
 
-our $VERSION = '2.20_2';
+our $VERSION = '2.20_3';
 
 sub cli_error {
     my ($error) = @_;
diff --git a/lib/URI/VersionRange/Constraint.pm b/lib/URI/VersionRange/Constraint.pm
index 50d3bc3..2364b77 100644
--- a/lib/URI/VersionRange/Constraint.pm
+++ b/lib/URI/VersionRange/Constraint.pm
@@ -12,7 +12,7 @@ use overload '""' => 'to_string', fallback => 1;
 
 use URI::VersionRange::Version;
 
-our $VERSION = '2.20_2';
+our $VERSION = '2.20_3';
 
 our %COMPARATOR = (
     '='  => 'equal',