railroad_diagrams 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6fa68a911b60026d1ad25654c32a26e5f0f2e972e62361b23d451a4f9a97631
-  data.tar.gz: 24048fdb5ee0ffb805f5581f37035f37f7fab2328ba15aec5134590de5f5db1d
+  metadata.gz: 3e08635bb1091eae639e0c6579810827a46b42dc7ab39856df0167c5a771b651
+  data.tar.gz: d0b8e359534ca8556b056e16323405bad2d187b35862f1198cc333e2909679ed
 SHA512:
-  metadata.gz: cab2582164d955d3761eabb1f28b663b9dcd28399309259e225560b9d142eff2f92963dc4e9f118a6bfe21be1dba2e67c452638e8de63ce1282c6db30d4052d5
-  data.tar.gz: d7babd2c0e30c60fedd4a3ca638eec5169ffd3d60418abe36478f256010f0354b857b7c9891ad90991b728b9cfa6ea926bf948b2ccec0f4d10cd723d7a09345f
+  metadata.gz: e0e40fcbe169c00fb808bbc479e59c9d2b52bb132f7d096ec228d82c8a594ef207fdb01fa4a7f68445937a0b6cda2f592c6c936215434ab1fb65ca86ea7a3300
+  data.tar.gz: 0355b014fc8baa9138dbabc81c2cdf338cabc7b0c8905563078b702b8765cabfd2475b281673eceffc5b6fd7684eb8e6f587c545621364a406b57509157aaa4a

data/.github/workflows/main.yml

@@ -26,4 +26,8 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - run: exe/railroad_diagrams --format=svg
+      - run: |
+          exe/railroad_diagrams --format=svg
+          exe/railroad_diagrams --format=ascii
+          exe/railroad_diagrams --format=unicode
+          exe/railroad_diagrams --format=standalone

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 0.3.0 - 2025-02-24
+
+- Fix some error when using ascii and unicode mode.
+
 ## 0.2.1 - 2025-02-01
 
 - Fix an error for bundle install from Ruby 2.5.

data/README.md

@@ -2,6 +2,8 @@
 
 A tiny Ruby+SVG library for drawing railroad syntax diagrams.
 
+Inspired by: https://github.com/tabatkins/railroad-diagrams
+
 # Installation
 
 Add this line to your application's Gemfile:

data/lib/railroad_diagrams/alternating_sequence.rb

@@ -115,14 +115,14 @@ module RailroadDiagrams
 
       first_td = @items[0].text_diagram
       second_td = @items[1].text_diagram
-      max_width = TextDiagram._max_width(first_td, second_td)
-      left_width, right_width = TextDiagram._gaps(max_width, 0)
+      max_width = TextDiagram.max_width(first_td, second_td)
+      left_width, right_width = TextDiagram.gaps(max_width, 0)
 
       left_lines = []
       right_lines = []
       separator = []
 
-      left_size, right_size = TextDiagram._gaps(first_td.width, 0)
+      left_size, right_size = TextDiagram.gaps(first_td.width, 0)
       diagram_td = first_td.expand(left_width - left_size, right_width - right_size, 0, 0)
 
       left_lines += [' ' * 2] * diagram_td.entry
@@ -142,7 +142,7 @@ module RailroadDiagrams
       left_lines << (' ' * 2)
       right_lines << (' ' * 2)
 
-      left_size, right_size = TextDiagram._gaps(second_td.width, 0)
+      left_size, right_size = TextDiagram.gaps(second_td.width, 0)
       second_td = second_td.expand(left_width - left_size, right_width - right_size, 0, 0)
       diagram_td = diagram_td.append_below(second_td, separator, move_entry: true, move_exit: true)
 
@@ -155,7 +155,7 @@ module RailroadDiagrams
       right_lines << (line + corner_bot_right)
 
       mid_point = first_td.height + (separator.size / 2)
-      diagram_td = diagram_td.alter(entry: mid_point, exit: mid_point)
+      diagram_td = diagram_td.alter(new_entry: mid_point, new_exit: mid_point)
 
       left_td = TextDiagram.new(mid_point, mid_point, left_lines)
       right_td = TextDiagram.new(mid_point, mid_point, right_lines)

data/lib/railroad_diagrams/choice.rb

@@ -40,8 +40,6 @@ module RailroadDiagrams
       @up += @items[0].up
 
       @height = @items[default].height
-      @down = 0
-
       (default + 1...@items.size).each do |i|
         arcs =
           if i == default + 1
@@ -67,7 +65,7 @@ module RailroadDiagrams
     end
 
     def to_s
-      items_str = @items.map(&:inspect).join(', ')
+      items_str = @items.map(&:to_s).join(', ')
       "Choice(#{@default}, #{items_str})"
     end
 
@@ -150,57 +148,62 @@ module RailroadDiagrams
         move_entry = false
         move_exit = false
         if i <= @default
-          # First item and above the line: also remove ascenders above the item's entry and exit, suppress the separator above it.
-          has_separator = false
-          [0..item_td.entry].each { |j| left_lines[j] = ' ' }
-          [0..item_td.exit].each { |j| right_lines[j] = ' ' }
+          # Item below the line: round off the entry/exit lines downwards.
+          left_lines[item_td.entry] = roundcorner_top_left
+          right_lines[item_td.exit] = roundcorner_top_right
+          if i.zero?
+            # First item and above the line: also remove ascenders above the item's entry and exit, suppress the separator above it.
+            has_separator = false
+            (0...item_td.entry).each { |j| left_lines[j] = ' ' }
+            (0...item_td.exit).each { |j| right_lines[j] = ' ' }
+          end
         end
         if i >= @default
           # Item below the line: round off the entry/exit lines downwards.
           left_lines[item_td.entry] = roundcorner_bot_left
-          right_lines[item_td.entry] = roundcorner_bot_right
-          if i == 0
+          right_lines[item_td.exit] = roundcorner_bot_right
+          if i.zero?
             # First item and below the line: also suppress the separator above it.
             has_separator = false
           end
           if i == @items.size - 1
             # Last item and below the line: also remove descenders below the item's entry and exit
-            [item_td.entry + 1..item_td.height].each { |j| left_lines[j] = ' ' }
-            [item_td.exit + 1..item_td.height].each { |j| right_lines[j] = ' ' }
+            (item_td.entry + 1...item_td.height).each { |j| left_lines[j] = ' ' }
+            (item_td.exit + 1...item_td.height).each { |j| right_lines[j] = ' ' }
           end
         end
         if i == @default
           # Item on the line: entry/exit are horizontal, and sets the outer entry/exit.
           left_lines[item_td.entry] = cross
-          right_lines[item_td.entry] = cross
+          right_lines[item_td.exit] = cross
           move_entry = true
           move_exit = true
-          if i == 0 && i == @items.size - 1
+          if i.zero? && i == @items.size - 1
             # Only item and on the line: set entry/exit for straight through.
             left_lines[item_td.entry] = line
-            right_lines[item_td.entry] = line
-          elsif i == 0
+            right_lines[item_td.exit] = line
+          elsif i.zero?
             # First item and on the line: set entry/exit for no ascenders.
-            left_lines[item_td.entry] = roundcorner_top_left
-            left_lines[item_td.exit] = roundcorner_bot_left
+            left_lines[item_td.entry] = roundcorner_top_right
+            right_lines[item_td.exit] = roundcorner_top_left
           elsif i == @items.size - 1
             # Last item and on the line: set entry/exit for no descenders.
-            left_lines[item_td.entry] = roundcorner_bot_left
-            right_lines[item_td.entry] = roundcorner_bot_right
+            left_lines[item_td.entry] = roundcorner_bot_right
+            right_lines[item_td.exit] = roundcorner_bot_left
           end
         end
         left_join_td = TextDiagram.new(item_td.entry, item_td.entry, left_lines)
         right_join_td = TextDiagram.new(item_td.exit, item_td.exit, right_lines)
         item_td = left_join_td.append_right(item_td, '').append_right(right_join_td, '')
-        separator = if has_separator
-                      [
-                        line_vertical +
-                          (' ' * (TextDiagram.max_width(diagram_td, item_td) - 2)) +
-                          line_vertical
-                      ]
-                    else
-                      []
-                    end
+        separator =
+          if has_separator
+            [
+              line_vertical +
+                (' ' * (TextDiagram.max_width(diagram_td, item_td) - 2)) + line_vertical
+            ]
+          else
+            []
+          end
         diagram_td = diagram_td.append_below(item_td, separator, move_entry: move_entry, move_exit: move_exit)
       end
       diagram_td

data/lib/railroad_diagrams/command.rb

@@ -69,12 +69,12 @@ module RailroadDiagrams
 
       case @format
       when 'svg'
-        diagram.write_svg(STDOUT.method(:write))
+        diagram.write_svg($stdout.method(:write))
       when 'standalone'
-        diagram.write_standalone(STDOUT.method(:write))
+        diagram.write_standalone($stdout.method(:write))
       when 'ascii', 'unicode'
         puts "\n<pre>"
-        diagram.write_text(STDOUT.method(:write))
+        diagram.write_text($stdout.method(:write))
         puts "\n</pre>"
       end
 

data/lib/railroad_diagrams/comment.rb

@@ -42,7 +42,7 @@ module RailroadDiagrams
 
     def text_diagram
       # NOTE: href, title, and cls are ignored for text diagrams.
-      TextDiagram.new(0, 0, @text)
+      TextDiagram.new(0, 0, [@text])
     end
   end
 end

data/lib/railroad_diagrams/diagram.rb

@@ -74,9 +74,10 @@ module RailroadDiagrams
       diagram_td = @items[0].text_diagram
       @items[1..-1].each do |item|
         item_td = item.text_diagram
-        item_td.expand(1, 1, 0, 0) if item.needs_space
-        diagram_td = diagram_td.append_right(separator)
+        item_td = item_td.expand(1, 1, 0, 0) if item.needs_space
+        diagram_td = diagram_td.append_right(item_td, separator)
       end
+      diagram_td
     end
 
     def write_svg(write)
@@ -88,8 +89,8 @@ module RailroadDiagrams
     def write_text(write)
       output = text_diagram
       output = "#{output.lines.join("\n")}\n"
-      output = output.gsub('&', '&amp;').gsub('<', '&lt;').gsub('>', '&gt;').gsub('"', '&quot;') if ESCAPE_HTML
-      write(output)
+      output = output.gsub('&', '&amp;').gsub('<', '&lt;').gsub('>', '&gt;').gsub('"', '&quot;')
+      write.call(output)
     end
 
     def write_standalone(write, css = nil)

data/lib/railroad_diagrams/diagram_item.rb

@@ -74,7 +74,7 @@ module RailroadDiagrams
       end
     end
 
-    def write_standalone(write, css = nil)
+    def write_standalone(write, _css = nil)
       write_svg(write)
     end
   end

data/lib/railroad_diagrams/group.rb

@@ -52,7 +52,7 @@ module RailroadDiagrams
       ).add(self)
 
       @item.format(x, y, @width).add(self)
-      @label.format(x, y - (@box_up + @label.down + @label.height), @width).add(self) if @label
+      @label&.format(x, y - (@box_up + @label.down + @label.height), @width)&.add(self)
 
       self
     end

data/lib/railroad_diagrams/horizontal_choice.rb

@@ -20,7 +20,7 @@ module RailroadDiagrams
         AR + # starting track
         (AR * 2 * (@items.size - 1)) + # inbetween tracks
         @items.sum { |x| x.width + (x.needs_space ? 20 : 0) } + # items
-        (last.height > 0 ? AR : 0) + # needs space to curve up
+        (last.height.positive? ? AR : 0) + # needs space to curve up
         AR # ending track
 
       # Always exits at entrance height
@@ -156,31 +156,31 @@ module RailroadDiagrams
       # diagram_entry: distance from top to lowest entry, aka distance from top to diagram entry, aka final diagram entry and exit.
       diagram_entry = item_tds.map(&:entry).max
       # soil_to_baseline: distance from top to lowest entry before rightmost item, aka distance from skip-over-items line to rightmost entry, aka SOIL height.
-      soil_to_baseline = item_tds[0..-2].map(&:entry).max || 0
+      soil_to_baseline = item_tds[0...-1].map(&:entry).max
       # top_to_soil: distance from top to skip-over-items line.
       top_to_soil = diagram_entry - soil_to_baseline
       # baseline_to_suil: distance from lowest entry or exit after leftmost item to bottom, aka distance from entry to skip-under-items line, aka SUIL height.
-      baseline_to_suil = item_tds[1..-1].map { |td| td.height - [td.entry, td.exit].min }.max.to_i - 1
+      baseline_to_suil = item_tds[1..-1].map { |td| td.height - [td.entry, td.exit].min }.max - 1
 
       # The diagram starts with a line from its entry up to skip-over-items line:
       lines = Array.new(top_to_soil, '  ')
       lines << (roundcorner_top_left + line)
-      lines += Array.new(soil_to_baseline, line_vertical + ' ')
+      lines += Array.new(soil_to_baseline, "#{line_vertical} ")
       lines << (roundcorner_bot_right + line)
 
       diagram_td = TextDiagram.new(lines.size - 1, lines.size - 1, lines)
 
       item_tds.each_with_index do |item_td, item_num|
-        if item_num > 0
+        if item_num.positive?
           # All items except the leftmost start with a line from the skip-over-items line down to their entry,
           # with a joining-line across at the skip-under-items line:
-          lines = Array.new(top_to_soil, '  ')
+          lines = ['  '] * top_to_soil
           # All such items except the rightmost also have a continuation of the skip-over-items line:
           line_to_next_item = item_num == item_tds.size - 1 ? ' ' : line
           lines << (roundcorner_top_right + line_to_next_item)
-          lines += Array.new(soil_to_baseline, line_vertical + ' ')
+          lines += ["#{line_vertical} "] * soil_to_baseline
           lines << (roundcorner_bot_left + line)
-          lines += Array.new(baseline_to_suil, '  ')
+          lines += ['  '] * baseline_to_suil
           lines << (line * 2)
 
           entry_td = TextDiagram.new(diagram_td.exit, diagram_td.exit, lines)
@@ -201,7 +201,7 @@ module RailroadDiagrams
 
         part_td = part_td.append_below(item_td, [], move_entry: true, move_exit: true)
 
-        if item_num > 0
+        if item_num.positive?
           # All items except the leftmost end with enough blank lines to pad down to the skip-under-items
           # line, followed by a segment of the skip-under-items line:
           lines = Array.new(baseline_to_suil - (item_td.height - item_td.entry) + 1, ' ' * item_td.width)
@@ -219,26 +219,25 @@ module RailroadDiagrams
           lines << (line * 2)
           lines += Array.new(diagram_td.exit - top_to_soil - 1, '  ')
           lines << (line + roundcorner_top_right)
-          lines += Array.new(baseline_to_suil - (diagram_td.exit - diagram_td.entry), ' ' + line_vertical)
-          line_from_prev_item = item_num > 0 ? line : ' '
+          lines += Array.new(baseline_to_suil - (diagram_td.exit - diagram_td.entry), " #{line_vertical}")
+          line_from_prev_item = item_num.positive? ? line : ' '
           lines << (line_from_prev_item + roundcorner_bot_left)
 
           entry = diagram_entry + 1 + (diagram_td.exit - diagram_td.entry)
           exit_td = TextDiagram.new(entry, diagram_entry + 1, lines)
-          diagram_td = diagram_td.append_right(exit_td, '')
         else
           # The rightmost item has a line from the skip-under-items line and from its exit up to the diagram exit:
           lines = []
           line_from_exit = diagram_td.exit == diagram_td.entry ? line : ' '
           lines << (line_from_exit + roundcorner_top_left)
-          lines += Array.new(diagram_td.exit - diagram_td.entry - 1, ' ' + line_vertical)
+          lines += Array.new(diagram_td.exit - diagram_td.entry, " #{line_vertical}")
           lines << (line + roundcorner_bot_right) if diagram_td.exit != diagram_td.entry
-          lines += Array.new(baseline_to_suil - (diagram_td.exit - diagram_td.entry), ' ' + line_vertical)
+          lines += Array.new(baseline_to_suil - (diagram_td.exit - diagram_td.entry), " #{line_vertical}")
           lines << (line + roundcorner_bot_right)
 
           exit_td = TextDiagram.new(diagram_td.exit - diagram_td.entry, 0, lines)
-          diagram_td = diagram_td.append_right(exit_td, '')
         end
+        diagram_td = diagram_td.append_right(exit_td, '')
       end
 
       diagram_td

data/lib/railroad_diagrams/multiple_choice.rb

@@ -124,7 +124,7 @@ module RailroadDiagrams
     def text_diagram
       multi_repeat = TextDiagram.get_parts(['multi_repeat']).first
       any_all = TextDiagram.rect(@type == 'any' ? '1+' : 'all')
-      diagram_td = Choice.text_diagram(self)
+      diagram_td = Choice.new(0, Skip.new).text_diagram
       repeat_td = TextDiagram.rect(multi_repeat)
       diagram_td = any_all.append_right(diagram_td, '')
       diagram_td.append_right(repeat_td, '')

data/lib/railroad_diagrams/one_or_more.rb

@@ -55,7 +55,7 @@ module RailroadDiagrams
       # Format the item and then format the repeat append it to the bottom, after a spacer.
       item_td = @item.text_diagram
       repeat_td = @rep.text_diagram
-      fir_width = TextDiagram._max_width(item_td, repeat_td)
+      fir_width = TextDiagram.max_width(item_td, repeat_td)
       repeat_td = repeat_td.expand(0, fir_width - repeat_td.width, 0, 0)
       item_td = item_td.expand(0, fir_width - item_td.width, 0, 0)
       item_and_repeat_td = item_td.append_below(repeat_td, [])
@@ -63,7 +63,7 @@ module RailroadDiagrams
       # Build the left side of the repeat line and append the combined item and repeat to its right.
       left_lines = []
       left_lines << (repeat_top_left + line)
-      left_lines += [repeat_left + ' '] * ((item_td.height - item_td.entry) + repeat_td.entry - 1)
+      left_lines += ["#{repeat_left} "] * ((item_td.height - item_td.entry) + repeat_td.entry - 1)
       left_lines << (repeat_bot_left + line)
       left_td = TextDiagram.new(0, 0, left_lines)
       left_td = left_td.append_right(item_and_repeat_td, '')
@@ -71,7 +71,7 @@ module RailroadDiagrams
       # Build the right side of the repeat line and append it to the combined left side, item, and repeat's right.
       right_lines = []
       right_lines << (line + repeat_top_right)
-      right_lines += [' ' + repeat_right] * ((item_td.height - item_td.exit) + repeat_td.exit - 1)
+      right_lines += [" #{repeat_right}"] * ((item_td.height - item_td.exit) + repeat_td.exit - 1)
       right_lines << (line + repeat_bot_right)
       right_td = TextDiagram.new(0, 0, right_lines)
       left_td.append_right(right_td, '')

data/lib/railroad_diagrams/optional_sequence.rb

@@ -136,7 +136,7 @@ module RailroadDiagrams
       # diagramEntry: distance from top to lowest entry, aka distance from top to diagram entry, aka final diagram entry and exit.
       diagram_entry = item_tds.map(&:entry).max
       # SOILHeight: distance from top to lowest entry before rightmost item, aka distance from skip-over-items line to rightmost entry, aka SOIL height.
-      soil_height = item_tds[0...-1].map(&:entry).max
+      soil_height = item_tds.map(&:entry).max
       # topToSOIL: distance from top to skip-over-items line.
       top_to_soil = diagram_entry - soil_height
 
@@ -147,7 +147,7 @@ module RailroadDiagrams
       lines += [roundcorner_bot_right + line]
       diagram_td = TextDiagram.new(lines.size - 1, lines.size - 1, lines)
 
-      @items.each_with_index do |item_td, i|
+      item_tds.each_with_index do |item_td, i|
         if i.positive?
           # All items except the leftmost start with a line from their entry down to their skip-under-item line,
           # with a joining-line across at the skip-over-items line:
@@ -162,9 +162,10 @@ module RailroadDiagrams
 
           # All items except the leftmost next have a line from skip-over-items line down to their entry,
           # with joining-lines at their entry and at their skip-under-item line:
-          lines = (['  '] * top_to_soil) + [line + roundcorner_top_right +
-                                            # All such items except the rightmost also have a continuation of the skip-over-items line:
-                                            (i < item_tds.size - 1 ? line : ' ')] +
+          lines = (['  '] * top_to_soil) +
+                  [line + roundcorner_top_right +
+                   # All such items except the rightmost also have a continuation of the skip-over-items line:
+                   (i < item_tds.size - 1 ? line : ' ')] +
                   ([" #{line_vertical} "] * (diagram_td.exit - top_to_soil - 1)) +
                   [line + roundcorner_bot_left + line] +
                   ([' ' * 3] * (item_td.height - item_td.entry - 1)) +

data/lib/railroad_diagrams/stack.rb

@@ -115,6 +115,7 @@ module RailroadDiagrams
       diagram_td = left_td.append_right(diagram_td, '')
       right_td = TextDiagram.new(0, right_lines.size - 1, right_lines)
       diagram_td.append_right(right_td, '')
+      diagram_td
     end
   end
 end

data/lib/railroad_diagrams/text_diagram.rb

@@ -117,24 +117,43 @@ module RailroadDiagrams
         end
       end
 
-      def rect(item, dashed = false)
+      def rect(item, dashed: false)
         rectish('rect', item, dashed)
       end
 
-      def round_rect(item, dashed = false)
+      def round_rect(item, dashed: false)
         rectish('roundrect', item, dashed)
       end
 
+      def max_width(*args)
+        max_width = 0
+        args.each do |arg|
+          width =
+            case arg
+            when TextDiagram
+              arg.width
+            when Array
+              arg.map(&:length).max
+            when Numeric
+              arg.to_s.length
+            else
+              arg.length
+            end
+          max_width = width if width > max_width
+        end
+        max_width
+      end
+
       def pad_l(string, width, pad)
         gap = width - string.length
-        raise "Gap #{gap} must be a multiple of pad string '#{pad}'" unless gap % pad.length == 0
+        raise "Gap #{gap} must be a multiple of pad string '#{pad}'" unless (gap % pad.length).zero?
 
         (pad * (gap / pad.length)) + string
       end
 
       def pad_r(string, width, pad)
         gap = width - string.length
-        raise "Gap #{gap} must be a multiple of pad string '#{pad}'" unless gap % pad.length == 0
+        raise "Gap #{gap} must be a multiple of pad string '#{pad}'" unless (gap % pad.length).zero?
 
         string + (pad * (gap / pad.length))
       end
@@ -169,54 +188,57 @@ module RailroadDiagrams
 
       def rectish(rect_type, data, dashed)
         line_type = dashed ? '_dashed' : ''
-        parts = get_parts([
-                            "#{rect_type}_top_left",
-                            "#{rect_type}_left#{line_type}",
-                            "#{rect_type}_bot_left",
-                            "#{rect_type}_top_right",
-                            "#{rect_type}_right#{line_type}",
-                            "#{rect_type}_bot_right",
-                            "#{rect_type}_top#{line_type}",
-                            "#{rect_type}_bot#{line_type}",
-                            'line',
-                            'cross'
-                          ])
-
-        item_td = data.is_a?(TextDiagram) ? data : new(0, 0, [data.to_s])
-
-        lines = [parts[6] * (item_td.width + 2)]
-        lines += item_td.expand(1, 1, 0, 0).lines.map { |line| " #{line} " }
-        lines << (parts[7] * (item_td.width + 2))
+        top_left, ctr_left, bot_left, top_right, ctr_right, bot_right, top_horiz, bot_horiz, line, cross =
+          get_parts([
+                      "#{rect_type}_top_left",
+                      "#{rect_type}_left#{line_type}",
+                      "#{rect_type}_bot_left",
+                      "#{rect_type}_top_right",
+                      "#{rect_type}_right#{line_type}",
+                      "#{rect_type}_bot_right",
+                      "#{rect_type}_top#{line_type}",
+                      "#{rect_type}_bot#{line_type}",
+                      'line',
+                      'cross'
+                    ])
+
+        item_td = data.is_a?(TextDiagram) ? data : new(0, 0, [data])
+
+        lines = [top_horiz * (item_td.width + 2)]
+        if data.is_a?(TextDiagram)
+          lines += item_td.expand(1, 1, 0, 0).lines
+        else
+          (0...item_td.lines.length).each do |i|
+            lines += [" #{item_td.lines[i]} "]
+          end
+        end
+        lines += [(bot_horiz * (item_td.width + 2))]
 
         entry = item_td.entry + 1
         exit = item_td.exit + 1
 
-        left_max = [parts[0], parts[1], parts[2]].map(&:size).max
-        lefts = Array.new(lines.size, parts[1].ljust(left_max))
-        lefts[0] = parts[0].ljust(left_max, parts[6])
-        lefts[-1] = parts[2].ljust(left_max, parts[7])
-        lefts[entry] = parts[9].ljust(left_max) if data.is_a?(TextDiagram)
+        left_max_width = max_width(top_left, ctr_left, bot_left)
+        lefts = [pad_r(ctr_left, left_max_width, ' ')] * lines.length
+        lefts[0] = pad_r(top_left, left_max_width, top_horiz)
+        lefts[-1] = pad_r(bot_left, left_max_width, bot_horiz)
+        lefts[entry] = cross if data.is_a?(TextDiagram)
 
-        right_max = [parts[3], parts[4], parts[5]].map(&:size).max
-        rights = Array.new(lines.size, parts[4].rjust(right_max))
-        rights[0] = parts[3].rjust(right_max, parts[6])
-        rights[-1] = parts[5].rjust(right_max, parts[7])
-        rights[exit] = parts[9].rjust(right_max) if data.is_a?(TextDiagram)
+        right_max_width = max_width(top_right, ctr_right, bot_right)
+        rights = [pad_l(ctr_right, right_max_width, ' ')] * lines.length
+        rights[0] = pad_l(top_right, right_max_width, top_horiz)
+        rights[-1] = pad_l(bot_right, right_max_width, bot_horiz)
+        rights[exit] = cross if data.is_a?(TextDiagram)
 
-        new_lines = lines.each_with_index.map do |line, i|
-          lefts[i] + line + rights[i]
-        end
+        lines = enclose_lines(lines, lefts, rights)
 
-        lefts = Array.new(lines.size, ' ')
-        lefts[entry] = parts[8]
-        rights = Array.new(lines.size, ' ')
-        rights[exit] = parts[8]
+        lefts = [' '] * lines.length
+        lefts[entry] = line
+        rights = [' '] * lines.length
+        rights[exit] = line
 
-        new_lines = new_lines.each_with_index.map do |line, i|
-          lefts[i] + line + rights[i]
-        end
+        lines = enclose_lines(lines, lefts, rights)
 
-        new(entry, exit, new_lines)
+        new(entry, exit, lines)
       end
     end
 
@@ -227,12 +249,17 @@ module RailroadDiagrams
       @exit = exit
       @lines = lines.dup
       @height = lines.size
-      @width = lines.empty? ? 0 : lines.first.size
+      @width = lines.any? ? lines[0].length : 0
+
+      raise "Entry is not within diagram vertically:\n#{dump(false)}" unless entry <= lines.length
+      raise "Exit is not within diagram vertically:\n#{dump(false)}" unless exit <= lines.length
 
-      validate
+      lines.each do |line|
+        raise "Diagram data is not rectangular:\n#{dump(false)}" unless lines[0].length == line.length
+      end
     end
 
-    def alter(new_entry = nil, new_exit = nil, new_lines = nil)
+    def alter(new_entry: nil, new_exit: nil, new_lines: nil)
       self.class.new(
         new_entry || @entry,
         new_exit || @exit,
@@ -310,23 +337,33 @@ module RailroadDiagrams
       )
     end
 
-    private
-
-    def validate
-      return if @lines.empty?
-
-      line_length = @lines.first.size
-      @lines.each do |line|
-        raise ArgumentError, "Diagram is not rectangular:\n#{inspect}" unless line.size == line_length
+    def dump(show = true)
+      result = "height=#{@height}; len(lines)=#{@lines.length}"
+
+      result += "; entry outside diagram: entry=#{@ntry}" if @entry > @lines.length
+      result += "; exit outside diagram: exit=#{@exit}" if @exit > @lines.length
+
+      (0...[@lines.length, @entry + 1, @exit + 1].max).each do |y|
+        result += "\n[#{format('%03d', y)}]"
+        result += " '#{@lines[y]}' len=#{@lines[y].length}" if y < @lines.length
+        if y == @entry && y == @exit
+          result += ' <- entry, exit'
+        elsif y == @entry
+          result += ' <- entry'
+        elsif y == @exit
+          result += ' <- exit'
+        end
       end
 
-      raise ArgumentError, "Entry point out of bounds:\n#{inspect}" if @entry >= @height
-
-      return unless @exit >= @height
-
-      raise ArgumentError, "Exit point out of bounds:\n#{inspect}"
+      if show
+        puts result
+      else
+        result
+      end
     end
 
+    private
+
     def inspect
       output = ["TextDiagram(entry=#{@entry}, exit=#{@exit}, height=#{@height})"]
       @lines.each_with_index do |line, i|

data/lib/railroad_diagrams/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailroadDiagrams
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/railroad_diagrams.gemspec

@@ -10,14 +10,14 @@ Gem::Specification.new do |spec|
 
   spec.summary = '🛤️ A tiny Ruby+SVG library for drawing railroad syntax diagrams like JSON.org.'
   spec.description = 'Generate SVG railroad syntax diagrams, like on JSON.org.'
-  spec.homepage = "https://github.com/ydah/railroad_diagrams"
+  spec.homepage = 'https://github.com/ydah/railroad_diagrams'
   spec.license = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
-  spec.metadata["homepage_uri"]          = spec.homepage
-  spec.metadata["source_code_uri"]       = spec.homepage
-  spec.metadata["changelog_uri"]         = "#{spec.homepage}/releases"
-  spec.metadata["bug_tracker_uri"]       = "#{spec.homepage}/issues"
+  spec.metadata['homepage_uri']          = spec.homepage
+  spec.metadata['source_code_uri']       = spec.homepage
+  spec.metadata['changelog_uri']         = "#{spec.homepage}/releases"
+  spec.metadata['bug_tracker_uri']       = "#{spec.homepage}/issues"
   spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do

data/test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 add('test choice up',
     Diagram.new(
       Choice.new(

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: railroad_diagrams
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Yudai Takada
 bindir: exe
 cert_chain: []
-date: 2025-02-01 00:00:00.000000000 Z
+date: 2025-02-24 00:00:00.000000000 Z
 dependencies: []
 description: Generate SVG railroad syntax diagrams, like on JSON.org.
 email: