xml2json-rb 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 929c9024b54d50ca7dc4d457c75cd69ddb02d0f4394d25eb2d3b6c5e8573fd25
-  data.tar.gz: 6e80dac62fb5f67fa6f19641cd0c0a62c91110d190a4ec38e6a461d166d3074b
+  metadata.gz: ef6f85b883fb1df89aa98b03908137ce38568434f4ac1c84456da42be613e636
+  data.tar.gz: c519a3d628e6e07356bd0892eeed6e13e3775423c21350d46e4cf59464eb50d9
 SHA512:
-  metadata.gz: dcd614a2cbfd953cc2ae8adcf123a1723a0143f2754ca0ff3e42509cb385b283794d8090bd5808ed117c8e0e6f65bc630791052941848e2f46cb626e26599593
-  data.tar.gz: 28e43cbfaaa8987a1f7fbb1ef348055e742886dc3b629874c0f04d67bd74789751dc1e288d93358ee4c8e0b0fe7a2a6fa0c88393cc426dfe7731c0056e146383
+  metadata.gz: 5e7c60d98d3d92e3570c928cd05c257845aea1073ded6dcdeff7fd731808d9f38b17f0919cbb2fa9ef4679c7ce233b7ef9c0fa5ff12d761b0286c65525bd8bd8
+  data.tar.gz: d5da3cd90ca19975c7d933b14ffe6ac442faf6069916cf79accdf2ed90508aa04126d749494789c30fcc2b7c991f71422d48001a8248102da5cce0207f54ca4c

data/Cargo.lock

@@ -355,7 +355,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "xml2json"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
  "magnus",
  "rb-sys",

data/ext/xml2json/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xml2json"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2021"
 authors = ["uvlad7 <uvlad7@gmail.com>"]
 license = "MIT"

data/ext/xml2json/src/lib.rs

@@ -1,15 +1,26 @@
-use magnus::{define_module, function, prelude::*, Error, Value};
-use magnus::scan_args::{scan_args};
+use magnus::{define_module, scan_args::scan_args, function, prelude::*, Error, TryConvert, Value};
 use xml2json_rs::{XmlBuilder, JsonBuilder, JsonConfig, XmlConfig, Declaration, Version, Encoding, Indentation};
 
 #[macro_export]
 macro_rules! set_arg {
-    ($config:expr, $opts_hash:expr, $arg:ident, $arg_type:ident) => (
-        let arg_value = $opts_hash.lookup::<_, Option<$arg_type>>(magnus::Symbol::new(stringify!($arg)))?;
+    ($config:expr, $opts_hash:expr, $arg:ident, $arg_type:ident) => {{
+        let arg_value: Option<Value> = $opts_hash.get(magnus::Symbol::new(stringify!($arg)));
         if let Some(value) = arg_value {
-            $config.$arg(value);
+            $config.$arg(<$arg_type as TryConvert>::try_convert(value)?);
         }
-    );
+    }};
+}
+
+#[macro_export]
+macro_rules! get_arg {
+    ($opts_hash:expr, $arg:ident, $arg_type:ident) => {{
+        let arg_value: Option<Value> = $opts_hash.get(magnus::Symbol::new(stringify!($arg)));
+        if let Some(value) = arg_value {
+            Some(<$arg_type as TryConvert>::try_convert(value)?)
+        } else {
+            None
+        }
+    }};
 }
 
 fn map_xml2json_err(error: xml2json_rs::X2JError) -> Error {
@@ -37,46 +48,49 @@ fn build_xml_impl(args: &[Value], build_pretty: bool) -> Result<String, Error> {
         set_arg!(config, opts_hash, attrkey, String);
         set_arg!(config, opts_hash, charkey, String);
 
-        let decl_version = opts_hash.lookup::<_, Option<Value>>(magnus::Symbol::new("version"))?;
-        let decl_encoding = opts_hash.lookup::<_, Option<Value>>(magnus::Symbol::new("encoding"))?;
-        let decl_standalone = opts_hash.lookup::<_, Option<bool>>(magnus::Symbol::new("standalone"))?;
+        let decl_version = opts_hash.get(magnus::Symbol::new("version"));
+        let decl_encoding = opts_hash.get(magnus::Symbol::new("encoding"));
+        let decl_standalone = opts_hash.get(magnus::Symbol::new("standalone"));
         if decl_version.is_some()
             || decl_encoding.is_some()
             || decl_standalone.is_some()
         { // something is specified
             // I didn't find a way to get defaults without copying them
-            let decl_version_val = if decl_version.is_some() {
-                let decl_version_str = unsafe { decl_version.unwrap().to_s() }?.into_owned();
+            let decl_version_val = if let Some(decl_version_opt) = decl_version {
+                let decl_version_str = unsafe { decl_version_opt.to_s() }?.into_owned();
                 Version::try_from(decl_version_str.as_str())
                     .map_err(map_xml2json_err)?
             } else { Version::XML10 };
-            let decl_encoding_val = if decl_encoding.is_some() {
-                let decl_encoding_str = unsafe { decl_encoding.unwrap().to_s() }?.into_owned();
+            let decl_encoding_val = if let Some(decl_encoding_opt) = decl_encoding {
+                let decl_encoding_str = unsafe { decl_encoding_opt.to_s() }?.into_owned();
                 Some(Encoding::try_from(decl_encoding_str.as_str())
                     .map_err(map_xml2json_err)?)
             } else { None };
+            let decl_standalone_val = if let Some(decl_standalone_opt) = decl_standalone {
+                Some(TryConvert::try_convert(decl_standalone_opt)?)
+            } else { None };
 
             let decl = Declaration::new(
                 decl_version_val,
                 decl_encoding_val,
-                decl_standalone,
+                decl_standalone_val,
             );
             config.decl(decl);
         }
 
-        let indent = opts_hash.lookup::<_, Option<bool>>(magnus::Symbol::new("indent"))?;
+        let indent = get_arg!(opts_hash, indent, bool);
         if indent.unwrap_or(true) {
-            let indent_char = opts_hash.lookup::<_, Option<char>>(magnus::Symbol::new("indent_char"))?;
-            let indent_size = opts_hash.lookup::<_, Option<usize>>(magnus::Symbol::new("indent_size"))?;
-            if indent_char.is_some()
-                || indent_size.is_some()
+            let indent_char_opt = get_arg!(opts_hash, indent_char, char);
+            let indent_size_opt = get_arg!(opts_hash, indent_size, usize);
+            if indent_char_opt.is_some()
+                || indent_size_opt.is_some()
             {
-                let indent_char_val: u8 = if indent_char.is_some() {
-                    u8::try_from(indent_char.unwrap()).map_err(|error| Error::new(magnus::exception::type_error(), error.to_string()))?
+                let indent_char_val: u8 = if let Some(indent_char) = indent_char_opt {
+                    u8::try_from(indent_char).map_err(|error| Error::new(magnus::exception::type_error(), error.to_string()))?
                 } else { b' ' };
                 config.rendering(Indentation::new(
                     indent_char_val,
-                    indent_size.unwrap_or(2),
+                    indent_size_opt.unwrap_or(2),
                 ));
             } else if indent.unwrap_or(build_pretty) {
                 // because Indentation::default is not the same as not calling config.rendering at all;
@@ -123,9 +137,8 @@ fn build_json_impl(args: &[Value], mut build_pretty: bool) -> Result<String, Err
         set_arg!(config, opts_hash, explicit_charkey, bool);
         json_builder = config.finalize();
 
-        let indent = opts_hash.lookup::<_, Option<bool>>(magnus::Symbol::new("indent"))?;
-        if let Some(indent_value) = indent {
-            build_pretty = indent_value;
+        if let Some(indent) = get_arg!(opts_hash, indent, bool) {
+            build_pretty = indent;
         }
     } else { json_builder = JsonBuilder::default(); }
 

data/lib/xml2json/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Xml2Json
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xml2json-rb
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - uvlad7
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-30 00:00:00.000000000 Z
+date: 2025-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.21'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -205,9 +219,9 @@ metadata:
   homepage_uri: https://github.com/uvlad7/xml2json-rb
   source_code_uri: https://github.com/uvlad7/xml2json-rb
   changelog_uri: https://github.com/uvlad7/xml2json-rb/blob/main/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/xml2json-rb/0.3.1
+  documentation_uri: https://rubydoc.info/gems/xml2json-rb/0.3.2
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -222,8 +236,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.3.11
 requirements: []
-rubygems_version: 3.4.20
-signing_key: 
+rubygems_version: 3.4.14
+signing_key:
 specification_version: 4
 summary: Ruby wrapper for xml2json-rs
 test_files: []