html-to-markdown 2.27.2 → 2.28.0

data/rust-vendor/tokio/tests/tcp_socket.rs

@@ -62,7 +62,6 @@ async fn bind_before_connect() {
 }
 
 #[tokio::test]
-#[expect(deprecated)] // set_linger is deprecated
 async fn basic_linger() {
     // Create server
     let addr = assert_ok!("127.0.0.1:0".parse());
@@ -71,7 +70,7 @@ async fn basic_linger() {
 
     assert!(srv.linger().unwrap().is_none());
 
-    srv.set_linger(Some(Duration::new(0, 0))).unwrap();
+    srv.set_zero_linger().unwrap();
     assert_eq!(srv.linger().unwrap(), Some(Duration::new(0, 0)));
 }
 
@@ -124,10 +123,10 @@ const SET_BUF_SIZE: u32 = 4096;
 // Linux doubles the buffer size for kernel usage, and exposes that when
 // retrieving the buffer size.
 
-#[cfg(not(target_os = "linux"))]
+#[cfg(not(any(target_os = "android", target_os = "linux")))]
 const GET_BUF_SIZE: u32 = SET_BUF_SIZE;
 
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "android", target_os = "linux"))]
 const GET_BUF_SIZE: u32 = 2 * SET_BUF_SIZE;
 
 test!(keepalive, set_keepalive(true));

data/rust-vendor/tokio/tests/tcp_stream.rs

@@ -25,6 +25,9 @@ async fn set_linger() {
     assert_ok!(stream.set_linger(Some(Duration::from_secs(1))));
     assert_eq!(stream.linger().unwrap().unwrap().as_secs(), 1);
 
+    assert_ok!(stream.set_zero_linger());
+    assert_eq!(stream.linger().unwrap().unwrap().as_secs(), 0);
+
     assert_ok!(stream.set_linger(None));
     assert!(stream.linger().unwrap().is_none());
 }

data/sig/html_to_markdown.rbs

@@ -185,6 +185,18 @@ module HtmlToMarkdown
     structured_data: Array[structured_data]
   }
 
+  type table_data = {
+    cells: Array[Array[String]],
+    markdown: String,
+    is_header_row: Array[bool]
+  }
+
+  type table_extraction_result = {
+    content: String,
+    metadata: extended_metadata?,
+    tables: Array[table_data]
+  }
+
   # Native methods (implemented in Rust via Magnus/rb-sys)
   # These are aliased from the Rust extension and available as both module and instance methods
   private
@@ -217,6 +229,11 @@ module HtmlToMarkdown
     conversion_options? options,
     visitor? visitor
   ) -> String
+  def self.native_convert_with_tables: (
+    String html,
+    conversion_options? options,
+    metadata_config? metadata_config
+  ) -> table_extraction_result
 
   def native_convert: (String html, conversion_options? options) -> String
   def native_options: (conversion_options? options_hash) -> Options
@@ -246,6 +263,11 @@ module HtmlToMarkdown
     conversion_options? options,
     visitor? visitor
   ) -> String
+  def native_convert_with_tables: (
+    String html,
+    conversion_options? options,
+    metadata_config? metadata_config
+  ) -> table_extraction_result
 
   # Visitor interface for customizing conversion behavior
   type visitor = Object
@@ -422,6 +444,25 @@ module HtmlToMarkdown
     ?metadata_config metadata_config
   ) -> [String, extended_metadata]
 
+  # Convert HTML and extract tables as structured data
+  #
+  # Args:
+  #   html: HTML string to convert
+  #   options: Optional conversion configuration
+  #   metadata_config: Optional metadata extraction configuration
+  #
+  # Returns:
+  #   table_extraction_result: Hash containing content, metadata, and tables array
+  #
+  # Example:
+  #   result = HtmlToMarkdown.convert_with_tables(html)
+  #   puts result[:tables].length
+  def self.convert_with_tables: (
+    String html,
+    ?conversion_options options,
+    ?metadata_config metadata_config
+  ) -> table_extraction_result
+
   # Instance method versions (created by module_function)
   def convert: (String html, ?conversion_options options, ?visitor visitor) -> String
   def options: (?conversion_options options_hash) -> Options
@@ -449,4 +490,9 @@ module HtmlToMarkdown
     Options options_handle,
     ?metadata_config metadata_config
   ) -> [String, extended_metadata]
+  def convert_with_tables: (
+    String html,
+    ?conversion_options options,
+    ?metadata_config metadata_config
+  ) -> table_extraction_result
 end

data/spec/convert_with_tables_spec.rb

@@ -0,0 +1,194 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe HtmlToMarkdown do
+  describe '.convert_with_tables' do
+    it 'returns a hash with content, metadata, and tables keys' do
+      html = '<table><tr><td>Cell</td></tr></table>'
+      result = described_class.convert_with_tables(html)
+
+      expect(result).to be_a(Hash)
+      expect(result).to include(:content, :metadata, :tables)
+    end
+
+    context 'with a basic table with header' do
+      let(:html) do
+        <<~HTML
+          <table>
+            <thead>
+              <tr><th>Name</th><th>Age</th></tr>
+            </thead>
+            <tbody>
+              <tr><td>Alice</td><td>30</td></tr>
+            </tbody>
+          </table>
+        HTML
+      end
+
+      it 'extracts exactly one table' do
+        result = described_class.convert_with_tables(html)
+
+        expect(result[:tables].length).to eq(1)
+      end
+
+      it 'extracts cells as rows of columns' do
+        result = described_class.convert_with_tables(html)
+        table = result[:tables][0]
+
+        expect(table[:cells]).to be_an(Array)
+        expect(table[:cells].length).to eq(2)
+        expect(table[:cells][0]).to eq(%w[Name Age])
+        expect(table[:cells][1]).to eq(%w[Alice 30])
+      end
+
+      it 'provides markdown representation' do
+        result = described_class.convert_with_tables(html)
+        table = result[:tables][0]
+
+        expect(table[:markdown]).to be_a(String)
+        expect(table[:markdown]).to include('Name')
+        expect(table[:markdown]).to include('Alice')
+      end
+
+      it 'marks header rows correctly' do
+        result = described_class.convert_with_tables(html)
+        table = result[:tables][0]
+
+        expect(table[:is_header_row]).to be_an(Array)
+        expect(table[:is_header_row].length).to eq(2)
+        expect(table[:is_header_row][0]).to be true
+        expect(table[:is_header_row][1]).to be false
+      end
+
+      it 'includes converted markdown content' do
+        result = described_class.convert_with_tables(html)
+
+        expect(result[:content]).to be_a(String)
+        expect(result[:content]).not_to be_empty
+      end
+    end
+
+    context 'with empty HTML' do
+      it 'returns empty tables array' do
+        result = described_class.convert_with_tables('')
+
+        expect(result[:tables]).to eq([])
+        expect(result[:content]).to be_a(String)
+      end
+    end
+
+    context 'with HTML containing no tables' do
+      it 'returns empty tables array' do
+        html = '<p>No tables here</p>'
+        result = described_class.convert_with_tables(html)
+
+        expect(result[:tables]).to eq([])
+        expect(result[:content]).to include('No tables here')
+      end
+    end
+
+    context 'with multiple tables' do
+      let(:html) do
+        <<~HTML
+          <table>
+            <tr><th>A</th></tr>
+            <tr><td>1</td></tr>
+          </table>
+          <p>Some text between tables</p>
+          <table>
+            <tr><th>B</th><th>C</th></tr>
+            <tr><td>2</td><td>3</td></tr>
+            <tr><td>4</td><td>5</td></tr>
+          </table>
+        HTML
+      end
+
+      it 'extracts all tables' do
+        result = described_class.convert_with_tables(html)
+
+        expect(result[:tables].length).to eq(2)
+      end
+
+      it 'preserves table order' do
+        result = described_class.convert_with_tables(html)
+
+        first_table = result[:tables][0]
+        second_table = result[:tables][1]
+
+        expect(first_table[:cells][0]).to eq(['A'])
+        expect(second_table[:cells][0]).to eq(%w[B C])
+      end
+
+      it 'extracts correct row counts per table' do
+        result = described_class.convert_with_tables(html)
+
+        expect(result[:tables][0][:cells].length).to eq(2)
+        expect(result[:tables][1][:cells].length).to eq(3)
+      end
+    end
+
+    context 'with special characters in cells' do
+      let(:html) do
+        <<~HTML
+          <table>
+            <tr><th>Key</th><th>Value</th></tr>
+            <tr><td>Brackets &lt;&gt;</td><td>Ampersand &amp;</td></tr>
+            <tr><td>Quotes "double"</td><td>Quotes 'single'</td></tr>
+            <tr><td>Unicode: cafe\u0301</td><td>Emoji: test</td></tr>
+          </table>
+        HTML
+      end
+
+      it 'handles HTML entities in cells' do
+        result = described_class.convert_with_tables(html)
+        table = result[:tables][0]
+
+        expect(table[:cells][1][0]).to include('<>')
+        expect(table[:cells][1][1]).to include('&')
+      end
+
+      it 'handles quotes in cells' do
+        result = described_class.convert_with_tables(html)
+        table = result[:tables][0]
+
+        expect(table[:cells][2][0]).to include('"double"')
+        expect(table[:cells][2][1]).to include("'single'")
+      end
+
+      it 'handles unicode in cells' do
+        result = described_class.convert_with_tables(html)
+        table = result[:tables][0]
+
+        expect(table[:cells][3][0]).to be_a(String)
+      end
+    end
+
+    context 'with conversion options' do
+      it 'accepts options hash' do
+        html = '<table><tr><th>Header</th></tr><tr><td>Data</td></tr></table>'
+        result = described_class.convert_with_tables(html, { heading_style: :atx })
+
+        expect(result).to be_a(Hash)
+        expect(result[:tables].length).to eq(1)
+      end
+
+      it 'accepts nil options' do
+        html = '<table><tr><td>Data</td></tr></table>'
+        result = described_class.convert_with_tables(html, nil, nil)
+
+        expect(result).to be_a(Hash)
+        expect(result[:tables].length).to eq(1)
+      end
+    end
+
+    context 'with metadata config' do
+      it 'includes metadata when configured' do
+        html = '<html><head><title>Test</title></head><body><table><tr><td>Data</td></tr></table></body></html>'
+        result = described_class.convert_with_tables(html, nil, { extract_headers: true })
+
+        expect(result[:metadata]).to be_a(Hash).or(be_nil)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-to-markdown
 version: !ruby/object:Gem::Version
-  version: 2.27.2
+  version: 2.28.0
 platform: ruby
 authors:
 - Na'aman Hirschfeld
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-02 00:00:00.000000000 Z
+date: 2026-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -61,6 +61,7 @@ files:
 - ext/html-to-markdown-rb/native/src/conversion/inline_images.rs
 - ext/html-to-markdown-rb/native/src/conversion/metadata.rs
 - ext/html-to-markdown-rb/native/src/conversion/mod.rs
+- ext/html-to-markdown-rb/native/src/conversion/tables.rs
 - ext/html-to-markdown-rb/native/src/lib.rs
 - ext/html-to-markdown-rb/native/src/options.rs
 - ext/html-to-markdown-rb/native/src/profiling.rs
@@ -1550,7 +1551,8 @@ files:
 - rust-vendor/getrandom/src/sys_rng.rs
 - rust-vendor/getrandom/src/util.rs
 - rust-vendor/getrandom/src/utils/get_errno.rs
-- rust-vendor/getrandom/src/utils/lazy.rs
+- rust-vendor/getrandom/src/utils/lazy_bool.rs
+- rust-vendor/getrandom/src/utils/lazy_ptr.rs
 - rust-vendor/getrandom/src/utils/sanitizer.rs
 - rust-vendor/getrandom/src/utils/sys_fill_exact.rs
 - rust-vendor/getrandom/tests/mod.rs
@@ -1948,6 +1950,7 @@ files:
 - rust-vendor/html-to-markdown-rs/tests/issue_199_regressions.rs
 - rust-vendor/html-to-markdown-rs/tests/issue_200_regressions.rs
 - rust-vendor/html-to-markdown-rs/tests/issue_212_regressions.rs
+- rust-vendor/html-to-markdown-rs/tests/issue_216_217_regressions.rs
 - rust-vendor/html-to-markdown-rs/tests/json_ld_script_extraction.rs
 - rust-vendor/html-to-markdown-rs/tests/lists_test.rs
 - rust-vendor/html-to-markdown-rs/tests/plain_output_test.rs
@@ -4761,6 +4764,75 @@ files:
 - rust-vendor/quote/tests/ui/not-repeatable.stderr
 - rust-vendor/quote/tests/ui/wrong-type-span.rs
 - rust-vendor/quote/tests/ui/wrong-type-span.stderr
+- rust-vendor/r-efi-5.3.0/.cargo-checksum.json
+- rust-vendor/r-efi-5.3.0/.cargo_vcs_info.json
+- rust-vendor/r-efi-5.3.0/.github/workflows/publish.yml
+- rust-vendor/r-efi-5.3.0/.github/workflows/rust-tests.yml
+- rust-vendor/r-efi-5.3.0/AUTHORS
+- rust-vendor/r-efi-5.3.0/Cargo.lock
+- rust-vendor/r-efi-5.3.0/Cargo.toml
+- rust-vendor/r-efi-5.3.0/Cargo.toml.orig
+- rust-vendor/r-efi-5.3.0/Makefile
+- rust-vendor/r-efi-5.3.0/NEWS.md
+- rust-vendor/r-efi-5.3.0/README.md
+- rust-vendor/r-efi-5.3.0/examples/freestanding.rs
+- rust-vendor/r-efi-5.3.0/examples/gop-query.rs
+- rust-vendor/r-efi-5.3.0/examples/hello-world.rs
+- rust-vendor/r-efi-5.3.0/src/base.rs
+- rust-vendor/r-efi-5.3.0/src/hii.rs
+- rust-vendor/r-efi-5.3.0/src/lib.rs
+- rust-vendor/r-efi-5.3.0/src/protocols.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/absolute_pointer.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/block_io.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/bus_specific_driver_override.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/debug_support.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/debugport.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/decompress.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/device_path.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/device_path_from_text.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/device_path_to_text.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/device_path_utilities.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/disk_io.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/disk_io2.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/driver_binding.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/driver_diagnostics2.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/driver_family_override.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/file.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/graphics_output.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/hii_database.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/hii_font.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/hii_font_ex.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/hii_package_list.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/hii_string.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/ip4.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/ip6.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/load_file.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/load_file2.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/loaded_image.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/loaded_image_device_path.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/managed_network.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/memory_attribute.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/mp_services.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/pci_io.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/platform_driver_override.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/rng.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/service_binding.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/shell.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/shell_dynamic_command.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/shell_parameters.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/simple_file_system.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/simple_network.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/simple_text_input.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/simple_text_input_ex.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/simple_text_output.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/tcp4.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/tcp6.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/timestamp.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/udp4.rs
+- rust-vendor/r-efi-5.3.0/src/protocols/udp6.rs
+- rust-vendor/r-efi-5.3.0/src/system.rs
+- rust-vendor/r-efi-5.3.0/src/vendor.rs
+- rust-vendor/r-efi-5.3.0/src/vendor/intel/console_control.rs
 - rust-vendor/r-efi/.cargo-checksum.json
 - rust-vendor/r-efi/.cargo_vcs_info.json
 - rust-vendor/r-efi/.github/workflows/publish.yml
@@ -6317,6 +6389,7 @@ files:
 - rust-vendor/tokio/.cargo-checksum.json
 - rust-vendor/tokio/.cargo_vcs_info.json
 - rust-vendor/tokio/CHANGELOG.md
+- rust-vendor/tokio/Cargo.lock
 - rust-vendor/tokio/Cargo.toml
 - rust-vendor/tokio/Cargo.toml.orig
 - rust-vendor/tokio/LICENSE
@@ -6718,6 +6791,7 @@ files:
 - rust-vendor/tokio/tests/fs_uring_read.rs
 - rust-vendor/tokio/tests/fs_write.rs
 - rust-vendor/tokio/tests/io_async_fd.rs
+- rust-vendor/tokio/tests/io_async_fd_memory_leak.rs
 - rust-vendor/tokio/tests/io_async_read.rs
 - rust-vendor/tokio/tests/io_buf_reader.rs
 - rust-vendor/tokio/tests/io_buf_writer.rs
@@ -6774,12 +6848,14 @@ files:
 - rust-vendor/tokio/tests/process_smoke.rs
 - rust-vendor/tokio/tests/rt_basic.rs
 - rust-vendor/tokio/tests/rt_common.rs
+- rust-vendor/tokio/tests/rt_common_before_park.rs
 - rust-vendor/tokio/tests/rt_handle.rs
 - rust-vendor/tokio/tests/rt_handle_block_on.rs
 - rust-vendor/tokio/tests/rt_local.rs
 - rust-vendor/tokio/tests/rt_metrics.rs
 - rust-vendor/tokio/tests/rt_panic.rs
 - rust-vendor/tokio/tests/rt_poll_callbacks.rs
+- rust-vendor/tokio/tests/rt_shutdown_err.rs
 - rust-vendor/tokio/tests/rt_threaded.rs
 - rust-vendor/tokio/tests/rt_time_start_paused.rs
 - rust-vendor/tokio/tests/rt_unstable_metrics.rs
@@ -9662,6 +9738,7 @@ files:
 - sig/open3.rbs
 - spec/cli_proxy_spec.rb
 - spec/convert_spec.rb
+- spec/convert_with_tables_spec.rb
 - spec/metadata_extraction_spec.rb
 - spec/spec_helper.rb
 - spec/visitor_issue_187_spec.rb

data/rust-vendor/getrandom/src/utils/lazy.rs

@@ -1,64 +0,0 @@
-//! Helpers built around pointer-sized atomics.
-use core::sync::atomic::{AtomicUsize, Ordering};
-
-// This structure represents a lazily initialized static usize value. Useful
-// when it is preferable to just rerun initialization instead of locking.
-// unsync_init will invoke an init() function until it succeeds, then return the
-// cached value for future calls.
-//
-// unsync_init supports init() "failing". If the init() method returns UNINIT,
-// that value will be returned as normal, but will not be cached.
-//
-// Users should only depend on the _value_ returned by init() functions.
-// Specifically, for the following init() function:
-//      fn init() -> usize {
-//          a();
-//          let v = b();
-//          c();
-//          v
-//      }
-// the effects of c() or writes to shared memory will not necessarily be
-// observed and additional synchronization methods may be needed.
-struct LazyUsize(AtomicUsize);
-
-impl LazyUsize {
-    // The initialization is not completed.
-    const UNINIT: usize = usize::MAX;
-
-    const fn new() -> Self {
-        Self(AtomicUsize::new(Self::UNINIT))
-    }
-
-    // Runs the init() function at most once, returning the value of some run of
-    // init(). Multiple callers can run their init() functions in parallel.
-    // init() should always return the same value, if it succeeds.
-    fn unsync_init(&self, init: impl FnOnce() -> usize) -> usize {
-        #[cold]
-        fn do_init(this: &LazyUsize, init: impl FnOnce() -> usize) -> usize {
-            let val = init();
-            this.0.store(val, Ordering::Relaxed);
-            val
-        }
-
-        // Relaxed ordering is fine, as we only have a single atomic variable.
-        let val = self.0.load(Ordering::Relaxed);
-        if val != Self::UNINIT {
-            val
-        } else {
-            do_init(self, init)
-        }
-    }
-}
-
-// Identical to LazyUsize except with bool instead of usize.
-pub(crate) struct LazyBool(LazyUsize);
-
-impl LazyBool {
-    pub const fn new() -> Self {
-        Self(LazyUsize::new())
-    }
-
-    pub fn unsync_init(&self, init: impl FnOnce() -> bool) -> bool {
-        self.0.unsync_init(|| usize::from(init())) != 0
-    }
-}