xml2json-rb 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 894ff6fe88c1e4a0e7bbb426419954f98413f568f8ac361784e60537074033fd
-  data.tar.gz: face561e86ac59fb767535689377e361f171574b77722ba55a55056c96630767
+  metadata.gz: 7300901db2b5b148d589efdc043ba16afe065c4848300ae4fe13606e372c9e8f
+  data.tar.gz: bcfa9f9a7017c4d5c62f538b1abe07bd4c996d8a650e412798d43e7c18871e15
 SHA512:
-  metadata.gz: 2d3917434cd6824082cb8256ef752e10af0153d29da3b00365f0ed5ceebcef5626e422998b52a7f1a3c63b44ab2b49586f079557e1cb4888a08cf2d4f128c9bc
-  data.tar.gz: 36cf6993a5ca3f586357b8d46b9a038ad53cab83eae759fa1506ab58989cdd3c97dad69fe15a44f3ecea49eb3ac7287f35a75a01582e3bd13d493e58029a523a
+  metadata.gz: 2719f4a3cc080a3b26c1c2e4e06fb351af1f6a71d882f2a192171a55b63caf66c4d2b143744239ea6842ef6cecfa00b4d0b45065660264d012dd281f716efe9b
+  data.tar.gz: 973a6c931eba9a847bcb48be1834e6c63a5c6f64538d199380b7405e4ca64d3ad316a4041490db7bf59623e24f299335ee68697f9ea304ab9f245b490eff1029

data/Cargo.lock

@@ -344,7 +344,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "xml2json"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
  "magnus",
  "xml2json-rs",

data/ext/xml2json/Cargo.toml

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

data/ext/xml2json/src/lib.rs

@@ -21,6 +21,14 @@ fn map_xml2json_err(error: xml2json_rs::X2JError) -> Error {
 }
 
 fn build_xml(args: &[Value]) -> Result<String, Error> {
+    build_xml_impl(args, false)
+}
+
+fn build_pretty_xml(args: &[Value]) -> Result<String, Error> {
+    build_xml_impl(args, true)
+}
+
+fn build_xml_impl(args: &[Value], build_pretty: bool) -> Result<String, Error> {
     let args = scan_args::<_, _, (), (), _, ()>(args)?;
     let (json_s, ): (String, ) = args.required;
     let (opts, ): (Option<magnus::RHash>, ) = args.optional;
@@ -75,18 +83,18 @@ fn build_xml(args: &[Value]) -> Result<String, Error> {
                 if indent_char.is_some() {
                     indent_char_val = u8::try_from(indent_char.unwrap()).map_err(|error| Error::new(magnus::exception::type_error(), error.to_string()))?;
                 } else { indent_char_val = b' '; }
-
-                let intent = Indentation::new(
+                config.rendering(Indentation::new(
                     indent_char_val,
                     indent_size.unwrap_or(2),
-                );
-                config.rendering(intent);
-            } else if indent.unwrap_or(false) {
+                ));
+            } else if indent.unwrap_or(build_pretty) {
                 // because Indentation::default is not the same as not calling config.rendering at all;
                 config.rendering(Indentation::default());
             }
         }
         xml_builder = config.finalize();
+    } else if build_pretty {
+        xml_builder = XmlConfig::new().rendering(Indentation::default()).finalize();
     } else { xml_builder = XmlBuilder::default(); }
 
     xml_builder.build_from_json_string(&json_s).or_else(|error| {
@@ -95,6 +103,14 @@ fn build_xml(args: &[Value]) -> Result<String, Error> {
 }
 
 fn build_json(args: &[Value]) -> Result<String, Error> {
+    build_json_impl(args, false)
+}
+
+fn build_pretty_json(args: &[Value]) -> Result<String, Error> {
+    build_json_impl(args, true)
+}
+
+fn build_json_impl(args: &[Value], mut build_pretty: bool) -> Result<String, Error> {
     // https://docs.rs/magnus/latest/magnus/scan_args/fn.scan_args.html
     let args = scan_args::<_, _, (), (), _, ()>(args)?;
     let (xml, ): (String, ) = args.required;
@@ -173,9 +189,18 @@ fn build_json(args: &[Value]) -> Result<String, Error> {
         set_arg!(config, opts_hash, explicit_array, bool);
         set_arg!(config, opts_hash, explicit_charkey, bool);
         json_builder = config.finalize();
+
+        let indent = opts_hash.lookup::<_, Option<bool>>(magnus::Symbol::new("indent"))?;
+        if indent.is_some() {
+            build_pretty = indent.unwrap();
+        }
     } else { json_builder = JsonBuilder::default(); }
 
-    json_builder.build_string_from_xml(&xml).or_else(|error| {
+    if build_pretty {
+        json_builder.build_pretty_string_from_xml(&xml)
+    } else {
+        json_builder.build_string_from_xml(&xml)
+    }.or_else(|error| {
         Err(map_xml2json_err(error))
     })
 }
@@ -192,7 +217,9 @@ fn init() -> Result<(), Error> {
     let xml_encoding = xml.define_module("Encoding")?;
     xml_encoding.const_set("UTF8", Encoding::UTF8.to_string())?;
     xml.define_singleton_method("build", function!(build_xml, -1))?;
+    xml.define_singleton_method("build_pretty", function!(build_pretty_xml, -1))?;
     let json = module.define_module("Json")?;
     json.define_singleton_method("build", function!(build_json, -1))?;
+    json.define_singleton_method("build_pretty", function!(build_pretty_json, -1))?;
     Ok(())
 }

data/lib/xml2json/version.rb

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

data/lib/xml2json.rb

@@ -21,6 +21,7 @@ module Xml2Json
   #      # @return [String] XML string
   #      # @raise [RuntimeError] if the input string is invalid
   #      def self.build(json_s, opts: nil); end
+  #      def self.build_pretty(json_s, opts: nil); end
   #    end
   #
   #    module Json
@@ -30,5 +31,6 @@ module Xml2Json
   #      # @return [String] JSON string
   #      # @raise [RuntimeError] if the input string is invalid
   #      def self.build(xml, opts: nil); end
+  #      def self.build_pretty(xml, opts: nil); end
   #    end
 end

data/sig/xml2_json/json.rbs

@@ -1,5 +1,6 @@
 module Xml2Json
   module Json
     def self.build: (xml: String, opts: Hash[Symbol, Object]?) -> String
+    def self.build_pretty: (xml: String, opts: Hash[Symbol, Object]?) -> String
   end
 end

data/sig/xml2_json/xml.rbs

@@ -1,5 +1,6 @@
 module Xml2Json
   module Xml
     def self.build: (json_s: String, opts: Hash[Symbol, Object]?) -> String
+    def self.build_pretty: (json_s: String, opts: Hash[Symbol, Object]?) -> String
   end
 end

metadata

@@ -1,113 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: xml2json-rb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - uvlad7
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: yard-rustdoc
-  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
-    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-byebug
-  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: yard
-  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: rack
-  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: rackup
-  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: puma
-  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'
+date: 2023-10-01 00:00:00.000000000 Z
+dependencies: []
 description: This gem helps to convert xml strings to json and vise versa
 email:
 - uvlad7@gmail.com
@@ -136,8 +38,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.2.1
-post_install_message:
+  documentation_uri: https://rubydoc.info/gems/xml2json-rb/0.3.0
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -153,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 3.3.11
 requirements: []
 rubygems_version: 3.4.10
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Ruby wrapper for xml2json-rs
 test_files: []