Update UnixPermissions goodie's output format

duckduckgo · Mar 21, 2013 · 44be7e4 · 44be7e4
1 parent 367a8d3
commit 44be7e4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/lib/DDG/Goodie/UnixPermissions.pm b/lib/DDG/Goodie/UnixPermissions.pm
@@ -34,16 +34,17 @@ handle remainder => sub {
 
     my @digits = split '', $1;
     my @modes = qw(--- --x -w- -wx r-- r-x rw- rwx);
-    my $plain_output = join('', map($modes[$_], @digits))   . "\n" .
+    my $plain_output  = "$1 (octal)\n";
+       $plain_output .= join('', map($modes[$_], @digits))   . " (symbolic)\n" .
                        'User: '   . $modes_desc[$digits[0]] . "\n" .
                        'Group: '  . $modes_desc[$digits[1]] . "\n" .
                        'Others: ' . $modes_desc[$digits[2]] . "\n";
     (my $html_output = $plain_output) =~ s/\n/<br>/g;
 
-    $plain_output .= 'Find out more on this: https://en.wikipedia.org/wiki/Permissions#Notation_of_traditional_Unix_permissions';
-    $html_output  .= 'Find out more on this: <a href="https://en.wikipedia.org/wiki/Permissions#Notation_of_traditional_Unix_permissions">https://en.wikipedia.org/wiki/Permissions#Notation_of_traditional_Unix_permissions</a>';
+    $plain_output .= 'More at https://en.wikipedia.org/wiki/Permissions#Notation_of_traditional_Unix_permissions';
+    $html_output  .= 'More at <a href="https://en.wikipedia.org/wiki/Permissions#Notation_of_traditional_Unix_permissions">https://en.wikipedia.org/wiki/Permissions#Notation_of_traditional_Unix_permissions</a>';
 
-    return $plain_output, html => $html_output;
+    return $plain_output, html => $html_output, heading => "Unix Permissions";
 };
 
 1;
diff --git a/t/UnixPermissions.t b/t/UnixPermissions.t
@@ -11,21 +11,28 @@ ddg_goodie_test(
         DDG::Goodie::UnixPermissions
     )],
     'chmod 755' => test_zci(
-'rwxr-xr-x
+'755 (octal)
+rwxr-xr-x (symbolic)
 User: Read, write and execute
 Group: Read and execute
 Others: Read and execute
-Find out more on this: https://en.wikipedia.org/wiki/Permissions#Notation_of_traditional_Unix_permissions',
-        html =>
-        'rwxr-xr-x<br>User: Read, write and execute<br>Group: Read and execute<br>Others: Read and execute<br>Find out more on this: <a href="https://en.wikipedia.org/wiki/Permissions#Notation_of_traditional_Unix_permissions">https://en.wikipedia.org/wiki/Permissions#Notation_of_traditional_Unix_permissions</a>'),
+More at https://en.wikipedia.org/wiki/Permissions#Notation_of_traditional_Unix_permissions',
+
+    html => '755 (octal)<br>rwxr-xr-x (symbolic)<br>User: Read, write and execute<br>Group: Read and execute<br>Others: Read and execute<br>More at <a href="https://en.wikipedia.org/wiki/Permissions#Notation_of_traditional_Unix_permissions">https://en.wikipedia.org/wiki/Permissions#Notation_of_traditional_Unix_permissions</a>',
+
+    heading => 'Unix Permissions'),
+
     'permission 0644' => test_zci(
-'rw-r--r--
+'644 (octal)
+rw-r--r-- (symbolic)
 User: Read and write
 Group: Read
 Others: Read
-Find out more on this: https://en.wikipedia.org/wiki/Permissions#Notation_of_traditional_Unix_permissions',
-        html =>
-        'rw-r--r--<br>User: Read and write<br>Group: Read<br>Others: Read<br>Find out more on this: <a href="https://en.wikipedia.org/wiki/Permissions#Notation_of_traditional_Unix_permissions">https://en.wikipedia.org/wiki/Permissions#Notation_of_traditional_Unix_permissions</a>')
+More at https://en.wikipedia.org/wiki/Permissions#Notation_of_traditional_Unix_permissions',
+
+    html => '644 (octal)<br>rw-r--r-- (symbolic)<br>User: Read and write<br>Group: Read<br>Others: Read<br>More at <a href="https://en.wikipedia.org/wiki/Permissions#Notation_of_traditional_Unix_permissions">https://en.wikipedia.org/wiki/Permissions#Notation_of_traditional_Unix_permissions</a>',
+
+    heading => 'Unix Permissions')
 );
 
 done_testing;