xml-mixup 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48a86946adc9a44a1bc9d986416ef411991303edb21e9504c65298780133b57d
-  data.tar.gz: da5b71064ada3a7d49ce014c30432aed83a0d04543ef581b2952279522bda033
+  metadata.gz: 74f33a7307a517d3447e6cc3e41b79a964d7002dcd41118f20f77854ad20c7c9
+  data.tar.gz: c0fe7162ce9a6b6d0b27880b6127e783bbe2f340358be29e2cc9386345ef6cff
 SHA512:
-  metadata.gz: 4b841ff188b208a3986ccc97b8a44df1c29b0371bef01d113cf03358c8757ed728e906e8585ec1233acccdf16d2676a78052fbeb50eb75e972d073785b28ad1f
-  data.tar.gz: 6c83a42f76ba918526bf2bc192de5e101fea497593983e8c5d8415a66eefabe5c786302f58bbb488f01954ba6a45dbdab133f6598c8d129794f4fb34a73d05d5
+  metadata.gz: c50bb0074170d8b936bf83084d5d471ab3f6f70703ec87e4c7e1b3f8d02bff4bb557986367f648bfec14f62cdb0a6b7b0ddaa7b88cdc3308e6922eb377b8619d
+  data.tar.gz: 86e2f6b2ba2f89808215e1176031bc2079ff254f425d5c3a8e2d6f9a8f81506e9bc921b9605d531b3708fca92cf3dc18cb3f8ceca6dd8615b76b2eeed1f7deee

data/README.md

@@ -148,6 +148,21 @@ flattened like this:
 # => <foo array="a b" hash="c: d e: f"/>
 ```
 
+Note that attribute values can also be a `Proc`, which are fed
+arbitrary arguments from the `markup` method. The `Proc` is expected
+to return something which can subsequently flattened. If an attribute
+value is `nil` or ultimately resolves to `nil`, or an empty `Array` or
+`Hash`, that attribute will be omitted. `nil` values in arrays or
+hashes will also be skipped, as will empty-string values in
+arrays. This is different behaviour from versions prior to 0.1.10,
+where `nil` (or, e.g., `[]`) would produce an attribute containing the
+empty string.
+
+This change was made to eliminate a lot of clunky logic in application
+code to determine whether or not to include a given attribute. If you
+need to render attributes explicitly with empty strings, then
+explicitly pass in the empty string.
+
 #### Processing instructions
 
 ```ruby

data/lib/xml/mixup.rb

@@ -216,7 +216,7 @@ module XML::Mixup
         # now we dispatch based on the name
         if name == '#comment'
           # first up, comments
-          node = doc.create_comment flatten(children, args)
+          node = doc.create_comment flatten(children, args).to_s
 
           # attach it
           ADJACENT[adj].call node, nodes[adj]
@@ -230,11 +230,12 @@ module XML::Mixup
           content = ''
           if (c = children[1..children.length]) and c.length > 0
             #warn c.inspect
-            content = flatten(c, args)
+            content = flatten(c, args).to_s
           else
             content = attr.sort.map { |pair|
-              "#{pair[0].to_s}=\"#{flatten(pair[1], args)}\""
-            }.join(' ')
+              v = flatten(pair[1], args) or next
+              "#{pair[0].to_s}=\"#{v}\""
+            }.compact.join(' ')
           end
               
           node = Nokogiri::XML::ProcessingInstruction.new(doc, target, content)
@@ -292,11 +293,12 @@ module XML::Mixup
           ns = {}
           at = {}
           attr.each do |k, v|
-            v = flatten(v, args)
-            if (md = /^xmlns(?::(.*))?$/i.match(k.to_s))
+            k = k.to_s
+            v = flatten(v, args) or next
+            if (md = /^xmlns(?::(.*))?$/i.match(k))
               ns[md[1]] = v
             else
-              at[k.to_s] = v
+              at[k] = v
             end
           end
 
@@ -545,26 +547,33 @@ module XML::Mixup
       elem.add_namespace((p.nil? ? p : p.to_s), ns[p].to_s)
     end
     attr.sort.each do |k, v|
-      elem[k.to_s] = flatten(v, args)
+      v = flatten(v, args) or next
+      elem[k.to_s] = v
     end
 
     elem
   end
 
-  ATOMS = [String, Symbol, Numeric, NilClass, FalseClass, TrueClass].freeze
+  ATOMS = [String, Symbol, Numeric, FalseClass, TrueClass].freeze
 
   # yo dawg
 
   def flatten obj, args
+    return if obj.nil?
     # early bailout for most likely condition
     if ATOMS.any? { |x| obj.is_a? x }
       obj.to_s
     elsif obj.is_a? Hash
-      obj.sort.map { |kv| "#{kv[0].to_s}: #{flatten(kv[1], args)}" }.join(' ')
+      tmp = obj.sort.map do |kv|
+        v = flatten(kv[1], args)
+        v.nil? ? nil : "#{kv[0].to_s}: #{v}"
+      end.compact
+      tmp.empty? ? nil : tmp.join(' ')
     elsif obj.respond_to? :call
-      obj.call(*args)
+      flatten(obj.call(*args), args)
     elsif obj.respond_to? :map
-      obj.map { |x| flatten(x, args) }.join(' ')
+      tmp = obj.map { |x| flatten(x, args) }.reject { |x| x.nil? || x == '' }
+      tmp.empty? ? nil : tmp.join(' ')
     else
       obj.to_s
     end

data/lib/xml/mixup/version.rb

@@ -1,5 +1,5 @@
 module XML
   module Mixup
-    VERSION = "0.1.9"
+    VERSION = "0.1.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xml-mixup
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Dorian Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A mixin for (XML) markup