xml-mixup 0.1.15 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83154ccf54f91484833c4f3b6990bce856635bc95864eeae11edb5b791d1118c
-  data.tar.gz: 6cc3737aedbaf7b5c9c04dc621b003c3047b6f86c16f9ab954da4a5bb4c774d0
+  metadata.gz: 460b4560533df750db75bcee4c5a6eedfaaece84faea406fc3f2711845ab17c0
+  data.tar.gz: 1f6311bcaa48547ce09f3ee718afa0077589addd2466982aaee2dd743035d6fa
 SHA512:
-  metadata.gz: f4591665e4d05cbe1b5d3d638f37f54d5e39a8ff79f4037814783c954cdeebb7809f4f3890f481148f4ff24c7a42d981df97b0d361965f078ba5b1f5f49876de
-  data.tar.gz: 7fe10c1db99f7fdf143f7fb49b20cdf68b4c157758c72cfb31cd8ba71cbbbad4647b574e3353c61ea9bd4169b2f9d8b2000c27d3b1f28a667929f8fd62f7ac56
+  metadata.gz: 2de6209eba128209f7433fcb50df44f9f4de64e3607e82d81e24b4b64c76a3c4e7d88d5625d4e3db2f9c2022058ca2fba6dd99764ccabd1bc7cecaf20c15696a
+  data.tar.gz: 163e037051e2f295254d3aa11972f213faf904e458aa8276e2451cfe4653defe69f617d6e322d3b7a1eeff952b1ccd2b4d4434360040b0c1d7949b4a92807463

data/lib/xml/mixup/version.rb

@@ -1,5 +1,5 @@
 module XML
   module Mixup
-    VERSION = "0.1.15"
+    VERSION = "0.2.0"
   end
 end

data/lib/xml/mixup.rb

@@ -63,21 +63,22 @@ module XML::Mixup
   #
   # @return [String] the attribute in question.
   #
-  def flatten_attr obj, args
+  def flatten_attr obj, args = []
     return if obj.nil?
+    args ||= []
     # early bailout for most likely condition
     if ATOMS.any? { |x| obj.is_a? x }
       obj.to_s
     elsif obj.is_a? Hash
       tmp = obj.sort.map do |kv|
-        v = flatten_attr kv[1], args
-        v.nil? ? nil : "#{kv[0].to_s}: #{v}"
+        v = flatten_attr kv.last, args
+        v.nil? ? nil : "#{kv.first.to_s}: #{v}"
       end.compact
       tmp.empty? ? nil : tmp.join(' ')
     elsif obj.respond_to? :call
       flatten_attr obj.call(*args), args
-    elsif obj.respond_to? :map
-      tmp = obj.map { |x| flatten_attr x, args }.reject do |x|
+    elsif [Array, Set].any? { |c| obj.is_a? c }
+      tmp = obj.to_a.map { |x| flatten_attr x, args }.reject do |x|
         x.nil? || x == ''
       end
       tmp.empty? ? nil : tmp.join(' ')
@@ -491,6 +492,9 @@ module XML::Mixup
       extra: [], head: {}, body: {}, attr: {}, content: [],
       transform: nil, dtd: true, xmlns: true, args: []
 
+    vocab ||= prefix[nil]
+    prefix = prefix.except nil if prefix
+
     spec = []
 
     # add xslt stylesheet
@@ -572,7 +576,7 @@ module XML::Mixup
         root[:prefix] = prefix
 
         if xmlns
-          x = prefix.transform_keys { |k| "xmlns:#{k}" }
+          x = prefix.except(nil).transform_keys { |k| "xmlns:#{k}" }
           root = x.merge(root)
         end
       end

data/xml-mixup.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.1"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.9"
+  spec.add_development_dependency "bundler", ">= 2.1"
+  spec.add_development_dependency "rake", ">= 13.0"
+  spec.add_development_dependency "rspec", ">= 3.9"
 
   spec.add_dependency "nokogiri", ">= 1.13.6"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: xml-mixup
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.2.0
 platform: ruby
 authors:
 - Dorian Taylor
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2023-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.9'
 - !ruby/object:Gem::Dependency
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.3.15
 signing_key:
 specification_version: 4
 summary: A mixin for (XML) markup