paru 0.2.5f → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d36825678ac43efb4419d37a42033055a161fe8
-  data.tar.gz: c639c47e276492541231e67cc3a683b4b68cc3eb
+  metadata.gz: 185b75188642b10c09282a90bfc79cf3668881f7
+  data.tar.gz: a6ad0e6180196916b569e92c855bb6d0f5bca2c7
 SHA512:
-  metadata.gz: 6384ccf86bd98e102fe068f6ceee9221a54758396f96e1f3787b16d8474530d6f683df255f845de565ffd98f80cea11a6df8b11155eccd758471758845291558
-  data.tar.gz: 2220576d8c4c53fd8dfe0dd9bf5855ed82f55064ca9c87d3810dafdd418f15c7280ac54ef6b407015096319e9cb3aa00c783af5b8ccd9b90ed14df4a2c6dc150
+  metadata.gz: 6e6140070d0709f90fbd9c23ef86c01685fe1e2f7421203cb8c732f00ece343fe8bdf0c87eee5d4d302697c54153fa37321d2e515b6a077c2354fe6dfb365d30
+  data.tar.gz: 19606ebcbbf9bed59c9c2cbaa694f56d9b2998dd07c8d1b6067f5715d5fde07e3c145fbad059c3458ffc757e7193acfa97e50e08fd915a028ba671fbb874898e

data/lib/paru.rb

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

data/lib/paru/filter.rb

@@ -199,9 +199,20 @@ module Paru
     # Booleans, Arrays, and Hashes. You can manipulate it like any other Ruby
     # Hash.
     #
+    # @!attribute metadata
+    #   @return [Hash] The metadata of the document being filtered as a Ruby
+    #     Hash
+    #
+    # @!attribute document
+    #   @return [Document] The document being filtered
+    #
+    # @!attribute current_node
+    #   @return [Node] The node in the AST of the document being filtered that 
+    #      is currently being inspected by the filter.
+    #
     class Filter
 
-        attr_reader :metadata, :document
+        attr_reader :metadata, :document, :current_node
 
         # Create a new Filter instance. For convenience, {run} creates a new
         # {Filter} and runs it immediately. Use this constructor if you want
@@ -261,26 +272,38 @@ module Paru
 
             @metadata = PandocFilter::Metadata.new @document.meta
 
-            @running = true
-            @document.each_depth_first do |node|
-                @filtered_nodes.push node
-                instance_eval(&block)
-                break unless @running
+            nodes_to_filter = Enumerator.new do |node_list|
+                @document.each_depth_first do |node|
+                    node_list << node
+                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
+                end
             end
+            
             @running = false
 
             @document.meta = @metadata.to_meta
             @output.write @document.to_JSON
         end
 
-        # +current_node+ points to the node that is *now* being processed while
-        # running this filter.
-        #
-        # @return [Node] the node that is currently being processed
-        def current_node()
-            @filtered_nodes.last
-        end
-
         # Specify what nodes to filter with a +selector+. If the +current_node+
         # matches that selector, it is passed to the block to this +with+ method.
         #
@@ -288,7 +311,7 @@ module Paru
         # @yield [Node] the current node if it matches the selector
         def with(selector)
             @selectors[selector] = Selector.new selector unless @selectors.has_key? selector
-            yield current_node if @selectors[selector].matches? current_node, @filtered_nodes
+            yield @current_node if @selectors[selector].matches? @current_node, @filtered_nodes
         end
 
         # Stop processing the document any further and output it as it is now.

data/lib/paru/filter/ast_manipulation.rb

@@ -32,6 +32,16 @@ module Paru
                 @children.find_index child
             end
 
+
+            # Get the child node at index
+            #
+            # @param index [Number] the index of the child to get
+            #
+            # @return [Node] the child at index
+            def get(index)
+                @children[index]
+            end
+
             # Insert child node among this node's children at position index.
             #
             # @param index [Integer] the position to insert the child
@@ -95,10 +105,17 @@ module Paru
             # @param block [Proc] the block to apply to each node in this node
             #   tree
             #
-            # @yield node
-            def each_depth_first(&block)
+            # @yield [Node]
+            def each_depth_first(&block)    
                 yield self
-                each {|child| child.each_depth_first(&block)} if has_children?
+
+                if has_been_replaced?
+                    node = get_replacement
+                else
+                    node = self
+                end
+
+                node.each {|child| child.each_depth_first(&block)} if node.has_children?
             end
 
         end

data/lib/paru/filter/node.rb

@@ -383,23 +383,43 @@ module Paru
                         temp_doc = temp_doc.children.first
                         
                         if not temp_doc.children.all? {|node| node.is_inline?}
-                            raise Error.new "Cannot replace the inline level node represented by '#{outer_markdown}' with markdown that converts to block level nodes: '#{markdown}'."
+                            raise Error.new "Cannot replace the inline level node represented by '#{self.markdown}' with markdown that converts to block level nodes: '#{markdown}'."
                         end
-                        
+                    else
+                        replacement = temp_doc.children.first
+                        @replacement = replacement unless replacement.nil? or to_ast == replacement.to_ast
                     end
-                        
+
                     index = current_index
                     temp_doc.each do |child|
                         index += 1
                         parent.insert index, child
                     end
+                        
+
                     # Remove the original node
                     parent.remove_at current_index
                 end
-
             end
 
             alias outer_markdown= markdown=
+
+            # Has this node been replaced by using the {markdown} method? If
+            # so, return true.
+            # 
+            # @return [Boolean]
+            def has_been_replaced?
+                not @replacement.nil?
+            end
+
+            # Get this node's replacemnt. Nil if it has not been replaced by
+            # the {markdown} method
+            #
+            # @return [Node] This node's replacement or nil if there is none.
+            def get_replacement
+                @replacement
+            end
+
         end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paru
 version: !ruby/object:Gem::Version
-  version: 0.2.5f
+  version: 0.2.5
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-11 00:00:00.000000000 Z
+date: 2017-06-17 00:00:00.000000000 Z
 dependencies: []
 description: Use Pandoc (http://www.pandoc.org) with ruby
 email: Huub@heerdebeer.org
@@ -101,12 +101,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      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