pandoc-ruby 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c07c31b644c343bcd4ab9371b2128579ced7577e
-  data.tar.gz: 983a9f0c36bd180077d4449bb51639cb22edf5e7
+  metadata.gz: 02f0af2a61483032f01e2d07de58a08bb63625a9
+  data.tar.gz: 84fcc719beb7c3ec49ec3d5b6411ab8e74a2ff84
 SHA512:
-  metadata.gz: cf592d887248d4d8f5131a8aebf55fcd4bf9b990cd34efd4058fc39629ccdc891d5ba40a8c470866d4448afedda6812bccd108aaf1ef49ddddaaf09ab8dec056
-  data.tar.gz: 8d6e6a5e741360555372e5054d625612b7fe2a6c8a4437768c57972d35d76f9919b632b6fece80421d4607b265454bdc09f806d5d6a6a4c58eb1ad87bfe3f579
+  metadata.gz: a9c155e6003414f32e8eeaf1922b4aec59afb301e7b5055619a539ab8e7a7588928acb0cc2a4a8bd8a9ca66a88c41c2ffed3854ba77cfa3da0db3a1872c943aa
+  data.tar.gz: c605f036e0f8dd80fad8b6a58468e6f8b17535d12b0fa4518c5d7724909cebec3dd432ed929f42c588631a706572e71384bed40e6a95c0b8e3430f11818e2a0a

data/Gemfile.lock

@@ -1,14 +1,12 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    json (1.8.3)
     metaclass (0.0.4)
-    minitest (5.8.4)
+    minitest (5.8.5)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    rake (11.1.2)
-    rdoc (4.2.2)
-      json (~> 1.4)
+    rake (12.1.0)
+    rdoc (5.1.0)
 
 PLATFORMS
   ruby
@@ -20,4 +18,4 @@ DEPENDENCIES
   rdoc
 
 BUNDLED WITH
-   1.12.2
+   1.14.3

data/Rakefile

@@ -29,3 +29,34 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+require './lib/pandoc-ruby.rb'
+desc <<HEREDOC
+  Regenerate test files in existing formats.
+HEREDOC
+task :regenerate_files do
+  extensions = []
+  files_dir = File.join(File.dirname(__FILE__), 'test', 'files')
+
+  Dir.glob(File.join(files_dir, 'format*')) do |f|
+    extensions << f.match(/format\.(\w+)\Z/)[1]
+  end
+
+  from_content = File.read(File.join(files_dir, 'format.markdown'))
+
+  extensions.each do |to|
+    next if to == 'markdown'
+
+    to_file = File.join(files_dir, "format.#{to}")
+
+    converted_content = PandocRuby.convert(
+      from_content,
+      :from => 'markdown',
+      :to   => to
+    )
+
+    File.open(to_file, 'w') do |file|
+      file.write(converted_content)
+    end
+  end
+end

data/lib/pandoc-ruby.rb

@@ -71,6 +71,11 @@ class PandocRuby
     new(*args).convert
   end
 
+  attr_writer :binary_output
+  def binary_output
+    @binary_output ||= false
+  end
+
   attr_writer :options
   def options
     @options ||= []
@@ -81,16 +86,14 @@ class PandocRuby
     @option_string ||= ''
   end
 
-  attr_writer :binary_output
-  def binary_output
-    @binary_output ||= false
-  end
-
   attr_writer :writer
   def writer
     @writer ||= 'html'
   end
 
+  attr_accessor :input_files
+  attr_accessor :input_string
+
   # Create a new PandocRuby converter object. The first argument contains the
   # input either as string or as an array of filenames.
   #
@@ -101,13 +104,10 @@ class PandocRuby
   #   new(["/path/to/file.md"], :option1 => :value, :option2)
   #   new(["/to/file1.html", "/to/file2.html"], :option1 => :value)
   def initialize(*args)
-    @input_string = nil
-    @input_files = nil
-
     if args[0].is_a?(String)
-      @input_string = args.shift
+      self.input_string = args.shift
     elsif args[0].is_a?(Array)
-      @input_files = args.shift.join(' ')
+      self.input_files = args.shift.join(' ')
     end
     self.options = args
   end
@@ -192,8 +192,8 @@ class PandocRuby
 
     # Wrapper to run pandoc in a consistent, DRY way
     def execute_pandoc
-      if ! @input_files.nil?
-        execute("#{@@pandoc_path} #{@input_files}#{self.option_string}")
+      if !self.input_files.nil?
+        execute("#{@@pandoc_path} #{self.input_files}#{self.option_string}")
       else
         execute("#{@@pandoc_path}#{self.option_string}")
       end
@@ -206,10 +206,8 @@ class PandocRuby
       Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
         begin
           Timeout.timeout(@timeout) do
-            unless @input_string.nil?
-              stdin.puts @input_string
-              stdin.close
-            end
+            stdin.puts self.input_string
+            stdin.close
             output = stdout.read
             error = stderr.read
             exit_status = wait_thr.value

data/pandoc-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = 'pandoc-ruby'
-  s.version = '2.0.1'
+  s.version = '2.0.2'
 
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.authors = ['William Melody']
-  s.date = '2016-05-04'
+  s.date = '2017-09-17'
   s.description = 'Ruby wrapper for Pandoc'
   s.email = 'hi@williammelody.com'
   s.extra_rdoc_files = [

data/test/test_pandoc_ruby.rb

@@ -133,6 +133,16 @@ describe PandocRuby do
     assert_match(/h2/, converter.convert)
   end
 
+  it 'accepts blank strings' do
+    converter = PandocRuby.new('')
+    assert_match("\n", converter.convert)
+  end
+
+  it 'accepts nil and treats like a blank string' do
+    converter = PandocRuby.new(nil)
+    assert_match("\n", converter.convert)
+  end
+
   it 'aliases to_s' do
     assert_equal @converter.convert, @converter.to_s
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pandoc-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - William Melody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2017-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha