paru 1.5.0 → 1.5.1

data/lib/paru/filter/strong.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Copyright 2015, 2016, 2017 Huub de Beer <Huub@heerdebeer.org>
 #
@@ -16,13 +18,12 @@
 # You should have received a copy of the GNU General Public License
 # along with Paru.  If not, see <http://www.gnu.org/licenses/>.
 #++
-require_relative "./inline.rb"
+require_relative 'inline'
 
 module Paru
-    module PandocFilter
-        # A Strong inline node
-        class Strong < Inline
-        end
+  module PandocFilter
+    # A Strong inline node
+    class Strong < Inline
     end
+  end
 end
-

data/lib/paru/filter/subscript.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Copyright 2015, 2016, 2017 Huub de Beer <Huub@heerdebeer.org>
 #
@@ -16,13 +18,12 @@
 # You should have received a copy of the GNU General Public License
 # along with Paru.  If not, see <http://www.gnu.org/licenses/>.
 #++
-require_relative "./inline.rb"
+require_relative 'inline'
 
 module Paru
-    module PandocFilter
-        # A Subscript inline node
-        class Subscript < Inline
-        end
+  module PandocFilter
+    # A Subscript inline node
+    class Subscript < Inline
     end
+  end
 end
-

data/lib/paru/filter/superscript.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Copyright 2015, 2016, 2017 Huub de Beer <Huub@heerdebeer.org>
 #
@@ -16,13 +18,12 @@
 # You should have received a copy of the GNU General Public License
 # along with Paru.  If not, see <http://www.gnu.org/licenses/>.
 #++
-require_relative "./inline.rb"
+require_relative 'inline'
 
 module Paru
-    module PandocFilter
-        # A Superscript inline node
-        class Superscript < Inline
-        end
+  module PandocFilter
+    # A Superscript inline node
+    class Superscript < Inline
     end
+  end
 end
-

data/lib/paru/filter/table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Copyright 2015, 2016, 2017, 2020, 2023 Huub de Beer <Huub@heerdebeer.org>
 #
@@ -16,218 +18,207 @@
 # You should have received a copy of the GNU General Public License
 # along with Paru.  If not, see <http://www.gnu.org/licenses/>.
 #++
-require "csv"
-require_relative "./block.rb"
-require_relative "./inline.rb"
-require_relative "./caption.rb"
-require_relative "./col_spec.rb"
-require_relative "./row.rb"
-require_relative "./table_head.rb"
-require_relative "./table_foot.rb"
-require_relative "./table_body.rb"
-    
+require 'csv'
+require_relative 'block'
+require_relative 'inline'
+require_relative 'caption'
+require_relative 'col_spec'
+require_relative 'row'
+require_relative 'table_head'
+require_relative 'table_foot'
+require_relative 'table_body'
+
 module Paru
-    module PandocFilter
-
-        # A Table node represents a table with an inline caption, column
-        # definition, widths, headers, and rows.
-        #
-        # @!attribute caption
-        #   @return Caption
-        #  
-        # @!attribute attr
-        #   @return Attr
-        #
-        # @!attribute colspec
-        #   @return ColSpec[]
-        #
-        # @!attribute head
-        #   @return TableHead[]
-        #   
-        # @!attribute foot
-        #   @return TableHead[]
-        class Table < Block
-            attr_accessor :caption, :attr, :colspec, :head, :foot
-
-            # Create a new Table based on the contents
-            #
-            # @param contents [Array]
-            def initialize(contents)
-                @attr = Attr.new contents[0]
-                @caption = Caption.new contents[1]
-                @colspec = contents[2].map {|p| ColSpec.new p}
-                @head = TableHead.new contents[3]
-                super []
-                contents[4].each do |table_body|
-                    @children.push TableBody.new table_body
-                end
-                @foot = TableFoot.new contents[5]
-            end
-
-            # The AST contents of this Table node
-            #
-            # @return [Array]
-            def ast_contents()
-                [
-                    @attr.to_ast,
-                    @caption.to_ast,
-                    @colspec.map {|c| c.to_ast},
-                    @head.to_ast,
-                    @children.map {|c| c.to_ast},
-                    @foot.to_ast,
-                ]
-            end
-
-            # Convert this table to a 2D table of markdown strings for each
-            # cell
-            #
-            # @param config [Hash] configuraton of the table output
-            #   Config can contain properties :headers
-            #
-            # @return [String[][]] This Table as a 2D array of cells
-            # represented by their markdown strings.
-            def to_array(config = {})
-                headers = if config.has_key? :headers then config[:headers] else false end
-                footers = if config.has_key? :footers then config[:footers] else false end
-
-                data = []
-                if headers then
-                    data.concat @head.to_array
-                end
-
-                @children.each do |row|
-                    data.concat row.to_array
-                end
-                
-                if footers then
-                    data.concat @foot.to_array
-                end
-
-                data
-            end
-
-            # Convert this Table to a CSV file. See to_array for the config
-            # options
-            #
-            # @param filename [String] filename to write to
-            # @param config [Hash] See #to_array for config options
-            def to_file(filename, config = {})
-                CSV.open(filename, "wb") do |csv|
-                    to_array(**config).each {|row| csv << row}
-                end
-            end
-
-            # Create a new Table from an 2D array and an optional
-            # configuration
-            #
-            # @param data [String[][]] an array of markdown strings
-            # @param config [Hash] configuration of the list.
-            #   properties:
-            #     :headers [Boolean] True if data includes headers on first
-            #     row. Defailts to false.
-            #     :caption [String] The table's caption
-            #     :footers [Boolean] True if data includes footers on last row,
-            #     default to false.
-            #
-            # @return [Table]
-            def self.from_array(data, config = {})
-                table_attribute = create_attr
-
-                caption = []
-                if config.has_key? :caption
-                  caption = create_caption config[:caption]
-                end
-
-                col_spec = data[0].map {|c| ColSpec.new.to_ast }
-
-                head = create_endrow []
-                if config.has_key? :headers and config[:headers]
-                  head = create_endrow data.first
-                  data = data[1..-1]
-                end
-
-                foot = create_endrow []
-                if config.has_key? :footers and config[:footers]
-                  foot = create_endrow data.last
-                  data = data[0...-1]
-                end
-
-                body = create_body data
-                
-                table = [
-                  table_attribute, 
-                  caption, 
-                  col_spec, 
-                  head, 
-                  body, 
-                  foot
-                ]
-
-                Table.new table
-            end
-
-
-            # Create a new Table from a CSV file.
-            #
-            # @param filename [String] filename to read CSV data from
-            # @param config [Hash] See #from_file for details
-            #
-            # @return [Table]
-            def self.from_file(filename, config = {}) 
-                data = []
-                CSV.foreach(filename) do |row|
-                    data << row
-                end
-
-                return self.from_array(data, config) 
-            end
-
-            private
-
-            def self.create_caption(contents)
-              [
-                nil,
-                [Node.from_markdown(contents).to_ast]
-              ]
-            end
-
-            def self.create_body(data) 
-              [[
-                create_attr,
-                0,
-                [],
-                data.map {|r| create_row(r)}
-              ]]
-            end
-            
-            def self.create_endrow(data)
-              [
-                create_attr,
-                if data.empty? then [] else [create_row(data)] end
-              ]
-            end
-
-            def self.create_row(data)
-              [
-                  create_attr, 
-                  data.map {|c| create_cell(c)}
-              ]
-            end
-
-            def self.create_cell(contents)
-              [
-                create_attr,
-                {"t" => "AlignDefault", "c" => nil},
-                1,
-                1,
-                [Node.from_markdown(contents).to_ast]
-              ]
-            end
-
-            def self.create_attr()
-              ["", [], []]
-            end
+  module PandocFilter
+    # A Table node represents a table with an inline caption, column
+    # definition, widths, headers, and rows.
+    #
+    # @!attribute caption
+    #   @return Caption
+    #
+    # @!attribute attr
+    #   @return Attr
+    #
+    # @!attribute colspec
+    #   @return ColSpec[]
+    #
+    # @!attribute head
+    #   @return TableHead[]
+    #
+    # @!attribute foot
+    #   @return TableHead[]
+    class Table < Block
+      attr_accessor :caption, :attr, :colspec, :head, :foot
+
+      # Create a new Table based on the contents
+      #
+      # @param contents [Array]
+      def initialize(contents)
+        @attr = Attr.new contents[0]
+        @caption = Caption.new contents[1]
+        @colspec = contents[2].map { |p| ColSpec.new p }
+        @head = TableHead.new contents[3]
+        super([])
+        contents[4].each do |table_body|
+          @children.push TableBody.new table_body
+        end
+        @foot = TableFoot.new contents[5]
+      end
+
+      # The AST contents of this Table node
+      #
+      # @return [Array]
+      def ast_contents
+        [
+          @attr.to_ast,
+          @caption.to_ast,
+          @colspec.map(&:to_ast),
+          @head.to_ast,
+          @children.map(&:to_ast),
+          @foot.to_ast
+        ]
+      end
+
+      # Convert this table to a 2D table of markdown strings for each
+      # cell
+      #
+      # @param config [Hash] configuraton of the table output
+      #   Config can contain properties :headers
+      #
+      # @return [String[][]] This Table as a 2D array of cells
+      # represented by their markdown strings.
+      def to_array(config = {})
+        headers = config.key?(:headers) ? config[:headers] : false
+        footers = config.key?(:footers) ? config[:footers] : false
+
+        data = []
+        data.concat @head.to_array if headers
+
+        @children.each do |row|
+          data.concat row.to_array
+        end
+
+        data.concat @foot.to_array if footers
+
+        data
+      end
 
+      # Convert this Table to a CSV file. See to_array for the config
+      # options
+      #
+      # @param filename [String] filename to write to
+      # @param config [Hash] See #to_array for config options
+      def to_file(filename, config = {})
+        CSV.open(filename, 'wb') do |csv|
+          to_array(**config).each { |row| csv << row }
         end
+      end
+
+      # Create a new Table from an 2D array and an optional
+      # configuration
+      #
+      # @param data [String[][]] an array of markdown strings
+      # @param config [Hash] configuration of the list.
+      #   properties:
+      #     :headers [Boolean] True if data includes headers on first
+      #     row. Defailts to false.
+      #     :caption [String] The table's caption
+      #     :footers [Boolean] True if data includes footers on last row,
+      #     default to false.
+      #
+      # @return [Table]
+      def self.from_array(data, config = {})
+        table_attribute = create_attr
+
+        caption = []
+        caption = create_caption config[:caption] if config.key? :caption
+
+        col_spec = data[0].map { |_c| ColSpec.new.to_ast }
+
+        head = create_endrow []
+        if config.key?(:headers) && config[:headers]
+          head = create_endrow data.first
+          data = data[1..]
+        end
+
+        foot = create_endrow []
+        if config.key?(:footers) && config[:footers]
+          foot = create_endrow data.last
+          data = data[0...-1]
+        end
+
+        body = create_body data
+
+        table = [
+          table_attribute,
+          caption,
+          col_spec,
+          head,
+          body,
+          foot
+        ]
+
+        Table.new table
+      end
+
+      # Create a new Table from a CSV file.
+      #
+      # @param filename [String] filename to read CSV data from
+      # @param config [Hash] See #from_file for details
+      #
+      # @return [Table]
+      def self.from_file(filename, config = {})
+        data = []
+        CSV.foreach(filename) do |row|
+          data << row
+        end
+
+        from_array(data, config)
+      end
+
+      def self.create_caption(contents)
+        [
+          nil,
+          [Node.from_markdown(contents).to_ast]
+        ]
+      end
+
+      def self.create_body(data)
+        [[
+          create_attr,
+          0,
+          [],
+          data.map { |r| create_row(r) }
+        ]]
+      end
+
+      def self.create_endrow(data)
+        [
+          create_attr,
+          data.empty? ? [] : [create_row(data)]
+        ]
+      end
+
+      def self.create_row(data)
+        [
+          create_attr,
+          data.map { |c| create_cell(c) }
+        ]
+      end
+
+      def self.create_cell(contents)
+        [
+          create_attr,
+          { 't' => 'AlignDefault', 'c' => nil },
+          1,
+          1,
+          [Node.from_markdown(contents).to_ast]
+        ]
+      end
+
+      def self.create_attr
+        ['', [], []]
+      end
     end
+  end
 end

data/lib/paru/filter/table_body.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Copyright 2015, 2016, 2017, 2020 Huub de Beer <Huub@heerdebeer.org>
 #
@@ -16,79 +18,77 @@
 # You should have received a copy of the GNU General Public License
 # along with Paru.  If not, see <http://www.gnu.org/licenses/>.
 #++
-require_relative "./block.rb"
-require_relative "./row.rb"
-require_relative "./value.rb"
+require_relative 'block'
+require_relative 'row'
+require_relative 'value'
 
 module Paru
-    module PandocFilter
-        # A TableBody node represents a row in a table's head or body
-        #  
-        # @!attribute attr
-        #   @return Attr
-        #
-        # @!attribute rowheadcolumns
-        #   @return Value containing an Integer indicating the number of head
-        #   columns.
-        #
-        # @!attribute rowheadercolums
-        #   @return [Row]
-        #
-        # @!attribute rows
-        #   @return [Row]
-        class TableBody < Block
-            attr_accessor :attr, :rowheadcolumnspec, :rowheadercolumns
+  module PandocFilter
+    # A TableBody node represents a row in a table's head or body
+    #
+    # @!attribute attr
+    #   @return Attr
+    #
+    # @!attribute rowheadcolumns
+    #   @return Value containing an Integer indicating the number of head
+    #   columns.
+    #
+    # @!attribute rowheadercolums
+    #   @return [Row]
+    #
+    # @!attribute rows
+    #   @return [Row]
+    class TableBody < Block
+      attr_accessor :attr, :rowheadcolumnspec, :rowheadercolumns
+
+      # Create a new TableBody
+      #
+      # @param contents [Array] The contents of this TableBody
+      def initialize(contents)
+        @attr = Attr.new contents[0]
+        @rowheadcolumns = IntValue.new contents[1]
+        @rowheadercolumns = contents[2].map { |r| Row.new r }
 
-            # Create a new TableBody
-            #
-            # @param contents [Array] The contents of this TableBody
-            def initialize(contents)
-                @attr = Attr.new contents[0]
-                @rowheadcolumns = IntValue.new contents[1]
-                @rowheadercolumns = contents[2].map {|r| Row.new r}
+        super([])
+        contents[3].each do |row|
+          @children.push Row.new row
+        end
+      end
 
-                super []
-                contents[3].each do |row|
-                    @children.push Row.new row
-                end
-            end
+      # The rows in this TableBody
+      #
+      # @return [Array<Row>]
+      def rows
+        @children
+      end
 
-            # The rows in this TableBody
-            #
-            # @return [Array<Row>]
-            def rows()
-                @children
-            end
+      # The AST contents of this TableBody
+      #
+      # @return [Array]
+      def ast_contents
+        [
+          @attr.to_ast,
+          @rowheadcolumns.to_ast,
+          @rowheadercolumns.map(&:to_ast),
+          @children.map(&:to_ast)
+        ]
+      end
 
-            # The AST contents of this TableBody
-            #
-            # @return [Array]
-            def ast_contents
-                [
-                  @attr.to_ast,
-                  @rowheadcolumns.to_ast,
-                  @rowheadercolumns.map {|r| r.to_ast},
-                  @children.map {|child| child.to_ast}
-                ]
-            end
+      # Create an AST representation of this Node
+      #
+      # @return [Hash]
+      def to_ast
+        ast_contents
+      end
 
-            # Create an AST representation of this Node
-            #
-            # @return [Hash]
-            def to_ast()
-              ast_contents()
-            end
-            
-            # Convert this table end to a 2D table of markdown strings for each
-            # cell
-            #
-            # @return [String[][]] This Table as a 2D array of cells
-            # represented by their markdown strings.
-            def to_array()
-                @children.map do |row|
-                    row.to_array
-                end
-            end
-        end
+      # Convert this table end to a 2D table of markdown strings for each
+      # cell
+      #
+      # @return [String[][]] This Table as a 2D array of cells
+      # represented by their markdown strings.
+      def to_array
+        @children.map(&:to_array)
+      end
     end
+  end
 end