- Re-implementing static caching.

- Adding tests for code tag display style.

Author: Jake Bell

gist_filter.module

@@ -99,6 +99,8 @@ function _gist_display_code($matches) {
   }
   // Otherwise, render all files.
   else {
+    module_load_include('php', 'devel', 'krumo/class.krumo');
+    krumo($data);
     foreach ($data['files'] as $file) {
       $output .= theme('gist_filter_code', array(
         'file' => $file,
@@ -143,20 +145,30 @@ function _gist_display_link($matches) {
  *   The data from the Github API.
  */
 function gist_filter_get_gist($id) {
-  // Cache ID
-  $cid = 'gist:' . $id;
-  // Check if this gist is already in the cache
-  $gist = cache_get($cid);
-  
-  if (!$gist) {
-    // Not available in the cache, so retrive the gist from Github
-    $url = 'https://api.github.com/gists/' . $id;
-    $response = drupal_http_request($url, array('headers' => array('Content-Type' => 'application/json')));
-    $gist = drupal_json_decode($response->data);
+  static $gists = array();
+
+  // First, try the static cache.
+  if (!isset($gists[$id])) {
+    // Cache ID
+    $cid = 'gist_filter:gist:' . $id;
+    // Check if this gist is already in the cache
+    $gist = cache_get($cid);
 
-    // Cache the gist until the next cache flush
-    cache_set($cid, $gist, 'cache', CACHE_TEMPORARY);
+    if ($cached = cache_get($cid)) {
+      $gist = $cached->data;
+    }
+    else {
+      // Not available in the cache, so retrive the gist from Github
+      $url = 'https://api.github.com/gists/' . $id;
+      $response = drupal_http_request($url, array('headers' => array('Content-Type' => 'application/json')));
+      $gist = drupal_json_decode($response->data);
+      
+      // Cache the gist until the next cache flush
+      cache_set($cid, $gist, 'cache', CACHE_TEMPORARY);
+    }
+
+    $gists[$id] = $gist;
   }
 
-  return $gist;
+  return $gists[$id];
 }

gist_filter.test

@@ -49,12 +49,12 @@ class GistFilterTestCase extends DrupalWebTestCase {
     $langcode = LANGUAGE_NONE;
     $edit = array(
       "title" => $this->randomName(),
-      "body[$langcode][0][value]" => 'Hello! [gist:788436]',
+      "body[$langcode][0][value]" => 'Hello! [gist:865412]',
     );
     $result = $this->drupalPost('node/add/' . $this->contentType->type, $edit, t('Save'));
     $this->assertResponse(200);
     $this->assertRaw("Hello! ");
-    $this->assertRaw('<script src="http://gist.github.com/788436.js"></script>');
+    $this->assertRaw('<script src="http://gist.github.com/865412.js"></script>');
 
   }
 
@@ -99,11 +99,11 @@ class GistFilterTestCase extends DrupalWebTestCase {
     $langcode = LANGUAGE_NONE;
     $edit = array(
       "title" => $this->randomName(),
-      "body[$langcode][0][value]" => 'Hello! [gist:788436]',
+      "body[$langcode][0][value]" => 'Hello! [gist:865412]',
     );
     $result = $this->drupalPost('node/add/' . $this->contentType->type, $edit, t('Save'));
     $this->assertResponse(200);
-    $this->assertRaw('Hello! <a href="http://gist.github.com/788436">http://gist.github.com/788436</a>');
+    $this->assertRaw('Hello! <a href="http://gist.github.com/865412">http://gist.github.com/865412</a>');
 
   }
 
@@ -131,4 +131,44 @@ class GistFilterTestCase extends DrupalWebTestCase {
 
   }
 
+  /**
+   * Testing the code tag option. 
+   */
+  function testCodeTagStyle() {
+
+    // Turn on our input filter and set the option to link.
+    $edit = array(
+      'filters[gist_filter][status]' => 1,
+      'filters[gist_filter][settings][gist_filter_display_method]' => 'code',
+    );
+    $this->drupalPost('admin/config/content/formats/plain_text', $edit, t('Save configuration'));
+
+    // Create a test node
+    $langcode = LANGUAGE_NONE;
+    $edit = array(
+      "title" => $this->randomName(),
+      "body[$langcode][0][value]" => 'Hello! [gist:865412]',
+    );
+    $result = $this->drupalPost('node/add/' . $this->contentType->type, $edit, t('Save'));
+    $this->assertResponse(200);
+    $this->assertPattern("@<pre type=\"php\">(.*)echo(.*)</pre>@sm");
+    $this->assertPattern("@<pre type=\"ruby\">(.*)a = 1\nputs a</pre>@");
+
+  }
+
+  /**
+   * Test that our API retrieval function caches calls to the Github API.
+   */
+  function testGistCachingTest() {
+    // Make sure our cache is all cleared first.
+    cache_clear_all('gist_filter:gist', 'cache', TRUE);
+    $this->assertFalse(cache_get('gist_filter:gist:865412'));
+
+    gist_filter_get_gist(865412);
+    
+    // Now the cache should be set.
+    $cached = cache_get('gist_filter:gist:865412');
+    $this->assertTrue($cached->data);
+  }
+
 }