pandoc-ruby 0.6.1 → 0.7.0

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.8)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
     git (1.2.5)
     i18n (0.6.1)
@@ -11,19 +11,19 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.5)
+    json (1.8.0)
     metaclass (0.0.1)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    multi_json (1.7.3)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
-    shoulda (3.3.0)
-      shoulda-context (~> 1.0)
-      shoulda-matchers (~> 1.4)
-    shoulda-context (1.0.0)
-    shoulda-matchers (1.4.0)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.1.2)
+    shoulda-matchers (2.1.0)
       activesupport (>= 3.0.0)
 
 PLATFORMS

data/README.markdown

@@ -2,7 +2,7 @@
 
 Wrapper for [Pandoc](http://johnmacfarlane.net/pandoc/), a Haskell library with command line tools for converting one markup format to another.
 
-Pandoc can read markdown and (subsets of) reStructuredText, HTML, and LaTeX, and it can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, PDF, RTF, DocBook XML, OpenDocument XML, ODT, GNU Texinfo, MediaWiki markup, groff man pages, and S5 HTML slide shows
+Pandoc can convert documents in markdown, reStructuredText, textile, HTML, DocBook, LaTeX, or MediaWiki markup to a variety of formats, including markdown, reStructuredText, HTML, LaTeX, ConTeXt, PDF, RTF, DocBook XML, OpenDocument XML, ODT, GNU Texinfo, MediaWiki markup, groff man pages, HTML slide shows, EPUB, and Microsoft Word docx.
 
 ## Installation
 
@@ -76,7 +76,6 @@ If you are trying to generate a standalone file with full file headers rather th
 ## Caveats
 
 * This has only been tested on \*nix systems.
-* ODT is not currently supported because it is a binary format.
 * PDF conversion may require additional dependencies and has not been tested.
 
 ## Note on Patches/Pull Requests

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0

data/lib/pandoc-ruby.rb

@@ -1,4 +1,5 @@
 require 'open3'
+require 'tempfile'
 
 class PandocRuby
   @@bin_path = nil
@@ -43,10 +44,14 @@ class PandocRuby
     'textile'       => 'textile',
     'rtf'           => 'rich text format',
     'org'           => 'emacs org mode',
-    'asciidoc'      => 'asciidoc',
-    'odt'           => 'odt',
-    'docx'          => 'docx',
-    'epub'          => 'epub'
+    'asciidoc'      => 'asciidoc'
+  }
+
+  BINARY_WRITERS = {
+    'odt'   => 'OpenDocument',
+    'docx'  => 'Word docx',
+    'epub'  => 'EPUB V2',
+    'epub3' => 'EPUB V3'
   }
   
   def self.bin_path=(path)
@@ -72,9 +77,24 @@ class PandocRuby
     @options = args
   end
 
+  def convert_binary(executable, *args)
+    tmp_file = Tempfile.new('pandoc-conversion')
+    begin
+      args += [{:output => tmp_file.path}]
+      execute executable + convert_options(args)
+      return IO.binread(tmp_file)
+    ensure
+      tmp_file.unlink
+    end
+  end
+
   def convert(*args)
     executable = @@bin_path ? File.join(@@bin_path, @executable) : @executable
-    execute executable + convert_options(args)
+    if will_output_binary?(args)
+      convert_binary(executable, *args)
+    else
+      execute executable + convert_options(args)
+    end
   end
   alias_method :to_s, :convert
   
@@ -87,7 +107,7 @@ class PandocRuby
     end
   end
   
-  WRITERS.each_key do |w|
+  WRITERS.merge(BINARY_WRITERS).each_key do |w|
     define_method(:"to_#{w}") do |*args|
       args += [{:to => w.to_sym}]
       convert(*args)
@@ -122,4 +142,18 @@ private
       string + (flag.length == 1 ? " -#{flag} #{val}" : " --#{flag}=#{val}")
     end
   end
+
+  def will_output_binary?(opts = [])
+    (@options+opts).flatten.each do |opt|
+      if opt.respond_to?(:each_pair)
+        opt.each_pair do |opt_key, opt_value|
+          if opt_key == :to && BINARY_WRITERS.keys.include?(opt_value.to_s)
+            return true
+          end 
+        end
+      end
+    end
+    false
+  end
+
 end

data/pandoc-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "pandoc-ruby"
-  s.version = "0.6.1"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Melody"]
-  s.date = "2013-04-07"
+  s.date = "2013-05-19"
   s.description = "Ruby wrapper for Pandoc"
   s.email = "hi@williammelody.com"
   s.extra_rdoc_files = [

data/test/test_pandoc-ruby.rb

@@ -109,6 +109,17 @@ class TestPandocRuby < Test::Unit::TestCase
     end
   end
   
+  PandocRuby::BINARY_WRITERS.each_key do |w|
+    should "convert to #{w} with to_#{w}" do
+      converter = PandocRuby.new(@file)
+      converter \
+        .expects(:execute) \
+        .with(regexp_matches(/^pandoc --no-wrap --to=#{w} --output=/)) \
+        .returns(true)
+      assert converter.send("to_#{w}", :no_wrap)
+    end
+  end
+  
   should "work with strings" do
     converter = PandocRuby.new('## this is a title')
     assert_match %r(h2), converter.convert
@@ -148,7 +159,6 @@ class TestPandocRuby < Test::Unit::TestCase
       "mediawiki"     =>  "MediaWiki markup",
       "html"          =>  "HTML",
       "plain"         =>  "plain",
-      "docx"          =>  "docx",
       "latex"         =>  "LaTeX",
       "s5"            =>  "S5 HTML slideshow",
       "textile"       =>  "textile",
@@ -156,7 +166,6 @@ class TestPandocRuby < Test::Unit::TestCase
       "docbook"       =>  "DocBook XML",
       "html5"         =>  "HTML5",
       "native"        =>  "pandoc native",
-      "epub"          =>  "epub",
       "org"           =>  "emacs org mode",
       "rtf"           =>  "rich text format",
       "markdown"      =>  "markdown",
@@ -168,9 +177,15 @@ class TestPandocRuby < Test::Unit::TestCase
       "slidy"         =>  "Slidy HTML slideshow",
       "rst"           =>  "reStructuredText",
       "context"       =>  "ConTeXt",
-      "odt"           =>  "odt",
       "asciidoc"      =>  "asciidoc"
     }
 
+    assert_equal PandocRuby::BINARY_WRITERS, {
+      "odt"   => "OpenDocument",
+      "docx"  => "Word docx",
+      "epub"  => "EPUB V2",
+      "epub3" => "EPUB V3"
+    }
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pandoc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -186577687651871911
+      hash: 1655115057340333945
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: