marvi 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5131e252ac808321286aa802bdd386e5b3bb9b494dda00df1761ef9700088a4e
-  data.tar.gz: 2e9bccb531018e22014e43053b6a05d081e60a422c9107966c54739829cf528d
+  metadata.gz: c5df9bb69ae060cf562d656a78f4aa152223a4ad58178af6b6b18891e19cb525
+  data.tar.gz: 1590ce11f925c30f25e256e1e0f0571355a4a4fd7690cc636310d9bf20e349eb
 SHA512:
-  metadata.gz: d87aa8d7de7acd2414e5301416fd09b09d1f33e48f64c93c86b5d0b7fc833e20102c297e89a77396cdcb4176269493459e835a6ab9df2a677d6d112ad9bbb3ed
-  data.tar.gz: 673ca0703a768010c6116fa4cae6b29c723b439a50e7591c3a7ac7f9928e614eda42f2ef2fda7f377ef7453babd37b729786579ef20479b24107f800be453c59
+  metadata.gz: 1541589372fbdd04e4dbf7fe929de77788f7308c4abdf31ed8fea657712de058d1e38f7a48000c1122405b0c8a44f679b57946937ed8c779dcc81e2e7f4cfd10
+  data.tar.gz: 8637f420f782945d396f8dfa97ec3f4b748ffd056bb43baf23c6e6adbd54c6e8d9f8b3dbe896a1540faf46c6affa772cb7637bc929a9c9fe60e626c0420392e3

data/.claude/hooks/standardrb-check.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# PostToolUse hook: run standardrb on the edited file and block the turn
+# when violations remain so Claude must fix them before continuing.
+
+set -u
+
+payload="$(cat)"
+file_path=$(printf '%s' "$payload" | jq -r '.tool_response.filePath // .tool_input.file_path // empty')
+[ -z "$file_path" ] && exit 0
+
+case "$file_path" in
+  "$PWD"/*.rb | "$PWD"/*.gemspec | "$PWD"/Rakefile | "$PWD"/Gemfile) ;;
+  *) exit 0 ;;
+esac
+
+output=$(bundle exec standardrb "$file_path" 2>&1)
+if [ $? -ne 0 ]; then
+  reason="standardrb violations in $file_path. Fix manually or run \`bundle exec rake standard:fix\`:
+
+$output"
+  jq -n --arg reason "$reason" '{decision:"block",reason:$reason}'
+fi
+exit 0

data/.claude/settings.json

@@ -0,0 +1,17 @@
+{
+  "hooks": {
+    "PostToolUse": [
+      {
+        "matcher": "Write|Edit",
+        "hooks": [
+          {
+            "type": "command",
+            "command": ".claude/hooks/standardrb-check.sh",
+            "timeout": 30,
+            "statusMessage": "Running standardrb"
+          }
+        ]
+      }
+    ]
+  }
+}

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [0.3.0] - 2026-05-18
+
+- Render tables correctly when cells contain East Asian wide characters and emoji (uses `unicode-display_width`).
+- Wrap long table cells to fit the terminal width so borders no longer break across physical lines; curses pager re-flows on window resize.
+
 ## [0.1.0] - 2026-03-17
 
 - Initial release

data/lib/marvi/ansi.rb

@@ -2,14 +2,14 @@
 
 module Marvi
   module ANSI
-    RESET   = "\e[0m"
-    BOLD    = "\e[1m"
-    ITALIC  = "\e[3m"
-    CYAN    = "\e[36m"
-    YELLOW  = "\e[33m"
-    GREEN   = "\e[32m"
+    RESET = "\e[0m"
+    BOLD = "\e[1m"
+    ITALIC = "\e[3m"
+    CYAN = "\e[36m"
+    YELLOW = "\e[33m"
+    GREEN = "\e[32m"
     MAGENTA = "\e[35m"
-    WHITE   = "\e[37m"
+    WHITE = "\e[37m"
     BG_DARK = "\e[48;5;236m"
 
     HEADER_COLORS = [CYAN, GREEN, YELLOW, MAGENTA, WHITE, WHITE].freeze

data/lib/marvi/ast_walker.rb

@@ -2,12 +2,17 @@
 
 require "kramdown"
 require "kramdown-parser-gfm"
+require "unicode/display_width"
 
 module Marvi
   class ASTWalker
     HEADER_COLORS = %i[cyan green yellow magenta white white].freeze
 
-    def walk(markdown)
+    DEFAULT_MAX_WIDTH = 80
+    MIN_COL_WIDTH = 4
+
+    def walk(markdown, max_width: nil)
+      @max_width = max_width || Integer(ENV["COLUMNS"] || DEFAULT_MAX_WIDTH)
       doc = Kramdown::Document.new(markdown, input: "GFM")
       lines = render_block(doc.root)
       lines.pop while lines.last&.plain_text&.empty?
@@ -52,7 +57,7 @@ module Marvi
     def render_header(el)
       level = el.options[:level]
       color = HEADER_COLORS[level - 1]
-      src   = el.options[:location]
+      src = el.options[:location]
       prefix = Span.new(text: "#" * level + " ", bold: true, color: color)
       content = render_inline_children(el).map do |s|
         Span.new(text: s.text, bold: true, italic: s.italic, color: s.color || color, bg_color: s.bg_color)
@@ -61,10 +66,10 @@ module Marvi
     end
 
     def render_li(el, indent:, list_type:, list_index:)
-      bullet = list_type == :ol ? "#{list_index}." : "•"
+      bullet = (list_type == :ol) ? "#{list_index}." : "•"
       prefix = Span.new(text: "#{"  " * indent}#{bullet} ", color: :cyan)
-      src    = el.options[:location]
-      lines  = []
+      src = el.options[:location]
+      lines = []
 
       el.children.each do |child|
         case child.type
@@ -79,10 +84,10 @@ module Marvi
             lines += render_block(child)
           end
         else
-          if lines.empty?
-            lines << RichLine.new([prefix] + render_inline(child), source_line: src)
+          lines << if lines.empty?
+            RichLine.new([prefix] + render_inline(child), source_line: src)
           else
-            lines << RichLine.new(render_inline(child))
+            RichLine.new(render_inline(child))
           end
         end
       end
@@ -90,12 +95,14 @@ module Marvi
     end
 
     def render_codeblock(el)
-      src  = el.options[:location]
+      src = el.options[:location]
       lang = el.options[:lang]
       lines = []
       lines << RichLine.new([Span.new(text: lang, color: :yellow)], source_line: src) if lang
       el.value.chomp.split("\n").each_with_index do |line, i|
-        line_src = src ? src + i + (lang ? 1 : 0) : nil
+        line_src = if src
+          src + i + (lang ? 1 : 0)
+        end
         lines << RichLine.new([Span.new(text: "  #{line}", color: :green, bg_color: :dark)], source_line: line_src)
       end
       lines << RichLine.blank
@@ -103,20 +110,21 @@ module Marvi
     end
 
     def render_blockquote(el)
-      inner  = el.children.flat_map { |child| render_block(child) }
+      inner = el.children.flat_map { |child| render_block(child) }
       prefix = Span.new(text: "│ ", color: :cyan)
       # preserve source_line from inner lines
       inner.map { |line| RichLine.new([prefix] + line.spans, source_line: line.source_line) } + [RichLine.blank]
     end
 
     def render_table(el)
-      src  = el.options[:location]
+      src = el.options[:location]
       rows = el.children.flat_map(&:children)
       header_row = el.children.find { |s| s.type == :thead }&.children&.first
 
       cell_spans = rows.map { |row| row.children.map { |cell| render_inline_children(cell) } }
-      col_widths = cell_spans.map { |row| row.map { |spans| spans.sum { |s| s.text.length } } }
+      natural_widths = cell_spans.map { |row| row.map { |spans| spans_display_width(spans) } }
         .transpose.map { |col| col.max }
+      col_widths = shrink_col_widths(natural_widths, @max_width)
 
       lines = []
       top = col_widths.map { |w| "─" * (w + 2) }.join("┬")
@@ -124,16 +132,23 @@ module Marvi
 
       rows.each_with_index do |row, ri|
         is_header = row == header_row
-        row_spans = []
-        row.children.each_with_index do |cell, ci|
+        wrapped = row.children.each_with_index.map do |_cell, ci|
           content = cell_spans[ri][ci]
-          plain_len = content.sum { |s| s.text.length }
-          padding = col_widths[ci] - plain_len
-          styled = is_header ? content.map { |s| Span.new(text: s.text, bold: true, color: :cyan) } : content
-          row_spans += [Span.new(text: "│ ", color: :cyan)] + styled + [Span.new(text: " " * (padding + 1))]
+          styled = is_header ? content.map { |s| Span.new(text: s.text, bold: true, italic: s.italic, color: :cyan, bg_color: s.bg_color) } : content
+          wrap_spans(styled, col_widths[ci])
+        end
+        sub_row_count = wrapped.map(&:size).max
+        sub_row_count.times do |j|
+          row_spans = []
+          wrapped.each_with_index do |cell_lines, ci|
+            sub_spans = cell_lines[j] || []
+            sub_len = spans_display_width(sub_spans)
+            padding = col_widths[ci] - sub_len
+            row_spans += [Span.new(text: "│ ", color: :cyan)] + sub_spans + [Span.new(text: " " * (padding + 1))]
+          end
+          row_spans << Span.new(text: "│", color: :cyan)
+          lines << RichLine.new(row_spans)
         end
-        row_spans << Span.new(text: "│", color: :cyan)
-        lines << RichLine.new(row_spans)
 
         if is_header
           sep = col_widths.map { |w| "─" * (w + 2) }.join("┼")
@@ -147,6 +162,63 @@ module Marvi
       lines
     end
 
+    def shrink_col_widths(widths, max_width)
+      budget = max_width - (3 * widths.size + 1)
+      total = widths.sum
+      return widths if total <= budget
+
+      shrunk = widths.dup
+      while total > budget
+        max_w, i = shrunk.each_with_index.max_by { |w, _| w }
+        break if max_w <= MIN_COL_WIDTH
+        shrunk[i] -= 1
+        total -= 1
+      end
+      shrunk
+    end
+
+    def wrap_spans(spans, width)
+      lines = [[]]
+      current_width = 0
+      spans.each do |span|
+        text = span.text.dup
+        until text.empty?
+          remaining = width - current_width
+          if remaining <= 0
+            lines << []
+            current_width = 0
+            remaining = width
+          end
+          taken = 0
+          chunk_width = 0
+          text.each_char do |c|
+            cw = Unicode::DisplayWidth.of(c)
+            break if chunk_width + cw > remaining
+            chunk_width += cw
+            taken += c.bytesize
+          end
+          if taken.zero?
+            first_char = text.each_char.first
+            taken = first_char.bytesize
+            chunk_width = Unicode::DisplayWidth.of(first_char)
+          end
+          chunk = text.byteslice(0, taken)
+          text = text.byteslice(taken..) || ""
+          lines.last << Span.new(text: chunk, bold: span.bold, italic: span.italic, color: span.color, bg_color: span.bg_color)
+          current_width += chunk_width
+          unless text.empty?
+            lines << []
+            current_width = 0
+          end
+        end
+      end
+      lines
+    end
+
+    def spans_display_width(spans)
+      spans.sum { |s| Unicode::DisplayWidth.of(s.text) }
+    end
+
     def render_inline_children(el)
       el.children.flat_map { |child| render_inline(child) }
     end

data/lib/marvi/renderer/ansi.rb

@@ -1,23 +1,31 @@
 # frozen_string_literal: true
 
+require "io/console"
+
 module Marvi
   module Renderer
     class ANSI
       COLOR_MAP = {
-        cyan:    Marvi::ANSI::CYAN,
-        green:   Marvi::ANSI::GREEN,
-        yellow:  Marvi::ANSI::YELLOW,
+        cyan: Marvi::ANSI::CYAN,
+        green: Marvi::ANSI::GREEN,
+        yellow: Marvi::ANSI::YELLOW,
         magenta: Marvi::ANSI::MAGENTA,
-        white:   Marvi::ANSI::WHITE
+        white: Marvi::ANSI::WHITE
       }.freeze
 
       def render(markdown)
-        lines = ASTWalker.new.walk(markdown)
+        lines = ASTWalker.new.walk(markdown, max_width: terminal_width)
         lines.map { |line| render_line(line) }.join("\n") + "\n"
       end
 
       private
 
+      def terminal_width
+        IO.console&.winsize&.last || Integer(ENV["COLUMNS"] || ASTWalker::DEFAULT_MAX_WIDTH)
+      rescue
+        ASTWalker::DEFAULT_MAX_WIDTH
+      end
+
       def render_line(line)
         line.spans.map { |span| render_span(span) }.join
       end

data/lib/marvi/renderer/curses.rb

@@ -7,13 +7,13 @@ module Marvi
   module Renderer
     class Curses
       COLOR_PAIRS = {
-        cyan:          1,
-        green:         2,
-        yellow:        3,
-        magenta:       4,
-        white:         5,
+        cyan: 1,
+        green: 2,
+        yellow: 3,
+        magenta: 4,
+        white: 5,
         green_on_dark: 6,
-        cyan_on_dark:  7
+        cyan_on_dark: 7
       }.freeze
 
       ITALIC_ATTR = (defined?(::Curses::A_ITALIC) ? ::Curses::A_ITALIC : 0)
@@ -21,13 +21,13 @@ module Marvi
       FILE_POLL_INTERVAL_MS = 500
 
       def render(markdown, file: nil)
-        @file     = file
+        @file = file
         @markdown = markdown
-        @lines    = ASTWalker.new.walk(markdown)
-        @scroll   = 0
+        @scroll = 0
         mark_reloaded
 
         init_curses_state
+        rewalk
         draw
 
         catch(:quit) do
@@ -84,36 +84,49 @@ module Marvi
 
         output = IO.popen(["infocmp", "-1", term, err: File::NULL], &:read)
         @infocmp_cache[term] = $?.success? ? output : nil
-      rescue StandardError
+      rescue
         @infocmp_cache[term] = nil
       end
 
       def setup_colors
-        ::Curses.init_pair(COLOR_PAIRS[:cyan],          ::Curses::COLOR_CYAN,    -1)
-        ::Curses.init_pair(COLOR_PAIRS[:green],         ::Curses::COLOR_GREEN,   -1)
-        ::Curses.init_pair(COLOR_PAIRS[:yellow],        ::Curses::COLOR_YELLOW,  -1)
-        ::Curses.init_pair(COLOR_PAIRS[:magenta],       ::Curses::COLOR_MAGENTA, -1)
-        ::Curses.init_pair(COLOR_PAIRS[:white],         ::Curses::COLOR_WHITE,   -1)
-        ::Curses.init_pair(COLOR_PAIRS[:green_on_dark], ::Curses::COLOR_GREEN,   ::Curses::COLOR_BLACK)
-        ::Curses.init_pair(COLOR_PAIRS[:cyan_on_dark],  ::Curses::COLOR_CYAN,    ::Curses::COLOR_BLACK)
+        ::Curses.init_pair(COLOR_PAIRS[:cyan], ::Curses::COLOR_CYAN, -1)
+        ::Curses.init_pair(COLOR_PAIRS[:green], ::Curses::COLOR_GREEN, -1)
+        ::Curses.init_pair(COLOR_PAIRS[:yellow], ::Curses::COLOR_YELLOW, -1)
+        ::Curses.init_pair(COLOR_PAIRS[:magenta], ::Curses::COLOR_MAGENTA, -1)
+        ::Curses.init_pair(COLOR_PAIRS[:white], ::Curses::COLOR_WHITE, -1)
+        ::Curses.init_pair(COLOR_PAIRS[:green_on_dark], ::Curses::COLOR_GREEN, ::Curses::COLOR_BLACK)
+        ::Curses.init_pair(COLOR_PAIRS[:cyan_on_dark], ::Curses::COLOR_CYAN, ::Curses::COLOR_BLACK)
       end
 
       def handle_key(key)
         case key
-        when "q", "Q", 27                   then throw :quit
-        when "j", ::Curses::Key::DOWN       then scroll_by(1)
-        when "k", ::Curses::Key::UP         then scroll_by(-1)
-        when "d"                            then scroll_by(page_size / 2)
-        when "u"                            then scroll_by(-page_size / 2)
+        when "q", "Q", 27 then throw :quit
+        when "j", ::Curses::Key::DOWN then scroll_by(1)
+        when "k", ::Curses::Key::UP then scroll_by(-1)
+        when "d" then scroll_by(page_size / 2)
+        when "u" then scroll_by(-page_size / 2)
         when "f", " ", ::Curses::Key::NPAGE then scroll_by(page_size)
-        when "b", ::Curses::Key::PPAGE      then scroll_by(-page_size)
-        when "g"                            then @scroll = 0; draw
-        when "G"                            then @scroll = max_scroll; draw
-        when "e"                            then launch_editor if @file
-        when "r", "R"                       then reload_from_key if @file
+        when "b", ::Curses::Key::PPAGE then scroll_by(-page_size)
+        when "g" then @scroll = 0
+                      draw
+        when "G" then @scroll = max_scroll
+                      draw
+        when "e" then launch_editor if @file
+        when "r", "R" then reload_from_key if @file
+        when ::Curses::Key::RESIZE then handle_resize
         end
       end
 
+      def handle_resize
+        rewalk
+        @scroll = [@scroll, max_scroll].min
+        draw
+      end
+
+      def rewalk
+        @lines = ASTWalker.new.walk(@markdown, max_width: ::Curses.cols)
+      end
+
       def reload_from_key
         reload
         mark_reloaded
@@ -134,7 +147,7 @@ module Marvi
       end
 
       def mark_reloaded
-        @last_mtime   = current_mtime
+        @last_mtime = current_mtime
         @file_updated = false
       end
 
@@ -147,21 +160,21 @@ module Marvi
 
       def launch_editor
         editor = ENV["EDITOR"] || ENV["VISUAL"] || "vi"
-        line   = current_source_line
-        cmd    = build_editor_command(editor, @file, line)
+        line = current_source_line
+        cmd = build_editor_command(editor, @file, line)
 
         ::Curses.close_screen
         system(cmd)
+        init_curses_state
         reload
         mark_reloaded
-        init_curses_state
         draw
       end
 
       def reload
         @markdown = File.read(@file)
-        @lines    = ASTWalker.new.walk(@markdown)
-        @scroll   = [@scroll, max_scroll].min
+        rewalk
+        @scroll = [@scroll, max_scroll].min
       end
 
       def init_curses_state
@@ -208,7 +221,7 @@ module Marvi
 
       def draw_status_bar
         ::Curses.setpos(::Curses.lines - 1, 0)
-        top    = @scroll + 1
+        top = @scroll + 1
         bottom = [@scroll + page_size, @lines.size].min
         edit_hint = @file ? "  e edit" : ""
         status = " #{top}-#{bottom}/#{@lines.size}  j/k scroll  g/G top/bottom#{edit_hint}  q quit"
@@ -245,10 +258,10 @@ module Marvi
       def build_attr(span)
         attr = 0
         attr |= ::Curses::A_BOLD if span.bold
-        attr |= ITALIC_ATTR      if span.italic
+        attr |= ITALIC_ATTR if span.italic
 
         pair_key = if span.bg_color == :dark
-          span.color == :cyan ? :cyan_on_dark : :green_on_dark
+          (span.color == :cyan) ? :cyan_on_dark : :green_on_dark
         elsif span.color
           span.color
         end
@@ -270,7 +283,7 @@ module Marvi
       end
 
       def scroll_by(delta)
-        @scroll = [[@scroll + delta, 0].max, max_scroll].min
+        @scroll = (@scroll + delta).clamp(0, max_scroll)
         draw
       end
     end

data/lib/marvi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Marvi
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marvi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mitsutaka Mimura
@@ -51,6 +51,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: unicode-display_width
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Renders Markdown with ANSI colors in pipes and an interactive curses
   pager in TTY.
 email:
@@ -60,6 +74,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".claude/hooks/standardrb-check.sh"
+- ".claude/settings.json"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - LICENSE.txt