paru 0.2.5.5 → 0.2.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 387603a1b179250c37685c4095e17fcef016ce48
-  data.tar.gz: 431ac92d161e735ad3cf9c70b2a5eda4acbc7618
+  metadata.gz: b314dd702e50bc29c3d5de54d00be79f76aeec99
+  data.tar.gz: c336ecb5371cfc4eeb23a36ec428cd59e939457e
 SHA512:
-  metadata.gz: 3324360c90db6a4f85428fe9112daca4d0ee3010c10a3af24f27c5a0104fc8f28e86e2afbc5223eb889e21f78a3ef671d0c8a1e7d25ba9913e141a367af0df5e
-  data.tar.gz: 50522a32e342f00eb75d98f8df0a4f76ae89e8e8c9196218c6ef823988c46957fd43d18c6f8d8fd8c7bc2fc37692e91a3fd388cf46a4f3ca4acb71e9150eab8c
+  metadata.gz: c72f808ac6e146ce331434edcad78293d4aaefea2bf657bd856cdbd3955f27b5ae133ae7bc3b2ff9a3bc8676ab54019cd9f53bd5a9c1050d8137af873d942b4c
+  data.tar.gz: 920e14f0aa27234ffaf1c6d0028c3ea4c93ee14708b5e07c9a8339d474f1def0aaca5d0375b9ed61a849dc777963f039421b280b82ec5a3a2cf468322a101644

data/lib/paru.rb

@@ -18,5 +18,5 @@
 #++
 module Paru
     # Paru's current version
-    VERSION = [0, 2, 5, 3]
+    VERSION = [0, 2, 5, 6]
 end

data/lib/paru/filter/cite.rb

@@ -49,8 +49,8 @@ module Paru
                 ]
             end
 
-            undef_method :inner_markdown
-            undef_method :inner_markdown=
+            #undef_method :inner_markdown
+            #undef_method :inner_markdown=
         end
     end
 end

data/lib/paru/pandoc.rb

@@ -16,6 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Paru.  If not, see <http://www.gnu.org/licenses/>.
 #++
+require "open3"
 require "shellwords"
 require "yaml"
 
@@ -149,17 +150,7 @@ module Paru
         # @example Using <<
         #   output = converter << 'this is a *strong* word'
         def convert(input)
-            begin
-            output = ''
-            IO.popen(to_command, 'r+') do |p|
-                p << input
-                p.close_write
-                output << p.read
-            end
-            output
-            rescue StandardError => err
-                throw Error.new "Error while running '#{to_command}' on input:\n\n#{input}\n\nPandoc responds: '#{err.message}'"
-            end
+            run_converter to_command, input
         end
         alias << convert
 
@@ -175,17 +166,7 @@ module Paru
         # @example Using convert_file
         #   output = converter.convert_file 'files/document.md'
         def convert_file(input_file)
-            command = "#{to_command} #{input_file}"
-            begin
-                output = ''
-                IO.popen(command, 'r+') do |p|
-                    p.close_write
-                    output << p.read
-                end
-                output
-            rescue StandardError => err
-                throw Error.new "Error while running '#{command}' on input:\n\n#{input}\n\nPandoc responds: '#{err.message}'"
-            end
+            run_converter "#{to_command} #{input_file}"
         end
 
         # Create a string representation of this converter's pandoc command
@@ -295,6 +276,34 @@ module Paru
             end
         end
 
+        private 
+
+        def run_converter(command, input = nil)
+            begin
+                output = ''
+                error = ''
+                status = 0
+
+                Open3.popen3(command) do |stdin, stdout, stderr, thread|
+                    stdin << input unless input.nil?
+                    stdin.close
+                    output << stdout.read
+                    error << stderr.read
+                    status = thread.value.exitstatus
+                end
+
+                if 0 < status
+                    # pandoc exited with an error
+                    raise Paru::Error.new "error while running:\n\n#{command}\n\nPandoc responded with:\n\n#{error}\n"
+                end
+
+                output
+            rescue Paru::Error => err
+                raise err
+            rescue StandardError => err
+                throw Error.new "Unable to run pandoc via command '#{command}': #{err.message}"
+            end
+        end
     end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paru
 version: !ruby/object:Gem::Version
-  version: 0.2.5.5
+  version: 0.2.5.6
 platform: ruby
 authors:
 - Huub de Beer
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Paru is a ruby wrapper around pandoc