fix a regression with extended block code blocks.

Author: ikirudennis

tests/test_block.py

@@ -47,3 +47,10 @@ def test_block_tags_false():
     result = t.parse('test')
     expect = 'test'
     assert result == expect
+
+def test_blockcode_extended():
+    input = 'bc.. text\nmoretext\n\nevenmoretext\n\nmoremoretext'
+    expect = '<pre><code>text\nmoretext\n\nevenmoretext\n\nmoremoretext</code></pre>'
+    t = Textile()
+    result = t.parse(input)
+    assert result == expect

tests/test_values.py

@@ -150,7 +150,7 @@
 
     ('<script>alert("hello");</script>', '\t<p><script>alert(&#8220;hello&#8221;);</script></p>'),
 
-    ('pre.. Hello\n\nHello Again\n\np. normal text', '<pre>Hello\n\nHello Again\n</pre>\n\n\t<p>normal text</p>'),
+    ('pre.. Hello\n\nHello Again\n\np. normal text', '<pre>Hello\n\nHello Again</pre>\n\n\t<p>normal text</p>'),
 
     ('<pre>this is in a pre tag</pre>', '<pre>this is in a pre tag</pre>'),
 
@@ -180,7 +180,7 @@
 
     ('h2. A header\n\n\n\n\n\nsome text', '\t<h2>A header</h2>\n\n\t<p>some text</p>'),
 
-    ('pre.. foo bar baz\nquux', '<pre>foo bar baz\nquux\n</pre>'),
+    ('pre.. foo bar baz\nquux', '<pre>foo bar baz\nquux</pre>'),
 
     ('line of text\n\n    leading spaces',
      '\t<p>line of text</p>\n\n    leading spaces'),
@@ -286,7 +286,7 @@
     # issue 2 escaping
     ('"foo ==(bar)==":#foobar', '\t<p><a href="#foobar">foo (bar)</a></p>'),
     # issue 14 newlines in extended pre blocks
-    ("pre.. Hello\n\nAgain\n\np. normal text", '<pre>Hello\n\nAgain\n</pre>\n\n\t<p>normal text</p>'),
+    ("pre.. Hello\n\nAgain\n\np. normal text", '<pre>Hello\n\nAgain</pre>\n\n\t<p>normal text</p>'),
     # url with parentheses
     ('"python":http://en.wikipedia.org/wiki/Python_(programming_language)', '\t<p><a href="http://en.wikipedia.org/wiki/Python_%28programming_language%29">python</a></p>'),
     # table with hyphen styles

textile/core.py

@@ -421,6 +421,7 @@ def block(self, text):
         tag = 'p'
         atts = cite = graf = ext = ''
 
+        last_item_is_a_shelf = False
         out = []
 
         for line in text:
@@ -430,6 +431,17 @@ def block(self, text):
             match = re.search(pattern, line, flags=re.S | re.U)
             # tag specified on this line.
             if match:
+                # if we had a previous extended tag but not this time, close up
+                # the tag
+                if out:
+                    last_item_is_a_shelf = out[-1] in self.shelf
+                if ext and match.group('tag') and last_item_is_a_shelf:
+                    content = out.pop()
+                    if block.inner_tag:
+                        content = generate_tag(block.inner_tag, content,
+                                block.inner_atts)
+                    out.append(generate_tag(block.outer_tag, content,
+                        block.outer_atts))
                 tag, atts, ext, cite, content = match.groups()
                 block = Block(self, **match.groupdict())
                 inner_block = generate_tag(block.inner_tag, block.content,
@@ -450,7 +462,7 @@ def block(self, text):
                 # if we're inside an extended block, add the text from the
                 # previous extension to the front
                 if ext:
-                    line = '{0}\n{1}'.format(out.pop(), line)
+                    line = '{0}\n\n{1}'.format(out.pop(), line)
                 whitespace = ' \t\n\r\f\v'
                 if ext or not line[0] in whitespace:
                     block = Block(self, tag, atts, ext, cite, line)
@@ -459,6 +471,8 @@ def block(self, text):
                     else:
                         line = generate_tag(block.outer_tag, block.content,
                                 block.outer_atts)
+                        if block.inner_tag == 'code':
+                            line = block.content
                         if block.outer_tag != 'pre' and not has_raw_text(line):
                             line = "\t{0}".format(line)
                 else:
@@ -477,7 +491,11 @@ def block(self, text):
                 graf = ''
 
         if ext:
-            out.append(generate_tag(block.outer_tag, out.pop(),
+            content = out.pop()
+            if block.inner_tag:
+                content = generate_tag(block.inner_tag, content,
+                        block.inner_atts)
+            out.append(generate_tag(block.outer_tag, content,
                 block.outer_atts))
         return '\n\n'.join(out)
 

textile/objects/block.py

@@ -99,8 +99,10 @@ def process(self):
             i_tag = ''
             if self.tag == 'bc':
                 i_tag = 'code'
-            self.content = self.textile.shelve(encode_html('{0}\n'.format(
-                self.content.rstrip("\n"))))
+            content = encode_html(self.content)
+            if not self.ext:
+                content = '{0}\n'.format(content)
+            self.content = self.textile.shelve(content)
             self.outer_tag = 'pre'
             self.outer_atts = self.attributes
             self.inner_tag = i_tag