Normalize github issue urls before attempting match

fixes metacpangh-1519.
sunnypatel4141 · May 14, 2015 · f34c13b · f34c13b
1 parent c55e63b
commit f34c13b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/lib/MetaCPAN/Web/Model/ReleaseInfo.pm b/lib/MetaCPAN/Web/Model/ReleaseInfo.pm
@@ -196,7 +196,8 @@ sub normalize_issues {
        # source as the url specified in the resources.
         if (
            # If the specified url matches the source we got our counts from...
-            $issues->{url} eq $bugs->{source}
+            $self->normalize_issue_url( $issues->{url} ) eq
+            $self->normalize_issue_url( $bugs->{source} )
 
             # or if both of them look like rt.
             or all {m{^https?://rt\.cpan\.org(/|$)}}
@@ -210,5 +211,13 @@ sub normalize_issues {
     return $issues;
 }
 
+sub normalize_issue_url {
+    local $_ = $_[1];
+
+    s{^https?:// (?:www\.)? ( github\.com / ([^/]+) / ([^/]+) ) (.*)$}{https://$1}x;
+
+    return $_;
+}
+
 __PACKAGE__->meta->make_immutable;
 1;
diff --git a/t/model/release-info.t b/t/model/release-info.t
@@ -228,6 +228,24 @@ subtest 'normalize_issues' => sub {
         'no resources: rt url; counts from old source: no count'
     );
 
+    foreach my $url (
+        qw(
+        https://github.com/user/repo
+        http://github.com/user/repo
+        https://github.com/user/repo/issues
+        http://www.github.com/user/repo/issues
+        https://www.github.com/user/repo/tree
+        )
+        )
+    {
+        normalize_issues_ok(
+            bugtracker( web => $url ),
+            { source => 'https://github.com/user/repo', active => 3 },
+            { url    => $url,                           active => 3 },
+            "github variation ($url) matches: specified url and count",
+        );
+    }
+
 };
 
 done_testing;