RbST 0.2.0 → 0.3.0

data/RbST.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "RbST"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Melody"]
-  s.date = "2012-11-01"
+  s.date = "2012-11-02"
   s.description = "A simple Ruby wrapper for processing reStructuredText via Python's Docutils"
   s.email = "hi@williammelody.com"
   s.extra_rdoc_files = [

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/rbst.rb

@@ -1,4 +1,4 @@
-require 'open3'
+# encoding: UTF-8
 
 class RbST
   
@@ -82,10 +82,10 @@ protected
   
   def execute(command)
     output = ''
-    Open3::popen3(command) do |stdin, stdout, stderr| 
-      stdin.puts @target 
-      stdin.close
-      output = stdout.read.strip 
+    IO.popen(command, "w+") do |f| 
+      f.puts @target 
+      f.close_write
+      output = f.read
     end
     output
   end
@@ -106,4 +106,4 @@ protected
       string + (flag.length == 1 ? " -#{flag} #{val}" : " --#{flag}=#{val}")
     end
   end
-end
+end

data/lib/rst2parts/rst2html.py

@@ -6,6 +6,7 @@ try:
 except:
     pass
 
+import sys
 from transform import transform
 from docutils.writers.html4css1 import Writer
 
@@ -13,4 +14,4 @@ def main():
     return transform(writer=Writer(), part='html_body')
 
 if __name__ == '__main__':
-    print(main())
+    sys.stdout.write(main())

data/lib/rst2parts/transform.py

@@ -36,5 +36,5 @@ def transform(writer=None, part=None):
     )
     
     if opts.part in parts:
-        return parts[opts.part]
+        return parts[opts.part].encode(parts["encoding"])
     return ''

data/test/files/test.html

@@ -332,4 +332,4 @@ with role</em>; <tt class="docutils literal">inline literal text</tt>; standalon
 </tbody>
 </table>
 </div>
-</div>
+</div>

data/test/files/test.latex

@@ -1,19 +1,24 @@
+\documentclass[a4paper]{article}
 % generated by Docutils <http://docutils.sourceforge.net/>
-\documentclass[a4paper,english]{article}
 \usepackage{fixltx2e} % LaTeX patches, \textsubscript
-\usepackage{cmap} % fix search and cut-and-paste in PDF
-\usepackage{babel}
+\usepackage{cmap} % fix search and cut-and-paste in Acrobat
+\usepackage{ifthen}
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
-\usepackage{ifthen}
 \usepackage{graphicx}
 \usepackage{multirow}
-\usepackage{longtable}
-\usepackage{array}
+\setcounter{secnumdepth}{0}
+\usepackage{longtable,ltcaption,array}
 \setlength{\extrarowheight}{2pt}
 \newlength{\DUtablewidth} % internal use in tables
 \usepackage{tabularx}
 
+%%% Custom LaTeX preamble
+% PDF Standard Fonts
+\usepackage{mathptmx} % Times
+\usepackage[scaled=.90]{helvet}
+\usepackage{courier}
+
 %%% User specified packages and stylesheets
 
 %%% Fallback definitions for Docutils-specific commands
@@ -82,28 +87,29 @@
 % hyperlinks:
 \ifthenelse{\isundefined{\hypersetup}}{
   \usepackage[colorlinks=true,linkcolor=blue,urlcolor=blue]{hyperref}
+  \urlstyle{same} % normal text font (alternatives: tt, rm, sf)
 }{}
 \hypersetup{
   pdftitle={The reStructuredText Cheat Sheet: Syntax Reminders},
   pdfauthor={David Goodger <goodger@python.org>}
 }
 
-%%% Body
-\begin{document}
-
-% Document title
-\title{The reStructuredText Cheat Sheet: Syntax Reminders%
-  \phantomsection%
+%%% Title Data
+\title{\phantomsection%
+  The \href{http://docutils.sf.net/rst.html}{reStructuredText} Cheat Sheet: Syntax Reminders%
   \label{the-restructuredtext-cheat-sheet-syntax-reminders}}
 \author{}
 \date{}
+
+%%% Body
+\begin{document}
 \maketitle
 
 % Docinfo
 \begin{center}
 \begin{tabularx}{\DUdocinfowidth}{lX}
 \textbf{Info}: &
-See <\href{http://docutils.sf.net/rst.html}{http://docutils.sf.net/rst.html}> for introductory docs.
+See <\url{http://docutils.sf.net/rst.html}> for introductory docs.
 \\
 \textbf{Author}: &
 	David Goodger <\href{mailto:goodger@python.org}{goodger@python.org}> \\
@@ -118,30 +124,21 @@ This is a ``docinfo block'', or bibliographic field list
 \end{center}
 
 
-%___________________________________________________________________________
-
-\section*{Section Structure%
-  \phantomsection%
-  \addcontentsline{toc}{section}{Section Structure}%
+\section{Section Structure%
   \label{section-structure}%
 }
 
 Section titles are underlined or overlined \& underlined.
 
 
-%___________________________________________________________________________
-
-\section*{Body Elements%
-  \phantomsection%
-  \addcontentsline{toc}{section}{Body Elements}%
+\section{Body Elements%
   \label{body-elements}%
 }
 
 Grid table:
 
-\leavevmode
 \setlength{\DUtablewidth}{\linewidth}
-\begin{longtable}[c]{|p{0.389\DUtablewidth}|p{0.424\DUtablewidth}|}
+\begin{longtable*}[c]{|p{0.389\DUtablewidth}|p{0.424\DUtablewidth}|}
 \hline
 
 Paragraphs are flush-left,
@@ -173,7 +170,7 @@ Doctest~block
 }
  &  \\
 \hline
-\multicolumn{2}{|l|}{
+\multicolumn{2}{|p{0.81\DUtablewidth}|}{
 \begin{DUlineblock}{0em}
 \item[] Line blocks preserve line breaks \& indents. {[}new in 0.3.6{]}
 \item[]
@@ -184,13 +181,12 @@ lines can be wrapped with continuation lines.
 \end{DUlineblock}
 } \\
 \hline
-\end{longtable}
+\end{longtable*}
 
 Simple tables:
 
-\leavevmode
 \setlength{\DUtablewidth}{\linewidth}
-\begin{longtable}[c]{|p{0.203\DUtablewidth}|p{0.714\DUtablewidth}|}
+\begin{longtable*}[c]{|p{0.203\DUtablewidth}|p{0.714\DUtablewidth}|}
 \hline
 \textbf{%
 List Type
@@ -266,11 +262,10 @@ Option list
 \end{DUoptionlist}
  \\
 \hline
-\end{longtable}
+\end{longtable*}
 
-\leavevmode
 \setlength{\DUtablewidth}{\linewidth}
-\begin{longtable}[c]{|p{0.203\DUtablewidth}|p{0.714\DUtablewidth}|}
+\begin{longtable*}[c]{|p{0.203\DUtablewidth}|p{0.714\DUtablewidth}|}
 \hline
 \textbf{%
 Explicit Markup
@@ -293,7 +288,7 @@ Examples (visible in the \href{cheatsheet.txt}{text source})
 
 Footnote
  & %
-\DUfootnotetext{id1}{id3}{1}{
+\DUfootnotetext{id1}{id3}{1}{%
 Manually numbered or {[}\#{]} auto-numbered
 (even {[}\#labelled{]}) or {[}*{]} auto-symbol
 }
@@ -337,38 +332,29 @@ Empty Comment
 used to separate indentation contexts)
  \\
 \hline
-\end{longtable}
-
+\end{longtable*}
 
-%___________________________________________________________________________
 
-\section*{Inline Markup%
-  \phantomsection%
-  \addcontentsline{toc}{section}{Inline Markup}%
+\section{Inline Markup%
   \label{inline-markup}%
 }
 
 \emph{emphasis}; \textbf{strong emphasis}; \DUroletitlereference{interpreted text}; \emph{interpreted text
 with role}; \texttt{inline literal text}; standalone hyperlink,
-\href{http://docutils.sourceforge.net}{http://docutils.sourceforge.net}; named reference, \href{http://docutils.sf.net/rst.html}{reStructuredText};
+\url{http://docutils.sourceforge.net}; named reference, \href{http://docutils.sf.net/rst.html}{reStructuredText};
 \href{http://docutils.sf.net/docs/ref/rst/restructuredtext.html}{anonymous reference}; footnote reference,\DUfootnotemark{id3}{id1}{1}; citation reference,
-[\hyperlink{cit2002}{CIT2002}]; like an inline directive; %
+\hyperlink{cit2002}{[CIT2002]}; like an inline directive; %
 \phantomsection\label{inline-internal-target}inline internal target.
 
 
-%___________________________________________________________________________
-
-\section*{Directive Quick Reference%
-  \phantomsection%
-  \addcontentsline{toc}{section}{Directive Quick Reference}%
+\section{Directive Quick Reference%
   \label{directive-quick-reference}%
 }
 
-See <\href{http://docutils.sf.net/docs/ref/rst/directives.html}{http://docutils.sf.net/docs/ref/rst/directives.html}> for full info.
+See <\url{http://docutils.sf.net/docs/ref/rst/directives.html}> for full info.
 
-\leavevmode
 \setlength{\DUtablewidth}{\linewidth}
-\begin{longtable}[c]{|p{0.203\DUtablewidth}|p{0.714\DUtablewidth}|}
+\begin{longtable*}[c]{|p{0.203\DUtablewidth}|p{0.714\DUtablewidth}|}
 \hline
 \textbf{%
 Directive Name
@@ -569,22 +555,17 @@ title
 Set the metadata document title {[}0.3.10{]}
  \\
 \hline
-\end{longtable}
-
+\end{longtable*}
 
-%___________________________________________________________________________
 
-\section*{Interpreted Text Role Quick Reference%
-  \phantomsection%
-  \addcontentsline{toc}{section}{Interpreted Text Role Quick Reference}%
+\section{Interpreted Text Role Quick Reference%
   \label{interpreted-text-role-quick-reference}%
 }
 
-See <\href{http://docutils.sf.net/docs/ref/rst/roles.html}{http://docutils.sf.net/docs/ref/rst/roles.html}> for full info.
+See <\url{http://docutils.sf.net/docs/ref/rst/roles.html}> for full info.
 
-\leavevmode
 \setlength{\DUtablewidth}{\linewidth}
-\begin{longtable}[c]{|p{0.203\DUtablewidth}|p{0.726\DUtablewidth}|}
+\begin{longtable*}[c]{|p{0.203\DUtablewidth}|p{0.726\DUtablewidth}|}
 \hline
 \textbf{%
 Role Name
@@ -658,6 +639,7 @@ title
 Title reference (book, etc.); standard default role
  \\
 \hline
-\end{longtable}
+\end{longtable*}
+
+\end{document}
 
-\end{document}

data/test/test_rbst.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'helper'
 require 'mocha'
 
@@ -58,23 +60,28 @@ class TestRbST < Test::Unit::TestCase
   
   should "recognize strip_comments option" do
     html_with_comment = RbST.convert(".. comment")
-    assert_equal html_with_comment, %Q{<div class="document">\n<!-- comment -->\n</div>}
+    assert_equal html_with_comment, %Q{<div class=\"document\">\n<!-- comment -->\n</div>\n}
     html_without_comment = RbST.convert(".. comment", 'strip-comments')
-    assert_equal html_without_comment, %Q{<div class="document">\n</div>}
+    assert_equal html_without_comment, %Q{<div class=\"document\">\n</div>\n}
   end
   
   should "recognize cloak_email_addresses option" do
     html_with_uncloaked_email = RbST.convert("steve@mac.com")
-    assert_equal %Q{<div class="document">\n<p><a class="reference external" href="mailto:steve&#64;mac.com">steve&#64;mac.com</a></p>\n</div>}, html_with_uncloaked_email
+    assert_equal %Q{<div class=\"document\">\n<p><a class=\"reference external\" href=\"mailto:steve&#64;mac.com\">steve&#64;mac.com</a></p>\n</div>\n}, html_with_uncloaked_email
     html_with_cloaked_email = RbST.convert("steve@mac.com", 'cloak-email-addresses')
-    assert_equal %Q{<div class="document">\n<p><a class="reference external" href="mailto:steve&#37;&#52;&#48;mac&#46;com">steve<span>&#64;</span>mac<span>&#46;</span>com</a></p>\n</div>}, html_with_cloaked_email
+    assert_equal %Q{<div class=\"document\">\n<p><a class=\"reference external\" href=\"mailto:steve&#37;&#52;&#48;mac&#46;com\">steve<span>&#64;</span>mac<span>&#46;</span>com</a></p>\n</div>\n}, html_with_cloaked_email
   end
   
   should "recognize part option" do
     html_body = RbST.convert("hello world", :part => :html_body)
-    assert_equal %Q{<div class="document">\n<p>hello world</p>\n</div>}, html_body
+    assert_equal %Q{<div class=\"document\">\n<p>hello world</p>\n</div>\n}, html_body
     fragment = RbST.convert("hello world", :part => :fragment)
-    assert_equal %Q{<p>hello world</p>}, fragment
+    assert_equal %Q{<p>hello world</p>\n}, fragment
+  end
+
+  should "convert unicode" do
+    output = RbST.convert("Hello ☃", :part => :fragment)
+    assert_equal %Q{<p>Hello ☃</p>\n}, output
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: RbST
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 679996262089713862
+      hash: 2317176860731085124
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: