Merge pull request #516 from duckduckgo/mintsoft/fortune

Fortune: Moving the file loading out of the sub so it's only loaded once
duckduckgo · Jun 28, 2014 · b4d1c58 · b4d1c58
2 parents fc962e7 + 3e638e9
commit b4d1c58
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/lib/DDG/Goodie/Fortune.pm b/lib/DDG/Goodie/Fortune.pm
@@ -16,13 +16,14 @@ attribution github => ['https://github.com/frncscgmz', 'frncscgmz'];
 zci is_cached => 0;
 zci answer_type => "fortune";
 
+my $ffile = share('fortunes');
+my $fortune_file = Fortune->new($ffile);
+$fortune_file->read_header();
+
 handle remainder => sub {
-   my $ffile = share('fortunes');
-   my $fortune_file = Fortune->new($ffile);
-   $fortune_file->read_header();
-   my $output = $fortune_file->get_random_fortune();
-   $output =~ s/\n//g;
-   return $output;
+    my $output = $fortune_file->get_random_fortune();
+    $output =~ s/\n//g;
+    return $output;
 };
 
 1;
diff --git a/t/Fortune.t b/t/Fortune.t
@@ -9,12 +9,12 @@ zci answer_type => 'fortune';
 zci is_cached => 0;
 
 ddg_goodie_test(
-	[qw(
-		DDG::Goodie::Fortune
-	)],
-	'gimmie a fortune cookie' => test_zci(qr/.+/),
+    [qw(
+        DDG::Goodie::Fortune
+    )],
+    'gimmie a fortune cookie' => test_zci(qr/.+/),
     'gimmie a unix fortune' => test_zci(qr/.+/),
-	'give me a fortune cookie!' => test_zci(qr/.+/),
+    'give me a fortune cookie!' => test_zci(qr/.+/),
     'give me a unix fortune!' => test_zci(qr/.+/),
     'unix fortune cookie' => test_zci(qr/.+/),
 );