gitlab-markup 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba2e135a901e431badeb43ed260ac0328e989c0e
-  data.tar.gz: 497d621b020dae18a892877a670e25eab141dac4
+  metadata.gz: 216b27009d51155a59aa00c6ea107ba15617c493
+  data.tar.gz: e22c1a28edaff57ff060a98c772b4ded2fc6370c
 SHA512:
-  metadata.gz: 199cbd714975aec603d2cd9d6bc9ade114f4e073652b32fbbfbfca5127ab81ab1a587609bafa20c75ce5351ed0c34d93a246792f11f14ff3b510ef880e32cd39
-  data.tar.gz: 0d429b9532d24a0b9800c0b44d741fe92d389a73a3ed90e45715b8834f13420306b66533976d2a2ba84b98099a650f4277ced260aaff6f5b71d1dc2e5ae70cee
+  metadata.gz: 5291f6b31d67fbb75e7630defd4d4d2bb265100d88e48cfb73264c62d828bc65619e197c31d4b4dc25e50063410baec5141308d549ccf1065beea23ddb851419
+  data.tar.gz: 348298df2c87487252cf2174ca51675429d0a877d3bd24ca7d92ababbb0672332ef984e532c6149df3d346dcc203fd1f767a263ed7c39bddc8414357599cd96d

data/.gitlab-ci.yml

@@ -13,9 +13,6 @@ variables:
   script:
     - bundle exec rake test
 
-ruby-20:
-  image: ruby:2.0
-  <<: *specs
 ruby-21:
   image: ruby:2.1
   <<: *specs

data/HISTORY.md

@@ -1,4 +1,4 @@
-## 1.6.1 (2017-09-20)
+## 1.6.2 (2017-09-20)
 
 * Support PlantUML blocks in reStructuredText
 

data/lib/github-markup.rb

@@ -1,6 +1,6 @@
 module GitHub
   module Markup
-    VERSION = '1.6.1'
+    VERSION = '1.6.2'
     Version = VERSION
   end
 end

data/lib/github/commands/rest2html

@@ -79,7 +79,18 @@ class DoctestDirective(CodeBlock):
         return super(DoctestDirective, self).run()
 
 
-class GitHubHTMLTranslator(HTMLTranslator):
+class PlantumlDirective(CodeBlock):
+    """
+    Render 'plantuml::' blocks as 'code:: plantuml', so they will be
+    picked up in GitLab by the generic Banzai::Filter::PlantumlFilter
+    """
+
+    def run(self):
+        self.arguments = ['plantuml']
+        return super(PlantumlDirective, self).run()
+
+
+class GitHubHTMLTranslator(HTMLTranslator, object):
 
     # removes the <div class="document"> tag wrapped around docs
     # see also: http://bit.ly/1exfq2h (warning! sourceforge link.)
@@ -104,9 +115,16 @@ class GitHubHTMLTranslator(HTMLTranslator):
         if len(classes) >= 2 and classes[0] == 'code':
             language = classes[1]
             del classes[:]
-            self.body.append(self.starttag(node, 'pre', lang=language))
+            self.body.append(self.starttag(node, 'pre'))
+            self.body.append(self.starttag(node, 'code', lang=language))
         else:
             self.body.append(self.starttag(node, 'pre'))
+            self.body.append(self.starttag(node, 'code'))
+
+    def depart_literal_block(self, node):
+        self.body.append('</code>')
+
+        return super(GitHubHTMLTranslator, self).depart_literal_block(node)
 
     # always wrap two-backtick rst inline literals in <code>, not <tt>
     # this also avoids the generation of superfluous <span> tags
@@ -179,6 +197,9 @@ def main():
     # Render source code in Sphinx doctest blocks
     directives.register_directive('doctest', DoctestDirective)
 
+    # Render source code in Sphinx plantuml blocks
+    directives.register_directive('plantuml', PlantumlDirective)
+
     parts = publish_parts(text, writer=writer, settings_overrides=SETTINGS)
     if 'html_body' in parts:
         html = parts['html_body']

data/test/markups/README.rst.html

@@ -17,14 +17,17 @@
 </ol>
 <p>The UTF-8 quote character in this table used to cause python to go boom. Now docutils just silently ignores it.</p>
 <pre>
-A block of code
+<code>
+A block of code</code>
 </pre>
-<pre lang="python">
-python.code('hooray')
+<pre>
+<code lang="python">
+python.code('hooray')</code>
 </pre>
-<pre lang="python">
+<pre>
+<code lang="python">
 &gt;&gt;&gt; some_function()
-'result'
+'result'</code>
 </pre>
 <table>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-markup
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Chris Wanstrath