xml-mixup 0.1.16 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2987df3a876da2b544c023d70a16dc8a44eb8bf391af07436263004b180f095
-  data.tar.gz: d04b0ad24255030ae51d50c7d198d95baf08570ec6a3e411b61119ef329a1542
+  metadata.gz: a5088e1b3a412b854e6bc38a37d75b0dc6cc40da1d1d820b70a698b5a933404e
+  data.tar.gz: 7f6bc8cb47dd18667d43416b188fda2de98ae30ba11f06e018f2bf0862fb11c4
 SHA512:
-  metadata.gz: 6537916b1380983c64e39aaf54048a0a08e6df07662c7319c07df566dee3320dd850b1153cfa705a7f18bacad12a26949d13b968f59c21a76270007889a2a3c2
-  data.tar.gz: 85d6a953e37ec44ca90f6b28dcb39483de885b094b17fa70caabf9ad18f52d6e723345391c264033df094f82f0db79e892231152615f9e305161badeca80dd8c
+  metadata.gz: e701a278fa9043d1a862e5e1a66da14a572836ea7aa423aeaf2810dea387f77820fd9f31349752c2bc4f71d8b359a49bc251a237cc19fc6db972bc763bd4a902
+  data.tar.gz: 4c58b9c816020b1f699027ec358802bfcf9dddcdbdf75a30215348edba18678a8ea5041861497b808e3995967c6bc644b953bf73dd1f1a24cc57d07ddd77a2a6

data/lib/xml/mixup/version.rb

@@ -1,5 +1,5 @@
 module XML
   module Mixup
-    VERSION = "0.1.16"
+    VERSION = "0.2.1"
   end
 end

data/lib/xml/mixup.rb

@@ -70,15 +70,15 @@ module XML::Mixup
     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}"
+      tmp = obj.sort { |a, b| a.first.to_s <=> b.first.to_s }.map do |kv|
+        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(' ')
@@ -492,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
@@ -573,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.16
+  version: 0.2.1
 platform: ruby
 authors:
 - Dorian Taylor
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2025-03-27 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.4.20
 signing_key:
 specification_version: 4
 summary: A mixin for (XML) markup