metanorma-ietf 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0009480252eb6b82ab3d795efc48b9fc3146a1790dedb07ab40b415c0085dde2'
-  data.tar.gz: 1ff86a356bcc191b07b5302439f88b134b69a02a9ab26db48fe85feed2a16cfa
+  metadata.gz: e7a4d62d9ba4598f0bc4a7e03e9a2685e157adf44914b5513d75e664e625a9e2
+  data.tar.gz: 56a43f317ad9b8feae2469e3a0f27ccb4c52960611df53ab6a6678989c5504c5
 SHA512:
-  metadata.gz: 061bf172d476731cd3885c49b825751c8d68dc458f0d591b48df8b47cc0f5fffcb2016e1934f3ade8f21fa55f13ecdcd68a2b2590eea198870ad3c0d7af9a95a
-  data.tar.gz: 684c4f1e6f6701fa54bf3b903a28ada68be7352fe99b4aa23036c6bd96c288cf15628b778689adfb516154bdb5cfaaf130ebf8bae8e5a78090bc08a7a157a439
+  metadata.gz: 05e58bfa09d771d279fd9358253d27ce7be451ae8cfb223aac2438dc4971f51736a630d983d435ab33140ac6ba52898b71f2b9dcb5efc7852d4e488e33cd2205
+  data.tar.gz: 6ecac088b4b00f92fbf1044d7345d50cc391280b0576cf300b7980e2edf5cf4ec4c1fd2a44b8a9e4b9b583dcbf763f894094c54696121af0e1fa1c90919e6684

data/.rubocop.yml

@@ -10,5 +10,3 @@ AllCops:
   DisplayCopNames: false
   StyleGuideCopsOnly: false
   TargetRubyVersion: 2.4
-Rails:
-  Enabled: true

data/lib/asciidoctor/ietf/isodoc.rng

@@ -876,6 +876,18 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="pagebreak">
+      <element name="pagebreak">
+        <optional>
+          <attribute name="orientation">
+            <choice>
+              <value>landscape</value>
+              <value>portrait</value>
+            </choice>
+          </attribute>
+        </optional>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
   <define name="colgroup">
@@ -943,8 +955,170 @@
       <ref name="permission"/>
       <ref name="imagemap"/>
       <ref name="svgmap"/>
+      <ref name="inputform"/>
+    </choice>
+  </define>
+  <define name="inputform">
+    <element name="form">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <attribute name="name"/>
+      <attribute name="action"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="TextElement"/>
+          <ref name="FormInput"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="FormInput">
+    <choice>
+      <ref name="input"/>
+      <ref name="formlabel"/>
+      <ref name="select"/>
+      <ref name="textarea"/>
+    </choice>
+  </define>
+  <define name="InputType">
+    <choice>
+      <value>button</value>
+      <value>checkbox</value>
+      <value>date</value>
+      <value>file</value>
+      <value>password</value>
+      <value>radio</value>
+      <value>submit</value>
+      <value>text</value>
     </choice>
   </define>
+  <define name="input">
+    <element name="input">
+      <attribute name="type">
+        <ref name="InputType"/>
+      </attribute>
+      <optional>
+        <attribute name="checked">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="disabled">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="readonly">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="maxlength">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="minlength">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+    </element>
+  </define>
+  <define name="formlabel">
+    <element name="label">
+      <attribute name="for">
+        <data type="IDREF"/>
+      </attribute>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="select">
+    <element name="select">
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="disabled">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="multiple">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="size">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <oneOrMore>
+        <ref name="option"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="option">
+    <element name="option">
+      <optional>
+        <attribute name="disabled">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="textarea">
+    <element name="textarea">
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="rows">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="cols">
+          <data type="int"/>
+        </attribute>
+      </optional>
+    </element>
+  </define>
   <define name="bibliography">
     <element name="bibliography">
       <oneOrMore>

data/lib/metanorma/ietf/processor.rb

@@ -1,11 +1,14 @@
 require "metanorma/processor"
 require "tempfile"
 
+require "isodoc/ietf/rfc_convert"
+
 module Metanorma
   module Ietf
-    class Processor < Metanorma::Processor
+    RfcConvert = ::IsoDoc::Ietf::RfcConvert
 
-      def initialize
+    class Processor < Metanorma::Processor
+      def initialize # rubocop:disable Lint/MissingSuper
         @short = :ietf
         @input_format = :asciidoc
         @asciidoctor_backend = :ietf
@@ -18,7 +21,7 @@ module Metanorma
           rfc: "rfc.xml",
           html: "html",
           txt: "txt",
-          pdf: "pdf"
+          pdf: "pdf",
         }
       end
 
@@ -26,15 +29,15 @@ module Metanorma
         "Metanorma::Ietf #{::Metanorma::Ietf::VERSION}"
       end
 
-      def extract_options(isodocxml)
+      def extract_options(_isodocxml)
         {}
       end
 
       # From mislav: https://stackoverflow.com/questions/2108727
       #        /which-in-ruby-checking-if-program-exists-in-path-from-ruby
       def which(cmd)
-        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
+        ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
           exts.each do |ext|
             exe = File.join(path, "#{cmd}#{ext}")
             return exe if File.executable?(exe) && !File.directory?(exe)
@@ -43,49 +46,43 @@ module Metanorma
         nil
       end
 
-      def use_presentation_xml(ext)
+      def use_presentation_xml(_ext)
         false
       end
 
-      def xml2rfc_present?
-        !which("xml2rfc").nil?
+      def check_xml2rfc_present?(format)
+        if which("xml2rfc").nil?
+          raise "[metanorma-ietf] Fatal: unable to generate #{format}," \
+                " the command `xml2rfc` is not found in path."
+        end
       end
 
-      def output(isodoc_node, inname, outname, format, options={})
+      def output(isodoc_node, inname, outname, format, options = {})
         case format
         when :rfc
           outname ||= inname.sub(/\.xml$/, ".rfc.xml")
-          IsoDoc::Ietf::RfcConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          RfcConvert.new(options).convert(inname, isodoc_node, nil, outname)
           @done_rfc = true
-
         when :txt, :pdf, :html
-          unless xml2rfc_present?
-            warn "[metanorma-ietf] Error: unable to generate #{format}, the command `xml2rfc` is not found in path."
-            return
-          end
+          xml2rfc(isodoc_node, inname, outname, format, options)
+        else
+          super
+        end
+      end
 
-          rfcname = inname.sub(/\.xml$/, ".rfc.xml")
-          unless @done_rfc && File.exist?(rfcname)
-            output(isodoc_node, inname, rfcname, :rfc, options)
-          end
+      def xml2rfc(isodoc_node, inname, outname, format, options)
+        check_xml2rfc_present?(format)
 
-          outext = case format
-            when :txt then ".txt"
-            when :pdf then ".pdf"
-            when :html then ".html"
-          end
+        rfcname = inname.sub(/\.xml$/, ".rfc.xml")
+        unless @done_rfc && File.exist?(rfcname)
+          output(isodoc_node, inname, rfcname, :rfc, options)
+        end
 
-          outflag = case format
-            when :txt then "--text"
-            when :pdf then "--pdf"
-            when :html then "--html"
-          end
+        outext = { txt: ".txt", pdf: ".pdf", html: ".html" }[format]
+        outflag = { txt: "--text", pdf: "--pdf", html: "--html" }[format]
 
-          outname ||= inname.sub(/\.xml$/, outext)
-          system("xml2rfc #{outflag} #{rfcname} -o #{outname}")
-        else
-          super
-        end
+        outname ||= inname.sub(/\.xml$/, outext)
+        system("xml2rfc #{outflag} #{rfcname} -o #{outname}")
       end
     end
   end

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "2.3.1".freeze
+    VERSION = "2.3.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc