github-markup 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e6ecef369a72fbef3cdd07bdf6da3653c43a1ba
-  data.tar.gz: efc6c822663fa8cab86fa7dbce03980ca8dca994
+  metadata.gz: afc82c320a97a18e1f5b60f73dc24655e976a44b
+  data.tar.gz: 191b767ae24fda9f343857c6a74c308b87cb91f9
 SHA512:
-  metadata.gz: 3da515fc4331f35270fc4ae775aa7fdf6f2c0864fe46a683fc5c95a57994f7ad8a784fa9ef8b941642a969ea22b12a1023c3cefee8226102d796a20e69468240
-  data.tar.gz: c4b691d2758f7c8edebf80e01af332f48766f51135973aa609f1f17a98ad76e7f40e29d4ba88b52f9210c3a731c5c771c0c3b6290f70de97c09c487bd112570a
+  metadata.gz: 5e377067276eedcc237ad87a899b023308def31c966c6cc13ed038d5738d70a6a5536a551acf77d88094270fb23b1b4e12259d1c49a60f12cc0ba3ae55fc4f4c
+  data.tar.gz: 3a379abbdebf7fa103412865ebd0b702cd6b14ea3144720e12f6f6e4a1f48f95e79f8e1e6a5003878e074b41cd905530f1bf310e70dd95b6e30e40203b2b0986

data/.travis.yml

@@ -1,7 +1,5 @@
 language: ruby
-before_install: sudo pip install docutils
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.1
   - jruby-19mode
@@ -9,3 +7,15 @@ jdk:
   - oraclejdk8
 notifications:
   email: false
+git:
+  depth: 10
+before_install: sudo pip install docutils
+cache:
+  - bundler
+  - pip
+env:
+  global:
+    - "JRUBY_OPTS=-Xcext.enabled=true"
+matrix:
+ allow_failures:
+   - rvm: jruby-19mode

data/github-markup.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = %w[lib]
 
+  s.add_development_dependency 'activesupport', '~> 4.0'
   s.add_development_dependency 'minitest', '~> 5.4.3'
   s.add_development_dependency 'html-pipeline', '~> 1.0'
   s.add_development_dependency 'sanitize', '~> 2.1.0'

data/lib/github-markup.rb

@@ -1,6 +1,6 @@
 module GitHub
   module Markup
-    VERSION = '1.4.0'
+    VERSION = '1.4.1'
     Version = VERSION
   end
 end

data/lib/github/commands/rest2html

@@ -45,31 +45,45 @@ except:
 import codecs
 
 from docutils import nodes
-from docutils.parsers.rst import roles
+from docutils.parsers.rst import directives, roles
+from docutils.parsers.rst.directives.body import CodeBlock
 from docutils.core import publish_parts
 from docutils.writers.html4css1 import Writer, HTMLTranslator
 
 SETTINGS = {
     'cloak_email_addresses': False,
     'file_insertion_enabled': False,
-    'raw_enabled': False,
+    'raw_enabled': True,
     'strip_comments': True,
     'doctitle_xform': True,
     'sectsubtitle_xform': True,
     'initial_header_level': 2,
     'report_level': 5,
-    'syntax_highlight' : 'none',
-    'math_output' : 'latex',
+    'syntax_highlight': 'none',
+    'math_output': 'latex',
     'field_name_limit': 50,
 }
 
+
+class DoctestDirective(CodeBlock):
+    """Render Sphinx 'doctest:: [group]' blocks as 'code:: python'
+    """
+
+    def run(self):
+        """Discard any doctest group argument, render contents as python code
+        """
+        self.arguments = ['python']
+        return super(DoctestDirective, self).run()
+
+
 class GitHubHTMLTranslator(HTMLTranslator):
+
     # removes the <div class="document"> tag wrapped around docs
     # see also: http://bit.ly/1exfq2h (warning! sourceforge link.)
     def depart_document(self, node):
         HTMLTranslator.depart_document(self, node)
-        self.html_body.pop(0) # pop the starting <div> off
-        self.html_body.pop() # pop the ending </div> off
+        self.html_body.pop(0)  # pop the starting <div> off
+        self.html_body.pop()   # pop the ending </div> off
 
     # technique for visiting sections, without generating additional divs
     # see also: http://bit.ly/NHtyRx
@@ -102,36 +116,38 @@ class GitHubHTMLTranslator(HTMLTranslator):
     def visit_table(self, node):
         classes = ' '.join(['docutils', self.settings.table_style]).strip()
         self.body.append(
-                self.starttag(node, 'table', CLASS=classes))
+            self.starttag(node, 'table', CLASS=classes))
 
     def depart_table(self, node):
         self.body.append('</table>\n')
 
     def depart_image(self, node):
-      uri = node['uri']
-      ext = os.path.splitext(uri)[1].lower()
-      # we need to swap RST's use of `object` with `img` tags
-      # see http://git.io/5me3dA
-      if ext == ".svg":
-        # preserve essential attributes
-        atts = {}
-        for attribute, value in  node.attributes.items():
-          # we have no time for empty values
-          if value:
-            if attribute == "uri":
-              atts['src'] = value
-            else:
-              atts[attribute] = value
-
-        # toss off `object` tag
-        self.body.pop()
+        uri = node['uri']
+        ext = os.path.splitext(uri)[1].lower()
+        # we need to swap RST's use of `object` with `img` tags
+        # see http://git.io/5me3dA
+        if ext == ".svg":
+            # preserve essential attributes
+            atts = {}
+            for attribute, value in node.attributes.items():
+                # we have no time for empty values
+                if value:
+                    if attribute == "uri":
+                        atts['src'] = value
+                    else:
+                        atts[attribute] = value
+
+            # toss off `object` tag
+            self.body.pop()
         # add on `img` with attributes
-        self.body.append(self.starttag(node, 'img', **atts))
-      self.body.append(self.context.pop())
+            self.body.append(self.starttag(node, 'img', **atts))
+        self.body.append(self.context.pop())
+
 
 def kbd(name, rawtext, text, lineno, inliner, options=None, content=None):
 
-  return [nodes.raw('', '<kbd>%s</kbd>' % text, format='html')], []
+    return [nodes.raw('', '<kbd>%s</kbd>' % text, format='html')], []
+
 
 def main():
     """
@@ -143,9 +159,9 @@ def main():
     """
     try:
         text = codecs.open(sys.argv[1], 'r', 'utf-8').read()
-    except IOError: # given filename could not be found
+    except IOError:  # given filename could not be found
         return ''
-    except IndexError: # no filename given
+    except IndexError:  # no filename given
         text = sys.stdin.read()
 
     writer = Writer()
@@ -153,6 +169,9 @@ def main():
 
     roles.register_canonical_role('kbd', kbd)
 
+    # Render source code in Sphinx doctest blocks
+    directives.register_directive('doctest', DoctestDirective)
+
     parts = publish_parts(text, writer=writer, settings_overrides=SETTINGS)
     if 'html_body' in parts:
         html = parts['html_body']

data/lib/github/markup/markdown.rb

@@ -4,6 +4,9 @@ module GitHub
   module Markup
     class Markdown < Implementation
       MARKDOWN_GEMS = {
+        "commonmarker" => proc { |content|
+          CommonMarker.render_html(content, :default, %i[tagfilter autolink table strikethrough])
+        },
         "github/markdown" => proc { |content|
           GitHub::Markdown.render(content)
         },

data/lib/github/markups.rb

@@ -22,7 +22,9 @@ markup(:creole, /creole/) do |content|
 end
 
 markup(:wikicloth, /mediawiki|wiki/) do |content|
-  WikiCloth::WikiCloth.new(:data => content).to_html(:noedit => true)
+  wikicloth = WikiCloth::WikiCloth.new(:data => content)
+  WikiCloth::WikiBuffer::HTMLElement::ESCAPED_TAGS << 'tt'
+  wikicloth.to_html(:noedit => true)
 end
 
 markup(:asciidoctor, /adoc|asc(iidoc)?/) do |content|

data/test/markups/README.mediawiki

@@ -6,6 +6,9 @@ __TOC__
 
 = Red Bridge (JRuby Embed) =
 
+<tt>one-<two</tt>
+<pre>a-b</pre>
+
 JRuby has long had a private embedding API, which was closely tied to the runtime's internals and therefore changed frequently as JRuby evolved. Since version 1.4, however, we have also provided a more stable public API, known as Red Bridge or JRuby Embed. Existing Java programs written to the [[DirectJRubyEmbedding|legacy API]] should still work, but we strongly recommend Red Bridge for all new projects.
 
 == Features of Red Bridge ==

data/test/markups/README.mediawiki.html

@@ -18,6 +18,9 @@ Using Java from Ruby is JRuby's best-known feature---but you can also go in the
 <a name="Red_Bridge_JRuby_Embed"></a>Red Bridge (JRuby Embed)</h1>
 
 
+<p><tt>one-&lt;two</tt>
+</p><pre>a-b</pre>
+
 
 <p>JRuby has long had a private embedding API, which was closely tied to the runtime's internals and therefore changed frequently as JRuby evolved. Since version 1.4, however, we have also provided a more stable public API, known as Red Bridge or JRuby Embed. Existing Java programs written to the <a href="DirectJRubyEmbedding">legacy API</a> should still work, but we strongly recommend Red Bridge for all new projects.
 </p>

data/test/markups/README.rst

@@ -31,6 +31,19 @@ The UTF-8 quote character in this table used to cause python to go boom. Now doc
 	Tabular Data, 5
 	Made up ratings, 11
 
+.. code::
+
+	A block of code
+
+.. code:: python
+
+	python.code('hooray')
+
+.. doctest:: ignored
+
+	>>> some_function()
+	'result'
+
 ==============  ==========================================================
 Travis          http://travis-ci.org/tony/pullv
 Docs            http://pullv.rtfd.org
@@ -59,3 +72,8 @@ Field list
 someone@somewhere.org
 
 Press :kbd:`Ctrl+C` to quit
+
+
+.. raw:: html
+
+    <p><strong>RAW HTML!</strong></p><style> p {color:blue;} </style>

data/test/markups/README.rst.html

@@ -16,6 +16,16 @@
 <li>Somé UTF-8°</li>
 </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
+</pre>
+<pre lang="python">
+python.code('hooray')
+</pre>
+<pre lang="python">
+&gt;&gt;&gt; some_function()
+'result'
+</pre>
 <table>
 
 
@@ -77,3 +87,5 @@ but no problem!</td>
 <p><a href="mailto:someone@somewhere.org">someone@somewhere.org</a></p>
 
 <p>Press <kbd>Ctrl+C</kbd> to quit</p>
+
+<p><strong>RAW HTML!</strong></p> p {color:blue;}

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: github-markup
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Chris Wanstrath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The code GitHub uses to render README.markup