paru 0.3.0a6 → 0.3.0a8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 488f115207a3ee98fcf8ec1608b1cc9b7fee9325
-  data.tar.gz: 9d8b662d229fe71a3208bbf48ae9242e62024de8
+  metadata.gz: bfb62e841895598d6ee403719487470f82f8604f
+  data.tar.gz: 711cb74b424e87a6cd6879a751b9a2ee2d16009e
 SHA512:
-  metadata.gz: d7dd28e653f48a9ec014b28f3c2b197b6da2609ea7862e7d1d5cb5ce07f799154cbe096f392a19e2151c280e03516459ec74ba51cec533a0ceef42c827780d0e
-  data.tar.gz: bc1db4930e33a2e7313330a8f18d0e3c0070143b74aa2bc4d64216e2659d982dddfe97c9d17efa649ea2c1fc4c82dbdfe9900062c9e54ece212b464391f0b29a
+  metadata.gz: 95a62b675732dc9fadd6b616acb49ec08a899f76412e39984612fa050812b433814cf5f3fec0e677f495c492a7f5e36a937561134276664d817979430dc0bb2e
+  data.tar.gz: df08aa23b5e1ae0610f9b92cb73f504377fb46c5814063a576b393a76d00feff04608d9354bba546fcd9ee6572f6bc3352914b515dd5e2c3d1904186b35b45f2

data/lib/paru/filter.rb

@@ -226,7 +226,6 @@ module Paru
         def initialize(input = $stdin, output = $stdout)
             @input = input
             @output = output
-            @running = false
         end
 
         # Run the filter specified by block. This is a convenience method that
@@ -278,30 +277,22 @@ module Paru
                 end
             end
 
-            @running = true # used to be able to stop filtering immediately
             @current_node = @document
 
-            while @running do
-                begin
-                    if @current_node.has_been_replaced?
-                        @current_node = @current_node.get_replacement
-                        @filtered_nodes.pop
-                    else
-                        @current_node = nodes_to_filter.next
-                    end
-                        
-                    @filtered_nodes.push @current_node
-
-                    instance_eval(&block) # run the actual filter code
-                rescue StopIteration
-                    @running = false
+            nodes_to_filter.each do |node|
+                if @current_node.has_been_replaced?
+                    @current_node = @current_node.get_replacement
+                    @filtered_nodes.pop
+                else
+                    @current_node = node
                 end
+
+                @filtered_nodes.push @current_node
+
+                instance_eval(&block) # run the actual filter code
             end
-            
-            @running = false
 
-            @document.meta = @metadata.to_meta
-            @output.write @document.to_JSON
+            write_document
         end
 
         # Specify what nodes to filter with a +selector+. If the +current_node+
@@ -318,10 +309,15 @@ module Paru
         # This is a great timesaver for filters that only act on a small
         # number of nodes in a large document, or when you only want to set
         # the metadata.
+        #
+        # Note, stop will break off the filter immediately after outputting
+        # the document in its current state.
         def stop!()
-           @running = false 
+            write_document
+            exit true
         end
 
+
         private
 
         # The Document node from JSON formatted pandoc document structure
@@ -332,6 +328,12 @@ module Paru
         def read_document()
             PandocFilter::Document.from_JSON @input.read
         end
+
+        # Write the document being filtered to STDOUT
+        def write_document()
+            @document.meta = @metadata.to_meta
+            @output.write @document.to_JSON
+        end
     end
     
     # FilterError is thrown when there is an error during filtering

data/lib/paru/pandoc.rb

@@ -179,7 +179,7 @@ module Paru
         # @param option_sep [String] the string to separate options with
         # @return [String] This converter's command line invocation string.
         def to_command(option_sep = DEFAULT_OPTION_SEP)
-            "#{@@pandoc_exec.shellescape}\t#{to_option_string option_sep}"
+            "#{escape(@@pandoc_exec)}\t#{to_option_string option_sep}"
         end
 
         private
@@ -199,11 +199,11 @@ module Paru
                 when Array then
                     # This option can occur multiple times: list each with its value.
                     # For example: --css=main.css --css=print.css
-                    options_arr.push value.map {|val| "#{option_string}=#{val.to_s.shellescape}"}.join(option_sep)
+                    options_arr.push value.map {|val| "#{option_string}=#{escape(val.to_s)}"}.join(option_sep)
                 else
                     # All options that aren't flags and can occur only once have the
                     # same pattern: --option=value
-                    options_arr.push "#{option_string}=#{value.to_s.shellescape}"
+                    options_arr.push "#{option_string}=#{escape(value.to_s)}"
                 end
             end
             options_arr.join(option_sep)
@@ -282,6 +282,15 @@ module Paru
 
         private 
 
+        def escape(str)
+            if Gem.win_platform?
+                escaped = str.gsub("\\", "\\\\")
+                "\"#{escaped}\""
+            else
+                str.shellescape
+            end
+        end
+
         def run_converter(command, input = nil)
             begin
                 output = ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paru
 version: !ruby/object:Gem::Version
-  version: 0.3.0a6
+  version: 0.3.0a8
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies: []
 description: Use Pandoc (http://www.pandoc.org) with ruby
 email: Huub@heerdebeer.org