multi_xml 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: add5ff8df4d736d143b1d83c38c5f1b8b35d21cd
-  data.tar.gz: ec8e8a3657ff340a9a4abefa2561e44dfee8371d
+SHA256:
+  metadata.gz: 7bebe7a08139024835279d7ffc78a7d86d0cb9a5ff59787068e044f7c75dc6f9
+  data.tar.gz: a2f579d2e18a266fe9573174de87ac960fcf867081705a2a6feb458bfa573225
 SHA512:
-  metadata.gz: 1cb437e88276aa09e33c5b10a1e32bbf181ecae9543976ab13acc4ca458b00b1315a59f1e3e1cd95fd24e47559a85058585578ba16441ac83c98ffa81c5ee902
-  data.tar.gz: 1931768faabe059174c01e24d12f9b1c8bcc0c9717891ec9ba9098f55c98535ad2a0efab7dcc4bfd756a569f137bf86e4b45b652a182652e6a468393103de9f5
+  metadata.gz: be4ffea0dd836f1d1d1baf73ffded7de5a79fdc53a5b039b5e7fd0a615a786ca08dc0a7bbf5561266cdade44a9cb3c2382fe6e35a54599876f77ec74ec937d42
+  data.tar.gz: d579ab46f0122a1011704e397062b5d9e648eeaae85a8baa30ac8eda7f3d1cdaa9e57fe1922e6e3e7ac608ef9607033c1547773dbb2eb1fe6785176a3471764d

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--order random

data/.rubocop.yml

@@ -0,0 +1,54 @@
+require:
+  - rubocop-performance
+  - rubocop-rake
+  - rubocop-rspec
+  - standard
+  - standard-performance
+
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 3.1
+
+Layout/ArgumentAlignment:
+  EnforcedStyle: with_fixed_indentation
+  IndentationWidth: 2
+
+Layout/CaseIndentation:
+  EnforcedStyle: end
+
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: start_of_line
+
+Layout/LineLength:
+  Max: 140
+
+Layout/ParameterAlignment:
+  EnforcedStyle: with_fixed_indentation
+  IndentationWidth: 2
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+Metrics/ParameterLists:
+  CountKeywordArgs: false
+
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
+Style/Documentation:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  EnforcedStyle: never
+
+Style/OpenStructUse:
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes
+
+Style/TernaryParentheses:
+  EnforcedStyle: require_parentheses

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+0.7.0
+-----
+* [Add support for Ruby 3.3](https://github.com/sferik/multi_xml/pull/67)
+* [Drop support for Ruby 3.0](https://github.com/sferik/multi_xml/commit/eec72c56307fede3a93f1a61553587cb278b0c8a) [and](https://github.com/sferik/multi_xml/commit/6a6dec80a36c30774a5525b45f71d346fb561e69) [earlier](https://github.com/sferik/multi_xml/commit/e7dad37a0a0be8383a26ffe515c575b5b4d04588)
+* [Don't mutate strings](https://github.com/sferik/multi_xml/commit/71be3fff4afb0277a7e1c47c5f1f4b6106a8eb45)
+
+0.6.0
+-----
+* [Duplexed Streams](https://github.com/sferik/multi_xml/pull/45)
+* [Support for Oga](https://github.com/sferik/multi_xml/pull/47)
+* [Integer unification for Ruby 2.4](https://github.com/sferik/multi_xml/pull/54)
+
 0.5.5
 -----
 * [Fix symbolize_keys function](https://github.com/sferik/multi_xml/commit/a4cae3aeb690999287cd30206399abaa5ce1ae81)

data/Gemfile

@@ -0,0 +1,21 @@
+source "https://rubygems.org"
+
+gem "libxml-ruby", require: nil, platforms: :ruby
+gem "nokogiri", require: nil
+gem "oga", ">= 2.3", require: nil
+gem "ox", require: nil, platforms: :ruby
+gem "rexml", require: nil
+
+gem "rake", ">= 13.2.1"
+gem "rspec", ">= 3.12"
+gem "rubocop", ">= 1.62.1"
+gem "rubocop-performance", ">= 1.20.2"
+gem "rubocop-rake", ">= 0.6"
+gem "rubocop-rspec", ">= 2.24"
+gem "simplecov", ">= 0.22"
+gem "standard", ">= 1.35.1"
+gem "standard-performance", ">= 1.3.1"
+gem "yard", ">= 0.9.36"
+gem "yardstick", ">= 0.9.9"
+
+gemspec

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2013 Erik Michaels-Ober
+Copyright (c) 2010-2024 Erik Berlin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,17 +1,5 @@
 # MultiXML
 
-[![Gem Version](http://img.shields.io/gem/v/multi_xml.svg)][gem]
-[![Build Status](http://img.shields.io/travis/sferik/multi_xml.svg)][travis]
-[![Dependency Status](http://img.shields.io/gemnasium/sferik/multi_xml.svg)][gemnasium]
-[![Code Climate](http://img.shields.io/codeclimate/github/sferik/multi_xml.svg)][codeclimate]
-[![Coverage Status](http://img.shields.io/coveralls/sferik/multi_xml.svg)][coveralls]
-
-[gem]: https://rubygems.org/gems/multi_xml
-[travis]: http://travis-ci.org/sferik/multi_xml
-[gemnasium]: https://gemnasium.com/sferik/multi_xml
-[codeclimate]: https://codeclimate.com/github/sferik/multi_xml
-[coveralls]: https://coveralls.io/r/sferik/multi_xml
-
 A generic swappable back-end for XML parsing
 
 ## Installation
@@ -23,10 +11,6 @@ A generic swappable back-end for XML parsing
 [documentation]: http://rdoc.info/gems/multi_xml
 
 ## Usage Examples
-Lots of Ruby libraries utilize XML parsing in some form, and everyone has their
-favorite XML library. In order to best support multiple XML parsers and
-libraries, `multi_xml` is a general-purpose swappable XML backend library. You
-use it like so:
 ```ruby
 require 'multi_xml'
 
@@ -54,24 +38,19 @@ The `parser` setter takes either a symbol or a class (to allow for custom XML
 parsers) that responds to `.parse` at the class level.
 
 MultiXML tries to have intelligent defaulting. That is, if you have any of the
-supported parsers already loaded, it will utilize them before attempting to
-load any. When loading, libraries are ordered by speed: first Ox, then LibXML,
+supported parsers already loaded, it will use them before attempting to load
+a new one. When loading, libraries are ordered by speed: first Ox, then LibXML,
 then Nokogiri, and finally REXML.
 
 ## Supported Ruby Versions
-This library aims to support and is [tested against][travis] the following Ruby
+This library aims to support and is tested against the following Ruby
 implementations:
 
-* Ruby 1.9.3
-* Ruby 2.0.0
-* Ruby 2.1
-* Ruby 2.2
-* Ruby 2.3
-* [JRuby 9000][jruby]
-
-[jruby]: http://jruby.org/
+* 3.1
+* 3.2
+* 3.3
 
-If something doesn't work on one of these interpreters, it's a bug.
+If something doesn't work on one of these versions, it's a bug.
 
 This library may inadvertently work (or seem to work) on other Ruby
 implementations, however support will only be provided for the versions listed
@@ -90,6 +69,6 @@ MultiXML was inspired by [MultiJSON][].
 [multijson]: https://github.com/intridea/multi_json/
 
 ## Copyright
-Copyright (c) 2010-2013 Erik Michaels-Ober. See [LICENSE][] for details.
+Copyright (c) 2010-2024 Erik Berlin. See [LICENSE][] for details.
 
 [license]: LICENSE.md

data/Rakefile

@@ -0,0 +1,33 @@
+require "bundler"
+Bundler::GemHelper.install_tasks
+
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec)
+
+task test: :spec
+
+require "rubocop/rake_task"
+RuboCop::RakeTask.new
+
+require "yard"
+YARD::Rake::YardocTask.new do |task|
+  task.files = ["lib/**/*.rb", "-", "LICENSE.md"]
+  task.options = [
+    "--no-private",
+    "--protected",
+    "--output-dir", "doc/yard",
+    "--markup", "markdown"
+  ]
+end
+
+require "yardstick/rake/measurement"
+Yardstick::Rake::Measurement.new do |measurement|
+  measurement.output = "measurement/report.txt"
+end
+
+require "yardstick/rake/verify"
+Yardstick::Rake::Verify.new do |verify|
+  verify.threshold = 48.8
+end
+
+task default: %i[spec rubocop verify_measurements]

data/lib/multi_xml/parsers/libxml.rb

@@ -1,9 +1,9 @@
-require 'libxml' unless defined?(LibXML)
-require 'multi_xml/parsers/libxml2_parser'
+require "libxml" unless defined?(LibXML)
+require "multi_xml/parsers/libxml2_parser"
 
 module MultiXml
   module Parsers
-    module Libxml #:nodoc:
+    module Libxml # :nodoc:
       include Libxml2Parser
       extend self
 
@@ -15,14 +15,14 @@ module MultiXml
         node_to_hash(LibXML::XML::Parser.io(xml).parse.root)
       end
 
-    private
+      private
 
-      def each_child(node, &block)
-        node.each_child(&block)
+      def each_child(node, &)
+        node.each_child(&)
       end
 
-      def each_attr(node, &block)
-        node.each_attr(&block)
+      def each_attr(node, &)
+        node.each_attr(&)
       end
 
       def node_name(node)

data/lib/multi_xml/parsers/libxml2_parser.rb

@@ -1,6 +1,6 @@
 module MultiXml
   module Parsers
-    module Libxml2Parser #:nodoc:
+    module Libxml2Parser # :nodoc:
       # Convert XML document to hash
       #
       # node::
@@ -8,8 +8,8 @@ module MultiXml
       #
       # hash::
       #   Hash to merge the converted element into.
-      def node_to_hash(node, hash = {}) # rubocop:disable AbcSize, CyclomaticComplexity, MethodLength, PerceivedComplexity
-        node_hash = {MultiXml::CONTENT_ROOT => ''}
+      def node_to_hash(node, hash = {}) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+        node_hash = {MultiXml::CONTENT_ROOT => ""}
 
         name = node_name(node)
 
@@ -28,20 +28,18 @@ module MultiXml
           if c.element?
             node_to_hash(c, node_hash)
           elsif c.text? || c.cdata?
-            node_hash[MultiXml::CONTENT_ROOT] << c.content
+            node_hash[MultiXml::CONTENT_ROOT] += c.content
           end
         end
 
         # Remove content node if it is empty
-        if node_hash[MultiXml::CONTENT_ROOT].strip.empty?
-          node_hash.delete(MultiXml::CONTENT_ROOT)
-        end
+        node_hash.delete(MultiXml::CONTENT_ROOT) if node_hash[MultiXml::CONTENT_ROOT].strip.empty?
 
         # Handle attributes
         each_attr(node) do |a|
           key = node_name(a)
           v = node_hash[key]
-          node_hash[key] = (v ? [a.value, v] : a.value)
+          node_hash[key] = ((v) ? [a.value, v] : a.value)
         end
 
         hash
@@ -51,21 +49,21 @@ module MultiXml
       # xml::
       #   XML Document IO to parse
       def parse(_)
-        raise(NotImplementedError.new("inheritor should define #{__method__}"))
+        raise(NotImplementedError, "inheritor should define #{__method__}")
       end
 
-    private
+      private
 
       def each_child(*)
-        raise(NotImplementedError.new("inheritor should define #{__method__}"))
+        raise(NotImplementedError, "inheritor should define #{__method__}")
       end
 
       def each_attr(*)
-        raise(NotImplementedError.new("inheritor should define #{__method__}"))
+        raise(NotImplementedError, "inheritor should define #{__method__}")
       end
 
       def node_name(*)
-        raise(NotImplementedError.new("inheritor should define #{__method__}"))
+        raise(NotImplementedError, "inheritor should define #{__method__}")
       end
     end
   end

data/lib/multi_xml/parsers/nokogiri.rb

@@ -1,9 +1,9 @@
-require 'nokogiri' unless defined?(Nokogiri)
-require 'multi_xml/parsers/libxml2_parser'
+require "nokogiri" unless defined?(Nokogiri)
+require "multi_xml/parsers/libxml2_parser"
 
 module MultiXml
   module Parsers
-    module Nokogiri #:nodoc:
+    module Nokogiri # :nodoc:
       include Libxml2Parser
       extend self
 
@@ -14,17 +14,18 @@ module MultiXml
       def parse(xml)
         doc = ::Nokogiri::XML(xml)
         raise(doc.errors.first) unless doc.errors.empty?
+
         node_to_hash(doc.root)
       end
 
-    private
+      private
 
-      def each_child(node, &block)
-        node.children.each(&block)
+      def each_child(node, &)
+        node.children.each(&)
       end
 
-      def each_attr(node, &block)
-        node.attribute_nodes.each(&block)
+      def each_attr(node, &)
+        node.attribute_nodes.each(&)
       end
 
       def node_name(node)

data/lib/multi_xml/parsers/oga.rb

@@ -1,9 +1,9 @@
-require 'oga' unless defined?(Oga)
-require 'multi_xml/parsers/libxml2_parser'
+require "oga" unless defined?(Oga)
+require "multi_xml/parsers/libxml2_parser"
 
 module MultiXml
   module Parsers
-    module Oga #:nodoc:
+    module Oga # :nodoc:
       include Libxml2Parser
       extend self
 
@@ -16,8 +16,8 @@ module MultiXml
         node_to_hash(document.children[0])
       end
 
-      def node_to_hash(node, hash = {}) # rubocop:disable AbcSize, CyclomaticComplexity, MethodLength, PerceivedComplexity
-        node_hash = {MultiXml::CONTENT_ROOT => ''}
+      def node_to_hash(node, hash = {}) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+        node_hash = {MultiXml::CONTENT_ROOT => ""}
 
         name = node_name(node)
 
@@ -36,38 +36,36 @@ module MultiXml
           if c.is_a?(::Oga::XML::Element)
             node_to_hash(c, node_hash)
           elsif c.is_a?(::Oga::XML::Text) || c.is_a?(::Oga::XML::Cdata)
-            node_hash[MultiXml::CONTENT_ROOT] << c.text
+            node_hash[MultiXml::CONTENT_ROOT] += c.text
           end
         end
 
         # Remove content node if it is empty
-        if node_hash[MultiXml::CONTENT_ROOT].strip.empty?
-          node_hash.delete(MultiXml::CONTENT_ROOT)
-        end
+        node_hash.delete(MultiXml::CONTENT_ROOT) if node_hash[MultiXml::CONTENT_ROOT].strip.empty?
 
         # Handle attributes
         each_attr(node) do |a|
           key = node_name(a)
           v = node_hash[key]
-          node_hash[key] = (v ? [a.value, v] : a.value)
+          node_hash[key] = ((v) ? [a.value, v] : a.value)
         end
 
         hash
       end
 
-    private
+      private
 
-      def each_child(node, &block)
-        node.children.each(&block)
+      def each_child(node, &)
+        node.children.each(&)
       end
 
-      def each_attr(node, &block)
-        node.attributes.each(&block)
+      def each_attr(node, &)
+        node.attributes.each(&)
       end
 
       def node_name(node)
         node.name
       end
-    end # Oga
-  end # Parsers
-end # MultiXml
+    end
+  end
+end

data/lib/multi_xml/parsers/ox.rb

@@ -1,4 +1,4 @@
-require 'ox' unless defined?(Ox)
+require "ox" unless defined?(Ox)
 
 # Each MultiXml parser is expected to parse an XML document into a Hash. The
 # conversion rules are:
@@ -20,8 +20,8 @@ require 'ox' unless defined?(Ox)
 
 module MultiXml
   module Parsers
-    module Ox #:nodoc:
-      extend self
+    module Ox # :nodoc:
+      module_function
 
       def parse_error
         Exception
@@ -29,7 +29,7 @@ module MultiXml
 
       def parse(io)
         handler = Handler.new
-        ::Ox.sax_parse(handler, io, :convert_special => true)
+        ::Ox.sax_parse(handler, io, convert_special: true, skip: :skip_return)
         handler.doc
       end
 
@@ -68,7 +68,7 @@ module MultiXml
         end
 
         def error(message, line, column)
-          raise(Exception.new("#{message} at #{line}:#{column}"))
+          raise(StandardError, "#{message} at #{line}:#{column}")
         end
 
         def append(key, value)
@@ -85,7 +85,7 @@ module MultiXml
             h[key] = value
           end
         end
-      end # Handler
-    end # Ox
-  end # Parsers
-end # MultiXml
+      end
+    end
+  end
+end

data/lib/multi_xml/parsers/rexml.rb

@@ -1,8 +1,8 @@
-require 'rexml/document' unless defined?(REXML::Document)
+require "rexml/document" unless defined?(REXML::Document)
 
 module MultiXml
   module Parsers
-    module Rexml #:nodoc:
+    module Rexml # :nodoc:
       extend self
 
       def parse_error
@@ -15,11 +15,12 @@ module MultiXml
       #   XML Document IO to parse
       def parse(xml)
         doc = REXML::Document.new(xml)
-        raise(REXML::ParseException.new("The document #{doc.to_s.inspect} does not have a valid root")) unless doc.root
+        raise(REXML::ParseException, "The document #{doc.to_s.inspect} does not have a valid root") unless doc.root
+
         merge_element!({}, doc.root)
       end
 
-    private
+      private
 
       # Convert an XML element and merge into the hash
       #
@@ -56,8 +57,7 @@ module MultiXml
       def merge_texts!(hash, element)
         if element.has_text?
           # must use value to prevent double-escaping
-          texts = ''
-          element.texts.each { |t| texts << t.value }
+          texts = element.texts.map(&:value).join
           merge!(hash, MultiXml::CONTENT_ROOT, texts)
         else
           hash

data/lib/multi_xml/version.rb

@@ -1,45 +1,3 @@
 module MultiXml
-  module Version
-  module_function
-
-    # @return [Integer]
-    def major
-      0
-    end
-
-    # @return [Integer]
-    def minor
-      6
-    end
-
-    # @return [Integer]
-    def patch
-      0
-    end
-
-    # @return [Integer, NilClass]
-    def pre
-      nil
-    end
-
-    # @return [Hash]
-    def to_h
-      {
-        :major => major,
-        :minor => minor,
-        :patch => patch,
-        :pre => pre,
-      }
-    end
-
-    # @return [Array]
-    def to_a
-      [major, minor, patch, pre].compact
-    end
-
-    # @return [String]
-    def to_s
-      to_a.join('.')
-    end
-  end
+  VERSION = Gem::Version.create("0.7.0")
 end

data/lib/multi_xml.rb

@@ -1,81 +1,83 @@
-require 'base64'
-require 'bigdecimal'
-require 'date'
-require 'stringio'
-require 'time'
-require 'yaml'
-
-module MultiXml # rubocop:disable ModuleLength
+require "bigdecimal"
+require "date"
+require "stringio"
+require "time"
+require "yaml"
+
+module MultiXml # rubocop:disable Metrics/ModuleLength
   class ParseError < StandardError; end
+
   class NoParserError < StandardError; end
+
   class DisallowedTypeError < StandardError
     def initialize(type)
-      super "Disallowed type attribute: #{type.inspect}"
+      super("Disallowed type attribute: #{type.inspect}")
     end
   end
 
   unless defined?(REQUIREMENT_MAP)
     REQUIREMENT_MAP = [
-      ['ox', :ox],
-      ['libxml', :libxml],
-      ['nokogiri', :nokogiri],
-      ['rexml/document', :rexml],
-      ['oga', :oga],
+      ["ox", :ox],
+      ["libxml", :libxml],
+      ["nokogiri", :nokogiri],
+      ["rexml/document", :rexml],
+      ["oga", :oga]
     ].freeze
   end
 
-  CONTENT_ROOT = '__content__'.freeze unless defined?(CONTENT_ROOT)
+  CONTENT_ROOT = "__content__".freeze unless defined?(CONTENT_ROOT)
 
   unless defined?(PARSING)
     float_proc = proc { |float| float.to_f }
-    datetime_proc = proc { |time| Time.parse(time).utc rescue DateTime.parse(time).utc } # rubocop:disable RescueModifier
+    datetime_proc = proc { |time| Time.parse(time).utc rescue DateTime.parse(time).utc } # rubocop:disable Style/RescueModifier
 
     PARSING = {
-      'symbol'       => proc { |symbol| symbol.to_sym },
-      'date'         => proc { |date| Date.parse(date) },
-      'datetime'     => datetime_proc,
-      'dateTime'     => datetime_proc,
-      'integer'      => proc { |integer| integer.to_i },
-      'float'        => float_proc,
-      'double'       => float_proc,
-      'decimal'      => proc { |number| BigDecimal(number) },
-      'boolean'      => proc { |boolean| !%w(0 false).include?(boolean.strip) },
-      'string'       => proc { |string| string.to_s },
-      'yaml'         => proc { |yaml| YAML.load(yaml) rescue yaml }, # rubocop:disable RescueModifier
-      'base64Binary' => proc { |binary| ::Base64.decode64(binary) },
-      'binary'       => proc { |binary, entity| parse_binary(binary, entity) },
-      'file'         => proc { |file, entity| parse_file(file, entity) },
+      "symbol" => proc { |symbol| symbol.to_sym },
+      "date" => proc { |date| Date.parse(date) },
+      "datetime" => datetime_proc,
+      "dateTime" => datetime_proc,
+      "integer" => proc { |integer| integer.to_i },
+      "float" => float_proc,
+      "double" => float_proc,
+      "decimal" => proc { |number| BigDecimal(number) },
+      "boolean" => proc { |boolean| !%w[0 false].include?(boolean.strip) },
+      "string" => proc { |string| string.to_s },
+      "yaml" => proc { |yaml| YAML.load(yaml) rescue yaml }, # rubocop:disable Style/RescueModifier
+      "base64Binary" => proc { |binary| base64_decode(binary) },
+      "binary" => proc { |binary, entity| parse_binary(binary, entity) },
+      "file" => proc { |file, entity| parse_file(file, entity) }
     }.freeze
   end
 
   unless defined?(TYPE_NAMES)
     TYPE_NAMES = {
-      'Symbol'     => 'symbol',
-      'Integer'    => 'integer',
-      'BigDecimal' => 'decimal',
-      'Float'      => 'float',
-      'TrueClass'  => 'boolean',
-      'FalseClass' => 'boolean',
-      'Date'       => 'date',
-      'DateTime'   => 'datetime',
-      'Time'       => 'datetime',
-      'Array'      => 'array',
-      'Hash'       => 'hash',
+      "Symbol" => "symbol",
+      "Integer" => "integer",
+      "BigDecimal" => "decimal",
+      "Float" => "float",
+      "TrueClass" => "boolean",
+      "FalseClass" => "boolean",
+      "Date" => "date",
+      "DateTime" => "datetime",
+      "Time" => "datetime",
+      "Array" => "array",
+      "Hash" => "hash"
     }.freeze
   end
 
-  DISALLOWED_XML_TYPES = %w(symbol yaml).freeze
+  DISALLOWED_XML_TYPES = %w[symbol yaml].freeze
 
   DEFAULT_OPTIONS = {
-    :typecast_xml_value => true,
-    :disallowed_types => DISALLOWED_XML_TYPES,
-    :symbolize_keys => false,
+    typecast_xml_value: true,
+    disallowed_types: DISALLOWED_XML_TYPES,
+    symbolize_keys: false
   }.freeze
 
   class << self
     # Get the current parser class.
     def parser
       return @parser if defined?(@parser)
+
       self.parser = default_parser
       @parser
     end
@@ -91,14 +93,13 @@ module MultiXml # rubocop:disable ModuleLength
       return :oga if defined?(::Oga)
 
       REQUIREMENT_MAP.each do |library, parser|
-        begin
-          require library
-          return parser
-        rescue LoadError
-          next
-        end
+        require library
+        return parser
+      rescue LoadError
+        next
       end
-      raise(NoParserError.new("No XML parser detected. If you're using Rubinius and Bundler, try adding an XML parser to your Gemfile (e.g. libxml-ruby, nokogiri, or rubysl-rexml). For more information, see https://github.com/sferik/multi_xml/issues/42."))
+      raise(NoParserError,
+        "No XML parser detected. If you're using Rubinius and Bundler, try adding an XML parser to your Gemfile (e.g. libxml-ruby, nokogiri, or rubysl-rexml). For more information, see https://github.com/sferik/multi_xml/issues/42.")
     end
 
     # Set the XML parser utilizing a symbol, string, or class.
@@ -113,11 +114,11 @@ module MultiXml # rubocop:disable ModuleLength
       case new_parser
       when String, Symbol
         require "multi_xml/parsers/#{new_parser.to_s.downcase}"
-        @parser = MultiXml::Parsers.const_get(new_parser.to_s.split('_').collect(&:capitalize).join('').to_s)
+        @parser = MultiXml::Parsers.const_get(new_parser.to_s.split("_").collect(&:capitalize).join.to_s)
       when Class, Module
         @parser = new_parser
       else
-        raise('Did not recognize your parser specification. Please specify either a symbol or a class.')
+        raise("Did not recognize your parser specification. Please specify either a symbol or a class.")
       end
     end
 
@@ -130,8 +131,8 @@ module MultiXml # rubocop:disable ModuleLength
     # <tt>:disallowed_types</tt> :: Types to disallow from being typecasted. Defaults to `['yaml', 'symbol']`. Use `[]` to allow all types.
     #
     # <tt>:typecast_xml_value</tt> :: If true, won't typecast values for parsed document
-    def parse(xml, options = {}) # rubocop:disable AbcSize, CyclomaticComplexity, MethodLength, PerceivedComplexity
-      xml ||= ''
+    def parse(xml, options = {}) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+      xml ||= ""
 
       options = DEFAULT_OPTIONS.merge(options)
 
@@ -141,14 +142,15 @@ module MultiXml # rubocop:disable ModuleLength
 
         char = xml.getc
         return {} if char.nil?
+
         xml.ungetc(char)
 
         hash = undasherize_keys(parser.parse(xml) || {})
-        hash = options[:typecast_xml_value] ? typecast_xml_value(hash, options[:disallowed_types]) : hash
+        hash = typecast_xml_value(hash, options[:disallowed_types]) if options[:typecast_xml_value]
       rescue DisallowedTypeError
         raise
-      rescue parser.parse_error => error
-        raise(ParseError, error.message, error.backtrace) # rubocop:disable RaiseArgs
+      rescue parser.parse_error => e
+        raise(ParseError, e.message, e.backtrace)
       end
       hash = symbolize_keys(hash) if options[:symbolize_keys]
       hash
@@ -156,38 +158,42 @@ module MultiXml # rubocop:disable ModuleLength
 
     # This module decorates files with the <tt>original_filename</tt>
     # and <tt>content_type</tt> methods.
-    module FileLike #:nodoc:
+    module FileLike # :nodoc:
       attr_writer :original_filename, :content_type
 
       def original_filename
-        @original_filename || 'untitled'
+        @original_filename || "untitled"
       end
 
       def content_type
-        @content_type || 'application/octet-stream'
+        @content_type || "application/octet-stream"
       end
     end
 
-  private
+    private
 
     # TODO: Add support for other encodings
-    def parse_binary(binary, entity) #:nodoc:
-      case entity['encoding']
-      when 'base64'
-        Base64.decode64(binary)
+    def parse_binary(binary, entity) # :nodoc:
+      case entity["encoding"]
+      when "base64"
+        base64_decode(binary)
       else
         binary
       end
     end
 
     def parse_file(file, entity)
-      f = StringIO.new(Base64.decode64(file))
+      f = StringIO.new(base64_decode(file))
       f.extend(FileLike)
-      f.original_filename = entity['name']
-      f.content_type = entity['content_type']
+      f.original_filename = entity["name"]
+      f.content_type = entity["content_type"]
       f
     end
 
+    def base64_decode(input)
+      input.unpack1("m")
+    end
+
     def symbolize_keys(params)
       case params
       when Hash
@@ -204,8 +210,8 @@ module MultiXml # rubocop:disable ModuleLength
     def undasherize_keys(params)
       case params
       when Hash
-        params.inject({}) do |hash, (key, value)|
-          hash[key.to_s.tr('-'.freeze, '_'.freeze)] = undasherize_keys(value)
+        params.each_with_object({}) do |(key, value), hash|
+          hash[key.to_s.tr("-", "_")] = undasherize_keys(value)
           hash
         end
       when Array
@@ -215,16 +221,16 @@ module MultiXml # rubocop:disable ModuleLength
       end
     end
 
-    def typecast_xml_value(value, disallowed_types = nil) # rubocop:disable AbcSize, CyclomaticComplexity, MethodLength, PerceivedComplexity
+    def typecast_xml_value(value, disallowed_types = nil) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
       disallowed_types ||= DISALLOWED_XML_TYPES
 
       case value
       when Hash
-        if value.include?('type') && !value['type'].is_a?(Hash) && disallowed_types.include?(value['type'])
-          raise(DisallowedTypeError.new(value['type']))
+        if value.include?("type") && !value["type"].is_a?(Hash) && disallowed_types.include?(value["type"])
+          raise(DisallowedTypeError, value["type"])
         end
 
-        if value['type'] == 'array'
+        if value["type"] == "array"
 
           # this commented-out suggestion helps to avoid the multiple attribute
           # problem, but it breaks when there is only one item in the array.
@@ -239,7 +245,7 @@ module MultiXml # rubocop:disable ModuleLength
 
           # This approach ignores attribute entries that are not convertable
           # to an Array which allows attributes to be ignored.
-          _, entries = value.detect { |k, v| k != 'type' && (v.is_a?(Array) || v.is_a?(Hash)) }
+          _, entries = value.detect { |k, v| k != "type" && (v.is_a?(Array) || v.is_a?(Hash)) }
 
           case entries
           when NilClass
@@ -256,10 +262,10 @@ module MultiXml # rubocop:disable ModuleLength
 
         elsif value.key?(CONTENT_ROOT)
           content = value[CONTENT_ROOT]
-          block = PARSING[value['type']]
+          block = PARSING[value["type"]]
           if block
             if block.arity == 1
-              value.delete('type') if PARSING[value['type']]
+              value.delete("type") if PARSING[value["type"]]
               if value.keys.size > 1
                 value[CONTENT_ROOT] = block.call(content)
                 value
@@ -270,31 +276,31 @@ module MultiXml # rubocop:disable ModuleLength
               block.call(content, value)
             end
           else
-            value.keys.size > 1 ? value : content
+            (value.keys.size > 1) ? value : content
           end
-        elsif value['type'] == 'string' && value['nil'] != 'true'
-          ''
+        elsif value["type"] == "string" && value["nil"] != "true"
+          ""
         # blank or nil parsed values are represented by nil
-        elsif value.empty? || value['nil'] == 'true'
+        elsif value.empty? || value["nil"] == "true"
           nil
         # If the type is the only element which makes it then
         # this still makes the value nil, except if type is
         # a XML node(where type['value'] is a Hash)
-        elsif value['type'] && value.size == 1 && !value['type'].is_a?(Hash)
+        elsif value["type"] && value.size == 1 && !value["type"].is_a?(Hash)
           nil
         else
-          xml_value = value.inject({}) do |hash, (k, v)|
+          xml_value = value.each_with_object({}) do |(k, v), hash|
             hash[k] = typecast_xml_value(v, disallowed_types)
             hash
           end
 
           # Turn {:files => {:file => #<StringIO>} into {:files => #<StringIO>} so it is compatible with
           # how multipart uploaded files from HTML appear
-          xml_value['file'].is_a?(StringIO) ? xml_value['file'] : xml_value
+          (xml_value["file"].is_a?(StringIO)) ? xml_value["file"] : xml_value
         end
       when Array
         value.map! { |i| typecast_xml_value(i, disallowed_types) }
-        value.length > 1 ? value : value.first
+        (value.length > 1) ? value : value.first
       when String
         value
       else

metadata

@@ -1,40 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: multi_xml
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
-- Erik Michaels-Ober
-autorequire: 
-bindir: bin
+- Erik Berlin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
+        version: '3.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-description: Provides swappable XML backends utilizing LibXML, Nokogiri, Ox, or REXML.
-email: sferik@gmail.com
+        version: '3.1'
+description:
+email:
+- sferik@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rspec"
+- ".rubocop.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
+- Gemfile
 - LICENSE.md
 - README.md
+- Rakefile
 - lib/multi_xml.rb
 - lib/multi_xml/parsers/libxml.rb
 - lib/multi_xml/parsers/libxml2_parser.rb
@@ -43,12 +48,16 @@ files:
 - lib/multi_xml/parsers/ox.rb
 - lib/multi_xml/parsers/rexml.rb
 - lib/multi_xml/version.rb
-- multi_xml.gemspec
 homepage: https://github.com/sferik/multi_xml
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  allowed_push_host: https://rubygems.org
+  homepage_uri: https://github.com/sferik/multi_xml
+  source_code_uri: https://github.com/sferik/multi_xml
+  changelog_uri: https://github.com/sferik/multi_xml/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -56,16 +65,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.5
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
-summary: A generic swappable back-end for XML parsing
+summary: Provides swappable XML backends utilizing LibXML, Nokogiri, Ox, or REXML.
 test_files: []

data/multi_xml.gemspec

@@ -1,19 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'multi_xml/version'
-
-Gem::Specification.new do |spec|
-  spec.add_development_dependency 'bundler', '~> 1.0'
-  spec.author = 'Erik Michaels-Ober'
-  spec.description = 'Provides swappable XML backends utilizing LibXML, Nokogiri, Ox, or REXML.'
-  spec.email = 'sferik@gmail.com'
-  spec.files = %w(.yardopts CHANGELOG.md CONTRIBUTING.md LICENSE.md README.md multi_xml.gemspec) + Dir['lib/**/*.rb']
-  spec.homepage = 'https://github.com/sferik/multi_xml'
-  spec.licenses = ['MIT']
-  spec.name = 'multi_xml'
-  spec.require_paths = ['lib']
-  spec.required_rubygems_version = '>= 1.3.5'
-  spec.summary = 'A generic swappable back-end for XML parsing'
-  spec.version = MultiXml::Version
-end