sup 1.2 → 1.4

data/test/unit/test_line_cursor_mode.rb

@@ -0,0 +1,208 @@
+require "test_helper"
+require "dummy_buffer"
+
+require "sup"
+
+class TestLineCursorMode < Minitest::Test
+  def setup
+    $config = {
+      :load_more_threads_hysteresis => 0,
+      :load_more_threads_when_scrolling => true,
+      :continuous_scroll => false,
+    }
+    Redwood::BufferManager.init
+    @modes_to_cleanup = []
+    @lines = []
+    @load_more = Thread::Queue.new
+    @buffer_height = 41  # 1 for status line, 40 usable lines
+  end
+
+  def teardown
+    @modes_to_cleanup.each { |mode| mode.cleanup }
+    Redwood::BufferManager.deinstantiate!
+    $config = nil
+  end
+
+  def make_mode
+    mode = Redwood::LineCursorMode.new
+    @modes_to_cleanup << mode
+    lines = @lines
+    mode.define_singleton_method(:lines) { lines.length }
+    mode.define_singleton_method(:[]) { |i| lines[i] }
+    mode.send(:to_load_more) { |n| @load_more << n }
+    mode.buffer = Redwood::DummyBuffer.new 100, @buffer_height
+    mode.spawned
+    mode.draw
+    mode
+  end
+
+  def expect_load_more n
+    begin
+      requested = @load_more.pop :timeout => 0.1
+    rescue ThreadError
+      ## Ruby < 3.2 does not obey the timeout for Queue#pop
+      sleep 0.1
+      requested = @load_more.pop true
+    end
+    refute_nil requested, "Expected load_more callbacks to fire"
+    assert_equal n, requested
+    (0...n).map { |i| @lines << "line #{i}" }
+  end
+
+  def test_cursor_down
+    mode = make_mode
+    expect_load_more 41
+    mode.draw  # curpos gets messed up without this call, why?
+
+    21.times do
+      mode.handle_input Ncurses::CharCode.character('j')
+    end
+    assert_equal 21, mode.curpos
+    assert_equal 0, mode.topline
+
+    ## Two past halfway, load_more callbacks are triggered.
+    mode.handle_input Ncurses::CharCode.character('j')
+    assert_equal 22, mode.curpos
+    expect_load_more 40
+
+    17.times do
+      mode.handle_input Ncurses::CharCode.character('j')
+    end
+    assert_equal 39, mode.curpos
+    assert_equal 0, mode.topline
+
+    ## From the bottom line, it wraps back to the top of the next page.
+    mode.handle_input Ncurses::CharCode.character('j')
+    assert_equal 40, mode.curpos
+    assert_equal 40, mode.topline
+  end
+
+  def test_scroll_down
+    mode = make_mode
+    expect_load_more 41
+
+    ## When the cursor is already at the top, it moves with the scroll.
+    assert_equal 0, mode.curpos
+    assert_equal 0, mode.topline
+    mode.handle_input Ncurses::CharCode.character('J')
+    assert_equal 1, mode.curpos
+    assert_equal 1, mode.topline
+
+    3.times do
+      mode.handle_input Ncurses::CharCode.character('j')
+    end
+    assert_equal 4, mode.curpos
+    assert_equal 1, mode.topline
+
+    ## When the cursor is not at the top, it keeps its place and the
+    ## buffer scrolls underneath it.
+    mode.handle_input Ncurses::CharCode.character('J')
+    assert_equal 4, mode.curpos
+    assert_equal 2, mode.topline
+
+    ## It always loads 10 more if we would scroll past the bottom.
+    expect_load_more 10
+  end
+
+  def test_page_down
+    mode = make_mode
+    expect_load_more 41
+
+    mode.handle_input Ncurses::CharCode.keycode(Ncurses::KEY_NPAGE)
+    assert_equal 40, mode.curpos
+    assert_equal 40, mode.topline
+    expect_load_more 40
+
+    mode.handle_input Ncurses::CharCode.keycode(Ncurses::KEY_NPAGE)
+    assert_equal 80, mode.curpos
+    assert_equal 80, mode.topline
+    assert_equal 81, mode.lines
+    expect_load_more 40
+  end
+
+  def test_page_down_when_fully_populated
+    mode = make_mode
+    expect_load_more 41
+    (0...119).map { |i| @lines << "more line #{i}" }  # enough for 4 full pages
+
+    mode.handle_input Ncurses::CharCode.keycode(Ncurses::KEY_NPAGE)
+    assert_equal 40, mode.curpos
+    assert_equal 40, mode.topline
+
+    ## Relative cursor position is preserved when paging down.
+    3.times do
+      mode.handle_input Ncurses::CharCode.character('j')
+    end
+    assert_equal 43, mode.curpos
+    assert_equal 40, mode.topline
+    mode.handle_input Ncurses::CharCode.keycode(Ncurses::KEY_NPAGE)
+    assert_equal 83, mode.curpos
+    assert_equal 80, mode.topline
+  end
+
+  def test_half_page_down
+    mode = make_mode
+    expect_load_more 41
+
+    mode.handle_input Ncurses::CharCode.character("\C-d")
+    assert_equal 20, mode.curpos
+    assert_equal 20, mode.topline
+    expect_load_more 40
+
+    mode.handle_input Ncurses::CharCode.character("\C-d")
+    assert_equal 40, mode.curpos
+    assert_equal 40, mode.topline
+  end
+
+  def test_half_page_down_when_fully_populated
+    mode = make_mode
+    expect_load_more 41
+    (0...119).map { |i| @lines << "more line #{i}" }  # enough for 4 full pages
+
+    mode.handle_input Ncurses::CharCode.character("\C-d")
+    assert_equal 20, mode.curpos
+    assert_equal 20, mode.topline
+
+    25.times do
+      mode.handle_input Ncurses::CharCode.character('j')
+    end
+    assert_equal 45, mode.curpos
+    assert_equal 20, mode.topline
+    mode.handle_input Ncurses::CharCode.character("\C-d")
+    assert_equal 45, mode.curpos
+    assert_equal 40, mode.topline
+  end
+
+  def test_half_page_up
+    mode = make_mode
+    expect_load_more 41
+    (0...119).map { |i| @lines << "more line #{i}" }  # enough for 4 full pages
+
+    mode.handle_input Ncurses::CharCode.keycode(Ncurses::KEY_NPAGE)
+    assert_equal 40, mode.curpos
+    assert_equal 40, mode.topline
+
+    mode.handle_input Ncurses::CharCode.character("\C-u")
+    assert_equal 40, mode.curpos
+    assert_equal 20, mode.topline
+
+    mode.handle_input Ncurses::CharCode.character('j')
+    assert_equal 41, mode.curpos
+    assert_equal 20, mode.topline
+
+    mode.handle_input Ncurses::CharCode.character("\C-u")
+    assert_equal 40, mode.curpos
+    assert_equal 0, mode.topline
+  end
+
+  def test_jump_to_end
+    mode = make_mode
+    expect_load_more 41
+
+    mode.handle_input Ncurses::CharCode.keycode(Ncurses::KEY_END)
+    assert_equal 40, mode.curpos
+    assert_equal 1, mode.topline
+    assert_equal 41, mode.botline
+    expect_load_more 40
+  end
+end

data/test/unit/test_person.rb

@@ -5,12 +5,12 @@ module Redwood
 
 class TestPerson < Minitest::Test
   def setup
-    @person = Person.new("Thomassen, Bob", "bob@thomassen.com")
-    @no_name = Person.new(nil, "alice@alice.com")
+    @person = Person.new(+"Thomassen, Bob", +"bob@thomassen.com")
+    @no_name = Person.new(nil, +"alice@alice.com")
   end
 
   def test_email_must_be_supplied
-    assert_raises (ArgumentError) { Person.new("Alice", nil) }
+    assert_raises (ArgumentError) { Person.new(+"Alice", nil) }
   end
 
   def test_to_string

data/test/unit/test_rmail_message.rb

@@ -0,0 +1,36 @@
+require "test_helper"
+
+require "sup"
+
+class TestRMailMessage < Minitest::Test
+  def setup
+    @path = Dir.mktmpdir
+  end
+
+  def teardown
+    FileUtils.rm_r @path
+  end
+
+  def test_make_file_attachment
+    filename = File.join @path, "test.html"
+    File.write filename, "<html></html>"
+
+    a = RMail::Message.make_file_attachment(filename)
+    assert_equal "text/html; name=\"test.html\"", a.header["Content-Type"]
+    assert_equal "attachment; filename=\"test.html\"", a.header["Content-Disposition"]
+    assert_equal "8bit", a.header["Content-Transfer-Encoding"]
+  end
+
+  def test_make_file_attachment_text_with_long_lines
+    filename = File.join @path, "test.html"
+    File.write filename, "a" * 1023
+
+    a = RMail::Message.make_file_attachment(filename)
+    assert_equal "text/html; name=\"test.html\"", a.header["Content-Type"]
+    assert_equal "attachment; filename=\"test.html\"", a.header["Content-Disposition"]
+    assert_equal "quoted-printable", a.header["Content-Transfer-Encoding"]
+
+    qp_encoded = ("a" * 73 + "=\n") * 14 + "a=\n"
+    assert_equal qp_encoded, a.body
+  end
+end

data/test/unit/util/test_string.rb

@@ -18,7 +18,7 @@ describe "Sup's String extension" do
 
     it "calculates display length of a string" do
       data.each do |(str, length)|
-        assert_equal length, str.display_length
+        assert_equal length, str.dup.display_length
       end
     end
   end
@@ -36,7 +36,7 @@ describe "Sup's String extension" do
 
     it "slices string by display length" do
       data.each do |(str, length, sliced)|
-        assert_equal sliced, str.slice_by_display_length(length)
+        assert_equal sliced, str.dup.slice_by_display_length(length)
       end
     end
   end
@@ -56,7 +56,7 @@ describe "Sup's String extension" do
 
     it "wraps string by display length" do
       data.each do |(str, length, wrapped)|
-        assert_equal wrapped, str.wrap(length)
+        assert_equal wrapped, str.dup.wrap(length)
       end
     end
   end

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: sup
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.4'
 platform: ruby
 authors:
 - William Morgan
 - Gaute Hope
 - Hamish Downer
 - Matthieu Rakotojaona
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-21 00:00:00.000000000 Z
+date: 2026-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ncursesw
@@ -159,6 +158,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fiddle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -336,11 +363,21 @@ files:
 - contrib/nix/ruby2.6-Gemfile.lock
 - contrib/nix/ruby2.6-gemset.nix
 - contrib/nix/ruby2.6-shell.nix
+- contrib/nix/ruby2.7-Gemfile.lock
+- contrib/nix/ruby2.7-gemset.nix
 - contrib/nix/ruby2.7-shell.nix
+- contrib/nix/ruby3.0-Gemfile.lock
+- contrib/nix/ruby3.0-gemset.nix
 - contrib/nix/ruby3.0-shell.nix
+- contrib/nix/ruby3.1-Gemfile.lock
+- contrib/nix/ruby3.1-gemset.nix
 - contrib/nix/ruby3.1-shell.nix
+- contrib/nix/ruby3.2-Gemfile.lock
+- contrib/nix/ruby3.2-gemset.nix
 - contrib/nix/ruby3.2-shell.nix
 - contrib/nix/ruby3.3-shell.nix
+- contrib/nix/ruby3.4-shell.nix
+- contrib/nix/ruby4.0-shell.nix
 - contrib/nix/test-all-rubies.sh
 - devel/console.sh
 - devel/count-loc.sh
@@ -428,14 +465,16 @@ files:
 - man/sup-sync.1
 - man/sup-tweak-labels.1
 - man/sup.1
-- shell.nix
 - sup.gemspec
+- test/dummy_buffer.rb
 - test/dummy_source.rb
 - test/fixtures/bad-content-transfer-encoding-1.eml
 - test/fixtures/binary-content-transfer-encoding-2.eml
 - test/fixtures/blank-header-fields.eml
 - test/fixtures/contacts.txt
+- test/fixtures/embedded-message-rfc6532.eml
 - test/fixtures/embedded-message.eml
+- test/fixtures/invalid-date.eml
 - test/fixtures/mailing-list-header.eml
 - test/fixtures/malicious-attachment-names.eml
 - test/fixtures/missing-from-to.eml
@@ -452,13 +491,16 @@ files:
 - test/fixtures/zimbra-quote-with-bottom-post.eml
 - test/gnupg_test_home/.gpg-v21-migrated
 - test/gnupg_test_home/gpg.conf
-- test/gnupg_test_home/private-keys-v1.d/306D2EE90FF0014B5B9FD07E265C751791674140.key
+- test/gnupg_test_home/private-keys-v1.d/26C05E44706A8E230B3255BB9532B34DC9420232.key
+- test/gnupg_test_home/private-keys-v1.d/D187ADC90EC4DEB7047678EAA37E33A53A465D47.key
+- test/gnupg_test_home/private-keys-v1.d/FB2D9BD3B1BE90B5BCF697781F8404224B0FCF5B.key
 - test/gnupg_test_home/pubring.gpg
 - test/gnupg_test_home/receiver_pubring.gpg
 - test/gnupg_test_home/receiver_secring.gpg
 - test/gnupg_test_home/regen_keys.sh
 - test/gnupg_test_home/secring.gpg
 - test/gnupg_test_home/sup-test-2@foo.bar.asc
+- test/integration/test_draft.rb
 - test/integration/test_maildir.rb
 - test/integration/test_mbox.rb
 - test/integration/test_sup-add.rb
@@ -471,13 +513,17 @@ files:
 - test/test_yaml_regressions.rb
 - test/unit/service/test_label_service.rb
 - test/unit/test_contact.rb
+- test/unit/test_edit_message_mode.rb
 - test/unit/test_horizontal_selector.rb
+- test/unit/test_index.rb
+- test/unit/test_line_cursor_mode.rb
 - test/unit/test_locale_fiddler.rb
 - test/unit/test_person.rb
+- test/unit/test_rmail_message.rb
 - test/unit/util/test_query.rb
 - test/unit/util/test_string.rb
 - test/unit/util/test_uri.rb
-homepage: https://sup-heliotrope.github.io/
+homepage: https://supmua.dev/
 licenses:
 - GPL-2.0
 metadata: {}
@@ -504,17 +550,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: A console-based email client with the best features of GMail, mutt and Emacs
 test_files:
+- test/dummy_buffer.rb
 - test/dummy_source.rb
 - test/fixtures/bad-content-transfer-encoding-1.eml
 - test/fixtures/binary-content-transfer-encoding-2.eml
 - test/fixtures/blank-header-fields.eml
 - test/fixtures/contacts.txt
+- test/fixtures/embedded-message-rfc6532.eml
 - test/fixtures/embedded-message.eml
+- test/fixtures/invalid-date.eml
 - test/fixtures/mailing-list-header.eml
 - test/fixtures/malicious-attachment-names.eml
 - test/fixtures/missing-from-to.eml
@@ -531,13 +579,16 @@ test_files:
 - test/fixtures/zimbra-quote-with-bottom-post.eml
 - test/gnupg_test_home/.gpg-v21-migrated
 - test/gnupg_test_home/gpg.conf
-- test/gnupg_test_home/private-keys-v1.d/306D2EE90FF0014B5B9FD07E265C751791674140.key
+- test/gnupg_test_home/private-keys-v1.d/26C05E44706A8E230B3255BB9532B34DC9420232.key
+- test/gnupg_test_home/private-keys-v1.d/D187ADC90EC4DEB7047678EAA37E33A53A465D47.key
+- test/gnupg_test_home/private-keys-v1.d/FB2D9BD3B1BE90B5BCF697781F8404224B0FCF5B.key
 - test/gnupg_test_home/pubring.gpg
 - test/gnupg_test_home/receiver_pubring.gpg
 - test/gnupg_test_home/receiver_secring.gpg
 - test/gnupg_test_home/regen_keys.sh
 - test/gnupg_test_home/secring.gpg
 - test/gnupg_test_home/sup-test-2@foo.bar.asc
+- test/integration/test_draft.rb
 - test/integration/test_maildir.rb
 - test/integration/test_mbox.rb
 - test/integration/test_sup-add.rb
@@ -550,9 +601,13 @@ test_files:
 - test/test_yaml_regressions.rb
 - test/unit/service/test_label_service.rb
 - test/unit/test_contact.rb
+- test/unit/test_edit_message_mode.rb
 - test/unit/test_horizontal_selector.rb
+- test/unit/test_index.rb
+- test/unit/test_line_cursor_mode.rb
 - test/unit/test_locale_fiddler.rb
 - test/unit/test_person.rb
+- test/unit/test_rmail_message.rb
 - test/unit/util/test_query.rb
 - test/unit/util/test_string.rb
 - test/unit/util/test_uri.rb

data/shell.nix

@@ -1 +0,0 @@
-contrib/nix/ruby3.3-shell.nix