paru 0.2.5.11 → 0.2.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9282ef053ebf34c9fa984dfa659ee43a5c709c69
-  data.tar.gz: bac7b12462299030feb2a1b98bbad33d2b7a58ae
+  metadata.gz: 3b04f0bfc217b81b510d46cc2ef83601123b07e2
+  data.tar.gz: 4c00811eac2de58979daa5958e1331b60f35da8a
 SHA512:
-  metadata.gz: 9b13bcac43915c16c0ca09506917e8dc4dff83474a147b2fed9eece8c3458059c0c5d11aa035c7e96f560a970159c8299c68be6c5e28b22b46e9fed78d9659ad
-  data.tar.gz: '068180d8606414780dcd121b2bd1f4835eab8042b8258a6cae82dbd3e57762c343f15cb5bc6e680931f03f9978208ba314611e8c72a648364fc0ef75f705ae0e'
+  metadata.gz: 42f4816cbcdd7b6fc3e52dae360e1305e1e3546b3b28a69cfe7d8c0b2cc1f29b427e96b5c4be4e3ce381c39fbd25003ab475d0c8125e834e9bd4f6b31708bd05
+  data.tar.gz: c3ee0635d919ca0d8aedc0cd2ca790bf05750d21329cdf2340cdd4074474fb770f0f647ef47cd2890144e85704544355a1cb040949d930116d03b9c27c262a47

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paru
 version: !ruby/object:Gem::Version
-  version: 0.2.5.11
+  version: 0.2.5.12
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 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
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Paru is a ruby wrapper around pandoc