github-markup 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a84a52be34f80606a5f1242e796a1b46c385fb87
-  data.tar.gz: d36d6d7c3e3148bbdc0cb5bceea4fef4a953fe74
+  metadata.gz: 015436ffdbdabf0b573f786f948960ccae1e547c
+  data.tar.gz: e508fb427eb6e7ce276ab54478ff5a1f81bded7b
 SHA512:
-  metadata.gz: b555eb0a0b7b5483894380a3c25c22747e0e1cc582f3e7161b9f7eca0070047aaae84d91c328a9751e0bf27696a9c9abca0e4fb1d8c102cd2e9838c516cf3885
-  data.tar.gz: cc7e932e048021775673258daac64a8406f0d48fdb3951b9ab35578c51f6eb07c14ed367303f2a0c119b21e8114ab8872e15b301d75f330a8b02ecfab2a622b3
+  metadata.gz: 67f22bcd3f185424ba4ad390b60c972a0167afc1e3bc22d5b0bd2978dd3e9825d5ed1711e9d31cb94dcac64003e9d11aa536a45282416ae6f0e6bde121230d79
+  data.tar.gz: 875c40738eef72db08c8307800e10cbb49fadcfee28cd90bd084736e761a8e3b182c4fdf501d69ec93050693e844a7a20a059a30ded40bedddc558831a1b7322

data/.travis.yml

@@ -1,8 +1,11 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.1
-  - jruby-19mode
+  - 2.1.10
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
+  - jruby-9.1.9.0
 jdk:
   - oraclejdk8
 notifications:
@@ -25,4 +28,4 @@ env:
     - "JRUBY_OPTS=-Xcext.enabled=true"
 matrix:
  allow_failures:
-   - rvm: jruby-19mode
+   - rvm: jruby-9.1.9.0

data/Gemfile

@@ -10,5 +10,5 @@ gem "rdoc", "~>3.6"
 gem "org-ruby", "= 0.9.9"
 gem "creole", "~>0.3.6"
 gem "wikicloth", "=0.8.3"
-gem "asciidoctor", "= 1.5.5"
+gem "asciidoctor", "= 1.5.6.1"
 gem "rake"

data/HISTORY.md

@@ -1,3 +1,12 @@
+## 1.6.1 - 2017-07-25
+
+### Changed
+
+* Added support for highlight directive in rST [#925](https://github.com/github/markup/pull/925)
+* Fixes to documentation and code style [#1009](https://github.com/github/markup/pull/1009) [#1071](https://github.com/github/markup/pull/1071) [#1087](https://github.com/github/markup/pull/1087)
+* Test against newer Ruby versions [#1086](https://github.com/github/markup/pull/1086)
+* Upgrade to Asciidoctor 1.5.6.1 [#1088](https://github.com/github/markup/pull/1088)
+
 ## 1.6.0 - 2017-04-03
 
 ### Changed

data/README.md

@@ -25,7 +25,7 @@ you wish to run the library. You can also run `script/bootstrap` to fetch them a
 * [.org](http://orgmode.org/) -- `gem install org-ruby`
 * [.creole](http://wikicreole.org/) -- `gem install creole`
 * [.mediawiki, .wiki](http://www.mediawiki.org/wiki/Help:Formatting) -- `gem install wikicloth`
-* [.rst](http://docutils.sourceforge.net/rst.html) -- `python3 -m pip install sphinx`
+* [.rst](http://docutils.sourceforge.net/rst.html) -- `pip install docutils`
 * [.asciidoc, .adoc, .asc](http://asciidoc.org/) -- `gem install asciidoctor` (http://asciidoctor.org)
 * [.pod](http://search.cpan.org/dist/perl/pod/perlpod.pod) -- `Pod::Simple::XHTML`
   comes with Perl >= 5.10. Lower versions should install Pod::Simple from CPAN.
@@ -46,7 +46,7 @@ Basic form:
 ```ruby
 require 'github/markup'
 
-GitHub::Markup.render('README.markdown', '* One\n* Two')
+GitHub::Markup.render('README.markdown', "* One\n* Two")
 ```
 
 More realistic form:
@@ -62,7 +62,7 @@ And a convenience form:
 ```ruby
 require 'github/markup'
 
-GitHub::Markup.render_s(GitHub::Markups::MARKUP_MARKDOWN, '* One\n* Two')
+GitHub::Markup.render_s(GitHub::Markups::MARKUP_MARKDOWN, "* One\n* Two")
 ```
 
 

data/lib/github-markup.rb

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

data/lib/github/commands/rest2html

@@ -49,7 +49,7 @@ import io
 
 from docutils import nodes
 from docutils.parsers.rst import directives, roles
-from docutils.parsers.rst.directives.body import CodeBlock
+from docutils.parsers.rst.directives.body import CodeBlock, Directive
 from docutils.core import publish_parts
 from docutils.writers.html4css1 import Writer, HTMLTranslator
 from docutils.parsers.rst.states import Body
@@ -133,6 +133,18 @@ SETTINGS = {
     'field_name_limit': 50,
 }
 
+default_highlight_language = None
+
+class HighlightDirective(Directive):
+    required_arguments = 1
+    optional_arguments = 1
+    option_spec = {}
+    def run(self):
+        """Track the default syntax highlighting language
+        """
+        global default_highlight_language
+        default_highlight_language = self.arguments[0]
+        return []
 
 class DoctestDirective(CodeBlock):
     """Render Sphinx 'doctest:: [group]' blocks as 'code:: python'
@@ -171,6 +183,8 @@ class GitHubHTMLTranslator(HTMLTranslator):
             language = classes[1]
             del classes[:]
             self.body.append(self.starttag(node, 'pre', lang=language))
+        elif default_highlight_language is not None:
+            self.body.append(self.starttag(node, 'pre', lang=default_highlight_language))
         else:
             self.body.append(self.starttag(node, 'pre'))
 
@@ -248,6 +262,9 @@ def main():
     # Render source code in Sphinx doctest blocks
     directives.register_directive('doctest', DoctestDirective)
 
+    # Set default highlight language
+    directives.register_directive('highlight', HighlightDirective)
+
     parts = publish_parts(text, writer=writer, settings_overrides=SETTINGS)
     if 'html_body' in parts:
         html = parts['html_body']

data/test/markup_test.rb

@@ -9,11 +9,10 @@ require 'nokogiri'
 require 'nokogiri/diff'
 
 def normalize_html(text)
-  text.strip!
-  text.gsub!(/\s\s+/,' ')
-  text.gsub!(/\p{Pi}|\p{Pf}|"/u,'"')
-  text.gsub!("\u2026",'...')
-  text
+  text.strip
+      .gsub(/\s\s+/,' ')
+      .gsub(/\p{Pi}|\p{Pf}|"/u,'"')
+      .gsub("\u2026",'...')
 end
 
 def assert_html_equal(expected, actual, msg = nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-markup
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Chris Wanstrath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake