- wrote decoder

- stop using literal test output
- test success = compared to decoded output, not literal comparison of encoded output

.gitignore

@@ -0,0 +1,5 @@
+.DS_Store
+dns-shutdown.tap
+*.pyc
+*.pid
+*.log

csshttprequest.php

@@ -14,9 +14,8 @@
 function encode($string) {
 	$quoted = rawurlencode($string);
 	$out = "";
-	$n = 0;
-	for ($i = 0; $i < strlen($quoted); $i+=LENGTH) {
-		$out .= "#c" . $n . "{background:url(" . PREFIX . substr($quoted, $i, $i+LENGTH) . ");}\n";
+	for ($i = 0, $n = 0; $i < strlen($quoted); $i += LENGTH, $n++) {
+		$out .= "#c" . $n . "{background:url(" . PREFIX . substr($quoted, $i, LENGTH) . ");}\n";
 	}
 	return $out;
 }

csshttprequest.py

@@ -3,11 +3,13 @@
 __author__ = "Randy Reddig - ydnar@nb.io"
 
 
+import re
 import urllib
 
 
 PREFIX = "data:,"
 LENGTH = 2000 - len(PREFIX) # Internet Explorer 2KB URI limit
+MATCH_CHR = re.compile(r'\#c(?P<index>\d+)\s*\{\s*background(?:-image)?\:\s*url\(data\:,(?P<value>[^\)]+)\);?\s*}')
 
 
 def encode(string):
@@ -20,6 +22,19 @@ def encode(string):
     return out
 
 
+def decode(string):
+    out = []
+    rules = string.split('\n')
+    for rule in rules:
+        match = re.search(MATCH_CHR, rule)
+        if match:
+            index = int(match.group('index'))
+            value = match.group('value')
+            out.append('')
+            out[index] = value
+    return urllib.unquote(''.join(out))
+
+
 if __name__ == '__main__':
     import sys
     sys.stdout.write(encode(sys.stdin.read()))

test-all

@@ -3,34 +3,33 @@
 
 from __future__ import with_statement
 import os
+import re
 import sys
 import glob
 import unittest
 from subprocess import Popen, PIPE
+from csshttprequest import encode, decode
 
 
 class TestSequenceFunctions(unittest.TestCase):
     def setUp(self):
-        self.input = {}
-        self.output = {}
+        self.fixtures = {}
         for filename in glob.glob(os.path.join('tests','*.in')):
             with open(filename) as f:
-                self.input[filename.rsplit('.')[0]] = f.read()
-        for filename in glob.glob(os.path.join('tests','*.out')):
-            with open(filename) as f:
-                self.output[filename.rsplit('.')[0]] = self._normalize(f.read())
+                self.fixtures[filename.rsplit('.')[0]] = f.read()
 
     def _normalize(self, value):
         return value.rstrip('\n')
 
     def _test_cmd(self, cmd):
-        for test in self.input.keys():
-            sys.stdout.write("\nTesting %s with %s" % (cmd[1], test))
+        for key in self.fixtures.keys():
+            fixture = self.fixtures[key]
+            sys.stdout.write("\nTesting %s with %s" % (cmd[1], key))
             pipe = Popen(cmd, stdin=PIPE, stdout=PIPE, close_fds=True)
-            pipe.stdin.write(self.input[test])
+            pipe.stdin.write(fixture)
             pipe.stdin.close()
-            output = self._normalize(pipe.stdout.read())
-            self.assertEqual(output, self.output[test])
+            output = decode(self._normalize(pipe.stdout.read()))
+            self.assertEqual(output, fixture)
 
     def test_python(self):
         self._test_cmd(['python', 'csshttprequest.py'])