github-markup 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c8a09a747ae3f717bd9e710c3725217419f7bd1
-  data.tar.gz: b741c9f19985f3bcc8384dbde99ee3c74bb0fbc6
+  metadata.gz: d50733f9f72d5467bde744ded041c4ad3d2f6950
+  data.tar.gz: 556de89a612afd8d059af5ac970591654823c010
 SHA512:
-  metadata.gz: 924b42c03f352f31e81e5abdd3d2905f420b4010417ac59186553b2aa6354e779c3c1c6cd105b86a3a8119fb2853c74e8f24a69dfad7c7461c325b5079699264
-  data.tar.gz: 94ec8a1a48a890b4fdd2472d433c1f3a7cf30d15bc2b158015e975776ef096dbacbd021555a6fa2bda8001bd2e3286a672ff391f40b302575bf28ee954f1e79f
+  metadata.gz: b6f5e35df49de5e64d1a0778010a31d4ad39551e6ba819d688b1e1ee503023a0e39007f1b1b267e5bbe17dcff56bbbcf207b8cd058e6c4f69fbeb25a9dc30aa5
+  data.tar.gz: f36aea63143307915e6eba38ff8346606ad967391a06aa68b844d12994ff8b3943a04ce2721bbef3c97e8d19436d3c2edefc6b34d23c055f982a56c81d792ee4

data/Gemfile

@@ -1,10 +1,10 @@
 source "http://rubygems.org"
+gemspec
 gem "redcarpet"
 gem "RedCloth"
 gem "rdoc", "~>3.6"
-gem "org-ruby", ">= 0.8.1"
+gem "org-ruby", "= 0.9.1.gh"
 gem "creole", "~>0.3.6"
 gem "wikicloth", "=0.6.0"
 gem "asciidoctor", "= 0.1.4"
 gem "rake"
-gem "posix-spawn"

data/HISTORY.md

@@ -1,3 +1,8 @@
+## 1.1.1 (2014-04-03)
+
+* Upgrade to org-ruby 0.9.1
+* Set default encoding to UTF-8 for Python 2
+
 ## 1.1.0 (2014-03-10)
 
 * Raise GitHub::Markup::CommandError if external command exits with a non-zero status.

data/github-markup.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   ## the sub! line in the Rakefile
   s.name              = 'github-markup'
   s.version           = GitHub::Markup::VERSION
-  s.date              = '2014-03-10'
+  s.date              = '2014-04-09'
   s.executables       = ['github-markup']
 
   ## Make sure your summary is short. The description may be as long
@@ -107,5 +107,6 @@ desc
   ## Test files will be grabbed from the file list. Make sure the path glob
   ## matches what you actually use.
   s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
-end
 
+  s.add_dependency 'posix-spawn', '~> 0.3.8'
+end

data/lib/github-markup.rb

@@ -1,6 +1,6 @@
 module GitHub
   module Markup
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
     Version = VERSION
   end
 end

data/lib/github/commands/rest2html

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2 -S
 """
 rest2html - A small wrapper file for parsing ReST files at GitHub.
 
@@ -27,13 +27,19 @@ __author__ = "Jannis Leidel"
 __license__ = "CC0"
 __version__ = "0.1"
 
+import sys
+
+# This fixes docutils failing with unicode parameters to CSV-Table. The -S
+# switch and the following 2 lines can be removed after upgrading to python 3.
+sys.setdefaultencoding('utf-8')
+import site
+
 try:
     import locale
     locale.setlocale(locale.LC_ALL, '')
 except:
     pass
 
-import sys
 import codecs
 
 from docutils.core import publish_parts
@@ -45,7 +51,7 @@ SETTINGS = {
     'raw_enabled': False,
     'strip_comments': True,
     'doctitle_xform': False,
-    'report_level': 5,
+    'report_level': 3,
     'syntax_highlight' : 'none',
     'math_output' : 'latex'
 }

data/lib/github/markups.rb

@@ -11,7 +11,10 @@ markup('github/markup/rdoc', /rdoc/) do |content|
 end
 
 markup('org-ruby', /org/) do |content|
-  Orgmode::Parser.new(content).to_html
+  Orgmode::Parser.new(content, { 
+                        :allow_include_files => false, 
+                        :skip_syntax_highlight => true
+                      }).to_html
 end
 
 markup(:creole, /creole/) do |content|
@@ -26,7 +29,7 @@ markup(:asciidoctor, /adoc|asc(iidoc)?/) do |content|
   Asciidoctor.render(content, :safe => :secure, :attributes => %w(showtitle idprefix idseparator=- env=github env-github source-highlighter=html-pipeline))
 end
 
-command('rest2html', /re?st(\.txt)?/)
+command("python2 -S #{File.dirname(__FILE__)}/commands/rest2html", /re?st(\.txt)?/)
 
 # pod2html is nice enough to generate a full-on HTML document for us,
 # so we return the favor by ripping out the good parts.

data/test/markups/README.org

@@ -11,8 +11,8 @@
 #+STARTUP:    showall
 
  | Status:   | Under Development                 |
- | Location: | [[http://github.com/bdewey/org-ruby]] |
- | Version:  | 0.5.1                             |
+ | Location: | [[http://github.com/wallyqs/org-ruby]] |
+ | Version:  | 0.9.0                             |
 
 * Description
 
@@ -22,9 +22,25 @@
   conversion. The supplied textile conversion is optimized for
   extracting "content" from the orgfile as opposed to "metadata."
 
-
 * History
 
+** 2014-02-08: Version 0.9.0
+
+   - Let's make sure =#+INCLUDE:= is not supported
+
+#+INCLUDE: "./README.txt" src text
+
+   - And confirm that syntax highlight is supported
+
+#+begin_src ruby
+module GitHub
+  module Markup
+    VERSION = 'test'
+    Version = VERSION
+  end
+end
+#+end_src
+
 ** 2009-12-30: Version 0.5.1
 
    - Minor enhancement: Recognize lines starting with ":" as examples.

data/test/markups/README.org.html

@@ -1,8 +1,8 @@
 <p class="title">org-ruby</p>
 <table>
   <tr><td>Status:</td><td>Under Development</td></tr>
-  <tr><td>Location:</td><td><a href="http://github.com/bdewey/org-ruby">http://github.com/bdewey/org-ruby</a></td></tr>
-  <tr><td>Version:</td><td>0.5.1</td></tr>
+  <tr><td>Location:</td><td><a href="http://github.com/wallyqs/org-ruby">http://github.com/wallyqs/org-ruby</a></td></tr>
+  <tr><td>Version:</td><td>0.9.0</td></tr>
 </table>
 <h1><span class="heading-number heading-number-1">1</span> Description</h1>
 <p>Helpful Ruby routines for parsing orgmode files. The most
@@ -11,13 +11,28 @@
   conversion. The supplied textile conversion is optimized for
   extracting &#8220;content&#8221; from the orgfile as opposed to &#8220;metadata.&#8221;</p>
 <h1><span class="heading-number heading-number-1">2</span> History</h1>
-<h2><span class="heading-number heading-number-2">2.1</span> 2009-12-30: Version 0.5.1</h2>
+<h2><span class="heading-number heading-number-2">2.1</span> 2014-02-08: Version 0.9.0</h2>
+<ul>
+  <li>Let&#8217;s make sure <code>#+INCLUDE:</code> is not supported</li>
+</ul>
+<ul>
+  <li>And confirm that syntax highlight is supported</li>
+</ul>
+<pre class="src" lang="ruby">
+module GitHub
+  module Markup
+    VERSION = &#39;test&#39;
+    Version = VERSION
+  end
+end
+</pre>
+<h2><span class="heading-number heading-number-2">2.2</span> 2009-12-30: Version 0.5.1</h2>
 <ul>
   <li>Minor enhancement: Recognize lines starting with &#8220;:&#8221; as examples.</li>
   <li>Minor enhancement: Recognize #+BEGIN_SRC as source blocks</li>
   <li>Minor enhancement: Add &#8220;src&#8221; and &#8220;example&#8221; classes to &lt;pre&gt; blocks.</li>
 </ul>
-<h2><span class="heading-number heading-number-2">2.2</span> 2009-12-30: Version 0.5.0</h2>
+<h2><span class="heading-number heading-number-2">2.3</span> 2009-12-30: Version 0.5.0</h2>
 <ul>
   <li>Parse (but not necessarily <b>use</b>) in-buffer settings. The following
     in-buffer settings <b>are</b> used:
@@ -41,7 +56,7 @@
     </ul>
   </li>
 </ul>
-<h2><span class="heading-number heading-number-2">2.3</span> 2009-12-29: Version 0.4.2</h2>
+<h2><span class="heading-number heading-number-2">2.4</span> 2009-12-29: Version 0.4.2</h2>
 <ul>
   <li>Got rid of the extraneous newline at the start of code blocks.</li>
   <li>Everything now shows up in code blocks, even org-mode metadata.</li>
@@ -52,12 +67,12 @@
     </ul>
   </li>
 </ul>
-<h2><span class="heading-number heading-number-2">2.4</span> 2009-12-29: Version 0.4.1</h2>
+<h2><span class="heading-number heading-number-2">2.5</span> 2009-12-29: Version 0.4.1</h2>
 <ul>
   <li>HTML is now escaped by default</li>
   <li>org-mode comments will show up in a code block.</li>
 </ul>
-<h2><span class="heading-number heading-number-2">2.5</span> 2009-12-29: Version 0.4</h2>
+<h2><span class="heading-number heading-number-2">2.6</span> 2009-12-29: Version 0.4</h2>
 <ul>
   <li>The first thing output in HTML gets the class &#8220;title&#8221;</li>
   <li>HTML output is now indented</li>
@@ -70,7 +85,7 @@
     </ul>
   </li>
 </ul>
-<h2><span class="heading-number heading-number-2">2.6</span> 2009-12-27: Version 0.3</h2>
+<h2><span class="heading-number heading-number-2">2.7</span> 2009-12-27: Version 0.3</h2>
 <ul>
   <li>Uses rubypants to get better typography (smart quotes, elipses, etc&#8230;).</li>
   <li>Fixed bugs:
@@ -81,14 +96,14 @@
     </ul>
   </li>
 </ul>
-<h2><span class="heading-number heading-number-2">2.7</span> 2009-12-26: Version 0.2</h2>
+<h2><span class="heading-number heading-number-2">2.8</span> 2009-12-26: Version 0.2</h2>
 <ul>
   <li>Added <code>to_html</code> output on the parser.</li>
   <li>Added support for the full range of inline markup: <b>bold</b>,
     <i>italic</i>, <code>code</code>, <code>verbatim</code>, <span style="text-decoration:underline;">underline</span>, <del>strikethrough</del>.</li>
   <li>Lots of refactoring to make the code more maintainable.</li>
 </ul>
-<h2><span class="heading-number heading-number-2">2.8</span> 2009-12-23: Version 0.1</h2>
+<h2><span class="heading-number heading-number-2">2.9</span> 2009-12-23: Version 0.1</h2>
 <ul>
   <li>Added support for block code, like this:
     <pre class="example">

data/test/markups/README.rst

@@ -12,6 +12,20 @@ Header 2
 
 3. Somé UTF-8°
 
+The UTF-8 quote character in this table used to cause python to go boom. Now docutils just displays an error inline so the user can fix it. Upgrading to Python 3 will fix this.
+
+.. csv-table:: Things that are Awesome (on a scale of 1-11)
+	:quote: ”
+
+	Thing,Awesomeness
+	Icecream, 7
+	Honey Badgers, 10.5
+	Nickelback, -2
+	Iron Man, 10
+	Iron Man 2, 3
+	Tabular Data, 5
+	Made up ratings, 11
+
 ==============  ==========================================================
 Travis          http://travis-ci.org/tony/pullv
 Docs            http://pullv.rtfd.org

data/test/markups/README.rst.html

@@ -6,6 +6,26 @@
 <li>More <tt class="docutils literal">code</tt>, hooray</li>
 <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 displays an error inline so the user can fix it. Upgrading to Python 3 will fix this.</p>
+<div class="system-message">
+<p class="system-message-title">System Message: ERROR/3 (<tt class="docutils">&lt;string&gt;</tt>, line 17)</p>
+<p>Error with CSV data in &quot;csv-table&quot; directive:
+&quot;quotechar&quot; must be an 1-character string</p>
+<pre>
+.. csv-table:: Things that are Awesome (on a scale of 1-11)
+        :quote: ”
+
+        Thing,Awesomeness
+        Icecream, 7
+        Honey Badgers, 10.5
+        Nickelback, -2
+        Iron Man, 10
+        Iron Man 2, 3
+        Tabular Data, 5
+        Made up ratings, 11
+
+</pre>
+</div>
 <table class="docutils">
 <colgroup>
 <col width="19%" />
@@ -28,4 +48,4 @@
 <td><a class="reference external" href="https://github.com/tony/pullv">https://github.com/tony/pullv</a></td>
 </tr>
 </tbody>
-</table>
+</table>

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: github-markup
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Chris Wanstrath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
-dependencies: []
+date: 2014-04-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: posix-spawn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.8
 description: |2
     This gem is used by GitHub to render any fancy markup such as
     Markdown, Textile, Org-Mode, etc. Fork it and add your own!