kramdown-rfc2629 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 296e6b41d770f71cc7266daefdbef48425bd7b050ae3be467badabf1f2f8453d
-  data.tar.gz: 12ca2cd06a9d6911f4f4db728210909ccb23a44563c4ae8ac5beaaf044fb550e
+  metadata.gz: a4b5c45b8847c6578542b8920d23c017bd22ef3bf35fe005d871c8a305738219
+  data.tar.gz: 2f2ff22d21077a464373dfe592af271457e1f2cfec8c4f353da92e0ffd559e01
 SHA512:
-  metadata.gz: b8adf6c1c27f37b30468b6c593f3faa334adfba8953f99160ac842bfcc98bb7dde0ef02e36ea65450b9ea519ac46a200e5631c9a3bd5832296ef78b7aa18fb8a
-  data.tar.gz: ee84d6769775ea513fea5240bdf1d552f7a724213840363d76a0510a53d9cae8ae56dd2de342f6b1540f5e2c5f9fe085b53ad7e4ca9ccd15ee598798f7a2be65
+  metadata.gz: b9f8b2a133cfc9e511804df4bd7be41ed0b59203a2997d277fb888f2b7b3ac494988f8bb7a9ba084c4ebe7253a141daef4aa8f9c4147329d9a19ba1bdc62a649
+  data.tar.gz: 562538aacef3d53eed6fc976d08e78d72838c8c28ea29a9a47fa65652ebaed34d05fff26bbba1570161740431aa9e9bef487083216ab7833db8ad1e93c0045a3

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.5.1'
+  s.version = '1.5.2'
   s.summary = "Kramdown extension for generating RFC 7749 XML."
   s.description = %{An RFC7749 (XML2RFC) generating backend for Thomas Leitner's
 "kramdown" markdown parser.  Mostly useful for RFC writers.}

data/lib/kramdown-rfc/refxml.rb

@@ -57,17 +57,35 @@ module KramdownRFC
     aups
   end
 
+  # The below anticipates the "postalLine" changes.
+  # If a postalLine is used (abbreviated "postal" in YAML),
+  # non-postalLine elements are appended as further postalLines.
+  # This prepares for how "country" is expected to be handled
+  # specially with the next schema update.
+  # So an address is now best keyboarded as:
+  #   postal:
+  #     - Foo Street
+  #     - 28359 Bar
+  #   country: Germany
+
   PERSON_ERB = <<~ERB
     <<%= element_name%> <%=aups.attrs("initials", "surname", "fullname=name", "role")%>>
       <%= aups.ele("organization=org", aups.attrs("abbrev=orgabbrev",
                                                   *[$options.v3 && "ascii=orgascii"]), "") %>
       <address>
-<% postal = %w{street city region code country}.select{|gi| aups.has(gi)}
-   if postal != [] -%>
+<% postal_elements = %w{extaddr pobox street cityarea city region code sortingcode country postal}.select{|gi| aups.has(gi)}
+   if postal_elements != [] -%>
         <postal>
-<%   postal.each do |gi| -%>
+<% if pl = postal_elements.delete("postal") -%>
+          <%= aups.ele("postalLine=postal") %>
+<%   postal_elements.each do |gi| -%>
+          <%= aups.ele("postalLine=" << gi) %>
+<%   end -%>
+<% else -%>
+<%   postal_elements.each do |gi| -%>
           <%= aups.ele(gi) %>
 <%   end -%>
+<% end -%>
         </postal>
 <% end -%>
 <% %w{phone facsimile email uri}.select{|gi| aups.has(gi)}.each do |gi| -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown