paru 0.2.5.12 → 0.3.0a1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b04f0bfc217b81b510d46cc2ef83601123b07e2
-  data.tar.gz: 4c00811eac2de58979daa5958e1331b60f35da8a
+  metadata.gz: 1d3f58592821c089eb71f929c5913f09c5235bf8
+  data.tar.gz: d9f6b513b294bc25d8ffba591915895397c5729a
 SHA512:
-  metadata.gz: 42f4816cbcdd7b6fc3e52dae360e1305e1e3546b3b28a69cfe7d8c0b2cc1f29b427e96b5c4be4e3ce381c39fbd25003ab475d0c8125e834e9bd4f6b31708bd05
-  data.tar.gz: c3ee0635d919ca0d8aedc0cd2ca790bf05750d21329cdf2340cdd4074474fb770f0f647ef47cd2890144e85704544355a1cb040949d930116d03b9c27c262a47
+  metadata.gz: 062e92c053c9b8dcfdfaaf30d18f9f3f8c88ce1618d7b6e5a0c9265ed4e80e7b43de6149d39b9a35a9c87adf33b9bb9688834ce65cfeab22c0f9817a337db033
+  data.tar.gz: a19be07f8af5978259da737e47f93b6cd0ae071e62c38dba9633d7331672d1698c1780337214ed3c6f59340150c3c0951217efe589e3c2c4a7b85b23694a5a5e

data/lib/paru.rb

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

data/lib/paru/filter.rb

@@ -226,6 +226,7 @@ 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
@@ -277,22 +278,30 @@ module Paru
                 end
             end
 
+            @running = true # used to be able to stop filtering immediately
             @current_node = @document
 
-            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
+            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
+                    instance_eval(&block) # run the actual filter code
+                rescue StopIteration
+                    @running = false
+                end
             end
+            
+            @running = false
 
-            write_document
+            @document.meta = @metadata.to_meta
+            @output.write @document.to_JSON
         end
 
         # Specify what nodes to filter with a +selector+. If the +current_node+
@@ -309,15 +318,10 @@ 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!()
-            write_document
-            exit true
+           @running = false 
         end
 
-
         private
 
         # The Document node from JSON formatted pandoc document structure
@@ -328,12 +332,6 @@ 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/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/filter/document.rb

@@ -36,7 +36,7 @@ module Paru
 
         # The current pandoc type version
         # @see https://hackage.haskell.org/package/pandoc-types
-        CURRENT_PANDOC_VERSION = [1, 17, 0, 5]
+        CURRENT_PANDOC_VERSION = [1, 17, 1]
 
         # Each file that is being filtered by pandoc is represented by a root
         # Document. It is the root node of the AST of the document in the file.

data/lib/paru/pandoc.rb

@@ -16,7 +16,6 @@
 # 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"
 
@@ -79,10 +78,6 @@ module Paru
     #
     #
     class Pandoc
-
-        # Use a readable option separator on Unix-like systems, but fall back
-        # to a space on Windows.
-        DEFAULT_OPTION_SEP = if Gem.win_platform? then " " else " \\\n\t" end
         
         # Path to the pandoc executatble to use by paru.
         PARU_PANDOC_PATH = "PARU_PANDOC_PATH"
@@ -154,7 +149,17 @@ module Paru
         # @example Using <<
         #   output = converter << 'this is a *strong* word'
         def convert(input)
-            run_converter to_command, 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
         end
         alias << convert
 
@@ -170,7 +175,17 @@ module Paru
         # @example Using convert_file
         #   output = converter.convert_file 'files/document.md'
         def convert_file(input_file)
-            run_converter "#{to_command} #{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
         end
 
         # Create a string representation of this converter's pandoc command
@@ -178,8 +193,8 @@ 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)
-            "#{escape(@@pandoc_exec)}\t#{to_option_string option_sep}"
+        def to_command(option_sep = " \\\n\t")
+            "#{@@pandoc_exec.shellescape}\t#{to_option_string option_sep}"
         end
 
         private
@@ -199,11 +214,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}=#{escape(val.to_s)}"}.join(option_sep)
+                    options_arr.push value.map {|val| "#{option_string}=#{val.to_s.shellescape}"}.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}=#{escape(value.to_s)}"
+                    options_arr.push "#{option_string}=#{value.to_s.shellescape}"
                 end
             end
             options_arr.join(option_sep)
@@ -280,45 +295,6 @@ module Paru
             end
         end
 
-        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 = ''
-                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
-
-                warn error unless error.empty?
-
-                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

data/lib/paru/pandoc_options_version_2.yaml

@@ -43,10 +43,8 @@ dpi:                        96
 eol:                        "native"
 wrap:                       "auto"
 columns:                    78
-strip-comments:             true
 toc:                        true
 table_of_contents:          true
-toc_depth:                  3
 no_highlight:               true
 highlight_style:            ""
 syntax_definition:          ""
@@ -78,8 +76,8 @@ epub_cover_image:           ""
 epub_metadata:              ""
 epub_embed_font:            ""
 epub_chapter_level:         1
-pdf_engine:                 ""
-pdf_engine_opt:             ""
+latex_engine:               ""
+latex_engine_opt:           ""
 bibliography:               ""
 csl:                        ""
 citation_abbreviation:      ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paru
 version: !ruby/object:Gem::Version
-  version: 0.2.5.12
+  version: 0.3.0a1
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-26 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies: []
 description: Use Pandoc (http://www.pandoc.org) with ruby
 email: Huub@heerdebeer.org
@@ -102,13 +102,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
-summary: Paru is a ruby wrapper around pandoc
+summary: Paru is a ruby wrapper around pandoc (pandoc 2)
 test_files: []