metanorma-cc 1.7.9 → 1.7.13

data/lib/asciidoctor/cc/validate_section.rb

@@ -12,10 +12,10 @@ module Asciidoctor
       end
 
       ONE_SYMBOLS_WARNING = "Only one Symbols and Abbreviated "\
-        "Terms section in the standard".freeze
+                            "Terms section in the standard".freeze
 
       NON_DL_SYMBOLS_WARNING = "Symbols and Abbreviated Terms can "\
-        "only contain a definition list".freeze
+                               "only contain a definition list".freeze
 
       def symbols_validate(root)
         f = root.xpath("//definitions")
@@ -32,8 +32,9 @@ module Asciidoctor
       def seqcheck(names, msg, accepted)
         n = names.shift
         return [] if n.nil?
+
         test = accepted.map { |a| n.at(a) }
-        if test.all? { |a| a.nil? }
+        if test.all?(&:nil?)
           @log.add("Style", nil, msg)
         end
         names
@@ -45,77 +46,84 @@ module Asciidoctor
         [
           {
             msg: "Initial section must be (content) Foreword",
-            val:  ["./self::foreword"]
+            val: ["./self::foreword"],
           },
           {
             msg: "Prefatory material must be followed by (clause) Scope",
-            val:  ["./self::introduction", "./self::clause[@type = 'scope']" ]
+            val: ["./self::introduction", "./self::clause[@type = 'scope']"],
           },
           {
             msg: "Prefatory material must be followed by (clause) Scope",
-            val: ["./self::clause[@type = 'scope']" ]
+            val: ["./self::clause[@type = 'scope']"],
           },
           {
             msg: "Normative References must be followed by "\
-            "Terms and Definitions",
-            val: ["./self::terms | .//terms"]
+                 "Terms and Definitions",
+            val: ["./self::terms | .//terms"],
           },
-      ].freeze
+        ].freeze
 
       SECTIONS_XPATH =
         "//foreword | //introduction | //sections/terms | .//annex | "\
-        "//sections/definitions | //sections/clause | //references[not(parent::clause)] | "\
+        "//sections/definitions | //sections/clause | "\
+        "//references[not(parent::clause)] | "\
         "//clause[descendant::references][not(parent::clause)]".freeze
 
       def sections_sequence_validate(root)
         names = root.xpath(SECTIONS_XPATH)
-        names = seqcheck(names, SEQ[0][:msg], SEQ[0][:val]) 
+        names = seqcheck(names, SEQ[0][:msg], SEQ[0][:val])
         n = names[0]
         names = seqcheck(names, SEQ[1][:msg], SEQ[1][:val])
         if n&.at("./self::introduction")
-          names = seqcheck(names, SEQ[2][:msg], SEQ[2][:val]) 
+          names = seqcheck(names, SEQ[2][:msg], SEQ[2][:val])
         end
-        names = seqcheck(names, SEQ[3][:msg], SEQ[3][:val]) 
+        names = seqcheck(names, SEQ[3][:msg], SEQ[3][:val])
         n = names.shift
         if n&.at("./self::definitions")
-          n = names.shift 
+          n = names.shift
         end
         if n.nil? || n.name != "clause"
           @log.add("Style", nil, "Document must contain at least one clause")
         end
         n&.at("./self::clause") ||
           @log.add("Style", nil, "Document must contain clause after "\
-               "Terms and Definitions")
+                                 "Terms and Definitions")
         n&.at("./self::clause[@type = 'scope']") &&
-          @log.add("Style", nil, "Scope must occur before Terms and Definitions")
-        n = names.shift 
+          @log.add("Style", nil,
+                   "Scope must occur before Terms and Definitions")
+        n = names.shift
         while n&.name == "clause"
           n&.at("./self::clause[@type = 'scope']")
-            @log.add("Style", nil, "Scope must occur before Terms and Definitions")
-          n = names.shift 
+          @log.add("Style", nil,
+                   "Scope must occur before Terms and Definitions")
+          n = names.shift
         end
-         unless %w(annex references).include? n&.name
-          @log.add("Style", nil, "Only annexes and references can follow clauses")
+        unless %w(annex references).include? n&.name
+          @log.add("Style", nil,
+                   "Only annexes and references can follow clauses")
         end
-         while n&.name == "annex"
+        while n&.name == "annex"
           n = names.shift
           if n.nil?
             @log.add("Style", nil, "Document must include (references) "\
-                 "Normative References")
+                                   "Normative References")
           end
         end
-         n&.at("./self::references[@normative = 'true']") ||
+        n&.at("./self::references[@normative = 'true']") ||
           @log.add("Style", nil, "Document must include (references) "\
-               "Normative References")
+                                 "Normative References")
         n = names&.shift
         n&.at("./self::references[@normative = 'false']") ||
-          @log.add("Style", nil, "Final section must be (references) Bibliography")
+          @log.add("Style", nil,
+                   "Final section must be (references) Bibliography")
         names.empty? ||
-          @log.add("Style", nil, "There are sections after the final Bibliography")
+          @log.add("Style", nil,
+                   "There are sections after the final Bibliography")
       end
 
       def style_warning(node, msg, text = nil)
         return if @novalid
+
         w = msg
         w += ": #{text}" if text
         @log.add("Style", node, w)