kramdown 1.17.0 → 2.0.0.beta1

data/lib/kramdown/parser/kramdown/footnote.rb

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -22,9 +22,11 @@ module Kramdown
         start_line_number = @src.current_line_number
         @src.pos += @src.matched_size
 
-        el = Element.new(:footnote_def, nil, nil, :location => start_line_number)
+        el = Element.new(:footnote_def, nil, nil, location: start_line_number)
         parse_blocks(el, @src[2].gsub(INDENT, ''))
-        warning("Duplicate footnote name '#{@src[1]}' on line #{start_line_number} - overwriting") if @footnotes[@src[1]]
+        if @footnotes[@src[1]]
+          warning("Duplicate footnote name '#{@src[1]}' on line #{start_line_number} - overwriting")
+        end
         @tree.children << new_block_el(:eob, :footnote_def)
         (@footnotes[@src[1]] = {})[:content] = el
         @footnotes[@src[1]][:eob] = @tree.children.last
@@ -32,7 +34,6 @@ module Kramdown
       end
       define_parser(:footnote_definition, FOOTNOTE_DEFINITION_START)
 
-
       FOOTNOTE_MARKER_START = /\[\^(#{ALD_ID_NAME})\]/
 
       # Parse the footnote marker at the current location.
@@ -49,7 +50,7 @@ module Kramdown
           end
           fn_def[:marker] ||= []
           fn_def[:marker].push(Element.new(:footnote, fn_def[:content], fn_def[:attr],
-                                           fn_def[:options].merge(:name => @src[1], :location => start_line_number)))
+                                           fn_def[:options].merge(name: @src[1], location: start_line_number)))
           @tree.children << fn_def[:marker].last
         else
           warning("Footnote definition for '#{@src[1]}' not found on line #{start_line_number}")

data/lib/kramdown/parser/kramdown/header.rb

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -17,7 +17,7 @@ module Kramdown
 
       # Parse the Setext header at the current location.
       def parse_setext_header
-        return false if !after_block_boundary?
+        return false unless after_block_boundary?
         text, id = parse_header_contents
         return false if text.empty?
         add_header(@src["level"] == '-' ? 2 : 1, text, id)
@@ -25,12 +25,11 @@ module Kramdown
       end
       define_parser(:setext_header, SETEXT_HEADER_START)
 
-
       ATX_HEADER_START = /^(?<level>\#{1,6})[\t ]*(?<contents>[^ \t].*)\n/
 
       # Parse the Atx header at the current location.
       def parse_atx_header
-        return false if !after_block_boundary?
+        return false unless after_block_boundary?
         text, id = parse_header_contents
         text.sub!(/[\t ]#+\z/, '') && text.rstrip!
         return false if text.empty?
@@ -59,11 +58,12 @@ module Kramdown
       def add_header(level, text, id)
         start_line_number = @src.current_line_number
         @src.pos += @src.matched_size
-        el = new_block_el(:header, nil, nil, :level => level, :raw_text => text, :location => start_line_number)
+        el = new_block_el(:header, nil, nil, level: level, raw_text: text, location: start_line_number)
         add_text(text, el)
         el.attr['id'] = id if id
         @tree.children << el
       end
+
     end
   end
 end

data/lib/kramdown/parser/kramdown/horizontal_rule.rb

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -17,7 +17,7 @@ module Kramdown
       def parse_horizontal_rule
         start_line_number = @src.current_line_number
         @src.pos += @src.matched_size
-        @tree.children << new_block_el(:hr, nil, nil, :location => start_line_number)
+        @tree.children << new_block_el(:hr, nil, nil, location: start_line_number)
         true
       end
       define_parser(:horizontal_rule, HR_START)

data/lib/kramdown/parser/kramdown/html.rb

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -33,7 +33,7 @@ module Kramdown
                         else
                           :raw
                         end
-        if val = HTML_MARKDOWN_ATTR_MAP[el.attr.delete('markdown')]
+        if (val = HTML_MARKDOWN_ATTR_MAP[el.attr.delete('markdown')])
           content_model = (val == :default ? HTML_CONTENT_MODEL[el.value] : val)
         end
 
@@ -43,7 +43,7 @@ module Kramdown
 
         if !closed && handle_body
           if content_model == :block
-            if !parse_blocks(el)
+            unless parse_blocks(el)
               warning("Found no end tag for '#{el.value}' (line #{el.options[:location]}) - auto-closing it")
             end
           elsif content_model == :span
@@ -59,31 +59,32 @@ module Kramdown
           else
             parse_raw_html(el, &method(:handle_kramdown_html_tag))
           end
-          @src.scan(TRAILING_WHITESPACE) unless (@tree.type == :html_element && @tree.options[:content_model] == :raw)
+          unless @tree.type == :html_element && @tree.options[:content_model] == :raw
+            @src.scan(TRAILING_WHITESPACE)
+          end
         end
       end
 
-
       HTML_BLOCK_START = /^#{OPT_SPACE}<(#{REXML::Parsers::BaseParser::UNAME_STR}|\?|!--|\/)/
 
       # Parse the HTML at the current position as block-level HTML.
       def parse_block_html
         line = @src.current_line_number
-        if result = @src.scan(HTML_COMMENT_RE)
-          @tree.children << Element.new(:xml_comment, result, nil, :category => :block, :location => line)
+        if (result = @src.scan(HTML_COMMENT_RE))
+          @tree.children << Element.new(:xml_comment, result, nil, category: :block, location: line)
           @src.scan(TRAILING_WHITESPACE)
           true
-        elsif result = @src.scan(HTML_INSTRUCTION_RE)
-          @tree.children << Element.new(:xml_pi, result, nil, :category => :block, :location => line)
+        elsif (result = @src.scan(HTML_INSTRUCTION_RE))
+          @tree.children << Element.new(:xml_pi, result, nil, category: :block, location: line)
           @src.scan(TRAILING_WHITESPACE)
           true
         else
-          if result = @src.check(/^#{OPT_SPACE}#{HTML_TAG_RE}/) && !HTML_SPAN_ELEMENTS.include?(@src[1].downcase)
+          if @src.check(/^#{OPT_SPACE}#{HTML_TAG_RE}/) && !HTML_SPAN_ELEMENTS.include?(@src[1].downcase)
             @src.pos += @src.matched_size
             handle_html_start_tag(line, &method(:handle_kramdown_html_tag))
             Kramdown::Parser::Html::ElementConverter.convert(@root, @tree.children.last) if @options[:html_to_native]
             true
-          elsif result = @src.check(/^#{OPT_SPACE}#{HTML_TAG_CLOSE_RE}/) && !HTML_SPAN_ELEMENTS.include?(@src[1].downcase)
+          elsif @src.check(/^#{OPT_SPACE}#{HTML_TAG_CLOSE_RE}/) && !HTML_SPAN_ELEMENTS.include?(@src[1].downcase)
             name = @src[1].downcase
 
             if @tree.type == :html_element && @tree.value == name
@@ -99,20 +100,19 @@ module Kramdown
       end
       define_parser(:block_html, HTML_BLOCK_START)
 
-
       HTML_SPAN_START = /<(#{REXML::Parsers::BaseParser::UNAME_STR}|\?|!--|\/)/
 
       # Parse the HTML at the current position as span-level HTML.
       def parse_span_html
         line = @src.current_line_number
-        if result = @src.scan(HTML_COMMENT_RE)
-          @tree.children << Element.new(:xml_comment, result, nil, :category => :span, :location => line)
-        elsif result = @src.scan(HTML_INSTRUCTION_RE)
-          @tree.children << Element.new(:xml_pi, result, nil, :category => :span, :location => line)
-        elsif result = @src.scan(HTML_TAG_CLOSE_RE)
+        if (result = @src.scan(HTML_COMMENT_RE))
+          @tree.children << Element.new(:xml_comment, result, nil, category: :span, location: line)
+        elsif (result = @src.scan(HTML_INSTRUCTION_RE))
+          @tree.children << Element.new(:xml_pi, result, nil, category: :span, location: line)
+        elsif (result = @src.scan(HTML_TAG_CLOSE_RE))
           warning("Found invalidly used HTML closing tag for '#{@src[1]}' on line #{line}")
           add_text(result)
-        elsif result = @src.scan(HTML_TAG_RE)
+        elsif (result = @src.scan(HTML_TAG_RE))
           tag_name = @src[1]
           tag_name.downcase! if HTML_ELEMENT[tag_name.downcase]
           if HTML_BLOCK_ELEMENTS.include?(tag_name)
@@ -122,12 +122,17 @@ module Kramdown
           end
 
           attrs = parse_html_attributes(@src[2], line, HTML_ELEMENT[tag_name])
-          attrs.each {|name, value| value.gsub!(/\n+/, ' ')}
-
-          do_parsing = (HTML_CONTENT_MODEL[tag_name] == :raw || @tree.options[:content_model] == :raw ? false : @options[:parse_span_html])
-          if val = HTML_MARKDOWN_ATTR_MAP[attrs.delete('markdown')]
+          attrs.each_value {|value| value.gsub!(/\n+/, ' ') unless value.empty? }
+
+          do_parsing = if HTML_CONTENT_MODEL[tag_name] == :raw || @tree.options[:content_model] == :raw
+                         false
+                       else
+                         @options[:parse_span_html]
+                       end
+          if (val = HTML_MARKDOWN_ATTR_MAP[attrs.delete('markdown')])
             if val == :block
-              warning("Cannot use block-level parsing in span-level HTML tag (line #{line}) - using default mode")
+              warning("Cannot use block-level parsing in span-level HTML tag (line #{line}) " \
+                      "- using default mode")
             elsif val == :span
               do_parsing = true
             elsif val == :default
@@ -137,8 +142,8 @@ module Kramdown
             end
           end
 
-          el = Element.new(:html_element, tag_name, attrs, :category => :span, :location => line,
-                           :content_model => (do_parsing ? :span : :raw), :is_closed => !!@src[4])
+          el = Element.new(:html_element, tag_name, attrs, category: :span, location: line,
+                           content_model: (do_parsing ? :span : :raw), is_closed: !!@src[4])
           @tree.children << el
           stop_re = /<\/#{Regexp.escape(tag_name)}\s*>/
           stop_re = Regexp.new(stop_re.source, Regexp::IGNORECASE) if HTML_ELEMENT[tag_name]

data/lib/kramdown/parser/kramdown/html_entity.rb

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -18,11 +18,12 @@ module Kramdown
         start_line_number = @src.current_line_number
         @src.pos += @src.matched_size
         begin
-          @tree.children << Element.new(:entity, ::Kramdown::Utils::Entities.entity(@src[1] || (@src[2] && @src[2].to_i) || @src[3].hex),
-                                        nil, :original => @src.matched, :location => start_line_number)
+          value = ::Kramdown::Utils::Entities.entity(@src[1] || (@src[2]&.to_i) || @src[3].hex)
+          @tree.children << Element.new(:entity, value,
+                                        nil, original: @src.matched, location: start_line_number)
         rescue ::Kramdown::Error
           @tree.children << Element.new(:entity, ::Kramdown::Utils::Entities.entity('amp'),
-                                        nil, :location => start_line_number)
+                                        nil, location: start_line_number)
           add_text(@src.matched[1..-1])
         end
       end

data/lib/kramdown/parser/kramdown/line_break.rb

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -15,7 +15,7 @@ module Kramdown
 
       # Parse the line break at the current location.
       def parse_line_break
-        @tree.children << Element.new(:br, nil, nil, :location => @src.current_line_number)
+        @tree.children << Element.new(:br, nil, nil, location: @src.current_line_number)
         @src.pos += @src.matched_size
       end
       define_parser(:line_break, LINE_BREAK, '(  |\\\\)(?=\n)')

data/lib/kramdown/parser/kramdown/link.rb

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -25,14 +25,15 @@ module Kramdown
         return false if @src[3].to_s =~ /[ \t]+["']/
         @src.pos += @src.matched_size
         link_id, link_url, link_title = normalize_link_id(@src[1]), @src[2] || @src[3], @src[5]
-        warning("Duplicate link ID '#{link_id}' on line #{@src.current_line_number} - overwriting") if @link_defs[link_id]
+        if @link_defs[link_id]
+          warning("Duplicate link ID '#{link_id}' on line #{@src.current_line_number} - overwriting")
+        end
         @tree.children << new_block_el(:eob, :link_def)
         @link_defs[link_id] = [link_url, link_title, @tree.children.last]
         true
       end
       define_parser(:link_definition, LINK_DEFINITION_START)
 
-
       # This helper methods adds the approriate attributes to the element +el+ of type +a+ or +img+
       # and the element itself to the @tree.
       def add_link(el, href, title, alt_text = nil, ial = nil)
@@ -66,16 +67,17 @@ module Kramdown
         link_type = (result =~ /^!/ ? :img : :a)
 
         # no nested links allowed
-        if link_type == :a && (@tree.type == :img || @tree.type == :a || @stack.any? {|t,s| t && (t.type == :img || t.type == :a)})
+        if link_type == :a && (@tree.type == :img || @tree.type == :a ||
+                               @stack.any? {|t, _| t && (t.type == :img || t.type == :a) })
           add_text(result)
           return
         end
-        el = Element.new(link_type, nil, nil, :location => start_line_number)
+        el = Element.new(link_type, nil, nil, location: start_line_number)
 
         count = 1
         found = parse_spans(el, LINK_BRACKET_STOP_RE) do
-          count = count + (@src[1] ? -1 : 1)
-          count - el.children.select {|c| c.type == :img}.size == 0
+          count += (@src[1] ? -1 : 1)
+          count - el.children.select {|c| c.type == :img }.size == 0
         end
         unless found
           @src.revert_pos(saved_pos)
@@ -89,7 +91,7 @@ module Kramdown
         if @src.scan(LINK_INLINE_ID_RE) || !@src.check(/\(/)
           emit_warning = !@src[1]
           link_id = normalize_link_id(@src[1] || alt_text)
-          if @link_defs.has_key?(link_id)
+          if @link_defs.key?(link_id)
             add_link(el, @link_defs[link_id][0], @link_defs[link_id][1], alt_text,
                      @link_defs[link_id][2] && @link_defs[link_id][2].options[:ial])
           else
@@ -110,9 +112,9 @@ module Kramdown
             return
           end
         else
-          link_url = ''
+          link_url = +''
           nr_of_brackets = 0
-          while temp = @src.scan_until(LINK_PAREN_STOP_RE)
+          while (temp = @src.scan_until(LINK_PAREN_STOP_RE))
             link_url << temp
             if @src[2]
               nr_of_brackets -= 1

data/lib/kramdown/parser/kramdown/list.rb

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -35,7 +35,7 @@ module Kramdown
         else
           while content =~ /^ *\t/
             temp = content.scan(/^ */).first.length + indentation
-            content.sub!(/^( *)(\t+)/) {$1 << " "*(4 - (temp % 4) + ($2.length - 1)*4)}
+            content.sub!(/^( *)(\t+)/) { $1 << " " * (4 - (temp % 4) + ($2.length - 1) * 4) }
           end
           indentation += content[/^ */].length
         end
@@ -44,7 +44,6 @@ module Kramdown
         [content, indentation, *PARSE_FIRST_LIST_LINE_REGEXP_CACHE[indentation]]
       end
 
-
       LIST_START_UL = /^(#{OPT_SPACE}[+*-])([\t| ].*?\n)/
       LIST_START_OL = /^(#{OPT_SPACE}\d+\.)([\t| ].*?\n)/
       LIST_START = /#{LIST_START_UL}|#{LIST_START_OL}/
@@ -53,14 +52,14 @@ module Kramdown
       def parse_list
         start_line_number = @src.current_line_number
         type, list_start_re = (@src.check(LIST_START_UL) ? [:ul, LIST_START_UL] : [:ol, LIST_START_OL])
-        list = new_block_el(type, nil, nil, :location => start_line_number)
+        list = new_block_el(type, nil, nil, location: start_line_number)
 
         item = nil
         content_re, lazy_re, indent_re = nil
         eob_found = false
         nested_list_found = false
         last_is_blank = false
-        while !@src.eos?
+        until @src.eos?
           start_line_number = @src.current_line_number
           if last_is_blank && @src.check(HR_START)
             break
@@ -68,17 +67,21 @@ module Kramdown
             eob_found = true
             break
           elsif @src.scan(list_start_re)
-            item = Element.new(:li, nil, nil, :location => start_line_number)
-            item.value, indentation, content_re, lazy_re, indent_re = parse_first_list_line(@src[1].length, @src[2])
+            item = Element.new(:li, nil, nil, location: start_line_number)
+            item.value, indentation, content_re, lazy_re, indent_re =
+              parse_first_list_line(@src[1].length, @src[2])
             list.children << item
 
-            item.value.sub!(self.class::LIST_ITEM_IAL) do |match|
+            item.value.sub!(self.class::LIST_ITEM_IAL) do |_match|
               parse_attribute_list($1, item.options[:ial] ||= {})
               ''
             end
 
-            list_start_re = (type == :ul ? /^( {0,#{[3, indentation - 1].min}}[+*-])([\t| ].*?\n)/ :
-                             /^( {0,#{[3, indentation - 1].min}}\d+\.)([\t| ].*?\n)/)
+            list_start_re = if type == :ul
+                              /^( {0,#{[3, indentation - 1].min}}[+*-])([\t| ].*?\n)/
+                            else
+                              /^( {0,#{[3, indentation - 1].min}}\d+\.)([\t| ].*?\n)/
+                            end
             nested_list_found = (item.value =~ LIST_START)
             last_is_blank = false
             item.value = [item.value]
@@ -86,14 +89,14 @@ module Kramdown
             result.sub!(/^(\t+)/) { " " * 4 * $1.length }
             indentation_found = result.sub!(indent_re, '')
             if !nested_list_found && indentation_found && result =~ LIST_START
-              item.value << ''
+              item.value << +''
               nested_list_found = true
             elsif nested_list_found && !indentation_found && result =~ LIST_START
               result = " " * (indentation + 4) << result
             end
             item.value.last << result
             last_is_blank = false
-          elsif result = @src.scan(BLANK_LINE)
+          elsif (result = @src.scan(BLANK_LINE))
             nested_list_found = true
             last_is_blank = true
             item.value.last << result
@@ -106,7 +109,7 @@ module Kramdown
 
         last = nil
         list.children.each do |it|
-          temp = Element.new(:temp, nil, nil, :location => it.options[:location])
+          temp = Element.new(:temp, nil, nil, location: it.options[:location])
 
           env = save_env
           location = it.options[:location]
@@ -119,7 +122,7 @@ module Kramdown
 
           it.children = temp.children
           it.value = nil
-          next if it.children.size == 0
+          next if it.children.empty?
 
           # Handle the case where an EOB marker is inserted by a block IAL for the first paragraph
           it.children.delete_at(1) if it.children.first.type == :p &&
@@ -129,16 +132,12 @@ module Kramdown
               (it.children.length < 2 || it.children[1].type != :blank ||
                (it == list.children.last && it.children.length == 2 && !eob_found)) &&
               (list.children.last != it || list.children.size == 1 ||
-               list.children[0..-2].any? {|cit| !cit.children.first || cit.children.first.type != :p || cit.children.first.options[:transparent]})
+               list.children[0..-2].any? {|cit| !cit.children.first || cit.children.first.type != :p || cit.children.first.options[:transparent] })
             it.children.first.children.first.value << "\n" if it.children.size > 1 && it.children[1].type != :blank
             it.children.first.options[:transparent] = true
           end
 
-          if it.children.last.type == :blank
-            last = it.children.pop
-          else
-            last = nil
-          end
+          last = (it.children.last.type == :blank ? it.children.pop : nil)
         end
 
         @tree.children << last if !last.nil? && !eob_found
@@ -147,14 +146,14 @@ module Kramdown
       end
       define_parser(:list, LIST_START)
 
-
       DEFINITION_LIST_START = /^(#{OPT_SPACE}:)([\t| ].*?\n)/
 
       # Parse the ordered or unordered list at the current location.
       def parse_definition_list
         children = @tree.children
-        if !children.last || (children.length == 1 && children.last.type != :p ) ||
-            (children.length >= 2 && children[-1].type != :p && (children[-1].type != :blank || children[-1].value != "\n" || children[-2].type != :p))
+        if !children.last || (children.length == 1 && children.last.type != :p) ||
+            (children.length >= 2 && children[-1].type != :p &&
+             (children[-1].type != :blank || children[-1].value != "\n" || children[-2].type != :p))
           return false
         end
 
@@ -165,9 +164,10 @@ module Kramdown
           para = @tree.children.pop
           first_as_para = true
         end
-        deflist.options[:location] = para.options[:location] # take location from preceding para which is the first definition term
+        # take location from preceding para which is the first definition term
+        deflist.options[:location] = para.options[:location]
         para.children.first.value.split(/\n/).each do |term|
-          el = Element.new(:dt, nil, nil, :location => @src.current_line_number)
+          el = Element.new(:dt, nil, nil, location: @src.current_line_number)
           term.sub!(self.class::LIST_ITEM_IAL) do
             parse_attribute_list($1, el.options[:ial] ||= {})
             ''
@@ -182,15 +182,16 @@ module Kramdown
         content_re, lazy_re, indent_re = nil
         def_start_re = DEFINITION_LIST_START
         last_is_blank = false
-        while !@src.eos?
+        until @src.eos?
           start_line_number = @src.current_line_number
           if @src.scan(def_start_re)
-            item = Element.new(:dd, nil, nil, :location => start_line_number)
+            item = Element.new(:dd, nil, nil, location: start_line_number)
             item.options[:first_as_para] = first_as_para
-            item.value, indentation, content_re, lazy_re, indent_re = parse_first_list_line(@src[1].length, @src[2])
+            item.value, indentation, content_re, lazy_re, indent_re =
+              parse_first_list_line(@src[1].length, @src[2])
             deflist.children << item
 
-            item.value.sub!(self.class::LIST_ITEM_IAL) do |match|
+            item.value.sub!(self.class::LIST_ITEM_IAL) do |_match|
               parse_attribute_list($1, item.options[:ial] ||= {})
               ''
             end
@@ -201,12 +202,12 @@ module Kramdown
           elsif @src.check(EOB_MARKER)
             break
           elsif (result = @src.scan(content_re)) || (!last_is_blank && (result = @src.scan(lazy_re)))
-            result.sub!(/^(\t+)/) { " "*($1 ? 4*$1.length : 0) }
+            result.sub!(/^(\t+)/) { " " * ($1 ? 4 * $1.length : 0) }
             result.sub!(indent_re, '')
             item.value << result
             first_as_para = false
             last_is_blank = false
-          elsif result = @src.scan(BLANK_LINE)
+          elsif (result = @src.scan(BLANK_LINE))
             first_as_para = true
             item.value << result
             last_is_blank = true
@@ -221,13 +222,9 @@ module Kramdown
 
           parse_blocks(it, it.value)
           it.value = nil
-          next if it.children.size == 0
+          next if it.children.empty?
 
-          if it.children.last.type == :blank
-            last = it.children.pop
-          else
-            last = nil
-          end
+          last = (it.children.last.type == :blank ? it.children.pop : nil)
 
           if it.children.first && it.children.first.type == :p && !it.options.delete(:first_as_para)
             it.children.first.children.first.value << "\n" if it.children.size > 1
@@ -237,14 +234,15 @@ module Kramdown
 
         if @tree.children.length >= 1 && @tree.children.last.type == :dl
           @tree.children[-1].children.concat(deflist.children)
-        elsif @tree.children.length >= 2 && @tree.children[-1].type == :blank && @tree.children[-2].type == :dl
+        elsif @tree.children.length >= 2 && @tree.children[-1].type == :blank &&
+            @tree.children[-2].type == :dl
           @tree.children.pop
           @tree.children[-1].children.concat(deflist.children)
         else
           @tree.children << deflist
         end
 
-        @tree.children << last if !last.nil?
+        @tree.children << last if last
 
         true
       end