wreq-rb 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e740cdb86a8ba12a9ee11c05d951dca2076e057e311d337a572f4366cbfdf300
-  data.tar.gz: 531dcdab2a8319711c4086f836f64b2b5a34de3359275a93f55d6a66b3e0de1e
+  metadata.gz: 71608761c20fbf78bba7dee0c06b2518f6ed6ff843f755ea5df5e0a7bdc0c9a4
+  data.tar.gz: 84e1796d7cfc7bdb65dfb593a59b19c7cc482bc068fabfe108bf86e4df661acc
 SHA512:
-  metadata.gz: c69e832d944cdb0c08cb45450dca100826ec724cbc8672220dd729d4567226ab27ef43d2a3085a1b89d2db8ef788febd628aaccfaa20f1a5963a916f09dd9c11
-  data.tar.gz: 7996c31fb9f4bf8e05a00eb6435e9177c431ad50a3a3e3720cb3737ac2beafd18ceda048090d96a08c4b6ed9bfb9bd7c7d16d5e0a9b8099d1750bea8797df119
+  metadata.gz: 66afa069e1fe4ba4ea575507148a008021f59fbbefe53eb9433d123fd7caa36e956e340495914d159c7da69b9ce03773a1976af1c75c598ec763131cabc08e73
+  data.tar.gz: 87598598868608d50e6169d903c29cfc443f1e3439e4b20d8f81f974c95de6a247d11b272912ac880e4bae4377f72d1c9721e52bf7e774b9f0b74e6ec5f3e05c

data/Cargo.lock

@@ -2537,7 +2537,7 @@ dependencies = [
 
 [[package]]
 name = "wreq_rb"
-version = "0.3.3"
+version = "0.4.0"
 dependencies = [
  "bytes",
  "http",

data/README.md

@@ -76,6 +76,7 @@ client = Wreq::Client.new(
   deflate: true,               # enable deflate decompression
   zstd: true,                  # enable zstd decompression
   emulation: "chrome_143",     # browser emulation (enabled by default)
+  emulation_os: "windows",     # OS emulation: windows, macos (default), linux, android, ios
   headers: {                   # default headers for all requests
     "Accept" => "application/json"
   }
@@ -116,6 +117,7 @@ Pass an options hash as the second argument to any HTTP method:
 | `basic` | Array | `[username, password]` for Basic auth |
 | `proxy` | String | Per-request proxy URL |
 | `emulation` | String/Boolean | Per-request emulation override |
+| `emulation_os` | String | OS emulation: `windows`, `macos`, `linux`, `android`, `ios` |
 
 ## Browser Emulation
 
@@ -132,6 +134,10 @@ client = Wreq::Client.new(emulation: "edge_142")
 # 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")
+
 # Emulation + custom user-agent (user_agent overrides emulation's UA)
 client = Wreq::Client.new(emulation: "chrome_143", user_agent: "MyBot/1.0")
 

data/ext/wreq_rb/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wreq_rb"
-version = "0.3.3"
+version = "0.4.0"
 edition = "2021"
 publish = false
 
@@ -24,7 +24,7 @@ wreq = { path = "../../vendor/wreq", features = [
   "query",
   "form",
 ] }
-wreq-util = { version = "=3.0.0-rc.10", features = ["emulation", "emulation-serde"] }
+wreq-util = { version = "=3.0.0-rc.10", features = ["emulation", "emulation-serde", "emulation-compression"] }
 tokio = { version = "1", features = ["full"] }
 tokio-util = "0.7"
 serde_json = "1.0"

data/ext/wreq_rb/src/client.rs

@@ -11,7 +11,7 @@ use magnus::{
 use tokio::runtime::Runtime;
 use tokio_util::sync::CancellationToken;
 use wreq::header::{HeaderMap, HeaderName, HeaderValue};
-use wreq_util::Emulation as BrowserEmulation;
+use wreq_util::{Emulation as BrowserEmulation, EmulationOS, EmulationOption};
 
 use crate::error::{generic_error, to_magnus_error};
 use crate::response::Response;
@@ -149,6 +149,28 @@ fn parse_emulation(name: &str) -> Result<BrowserEmulation, magnus::Error> {
         .map_err(|_| generic_error(format!("unknown emulation: '{}'. Use names like 'chrome_145', 'firefox_147', '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> {
+    let json_val = serde_json::Value::String(name.to_string());
+    serde_json::from_value::<EmulationOS>(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.
+fn build_emulation_option(
+    emu: BrowserEmulation,
+    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(),
+    };
+    Ok(EmulationOption::builder()
+        .emulation(emu)
+        .emulation_os(os)
+        .build())
+}
+
 // --------------------------------------------------------------------------
 // Ruby Client
 // --------------------------------------------------------------------------
@@ -175,14 +197,17 @@ impl Client {
                 if val.is_kind_of(ruby.class_false_class()) {
                     // emulation: false — skip emulation entirely
                 } else if val.is_kind_of(ruby.class_true_class()) {
-                    builder = builder.emulation(DEFAULT_EMULATION);
+                    let opt = build_emulation_option(DEFAULT_EMULATION, &opts)?;
+                    builder = builder.emulation(opt);
                 } else {
                     let name: String = TryConvert::try_convert(val)?;
                     let emu = parse_emulation(&name)?;
-                    builder = builder.emulation(emu);
+                    let opt = build_emulation_option(emu, &opts)?;
+                    builder = builder.emulation(opt);
                 }
             } else {
-                builder = builder.emulation(DEFAULT_EMULATION);
+                let opt = build_emulation_option(DEFAULT_EMULATION, &opts)?;
+                builder = builder.emulation(opt);
             }
 
             if let Some(ua) = hash_get_string(&opts, "user_agent")? {
@@ -416,11 +441,13 @@ fn apply_request_options(
         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()) {
-            req = req.emulation(DEFAULT_EMULATION);
+            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)?;
-            req = req.emulation(emu);
+            let opt = build_emulation_option(emu, opts)?;
+            req = req.emulation(opt);
         }
     }
 

data/lib/wreq-rb/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wreq-rb
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Yicheng Zhou