pandoc-ruby 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 02f0af2a61483032f01e2d07de58a08bb63625a9
-  data.tar.gz: 84fcc719beb7c3ec49ec3d5b6411ab8e74a2ff84
+SHA256:
+  metadata.gz: cbbaf2248f0a6fa408258b8d8a49c19f78e2688a81ee5000f8c23f4d0eb1bebc
+  data.tar.gz: b819cb5b8406a798a6dcc6a7c472e34ff286e4882edbb076d72482a6202ceba6
 SHA512:
-  metadata.gz: a9c155e6003414f32e8eeaf1922b4aec59afb301e7b5055619a539ab8e7a7588928acb0cc2a4a8bd8a9ca66a88c41c2ffed3854ba77cfa3da0db3a1872c943aa
-  data.tar.gz: c605f036e0f8dd80fad8b6a58468e6f8b17535d12b0fa4518c5d7724909cebec3dd432ed929f42c588631a706572e71384bed40e6a95c0b8e3430f11818e2a0a
+  metadata.gz: f96d584f2c2998282a714cbdb86acdd87243505edafc85b4d8efe2fda1d5645f7e0a4f49d104e07bec12f7dce5e55fe91ad251210d3af1146f9c2aaf62c6eebc
+  data.tar.gz: cfd58d1cd5fd113a9a700b4dae8b87399d9d2affe9c9727832ca6e12584d5e1b1fd279545bf94a065b35fd61b529a9dbdbeee79070f60b40bdcd0b83f96dc39e

data/Gemfile

@@ -6,8 +6,8 @@ source 'http://rubygems.org'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development, :test do
-  gem 'minitest', '~>5.8.3'
-  gem 'mocha', '~>1.1.0'
+  gem 'minitest'
+  gem 'mocha'
   gem 'rake'
   gem 'rdoc'
 end

data/Gemfile.lock

@@ -1,21 +1,19 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    metaclass (0.0.4)
-    minitest (5.8.5)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    rake (12.1.0)
-    rdoc (5.1.0)
+    minitest (5.14.0)
+    mocha (1.11.2)
+    rake (13.0.1)
+    rdoc (6.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  minitest (~> 5.8.3)
-  mocha (~> 1.1.0)
+  minitest
+  mocha
   rake
   rdoc
 
 BUNDLED WITH
-   1.14.3
+   2.1.4

data/README.md

@@ -11,7 +11,7 @@ OpenDocument XML, ODT, GNU Texinfo, MediaWiki markup, groff man pages,
 HTML slide shows, EPUB, and Microsoft Word docx.
 
 *This documentation is for version 2 and higher. For version 1 documentation
-[see here](https://github.com/alphabetum/pandoc-ruby/blob/v1.0.0/README.markdown).*
+[see here](https://github.com/xwmx/pandoc-ruby/blob/v1.0.0/README.markdown).*
 
 ## Installation
 
@@ -105,7 +105,7 @@ or run `man pandoc`
 If you'd prefer a pure-Ruby extended markdown interpreter that can output a
 few different formats, take a look at [Maruku](http://maruku.rubyforge.org/).
 If you want to use the full reStructuredText syntax from within Ruby, check
-out [RbST](https://github.com/alphabetum/rbst), a docutils wrapper.
+out [RbST](https://github.com/xwmx/rbst), a docutils wrapper.
 
 This gem was inspired by [Albino](http://github.com/github/albino). For a
 slightly different approach to using Pandoc with Ruby, see

data/Rakefile

@@ -1,12 +1,10 @@
-# encoding: utf-8
-
 require 'rubygems'
 require 'bundler'
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts 'Run `bundle install` to install missing gems'
+  warn e.message
+  warn 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 require 'rake'

data/lib/pandoc-ruby.rb

@@ -3,7 +3,6 @@ require 'tempfile'
 require 'timeout'
 
 class PandocRuby
-
   @@pandoc_path = 'pandoc'
 
   # The available readers and their corresponding names. The keys are used to
@@ -21,28 +20,28 @@ class PandocRuby
   # The available string writers and their corresponding names. The keys are
   # used to generate methods and specify options to Pandoc.
   STRING_WRITERS = {
-    'native'        => 'pandoc native',
-    'json'          => 'pandoc JSON',
-    'html'          => 'HTML',
-    'html5'         => 'HTML5',
-    's5'            => 'S5 HTML slideshow',
-    'slidy'         => 'Slidy HTML slideshow',
-    'dzslides'      => 'Dzslides HTML slideshow',
-    'docbook'       => 'DocBook XML',
-    'opendocument'  => 'OpenDocument XML',
-    'latex'         => 'LaTeX',
-    'beamer'        => 'Beamer PDF slideshow',
-    'context'       => 'ConTeXt',
-    'texinfo'       => 'GNU Texinfo',
-    'man'           => 'groff man',
-    'markdown'      => 'markdown',
-    'plain'         => 'plain',
-    'rst'           => 'reStructuredText',
-    'mediawiki'     => 'MediaWiki markup',
-    'textile'       => 'textile',
-    'rtf'           => 'rich text format',
-    'org'           => 'emacs org mode',
-    'asciidoc'      => 'asciidoc'
+    'native'       => 'pandoc native',
+    'json'         => 'pandoc JSON',
+    'html'         => 'HTML',
+    'html5'        => 'HTML5',
+    's5'           => 'S5 HTML slideshow',
+    'slidy'        => 'Slidy HTML slideshow',
+    'dzslides'     => 'Dzslides HTML slideshow',
+    'docbook'      => 'DocBook XML',
+    'opendocument' => 'OpenDocument XML',
+    'latex'        => 'LaTeX',
+    'beamer'       => 'Beamer PDF slideshow',
+    'context'      => 'ConTeXt',
+    'texinfo'      => 'GNU Texinfo',
+    'man'          => 'groff man',
+    'markdown'     => 'markdown',
+    'plain'        => 'plain',
+    'rst'          => 'reStructuredText',
+    'mediawiki'    => 'MediaWiki markup',
+    'textile'      => 'textile',
+    'rtf'          => 'rich text format',
+    'org'          => 'emacs org mode',
+    'asciidoc'     => 'asciidoc'
   }.freeze
 
   # The available binary writers and their corresponding names. The keys are
@@ -220,6 +219,7 @@ class PandocRuby
       end
 
       raise error unless exit_status && exit_status.success?
+
       output
     end
 
@@ -227,14 +227,13 @@ class PandocRuby
     # opts passed in. Recursively calls itself in order to handle hash options.
     def prepare_options(opts = [])
       opts.inject('') do |string, (option, value)|
-        string += case
-                  when value
-                    create_option(option, value)
-                  when option.respond_to?(:each_pair)
-                    prepare_options(option)
-                  else
-                    create_option(option)
-                  end
+        string + if value
+                   create_option(option, value)
+                 elsif option.respond_to?(:each_pair)
+                   prepare_options(option)
+                 else
+                   create_option(option)
+                 end
       end
     end
 
@@ -243,9 +242,11 @@ class PandocRuby
     # command line options. If the option has an argument, it is also included.
     def create_option(flag, argument = nil)
       return '' unless flag
+
       flag = flag.to_s
       set_pandoc_ruby_options(flag, argument)
       return '' if flag == 'timeout' # pandoc doesn't accept timeouts yet
+
       if !argument.nil?
         "#{format_flag(flag)} #{argument}"
       else
@@ -269,10 +270,9 @@ class PandocRuby
       case flag
       when 't', 'to'
         self.writer = argument.to_s
-        self.binary_output = true if BINARY_WRITERS.keys.include?(self.writer)
+        self.binary_output = true if BINARY_WRITERS.key?(self.writer)
       when 'timeout'
         @timeout = argument
       end
     end
-
 end

data/pandoc-ruby.gemspec

@@ -5,18 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = 'pandoc-ruby'
-  s.version = '2.0.2'
-
-  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
+  s.version = '2.1.0'
   s.authors = ['William Melody']
-  s.date = '2017-09-17'
+  s.date = '2020-03-23'
   s.description = 'Ruby wrapper for Pandoc'
   s.email = 'hi@williammelody.com'
   s.extra_rdoc_files = [
     'LICENSE',
     'README.md'
   ]
-  s.files = %w(
+  s.files = %w[
     .document
     Gemfile
     Gemfile.lock
@@ -31,32 +29,10 @@ Gem::Specification.new do |s|
     test/helper.rb
     test/test_conversions.rb
     test/test_pandoc_ruby.rb
-  )
-  s.homepage = 'http://github.com/alphabetum/pandoc-ruby'
+  ]
+  s.homepage = 'http://github.com/xwmx/pandoc-ruby'
   s.licenses = ['MIT']
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 1.9.3'
-  s.rubygems_version = '1.8.25'
+  s.required_ruby_version = '>= 2.2'
   s.summary = 'PandocRuby'
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency('mocha', '~> 1.1', '>= 1.1.0')
-      s.add_development_dependency('rake', '~> 10.4', '>= 10.4.2')
-      s.add_development_dependency('rdoc', '~> 4.2', '>= 4.2.0')
-      s.add_development_dependency('minitest', '~>5.8.3', '>= 5.8.3')
-    else
-      s.add_dependency('mocha', ['~> 1.1.0'])
-      s.add_dependency('rake', ['~> 10.4.2'])
-      s.add_dependency('rdoc', ['~> 4.2.0'])
-      s.add_dependency('minitest', ['~>5.8.3'])
-    end
-  else
-    s.add_dependency('mocha', ['~> 1.1.0'])
-    s.add_dependency('rake', ['~> 10.4.2'])
-    s.add_dependency('rdoc', ['~> 4.2.0'])
-    s.add_dependency('minitest', ['~>5.8.3'])
-  end
 end

data/test/benchmark.rb

@@ -6,10 +6,10 @@
 iterations = 100
 test_file = File.join(File.dirname(__FILE__), 'files', 'benchmark.txt')
 impl_gems = {
-  'BlueCloth'   => 'bluecloth',
-  'RDiscount'   => 'rdiscount',
-  'Maruku'      => 'maruku',
-  'PandocRuby'  => 'pandoc-ruby'
+  'BlueCloth'  => 'bluecloth',
+  'RDiscount'  => 'rdiscount',
+  'Maruku'     => 'maruku',
+  'PandocRuby' => 'pandoc-ruby'
 }
 
 implementations = impl_gems.keys

data/test/helper.rb

@@ -3,13 +3,13 @@ require 'bundler'
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts 'Run `bundle install` to install missing gems'
+  warn e.message
+  warn 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 require 'minitest/autorun'
 require 'minitest/pride'
-require 'mocha/setup'
+require 'mocha/minitest'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_conversions.rb

@@ -27,4 +27,39 @@ describe 'Conversions' do
       end
     end
   end
+
+  describe '.docx' do
+    it "converts from docx to html" do
+      converted_content = PandocRuby.convert(
+        ['./test/files/reference.docx'],
+        :from => 'docx',
+        :to   => 'html'
+      )
+      assert_equal("<p>Hello World.</p>", converted_content.strip)
+    end
+
+    it "raises an error when attempting to convert doc with docx format" do
+      error = assert_raises(RuntimeError) do
+        PandocRuby.convert(
+          ['./test/files/reference.doc'],
+          :from => 'docx',
+          :to   => 'html'
+        )
+      end
+
+      assert_match(/couldn't parse docx file/, error.message)
+    end
+
+    it "raises an error when attempting to convert doc with doc format" do
+      error = assert_raises(RuntimeError) do
+        PandocRuby.convert(
+          ['./test/files/reference.doc'],
+          :from => 'doc',
+          :to   => 'html'
+        )
+      end
+
+      assert_match(/Pandoc can convert from DOCX, but not from DOC./, error.message)
+    end
+  end
 end

data/test/test_pandoc_ruby.rb

@@ -163,6 +163,9 @@ describe PandocRuby do
   end
 
   it 'gracefully times out when pandoc hangs due to malformed input' do
+    skip(%(
+Pandoc no longer times out with test file. Determine how to test.
+    ))
     file = File.join(File.dirname(__FILE__), 'files', 'bomb.tex')
     contents = File.read(file)
 
@@ -175,37 +178,37 @@ describe PandocRuby do
 
   it 'has reader and writer constants' do
     assert_equal PandocRuby::READERS,
-                 'html'      =>  'HTML',
-                 'latex'     =>  'LaTeX',
-                 'textile'   =>  'textile',
-                 'native'    =>  'pandoc native',
-                 'markdown'  =>  'markdown',
-                 'json'      =>  'pandoc JSON',
-                 'rst'       =>  'reStructuredText'
+                 'html'     => 'HTML',
+                 'latex'    => 'LaTeX',
+                 'textile'  => 'textile',
+                 'native'   => 'pandoc native',
+                 'markdown' => 'markdown',
+                 'json'     => 'pandoc JSON',
+                 'rst'      => 'reStructuredText'
 
     assert_equal PandocRuby::STRING_WRITERS,
-                 'mediawiki'     =>  'MediaWiki markup',
-                 'html'          =>  'HTML',
-                 'plain'         =>  'plain',
-                 'latex'         =>  'LaTeX',
-                 's5'            =>  'S5 HTML slideshow',
-                 'textile'       =>  'textile',
-                 'texinfo'       =>  'GNU Texinfo',
-                 'docbook'       =>  'DocBook XML',
-                 'html5'         =>  'HTML5',
-                 'native'        =>  'pandoc native',
-                 'org'           =>  'emacs org mode',
-                 'rtf'           =>  'rich text format',
-                 'markdown'      =>  'markdown',
-                 'man'           =>  'groff man',
-                 'dzslides'      =>  'Dzslides HTML slideshow',
-                 'beamer'        =>  'Beamer PDF slideshow',
-                 'json'          =>  'pandoc JSON',
-                 'opendocument'  =>  'OpenDocument XML',
-                 'slidy'         =>  'Slidy HTML slideshow',
-                 'rst'           =>  'reStructuredText',
-                 'context'       =>  'ConTeXt',
-                 'asciidoc'      =>  'asciidoc'
+                 'mediawiki'    => 'MediaWiki markup',
+                 'html'         => 'HTML',
+                 'plain'        => 'plain',
+                 'latex'        => 'LaTeX',
+                 's5'           => 'S5 HTML slideshow',
+                 'textile'      => 'textile',
+                 'texinfo'      => 'GNU Texinfo',
+                 'docbook'      => 'DocBook XML',
+                 'html5'        => 'HTML5',
+                 'native'       => 'pandoc native',
+                 'org'          => 'emacs org mode',
+                 'rtf'          => 'rich text format',
+                 'markdown'     => 'markdown',
+                 'man'          => 'groff man',
+                 'dzslides'     => 'Dzslides HTML slideshow',
+                 'beamer'       => 'Beamer PDF slideshow',
+                 'json'         => 'pandoc JSON',
+                 'opendocument' => 'OpenDocument XML',
+                 'slidy'        => 'Slidy HTML slideshow',
+                 'rst'          => 'reStructuredText',
+                 'context'      => 'ConTeXt',
+                 'asciidoc'     => 'asciidoc'
 
     assert_equal PandocRuby::BINARY_WRITERS,
                  'odt'   => 'OpenDocument',

metadata

@@ -1,95 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pandoc-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - William Melody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.4.2
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.8.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.8.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.8.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.8.3
+date: 2020-03-23 00:00:00.000000000 Z
+dependencies: []
 description: Ruby wrapper for Pandoc
 email: hi@williammelody.com
 executables: []
@@ -112,7 +32,7 @@ files:
 - test/helper.rb
 - test/test_conversions.rb
 - test/test_pandoc_ruby.rb
-homepage: http://github.com/alphabetum/pandoc-ruby
+homepage: http://github.com/xwmx/pandoc-ruby
 licenses:
 - MIT
 metadata: {}
@@ -124,17 +44,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: PandocRuby
 test_files: []
-has_rdoc: