wreq 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15ad9f6cc6c41b23c065d2118942ce008260dd0b0ec0124e03d5d72379ed9dda
-  data.tar.gz: ef0c61872bffe6dc3e3e7e820d1d774f944d129a5e486e1c8fe50c53d06b4c5d
+  metadata.gz: 847301c3eef022dc8dbdc25f84308f03ef73ac06f366caea11ecad0df51c8342
+  data.tar.gz: 6ec2ed9471e605f58546a9deeba976ccc4984a1b3c2372e3f9d2e85fdd3d3f94
 SHA512:
-  metadata.gz: a2c870dd5fedc1dfd0c72de4b1567b63f9a44ce361a7f6e47a57bfe751ddf1c083a4828542f778236ce1bc2bc529e7b85df19ef33c742580a695df33ac114cd2
-  data.tar.gz: b2616fcfc85af1ac603ea330ca6f2c697aa81049d36471df4619327ad0d549af974078f14d4d3f76aee0e581ac8f8fed6d711778d64c8b82fad8c038cec3f14b
+  metadata.gz: 5bbebe9ab0ad0119019d95d15c37266fff1d22832f0beaf8f576ceb461bcb7129da8c617c17dbac0c1b918f5cf992b52c1d14ea140b9753a573dde3c9ee959a2
+  data.tar.gz: 7baa2818b2a41af307f1152c4a4608ab7b3d2d3d921b29e50f4587637838318808b0153d80fdb9f4761a3454d42c3f51101d09c06f679f5583d8c733f39b73b5

data/Cargo.lock

@@ -85,9 +85,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "2.12.1"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84d7ced0ae9557296835c32bf1b1e02b44c746701f898460fb000d7eaa84f00a"
+checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
 
 [[package]]
 name = "brotli"
@@ -444,9 +444,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be7462df143984c4598a256ef469b251d7d7f9e271135073e78fc535414f3d0"
+checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425"
 dependencies = [
  "bytes",
  "itoa",
@@ -477,9 +477,9 @@ dependencies = [
 
 [[package]]
 name = "http2"
-version = "0.5.17"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "569ef7a780e853c4e1768f58a3c8168193b82cdcbab66638a0b1c6583ec5995e"
+checksum = "9d8c910a959d6fd27dd6f8fdb26509ac0f6561465cc8c5f875d45a203ab97911"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -902,9 +902,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.12.3"
+version = "1.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -925,9 +925,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
+checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
 
 [[package]]
 name = "rustc-hash"
@@ -1559,7 +1559,7 @@ dependencies = [
 
 [[package]]
 name = "wreq-ruby"
-version = "1.2.1"
+version = "1.2.2"
 dependencies = [
  "arc-swap",
  "bytes",

data/Cargo.toml

@@ -6,7 +6,7 @@ homepage = "https://github.com/SearchApi/wreq-ruby"
 repository = "https://github.com/SearchApi/wreq-ruby"
 edition = "2024"
 rust-version = "1.85"
-version = "1.2.1"
+version = "1.2.2"
 
 [lib]
 crate-type = ["cdylib"]

data/src/client.rs

@@ -10,7 +10,7 @@ use magnus::{
     Module, Object, RHash, RModule, Ruby, TryConvert, Value, function, method, typed_data::Obj,
 };
 use serde::Deserialize;
-use wreq::{Proxy, header::HeaderValue};
+use wreq::Proxy;
 
 use crate::{
     client::{req::execute_request, resp::Response},
@@ -19,7 +19,7 @@ use crate::{
     error::wreq_error_to_magnus,
     extractor::Extractor,
     gvl,
-    header::{Headers, OrigHeaders},
+    header::{Headers, OrigHeaders, UserAgent},
     http::Method,
 };
 
@@ -31,7 +31,7 @@ struct Builder {
     emulation: Option<Emulation>,
     /// The user agent to use for the client.
     #[serde(skip)]
-    user_agent: Option<HeaderValue>,
+    user_agent: Option<UserAgent>,
     /// The headers to use for the client.
     #[serde(skip)]
     headers: Option<Headers>,
@@ -136,6 +136,10 @@ impl Builder {
             builder.emulation = Some((*Obj::<Emulation>::try_convert(v)?).clone());
         }
 
+        if let Some(v) = hash.get(ruby.to_symbol(stringify!(user_agent))) {
+            builder.user_agent = Some(UserAgent::try_convert(v)?);
+        }
+
         if let Some(v) = hash.get(ruby.to_symbol(stringify!(headers))) {
             builder.headers = Some(Headers::try_convert(v)?);
         }
@@ -148,11 +152,6 @@ impl Builder {
             builder.cookie_provider = Some((*Obj::<Jar>::try_convert(v)?).clone());
         }
 
-        if let Some(jar) = hash.get(ruby.to_symbol(stringify!(cookie_provider))) {
-            builder.cookie_provider = Some((*Obj::<Jar>::try_convert(jar)?).clone());
-        }
-
-        builder.user_agent = Extractor::<HeaderValue>::try_convert(*keyword)?.into_inner();
         builder.proxy = Extractor::<Proxy>::try_convert(*keyword)?.into_inner();
 
         Ok(builder)
@@ -173,7 +172,7 @@ impl Client {
                 apply_option!(set_if_some_inner, builder, params.emulation, emulation);
 
                 // User agent options.
-                apply_option!(set_if_some, builder, params.user_agent, user_agent);
+                apply_option!(set_if_some_inner, builder, params.user_agent, user_agent);
 
                 // Headers options.
                 apply_option!(

data/src/extractor.rs

@@ -32,31 +32,6 @@ where
     }
 }
 
-// ===== impl Extractor<HeaderValue> =====
-
-impl ExtractorName for HeaderValue {
-    const NAME: &str = "user_agent";
-}
-
-impl TryConvert for Extractor<HeaderValue> {
-    fn try_convert(value: magnus::Value) -> Result<Self, magnus::Error> {
-        let ruby = Ruby::get_with(value);
-        let keyword = RHash::try_convert(value)?;
-
-        if let Some(ruby_value) = keyword
-            .get(ruby.to_symbol(HeaderValue::NAME))
-            .and_then(RString::from_value)
-        {
-            return HeaderValue::from_maybe_shared(ruby_value.to_bytes())
-                .map(Some)
-                .map(Extractor)
-                .map_err(header_value_error_to_magnus);
-        }
-
-        Ok(Extractor(None))
-    }
-}
-
 // ===== impl Extractor<HeaderMap> =====
 
 impl ExtractorName for HeaderMap {

data/src/header.rs

@@ -15,6 +15,9 @@ use crate::error::{
     header_name_error_to_magnus, header_value_error_to_magnus, type_value_error_to_magnus,
 };
 
+/// A wrapper for the User-Agent header value.
+pub struct UserAgent(pub HeaderValue);
+
 /// HTTP headers collection with read and write operations.
 ///
 /// This class wraps HTTP headers and provides convenient methods for
@@ -31,6 +34,17 @@ struct HeaderIter {
     next_name: Option<HeaderName>,
 }
 
+// ===== impl UserAgent =====
+
+impl TryConvert for UserAgent {
+    fn try_convert(value: Value) -> Result<Self, Error> {
+        let s = RString::try_convert(value)?;
+        let header_value =
+            HeaderValue::from_maybe_shared(s.to_bytes()).map_err(header_value_error_to_magnus)?;
+        Ok(Self(header_value))
+    }
+}
+
 // ===== impl Headers =====
 
 impl Headers {

metadata

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