RubyGems - xml-mixup - Versions diffs - 0.1.6 → 0.1.8 - Mend

xml-mixup 0.1.6 → 0.1.8

Files changed (5) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b913c511d5bba6785d8db148163e165cdefc95e812a1e50be2c0b340c004b8d8
-  data.tar.gz: 14000a5d897c303d6afda38d9a133a5b51f25d3f3fe05bd7e515c29bb4a95fed
+  metadata.gz: 8d600f3895e5048db0b914aa5252b480486bf0c45591a3eb73e4ddcef410b5d8
+  data.tar.gz: '088830420d03127e46e1d5d9e23dc8e6e9ab9bf9caad6ad88f9906ad8928fabe'
 SHA512:
-  metadata.gz: 0b195ce5cc4194bb50eaf6d6b45f63455d510cb866849907bc6a76eeea61062f1369271f43ede0744f74663fcdd92febf36ce88b55673cd3f27c10a3fe8439f2
-  data.tar.gz: 4a2ff48f0abf03e28951a0f9431e9799c791d3838c2316e8f78a0007b281cafcae1fa893f63f6c892f0a8d73fa4f1c9bcbfbbf0fc03f4b17da5cf3073733d36e
+  metadata.gz: ac41a0326ac73bff9b2fb89f8ead181e0cc308195d64d0b29ad76315e8c8687dfd570eb546572212fb8ab2f6fd08d6c559a0a1069982b18cadd4eb4c45c56384
+  data.tar.gz: 8fea64d8a5079e1f7e6e4e592f4517499c5026281ae9c62806f91e4e8aa2fdaf6fce26bfd739dabbe6d003f10ab7df30873f63698f9e1f4a86d6d1f9ad0a3f73

data/.gitignore CHANGED Viewed

@@ -13,3 +13,4 @@ Gemfile.lock
 # rspec failure tracking
 .rspec_status
+xml-mixup*.gem

data/lib/xml/mixup/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module XML
   module Mixup
-    VERSION = "0.1.6"
+    VERSION = "0.1.8"
   end
 end

data/lib/xml/mixup.rb CHANGED Viewed

@@ -304,9 +304,13 @@ module XML::Mixup
             p, _ = /^(?:([^:]+):)?(.+)$/.match(k).captures
             ns[p] ||= nil
           end
           # also do the tag prefix but only if there is a local name
           ns[prefix] ||= nil if local
+          # unconditionally remove ns['xml'], we never want it in there
+          ns.delete 'xml'
           # pseudo is a stand-in for non-parent adjacent nodes
           pseudo = nodes[:pseudo] || nodes[:parent]
@@ -324,7 +328,7 @@ module XML::Mixup
           # there should be no nil namespace declarations now
           if ns.has_value? nil
-            raise 'INTERNAL ERROR: nil namespace declaration'
+            raise "INTERNAL ERROR: nil namespace declaration: #{ns}"
           end
           # generate the node
@@ -373,7 +377,8 @@ module XML::Mixup
   #
   # @param vocab [#to_s] the contents of the root node's +vocab=+.
   #
-  # @param lang [#to_s] the contents of +lang=+ and when applicable, +xml:lang+.
+  # @param lang [#to_s] the contents of +lang=+ and when applicable,
+  #  +xml:lang+.
   #
   # @param title [#to_s, #to_a, Hash] the contents of the +<title>+
   #  tag. When given as an array-like object, all elements after the
@@ -381,9 +386,11 @@ module XML::Mixup
   #  the +property=+ attribute. When given as a {Hash}, it will be
   #  coerced into a snippet of spec that produces the appropriate tag.
   #
-  # @param link [#to_a, Hash] A spec describing one or more +<link/>+ elements.
+  # @param link [#to_a, Hash] A spec describing one or more +<link/>+
+  #  elements.
   #
-  # @param meta [#to_a, Hash] A spec describing one or more +<meta/>+ elements.
+  # @param meta [#to_a, Hash] A spec describing one or more +<meta/>+
+  #  elements.
   #
   # @param style [#to_a, Hash] A spec describing one or more
   #  +<style/>+ elements.
@@ -391,12 +398,16 @@ module XML::Mixup
   # @param script [#to_a, Hash] A spec describing one or more
   #  +<script/>+ elements.
   #
+  # @param extra [#to_a, Hash] A spec describing any extra elements
+  #  inside +<head>+ that aren't in the previous categories.
+  #
   # @param attr [Hash] A spec containing attributes for the +<body>+.
   #
   # @param content [Hash, Array, Nokogiri::XML::Node, ...] A spec which
   #  will be attached underneath the +<body>+.
   #
-  # @param head [Hash] A spec which overrides the entire +<head>+.
+  # @param head [Hash, Array] A Hash spec which overrides the entire
+  #  +<head>+ element, or otherwise an array of its children.
   #
   # @param body [Hash] A spec which overrides the entire +<body>+.
   #
@@ -418,7 +429,7 @@ module XML::Mixup
   def xhtml_stub doc: nil, base: nil, ns: {}, prefix: {}, vocab: nil,
       lang: nil, title: nil, link: [], meta: [], style: [], script: [],
-      head: {}, body: {}, attr: {}, content: [],
+      extra: [], head: {}, body: {}, attr: {}, content: [],
       transform: nil, dtd: true, xmlns: true, args: []
     spec = []
@@ -426,8 +437,7 @@ module XML::Mixup
     # add xslt stylesheet
     if transform
       spec << (transform.is_a?(Hash) ? transform :
-               { nil => ['#pi', 'xml-stylesheet'],
-                type: 'text/xsl', href: transform.to_s })
+        { '#pi' => 'xml-stylesheet', type: 'text/xsl', href: transform })
     end
     # add doctype declaration
@@ -436,19 +446,47 @@ module XML::Mixup
       spec << { nil => %w{#dtd html} + ps }
     end
+    # normalize title
+    if title.nil? or (title.respond_to?(:empty?) and title.empty?)
+      title = { '#title' => '' } # add an empty string for closing tag
+    elsif title.is_a? Hash
+      # nothing
+    elsif title.respond_to? :to_a
+      title = title.to_a
+      text  = title.shift
+      props = title
+      title = { '#title' => text }
+      title[:property] = props unless props.empty?
+    else
+      title = { '#title' => title }
+    end
+    # normalize base
+    if base and not base.is_a? Hash
+      base = { nil => :base, href: base }
+    end
+    # TODO normalize link, meta, style, script elements
     # construct document tree
     head ||= {}
-    if head.respond_to?(:empty) and head.empty?
-      head[nil] = [:head, title, base, link, meta, style, script]
+    if head.is_a? Hash and head.empty?
+      head[nil] = [:head, title, base, link, meta, style, script, extra]
+    elsif head.is_a? Array
+      # children of unmarked head element
+      head = { nil => [:head] + head }
     end
     body ||= {}
-    if body.respond_to?(:empty?) and body.empty?
+    if body.is_a? Hash and body.empty?
       body[nil] = [:body, content]
+      body = attr.merge(body) if attr and attr.is_a?(Hash)
     end
-    root = { nil => [:html, [head, body]] }
+    root = { nil => [:html, head, body] }
     root[:vocab] = vocab if vocab
     root[:lang]  = lang  if lang
@@ -458,31 +496,52 @@ module XML::Mixup
       # namespaced language attribute
       root['xml:lang'] = lang if lang
+      if !prefix and xmlns.is_a? Hash
+        x = prefix.transform_keys { |k| "xmlns:#{k}" }
+        root = x.merge(root)
+      end
     end
     # deal with prefixes distinct from namespaces
-    if prefix
+    prefix ||= {}
+    if prefix.respond_to? :to_h
+      prefix = prefix.to_h
+      unless prefix.empty?
+        # this will get automatically smushed into the right shape
+        root[:prefix] = prefix
+        if xmlns
+          x = prefix.transform_keys { |k| "xmlns:#{k}" }
+          root = x.merge(root)
+        end
+      end
     end
     # add the document structure to the spec
     spec << root
     # as usual this will return the last innermost node
-    markup spec: spec, doc: doc
+    markup spec: spec, doc: doc, args: args
   end
   private
   def element tag, doc: nil, ns: {}, attr: {}, args: []
     raise 'Document node must be present' unless doc
-    prefix = local = nil
+    pfx = nil
     if tag.respond_to? :to_a
-      prefix, local = tag
-      tag = tag[0..1].join ':'
+      pfx = tag[0]
+      tag = tag.to_a[0..1].join ':'
+    elsif m = tag.match(/([^:]+):/)
+      pfx = m[1]
     end
     elem = doc.create_element tag.to_s
-    ns.sort.each do |p, u|
-      elem.add_namespace((p.nil? ? p : p.to_s), u.to_s)
+    elem.default_namespace = ns[pfx] if ns[pfx]
+    ns.keys.sort { |a, b| a.to_s <=> b.to_s }.each do |p|
+      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)
@@ -491,7 +550,7 @@ module XML::Mixup
     elem
   end
-  ATOMS = [String, Symbol, Numeric, NilClass, FalseClass, TrueClass]
+  ATOMS = [String, Symbol, Numeric, NilClass, FalseClass, TrueClass].freeze
   # yo dawg

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xml-mixup
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Dorian Taylor
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-02-04 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler