pandoc-ruby 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 606934acc12140a2ce1f99e2f9c4e0cadfc24977
-  data.tar.gz: 6ae5fa55a9d05bb7f9f915d45a388f06869395fe
+  metadata.gz: c07c31b644c343bcd4ab9371b2128579ced7577e
+  data.tar.gz: 983a9f0c36bd180077d4449bb51639cb22edf5e7
 SHA512:
-  metadata.gz: 367018a0d5f56c3edac2a521ade4c695b6afc14f1755dc11605f30856a71b1ed7160da1aead1a4aa0e9919175a6e40e920bb0908bfb90539e98c3a397744e062
-  data.tar.gz: 9ebe803a32985af625b33165cf5db03d9daca6763bda2a80dda948e41fcd58bfdb46eac2181a8a0da2ba21a711ad3747cafce25d2cf80ac9fe76fad2c2d52b4e
+  metadata.gz: cf592d887248d4d8f5131a8aebf55fcd4bf9b990cd34efd4058fc39629ccdc891d5ba40a8c470866d4448afedda6812bccd108aaf1ef49ddddaaf09ab8dec056
+  data.tar.gz: 8d6e6a5e741360555372e5054d625612b7fe2a6c8a4437768c57972d35d76f9919b632b6fece80421d4607b265454bdc09f806d5d6a6a4c58eb1ad87bfe3f579

data/Gemfile.lock

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

data/README.md

@@ -83,7 +83,9 @@ PandocRuby assumes the `pandoc` executable is via your environment's `$PATH`
 variable.  If you'd like to set an explicit path to the `pandoc` executable,
 you can do so with  `PandocRuby.pandoc_path = '/path/to/pandoc'`
 
-Pandoc can also be set to take an array of file paths as the first argument.
+PandocRuby can also take an array of one or more file paths as the first
+argument. The files will be concatenated together with a blank line between
+each and used as input.
 
 ```ruby
 # One file path as a single-element array.

data/lib/pandoc-ruby.rb

@@ -71,24 +71,24 @@ class PandocRuby
     new(*args).convert
   end
 
-  attr_accessor :options
+  attr_writer :options
   def options
-    @options || []
+    @options ||= []
   end
 
-  attr_accessor :option_string
+  attr_writer :option_string
   def option_string
-    @option_string || ''
+    @option_string ||= ''
   end
 
-  attr_accessor :binary_output
+  attr_writer :binary_output
   def binary_output
-    @binary_output || false
+    @binary_output ||= false
   end
 
-  attr_accessor :writer
+  attr_writer :writer
   def writer
-    @writer || 'html'
+    @writer ||= 'html'
   end
 
   # Create a new PandocRuby converter object. The first argument contains the
@@ -101,6 +101,9 @@ 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
     elsif args[0].is_a?(Array)
@@ -174,7 +177,7 @@ class PandocRuby
       begin
         self.options += [{ :output => tmp_file.path }]
         self.option_string = "#{self.option_string} --output #{tmp_file.path}"
-        execute("#{@@pandoc_path}#{self.option_string}")
+        execute_pandoc
         return IO.binread(tmp_file)
       ensure
         tmp_file.close
@@ -184,6 +187,11 @@ class PandocRuby
 
     # Execute the pandoc command for string writers.
     def convert_string
+      execute_pandoc
+    end
+
+    # Wrapper to run pandoc in a consistent, DRY way
+    def execute_pandoc
       if ! @input_files.nil?
         execute("#{@@pandoc_path} #{@input_files}#{self.option_string}")
       else

data/pandoc-ruby.gemspec

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

data/test/test_pandoc_ruby.rb

@@ -40,6 +40,10 @@ describe PandocRuby do
     assert PandocRuby.new([@file, @file2]).to_html.match(/A Second Title/)
   end
 
+  it 'converts multiple element array input as array of file paths to a binary output format' do
+    assert PandocRuby.new([@file, @file2]).to_epub.match(/com.apple.ibooks/)
+  end
+
   it 'accepts short options' do
     @converter.expects(:execute).with('pandoc -t rst').returns(true)
     assert @converter.convert

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pandoc-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - William Melody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 3
 summary: PandocRuby