wreq 1.2.7 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d852c54ebc9e5ea5e94dee83399d2d59f8df824cc68bc74065e94eb0885e99a6
-  data.tar.gz: def648deb12f7339b3de1271dee582cb9e9c03f9cf6cf483bc8031f3815861b5
+  metadata.gz: 25b79ef76824f974c6f5f00e86bc1ad5ff1cbe76a5b87aad4f22e96e53d082d5
+  data.tar.gz: 4881b9242c6e672d67429406b2a029a8094904334d848ede43d3a97b44552334
 SHA512:
-  metadata.gz: f25d1ee505f44c8ce4c81b8f12f91a87d7ec6b5c324aa1c2478a6d9a2e18e4604036f46bd9cf711b951007ae53cb6811dd0b7e77973631d179dfd070f2c240ce
-  data.tar.gz: 890f1c4514804666a60f40735d9a678c26edbf0c2d17d057990e61d3209e39aca819c2ebf26cff8e4a3f1a2f7661b94467f109d24f469c3e93007f6c5bcdbf7a
+  metadata.gz: 737b77b0962becd596b4ebc05f0f8d3aebe547a9c6826aa1d6a76e1367f98d69abfa0874f345f635a570ef4478260660d7c83f802d18a5663b96b14e4a28abc8
+  data.tar.gz: 5bfdf49fe4df28390b08579298dac69422fd7c01cc9ab2055a739d8c165c3ec7362d21dde2ced8b751a81e80013c74a59a6bea832af654710353bd741bcce1a3

data/Cargo.lock

@@ -113,7 +113,7 @@ dependencies = [
 [[package]]
 name = "btls"
 version = "0.5.6"
-source = "git+https://github.com/0x676e67/btls?branch=demo%2Fmerge-upstream-boring-20260616#3100f47f98d45765a55ce0b9f8d3a281109cb6fe"
+source = "git+https://github.com/0x676e67/btls?branch=demo%2Fmerge-upstream-boring-20260616#67bc8c3547acabe5aa97f8e4529813926f2f7d4d"
 dependencies = [
  "bitflags",
  "btls-sys",
@@ -125,7 +125,7 @@ dependencies = [
 [[package]]
 name = "btls-sys"
 version = "0.5.6"
-source = "git+https://github.com/0x676e67/btls?branch=demo%2Fmerge-upstream-boring-20260616#3100f47f98d45765a55ce0b9f8d3a281109cb6fe"
+source = "git+https://github.com/0x676e67/btls?branch=demo%2Fmerge-upstream-boring-20260616#67bc8c3547acabe5aa97f8e4529813926f2f7d4d"
 dependencies = [
  "bindgen",
  "cmake",
@@ -260,9 +260,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
+checksum = "9e5e8f6c15a24b9a3ee5efec809ccd006d3b30e8b3bb63c39af737c7f87daa1d"
 
 [[package]]
 name = "encoding_rs"
@@ -1549,7 +1549,7 @@ dependencies = [
 
 [[package]]
 name = "wreq-ruby"
-version = "1.2.7"
+version = "1.2.9"
 dependencies = [
  "arc-swap",
  "bytes",

data/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["SearchApi <support@searchapi.io>"]
 homepage = "https://github.com/SearchApi/wreq-ruby"
 repository = "https://github.com/SearchApi/wreq-ruby"
 edition = "2024"
-version = "1.2.7"
+version = "1.2.9"
 rust-version = "1.95"
 
 [lib]
@@ -16,7 +16,7 @@ name = "wreq_ruby"
 [dependencies]
 magnus = { version = "0.8.2", features = ["bytes"] }
 rb-sys = { version = "0.9.128", default-features = false }
-tokio = { version = "1.52.3", features = ["full"] }
+tokio = { version = "1.53.1", features = ["full"] }
 wreq = { version = "6.0.0-rc", features = [
     "query",
     "form",
@@ -64,4 +64,4 @@ strip = true
 [patch.crates-io]
 btls = { git = "https://github.com/0x676e67/btls", branch = "demo/merge-upstream-boring-20260616" }
 btls-sys = { git = "https://github.com/0x676e67/btls", branch = "demo/merge-upstream-boring-20260616" }
-wreq-util = { path = "crates/wreq-util" }
+wreq-util = { path = "crates/wreq-util" }

data/lib/wreq_ruby/error.rb

@@ -2,6 +2,10 @@
 
 unless defined?(Wreq)
   module Wreq
+    # Keep interruption outside StandardError so a broad transport rescue
+    # never swallows a Ruby interrupt.
+    class InterruptError < Interrupt; end
+
     # System-level and runtime errors
 
     # Memory allocation failed.

data/src/client/body/stream.rs

@@ -113,7 +113,7 @@ impl BodySender {
     /// # Errors
     ///
     /// Returns `IOError` after either channel side has closed. An interrupted
-    /// wait raises Ruby's standard `Interrupt` exception.
+    /// wait raises `Wreq::InterruptError`.
     pub fn push(ruby: &Ruby, rb_self: &Self, data: RString) -> Result<(), Error> {
         // Clone during the shared borrow, then release it before waiting
         // for capacity. Request attachment needs a mutable borrow.

data/src/error.rs

@@ -84,14 +84,18 @@ define_exception!(DECODING_ERROR, "DecodingError", exception_runtime_error);
 // Configuration and builder errors
 define_exception!(BUILDER_ERROR, "BuilderError", exception_runtime_error);
 
+// Keep interruption outside StandardError so a broad transport rescue
+// never swallows a Ruby interrupt.
+define_exception!(INTERRUPT_ERROR, "InterruptError", exception_interrupt);
+
 /// Memory error constant
 pub fn memory_error(ruby: &Ruby) -> MagnusError {
     MagnusError::new(ruby.get_inner(&MEMORY), RACE_CONDITION_ERROR_MSG)
 }
 
-/// Create Ruby's standard thread interruption error.
+/// Create a `Wreq::InterruptError` when Ruby interrupts a request.
 pub fn interrupt_error(ruby: &Ruby) -> MagnusError {
-    MagnusError::new(ruby.exception_interrupt(), "request interrupted")
+    MagnusError::new(ruby.get_inner(&INTERRUPT_ERROR), "request interrupted")
 }
 
 /// Map a Tokio runtime initialization failure to `Wreq::BuilderError`.
@@ -312,5 +316,12 @@ pub fn include(ruby: &Ruby, gem_module: &RModule) -> Result<(), MagnusError> {
         "BuilderError",
         exception_runtime_error
     );
+    initialize_exception!(
+        ruby,
+        gem_module,
+        INTERRUPT_ERROR,
+        "InterruptError",
+        exception_interrupt
+    );
     Ok(())
 }

data/src/rt.rs

@@ -29,7 +29,7 @@ enum BlockOnError<E> {
 /// # Errors
 ///
 /// Returns `Wreq::BuilderError` if the Tokio runtime cannot be initialized,
-/// Ruby's standard `Interrupt` if Ruby interrupts the request, or the error produced
+/// `Wreq::InterruptError` if Ruby interrupts the request, or the error produced
 /// by `map_err` if the future fails.
 pub fn try_block_on<F, T, E, M>(ruby: &Ruby, future: F, map_err: M) -> Result<T, magnus::Error>
 where

data/test/error_handling_test.rb

@@ -1,6 +1,37 @@
 require "test_helper"
+require "socket"
+require "timeout"
 
 class ErrorHandlingTest < Minitest::Test
+  def test_interrupt_error_stays_outside_standard_error
+    assert_equal Interrupt, Wreq::InterruptError.superclass
+    refute_operator Wreq::InterruptError, :<, StandardError
+  end
+
+  def test_request_interruption_raises_interrupt_error
+    request_thread = nil
+    with_hanging_server do |url, accepted|
+      request_thread = Thread.new do
+        Wreq.get(url, timeout: 60)
+      rescue Interrupt, StandardError => error
+        error
+      end
+      request_thread.report_on_exception = false
+
+      Timeout.timeout(5) { accepted.pop }
+      request_thread.wakeup
+
+      assert request_thread.join(5), "Interrupted request thread should stop"
+
+      error = request_thread.value
+      assert_instance_of Wreq::InterruptError, error
+      refute_kind_of StandardError, error
+    end
+  ensure
+    request_thread&.kill
+    request_thread&.join(1)
+  end
+
   def test_network_error_handling
     # Try to connect to a non-existent domain
     response = Wreq.get("https://definitely-not-a-real-domain-12345.com")
@@ -89,4 +120,27 @@ class ErrorHandlingTest < Minitest::Test
       end
     end
   end
+
+  private
+
+  def with_hanging_server
+    server = TCPServer.new("127.0.0.1", 0)
+    accepted = Queue.new
+    thread = Thread.new do
+      socket = server.accept
+      accepted << true
+      sleep
+    rescue IOError, SystemCallError
+      nil
+    ensure
+      socket&.close unless socket&.closed?
+    end
+    thread.report_on_exception = false
+
+    yield "http://127.0.0.1:#{server.addr[1]}/", accepted
+  ensure
+    server&.close unless server&.closed?
+    thread&.kill
+    thread&.join(1)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wreq
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.9
 platform: ruby
 authors:
 - SearchApi