wreq-rb 0.5.0 → 0.5.1

data/LICENSE

@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2026 Yicheng Zhou
+   Copyright 2026 Illia Zub
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -47,7 +47,7 @@ resp = Wreq.get("https://httpbin.org/bearer", bearer: "my-token")
 resp = Wreq.get("https://httpbin.org/basic-auth/user/pass", basic: ["user", "pass"])
 
 # Browser emulation (enabled by default)
-resp = Wreq.get("https://tls.peet.ws/api/all", emulation: "chrome_143")
+resp = Wreq.get("https://tls.peet.ws/api/all", emulation: "chrome_148")
 ```
 
 ## Using a Client
@@ -116,7 +116,7 @@ All methods are available on both `Wreq` (module-level) and `Wreq::Client` (inst
 
 ### Cancelling Requests
 
-Call `cancel` on a client to abort all in-flight requests and close their underlying connections immediately:
+Call `cancel` on a client to interrupt all in-flight requests immediately:
 
 ```ruby
 client = Wreq::Client.new
@@ -124,7 +124,7 @@ client = Wreq::Client.new
 # From another thread:
 t = Thread.new { client.get("https://slow.example.com/big-download") }
 sleep 1
-client.cancel  # all in-flight requests return with "request interrupted" error
+client.cancel  # all in-flight requests raise Wreq::Error with "request interrupted"
 ```
 
 ### Per-Request Options
@@ -148,25 +148,25 @@ Pass an options hash as the second argument to any HTTP method:
 
 ## Browser Emulation
 
-wreq-rb emulates real browser TLS fingerprints, HTTP/2 settings, and headers by default. **The lastest supported Chrome is used when no emulation is specified.**
+wreq-rb emulates real browser TLS fingerprints, HTTP/2 settings, and headers by default. **The latest supported Chrome is used when no emulation is specified.**
 
 ```ruby
 resp = Wreq.get("https://tls.peet.ws/api/all")
 
 # Explicit browser emulation
-client = Wreq::Client.new(emulation: "firefox_146")
+client = Wreq::Client.new(emulation: "firefox_151")
 client = Wreq::Client.new(emulation: "safari_18.5")
-client = Wreq::Client.new(emulation: "edge_142")
+client = Wreq::Client.new(emulation: "edge_148")
 
 # Disable emulation entirely
 client = Wreq::Client.new(emulation: false)
 
 # Emulate a specific OS (default is macOS)
-client = Wreq::Client.new(emulation: "chrome_145", emulation_os: "windows")
-client = Wreq::Client.new(emulation: "chrome_145", emulation_os: "linux")
+client = Wreq::Client.new(emulation: "chrome_148", emulation_os: "windows")
+client = Wreq::Client.new(emulation: "chrome_148", emulation_os: "linux")
 
 # Emulation + custom user-agent (user_agent overrides emulation's UA)
-client = Wreq::Client.new(emulation: "chrome_143", user_agent: "MyBot/1.0")
+client = Wreq::Client.new(emulation: "chrome_148", user_agent: "MyBot/1.0")
 
 # Per-request emulation override
 resp = client.get("https://example.com", emulation: "safari_26.2")
@@ -176,12 +176,12 @@ resp = client.get("https://example.com", emulation: "safari_26.2")
 
 | Browser | Example values |
 |---------|---------------|
-| Chrome | `chrome_100` .. `chrome_145` |
-| Firefox | `firefox_109` .. `firefox_147`, `firefox_private_135` |
-| Safari | `safari_15.3` .. `safari_26.2`, `safari_ios_26`, `safari_ipad_18` |
-| Edge | `edge_101` .. `edge_145` |
-| Opera | `opera_116` .. `opera_119` |
-| OkHttp | `okhttp_3_9` .. `okhttp_5` |
+| Chrome | `chrome_100` .. `chrome_148` |
+| Firefox | `firefox_109` .. `firefox_151`, `firefox_private_135` |
+| Safari | `safari_15.3` .. `safari_26.4`, `safari_ios_26`, `safari_ipad_18` |
+| Edge | `edge_101` .. `edge_148` |
+| Opera | `opera_116` .. `opera_131` |
+| OkHttp | `okhttp_3.9` .. `okhttp_5` |
 
 ## Response
 
@@ -210,3 +210,7 @@ bundle install
 bundle exec rake compile
 bundle exec rake test
 ```
+
+## License
+
+wreq-rb is released under the [Apache License, Version 2.0](LICENSE).

data/ext/wreq_rb/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wreq_rb"
-version = "0.5.0"
+version = "0.5.1"
 edition = "2021"
 publish = false
 
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 [dependencies]
 magnus = { version = "0.8", features = ["rb-sys"] }
 rb-sys = "0.9"
-wreq = { path = "../../vendor/wreq", features = [
+wreq = { path = "../../vendor/wreq", version = "=6.0.0-rc.29", features = [
   "cookies",
   "json",
   "gzip",
@@ -24,7 +24,7 @@ wreq = { path = "../../vendor/wreq", features = [
   "query",
   "form",
 ] }
-wreq-util = { version = "=3.0.0-rc.10", features = ["emulation", "emulation-serde", "emulation-compression"] }
+wreq-util = { version = "=3.0.0-rc.12", features = ["emulation", "emulation-serde", "emulation-compression"] }
 tokio = { version = "1", features = ["full"] }
 tokio-util = "0.7"
 serde_json = "1.0"
@@ -32,8 +32,6 @@ bytes = "1"
 http = "1"
 
 [target.'cfg(target_os = "linux")'.dependencies]
-wreq = { path = "../../vendor/wreq", features = [
+wreq = { path = "../../vendor/wreq", version = "=6.0.0-rc.29", features = [
   "prefix-symbols",
 ] }
-
-

data/ext/wreq_rb/src/client.rs

@@ -13,7 +13,7 @@ use tokio_util::sync::CancellationToken;
 use std::net::IpAddr;
 use wreq::header::{HeaderMap, HeaderName, HeaderValue, OrigHeaderMap};
 use wreq::tls::TlsVersion;
-use wreq_util::{Emulation as BrowserEmulation, EmulationOS, EmulationOption};
+use wreq_util::{Emulation as BrowserEmulation, Platform as EmulationPlatform, Profile as BrowserProfile};
 
 use crate::error::{generic_error, to_magnus_error};
 use crate::response::Response;
@@ -141,35 +141,35 @@ async fn execute_request(req: wreq::RequestBuilder) -> Result<ResponseData, wreq
 // Emulation helpers
 // --------------------------------------------------------------------------
 
-/// The default emulation to apply when none is specified.
-const DEFAULT_EMULATION: BrowserEmulation = BrowserEmulation::Chrome145;
+/// The default browser profile to apply when none is specified.
+const DEFAULT_EMULATION: BrowserProfile = BrowserProfile::Chrome148;
 
-/// Parse a Ruby string like "chrome_143" into a BrowserEmulation variant.
-fn parse_emulation(name: &str) -> Result<BrowserEmulation, magnus::Error> {
+/// Parse a Ruby string like "chrome_143" into a BrowserProfile variant.
+fn parse_emulation(name: &str) -> Result<BrowserProfile, magnus::Error> {
     let json_val = serde_json::Value::String(name.to_string());
-    serde_json::from_value::<BrowserEmulation>(json_val)
-        .map_err(|_| generic_error(format!("unknown emulation: '{}'. Use names like 'chrome_145', 'firefox_147', 'safari_18.5', etc.", name)))
+    serde_json::from_value::<BrowserProfile>(json_val)
+        .map_err(|_| generic_error(format!("unknown emulation: '{}'. Use names like 'chrome_148', 'firefox_151', 'safari_18.5', etc.", name)))
 }
 
-/// Parse a Ruby string like "windows" into an EmulationOS variant.
-fn parse_emulation_os(name: &str) -> Result<EmulationOS, magnus::Error> {
+/// Parse a Ruby string like "windows" into an EmulationPlatform variant.
+fn parse_emulation_os(name: &str) -> Result<EmulationPlatform, magnus::Error> {
     let json_val = serde_json::Value::String(name.to_string());
-    serde_json::from_value::<EmulationOS>(json_val)
+    serde_json::from_value::<EmulationPlatform>(json_val)
         .map_err(|_| generic_error("unknown emulation_os. Use: 'windows', 'macos', 'linux', 'android', 'ios'"))
 }
 
-/// Build an EmulationOption from an Emulation and an optional OS from the opts hash.
+/// Build a BrowserEmulation from a profile and an optional platform from the opts hash.
 fn build_emulation_option(
-    emu: BrowserEmulation,
+    profile: BrowserProfile,
     opts: &RHash,
-) -> Result<EmulationOption, magnus::Error> {
-    let os = match hash_get_string(opts, "emulation_os")? {
-        Some(os_name) => parse_emulation_os(&os_name)?,
-        None => EmulationOS::default(),
+) -> Result<BrowserEmulation, magnus::Error> {
+    let platform = match hash_get_string(opts, "emulation_os")? {
+        Some(platform_name) => parse_emulation_os(&platform_name)?,
+        None => EmulationPlatform::default(),
     };
-    Ok(EmulationOption::builder()
-        .emulation(emu)
-        .emulation_os(os)
+    Ok(BrowserEmulation::builder()
+        .profile(profile)
+        .platform(platform)
         .build())
 }
 
@@ -192,7 +192,8 @@ impl Client {
             Some(RHash::try_convert(args[0])?)
         };
 
-        let mut builder = wreq::Client::builder();
+        let mut builder = wreq::Client::builder()
+            .retry(wreq::retry::Policy::never());
 
         if let Some(opts) = opts {
             // Apply header_order BEFORE emulation so the user's ordering takes precedence
@@ -276,11 +277,11 @@ impl Client {
             }
 
             if let Some(v) = hash_get_bool(&opts, "verify_host")? {
-                builder = builder.verify_hostname(v);
+                builder = builder.tls_verify_hostname(v);
             }
 
             if let Some(v) = hash_get_bool(&opts, "verify_cert")? {
-                builder = builder.cert_verification(v);
+                builder = builder.tls_cert_verification(v);
             }
 
             if let Some(true) = hash_get_bool(&opts, "http1_only")? {
@@ -311,7 +312,7 @@ impl Client {
                 builder = builder.pool_max_idle_per_host(n);
             }
 
-            if let Some(n) = hash_get_u32(&opts, "pool_max_size")? {
+            if let Some(n) = hash_get_usize(&opts, "pool_max_size")? {
                 builder = builder.pool_max_size(n);
             }
 
@@ -334,11 +335,11 @@ impl Client {
             }
 
             if let Some(s) = hash_get_string(&opts, "min_tls_version")? {
-                builder = builder.min_tls_version(parse_tls_version(&s)?);
+                builder = builder.tls_min_version(parse_tls_version(&s)?);
             }
 
             if let Some(s) = hash_get_string(&opts, "max_tls_version")? {
-                builder = builder.max_tls_version(parse_tls_version(&s)?);
+                builder = builder.tls_max_version(parse_tls_version(&s)?);
             }
         } else {
             builder = builder.emulation(DEFAULT_EMULATION);
@@ -387,7 +388,6 @@ impl Client {
             old
         };
         old_token.cancel();
-        self.inner.cancel_connections();
     }
 
     fn execute_method(&self, method_str: &str, args: &[Value]) -> Result<Response, magnus::Error> {
@@ -445,6 +445,21 @@ fn apply_request_options(
     mut req: wreq::RequestBuilder,
     opts: &RHash,
 ) -> Result<wreq::RequestBuilder, magnus::Error> {
+    if let Some(val) = hash_get_value(opts, "emulation")? {
+        let ruby = unsafe { Ruby::get_unchecked() };
+        if val.is_kind_of(ruby.class_false_class()) {
+            // emulation: false — no per-request emulation override
+        } else if val.is_kind_of(ruby.class_true_class()) {
+            let opt = build_emulation_option(DEFAULT_EMULATION, opts)?;
+            req = req.emulation(opt);
+        } else {
+            let name: String = TryConvert::try_convert(val)?;
+            let emu = parse_emulation(&name)?;
+            let opt = build_emulation_option(emu, opts)?;
+            req = req.emulation(opt);
+        }
+    }
+
     if let Some(hdr_hash) = hash_get_hash(opts, "headers")? {
         let hmap = hash_to_header_map(&hdr_hash)?;
         req = req.headers(hmap);
@@ -499,21 +514,6 @@ fn apply_request_options(
         req = req.proxy(proxy);
     }
 
-    if let Some(val) = hash_get_value(opts, "emulation")? {
-        let ruby = unsafe { Ruby::get_unchecked() };
-        if val.is_kind_of(ruby.class_false_class()) {
-            // emulation: false — no per-request emulation override
-        } else if val.is_kind_of(ruby.class_true_class()) {
-            let opt = build_emulation_option(DEFAULT_EMULATION, opts)?;
-            req = req.emulation(opt);
-        } else {
-            let name: String = TryConvert::try_convert(val)?;
-            let emu = parse_emulation(&name)?;
-            let opt = build_emulation_option(emu, opts)?;
-            req = req.emulation(opt);
-        }
-    }
-
     Ok(req)
 }
 
@@ -599,13 +599,6 @@ fn hash_get_usize(hash: &RHash, key: &str) -> Result<Option<usize>, magnus::Erro
     }
 }
 
-fn hash_get_u32(hash: &RHash, key: &str) -> Result<Option<u32>, magnus::Error> {
-    match hash_get_value(hash, key)? {
-        Some(v) => Ok(Some(TryConvert::try_convert(v)?)),
-        None => Ok(None),
-    }
-}
-
 fn parse_tls_version(s: &str) -> Result<TlsVersion, magnus::Error> {
     match s {
         "tls1.0" | "tls_1_0" | "1.0" => Ok(TlsVersion::TLS_1_0),

data/lib/wreq-rb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wreq
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end