mawsitsit 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8822dfa37e369cfcf7ab3633b016e5cb8f2704798233aa32d546c2ef6a754e4
-  data.tar.gz: 6b9f99a27efba3b5ff94970b8e890cd5bfbae353d88b93bf9a8093c9e5d4ab5f
+  metadata.gz: 6bf107f10254c4381ea6ddb43804bab677e9d21652f88979c92aee21efe85bf0
+  data.tar.gz: cae9847e3ed605ab6c9323883b4b04577455a42f52b3e27bc4f2305a39616122
 SHA512:
-  metadata.gz: 3a3c73aea5ae02a5321be9f9261af7b8d0d90a1442164c20870a65a886cb2cb4f808c2c6fd6667c4fdc5821a1076657a5bde7fba4c1d56c614a394cf89a33b8e
-  data.tar.gz: 99416b91be67f0c2933c0ea85de53b52e377d4835230b4a3c7a1c57c4041ae9682dce3be036a424257902ca0996da4326c15d48a045cc064b09a3315a0fcd378
+  metadata.gz: 287bc58ab99f97a3f0c78c7ac71f558e5d3d40dafff21e7bcd41fdc08f3ddce1cbc2d152dd9cf035f332c5b97ad62f222d1d61016bde01ccaf68433e9716d7e4
+  data.tar.gz: 61dfc1aec419c9e2665d71551bdcaf57bebf5e590a08e6a982d4ad413c6a82cc60af51451d8a1f942f552aa10f8c6060360f3bddf4f8684c947825d57183117e

data/Cargo.lock

@@ -49,7 +49,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -91,7 +91,7 @@ version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
  "itertools",
@@ -102,7 +102,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.67",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -113,9 +113,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "bumpalo"
@@ -131,9 +131,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cc"
-version = "1.0.99"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d"
 
 [[package]]
 name = "cexpr"
@@ -193,9 +193,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "either"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "encoding_rs"
@@ -345,7 +345,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -620,9 +620,9 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "lazycell"
@@ -638,9 +638,9 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libloading"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
 dependencies = [
  "cfg-if",
  "windows-targets 0.52.5",
@@ -664,9 +664,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "magnus"
@@ -688,7 +688,7 @@ checksum = "5968c820e2960565f647819f5928a42d6e874551cab9d88d75e3e0660d7f71e3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -696,7 +696,6 @@ name = "mawsitsit"
 version = "0.1.0"
 dependencies = [
  "async-recursion",
- "base64",
  "chrono",
  "exitfailure",
  "futures",
@@ -815,7 +814,7 @@ version = "0.10.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -832,7 +831,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -899,7 +898,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -959,7 +958,7 @@ dependencies = [
  "quote",
  "regex",
  "shell-words",
- "syn 2.0.67",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -974,7 +973,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -1082,7 +1081,7 @@ version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -1156,7 +1155,7 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -1196,14 +1195,14 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4"
 dependencies = [
  "itoa",
  "ryu",
@@ -1287,9 +1286,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
 [[package]]
 name = "subtle"
-version = "2.6.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d0208408ba0c3df17ed26eb06992cb1a1268d41b2c0e12e65203fbe3972cee5"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
@@ -1304,9 +1303,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.67"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1387,14 +1386,14 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -1432,7 +1431,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -1607,7 +1606,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.68",
  "wasm-bindgen-shared",
 ]
 
@@ -1641,7 +1640,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.68",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]

data/ext/mawsitsit/Cargo.toml

@@ -17,7 +17,6 @@ serde_json = "1.0.73"
 serde_derive = "1.0.130"
 reqwest = { version = "0.12.4", features = ["json"] }
 exitfailure = "0.5.1"
-base64 = "0.22.1"
 futures = "0.3.30"
 async-recursion = "1.1.1"
 thiserror = "1.0.61"

data/ext/mawsitsit/src/parser/manipulators.rs

@@ -40,8 +40,15 @@ pub async fn like_fetch(args: &str, ftch: &str) -> Value {
     let mut input : HashMap<&str,&str> = HashMap::new();
     input.insert(ftch_list[4], new_args.as_str());
     let result = fetch(ftch_list[0], ftch_list[1], ftch_list[3], input).await;
-    let result_value = JsonValue::new(result.unwrap());
-    return result_value.get_by_path(ftch_list[5]).expect("Not found").clone();
+    let result = match result {
+        Ok(res) => JsonValue::new(res),
+        Err(_err) => JsonValue::null(),
+    };
+    let final_value = result
+        .get_by_path(ftch_list[5])
+        .map_or(serde_json::Value::Null, |v| v.clone());
+
+    final_value
 }
 
 pub fn like_lambda(_args: &str, _enm: &str) -> Value {

data/ext/mawsitsit/src/parser/parser.rs

@@ -16,6 +16,9 @@ impl JsonValue {
     pub fn new(value: serde_json::Value) -> JsonValue {
         JsonValue { value }
     }
+    pub fn null() -> JsonValue {
+        JsonValue { value: serde_json::Value::Null }
+    }
     pub fn get_by_path(&self, path: &str) -> Option<&Value> {
         let mut current = &self.value;
         for key in path.split('.') {

data/ext/mawsitsit/src/parser/utils/helpers.rs

@@ -1,6 +1,5 @@
 use reqwest::{Client, Method};
 use std::collections::HashMap;
-use base64::encode;
 use magnus::Value as RubyValue;
 use serde_json::{Map, Value as SerdeValue};
 
@@ -25,11 +24,8 @@ pub async fn fetch(
     let mut request = client.request(method, url);
     request = request.header("accept", "application/json")
         .header("content-type", "application/json");
-
     request = request.body(serde_json::to_string(&input)?);
-
-
-    let auth_header = format!("Basic {}", encode(api_key));
+    let auth_header = format!("Basic {}", api_key);
     request = request.header("authorization", auth_header);
     let response = request.send().await?;
     let json = response.json().await?;

data/lib/mawsitsit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mawsitsit
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

data/var/destination.json

@@ -22,7 +22,7 @@
   "latitude": null,
   "country_code": null,
   "postal_code": null,
-  "city": "results.locationIds.primaryLocationId-<fetch|https://api.ashbyhq.com/location.info,POST,JSON,94befa3e484fbfa12ae6929f81c9b289ec37e3a6072473c6dbdf2992eb6c5ccf:,locationId,results.name>",
+  "city": "results.locationIds.primaryLocationId-<fetch|https://api.ashbyhq.com/location.info,POST,JSON,OTRiZWZhM2U0ODRmYmZhMTJhZTY5MjlmODFjOWIyODllYzM3ZTNhNjA3MjQ3M2M2ZGJkZjI5OTJlYjZjNWNjZjo=,locationId,results.name>",
   "address": null,
   "view_count": null,
   "created_at": "results.publishedDate",

data/var/test_1.json

@@ -22,7 +22,7 @@
     "latitude": null,
     "country_code": null,
     "postal_code": null,
-    "city": "results.locationIds.primaryLocationId-<fetch|https://api.ashbyhq.com/location.info,POST,JSON,94befa3e484fbfa12ae6929f81c9b289ec37e3a6072473c6dbdf2992eb6c5ccf:,locationId,results.name>",
+    "city": "results.locationIds.primaryLocationId-<fetch|https://api.ashbyhq.com/location.info,POST,JSON,OTRiZWZhM2U0ODRmYmZhMTJhZTY5MjlmODFjOWIyODllYzM3ZTNhNjA3MjQ3M2M2ZGJkZjI5OTJlYjZjNWNjZjo=,locationId,results.name>",
     "address": null,
     "view_count": null,
     "created_at": "results.publishedDate",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mawsitsit
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Jan Hummel