metanorma-ogc 1.3.4 → 1.3.8

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -154,6 +154,7 @@ module IsoDoc
       end
 
       def references(docxml)
+        super
         docxml.xpath(ns("//bibitem/date")).each do |d|
           d.xpath(ns("./on | ./from | ./to")).each do |d1|
             d1.children = d1.text.sub(/^(\d\d\d\d).*$/, "\\1")

data/lib/isodoc/ogc/reqt.rb

@@ -8,12 +8,16 @@ module IsoDoc
         return "recommendtest" if node["type"] == "abstracttest"
         return "recommendclass" if node["type"] == "class"
         return "recommendclass" if node["type"] == "conformanceclass"
+
         "recommend"
       end
 
       def recommendation_class(node)
-        node["type"] == "recommendtest" ?
-          "RecommendationTestTitle" : "RecommendationTitle"
+        if node["type"] == "recommendtest"
+          "RecommendationTestTitle"
+        else
+          "RecommendationTitle"
+        end
       end
 
       def recommendation_header(r)
@@ -27,7 +31,7 @@ module IsoDoc
           name.children.each { |n| b << n }
           b << l10n(":")
         end
-        if title =  node&.at(ns("./title"))&.remove
+        if title = node&.at(ns("./title"))&.remove
           b << l10n(" ") if name
           title.children.each { |n| b << n }
         end
@@ -54,7 +58,7 @@ module IsoDoc
       end
 
       def rec_subj(node)
-        node["type"] == "recommendclass" ?  "Target Type" : "Subject"
+        node["type"] == "recommendclass" ? "Target Type" : "Subject"
       end
 
       def recommendation_attr_keyvalue(node, key, value)
@@ -73,12 +77,14 @@ module IsoDoc
 
       def preserve_in_nested_table?(node)
         return true if %w(recommendation requirement permission table).include?(node.name)
+
         false
       end
 
       def requirement_component_parse(node, out)
         node.remove
         return if node["exclude"] == "true"
+
         node.elements.size == 1 && node.first_element_child.name == "dl" and
           return reqt_dl(node.first_element_child, out)
         b = out.add_child("<tr><td colspan='2'></td></tr>").first
@@ -110,6 +116,7 @@ module IsoDoc
         recommendation_attributes(node, b)
         node.elements.each do |n|
           next if %w(thead tbody).include?(n.name)
+
           requirement_component_parse(n, b)
         end
       end
@@ -145,8 +152,8 @@ module IsoDoc
           x = t.at(ns("./thead")) and x.replace(x.children)
           x = t.at(ns("./tbody")) and x.replace(x.children)
           x = t.at(ns("./tfoot")) and x.replace(x.children)
-          if x = t.at(ns("./tr/th[@colspan = '2']")) and
-              y = t.at(ns("./tr/td[@colspan = '2']"))
+          if (x = t.at(ns("./tr/th[@colspan = '2']"))) &&
+              (y = t.at(ns("./tr/td[@colspan = '2']")))
             requirement_table_cleanup1(x, y)
           end
           t.parent.parent.replace(t.children)

data/lib/isodoc/ogc/sections.rb

@@ -1,10 +1,10 @@
 module IsoDoc
   module Ogc
     module BaseConvert
-      def intro_clause(f, out)
-        out.div **{ class: "Section3", id: f["id"] } do |div|
-          clause_name(nil, f&.at(ns("./title")), div, class: "IntroTitle")
-          f.elements.each { |e| parse(e, div) unless e.name == "title" }
+      def intro_clause(elem, out)
+        out.div **{ class: "Section3", id: elem["id"] } do |div|
+          clause_name(nil, elem&.at(ns("./title")), div, class: "IntroTitle")
+          elem.elements.each { |e| parse(e, div) unless e.name == "title" }
         end
       end
 
@@ -14,7 +14,8 @@ module IsoDoc
       end
 
       def submittingorgs(docxml, out)
-        f = docxml.at(ns("//preface/clause[@type = 'submitting_orgs']")) || return
+        f = docxml.at(ns("//preface/clause[@type = 'submitting_orgs']")) or
+          return
         intro_clause(f, out)
       end
 
@@ -30,7 +31,8 @@ module IsoDoc
 
       def preface(isoxml, out)
         isoxml.xpath(ns("//preface/clause[not(@type = 'keywords' or "\
-                        "@type = 'submitting_orgs' or @type = 'security')]")).each do |f|
+                        "@type = 'submitting_orgs' or @type = 'security')]"))
+          .each do |f|
           intro_clause(f, out)
         end
       end

data/lib/isodoc/ogc/word_convert.rb

@@ -15,7 +15,7 @@ module IsoDoc
         super
       end
 
-      def default_fonts(options)
+      def default_fonts(_options)
         {
           bodyfont: '"Times New Roman",serif',
           headerfont: '"Times New Roman",serif',
@@ -27,7 +27,7 @@ module IsoDoc
         }
       end
 
-      def default_file_locations(options)
+      def default_file_locations(_options)
         {
           wordstylesheet: html_doc_path("wordstyle.scss"),
           standardstylesheet: html_doc_path("ogc.scss"),
@@ -40,7 +40,7 @@ module IsoDoc
       end
 
       def convert1(docxml, filename, dir)
-        if docxml&.at(ns('//bibdata/ext/doctype'))&.text == "white-paper"
+        if docxml&.at(ns("//bibdata/ext/doctype"))&.text == "white-paper"
           @wordstylesheet_name = html_doc_path("wordstyle_wp.scss")
           @standardstylesheet_name = html_doc_path("ogc_wp.scss")
           @wordcoverpage = html_doc_path("word_ogc_titlepage_wp.html")
@@ -86,7 +86,7 @@ module IsoDoc
                           <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;RecommendationTitle,recommendationtitle&quot; 
+        \\h \\z \\t &quot;RecommendationTitle,recommendationtitle&quot;#{' '}
         <span style='mso-element:field-separator'></span></span>
       TOC
 
@@ -117,7 +117,7 @@ module IsoDoc
           toc += word_toc_entry(1, header_strip(h))
         end
         toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_TABLE_PREFACE1}}) +  WORD_TOC_SUFFIX1
+                %{\\1#{WORD_TOC_TABLE_PREFACE1}}) + WORD_TOC_SUFFIX1
       end
 
       def make_FigureWordToC(docxml)
@@ -126,7 +126,7 @@ module IsoDoc
           toc += word_toc_entry(1, header_strip(h))
         end
         toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_FIGURE_PREFACE1}}) +  WORD_TOC_SUFFIX1
+                %{\\1#{WORD_TOC_FIGURE_PREFACE1}}) + WORD_TOC_SUFFIX1
       end
 
       def make_RecommendationWordToC(docxml)
@@ -135,7 +135,7 @@ module IsoDoc
           toc += word_toc_entry(1, header_strip(h))
         end
         toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_RECOMMENDATION_PREFACE1}}) +  WORD_TOC_SUFFIX1
+                %{\\1#{WORD_TOC_RECOMMENDATION_PREFACE1}}) + WORD_TOC_SUFFIX1
       end
 
       def make_body2(body, docxml)
@@ -179,10 +179,11 @@ module IsoDoc
         x = "//div[@class = 'boilerplate-copyright']/div[1]/p[not(@class)]"
         docxml.xpath(x).each { |p| p["align"] = "center" }
         return unless @doctype == "white-paper"
-        docxml.xpath("//div[@class = 'boilerplate-copyright']//p[not(@class)]").
-          each { |p| p["class"] = "license" }
-        docxml.xpath("//div[@class = 'boilerplate-legal']//p[not(@class)]").
-          each { |p| p["class"] = "license" }
+
+        docxml.xpath("//div[@class = 'boilerplate-copyright']//p[not(@class)]")
+          .each { |p| p["class"] = "license" }
+        docxml.xpath("//div[@class = 'boilerplate-legal']//p[not(@class)]")
+          .each { |p| p["class"] = "license" }
       end
 
       def word_term_cleanup(docxml)
@@ -199,7 +200,7 @@ module IsoDoc
           style_update(tr, "background:#A5A5A5;")
         end
         docxml.xpath("//table[@class = 'recommend']/tbody").each do |tr|
-          tr.xpath("./tr").each_slice(2) do |tr1, tr2|
+          tr.xpath("./tr").each_slice(2) do |_tr1, tr2|
             tr2 && style_update(tr2, "background:#C9C9C9;")
           end
         end

data/lib/isodoc/ogc/xref.rb

@@ -19,6 +19,7 @@ module IsoDoc
         c = Counter.new
         clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}")).each do |t|
           next if t["id"].nil? || t["id"].empty?
+
           id = c.increment(t).print
           @anchors[t["id"]] = anchor_struct(id, t, label, klass,
                                             t["unnumbered"])
@@ -28,15 +29,15 @@ module IsoDoc
       end
 
       def req_class_paths
-        { "class" => "@type = 'class'", 
-          "test" => "@type = 'verification'", 
+        { "class" => "@type = 'class'",
+          "test" => "@type = 'verification'",
           "" => "not(@type = 'verification' or @type = 'class' or "\
-          "@type = 'abstracttest' or @type = 'conformanceclass')", }
+          "@type = 'abstracttest' or @type = 'conformanceclass')" }
       end
 
       def req_class_paths2
         { "abstracttest" => "@type = 'abstracttest'",
-          "conformanceclass" => "@type = 'conformanceclass'", }
+          "conformanceclass" => "@type = 'conformanceclass'" }
       end
 
       def sequential_permission_children(t, id)
@@ -55,6 +56,7 @@ module IsoDoc
         c = Counter.new
         block.xpath(ns("./#{klass}")).each do |t|
           next if t["id"].nil? || t["id"].empty?
+
           id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
           @anchors[t["id"]] = anchor_struct(id, t, label, klass,
                                             t["unnumbered"])
@@ -96,6 +98,7 @@ module IsoDoc
         c = Counter.new
         clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}")).each do |t|
           next if t["id"].nil? || t["id"].empty?
+
           lbl = "#{num}#{hiersep}#{c.increment(t).print}"
           @anchors[t["id"]] = anchor_struct(lbl, t, label, klass,
                                             t["unnumbered"])
@@ -120,15 +123,17 @@ module IsoDoc
         end
         preface_names_numbered(d.at(ns("//acknowledgements")))
         sequential_asset_names(d.xpath(ns(
-          "//preface/abstract | //foreword | //introduction | "\
-          "//submitters | //acknowledgements | //preface/clause")))
+                                         "//preface/abstract | //foreword | //introduction | "\
+                                         "//submitters | //acknowledgements | //preface/clause",
+                                       )))
         n = Counter.new
         n = section_names(d.at(ns("//clause[@type = 'scope']")), n, 1)
         n = section_names(d.at(ns("//clause[@type = 'conformance']")), n, 1)
         n = section_names(d.at(ns(@klass.norm_ref_xpath)), n, 1)
         n = section_names(
           d.at(ns("//sections/terms | //sections/clause[descendant::terms]")),
-          n, 1)
+          n, 1
+        )
         n = section_names(d.at(ns("//sections/definitions")), n, 1)
         middle_section_asset_names(d)
         clause_names(d, n)
@@ -147,6 +152,7 @@ module IsoDoc
 
       def preface_names_numbered(clause)
         return if clause.nil?
+
         @prefacenum += 1
         pref = preface_number(@prefacenum, 1)
         @anchors[clause["id"]] =
@@ -159,7 +165,7 @@ module IsoDoc
 
       def preface_names_numbered1(clause, num, level)
         @anchors[clause["id"]] =
-          { label: num, level: level, xref: l10n("#{@labels["clause"]} #{num}"),
+          { label: num, level: level, xref: l10n("#{@labels['clause']} #{num}"),
             type: "clause" }
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
           lbl = "#{num}.#{preface_number(i + 1, level + 1)}"
@@ -174,8 +180,8 @@ module IsoDoc
         when 3 then num.to_s
         when 4 then (96 + num).chr.to_s
         when 5 then RomanNumerals.to_roman(num).downcase
-        when 6 then "(#{num.to_s})"
-        when 7 then "(#{(96 + num).chr.to_s})"
+        when 6 then "(#{num})"
+        when 7 then "(#{(96 + num).chr})"
         when 8 then "(#{RomanNumerals.to_roman(num).downcase})"
         else
           num.to_s
@@ -185,6 +191,7 @@ module IsoDoc
       def reference_names(ref)
         super
         return unless @klass.ogc_draft_ref?(ref)
+
         @anchors[ref["id"]] = { xref: @anchors[ref["id"]][:xref] + " (draft)" }
       end
     end

data/lib/metanorma/ogc.rb

@@ -11,9 +11,8 @@ module Metanorma
       }
     end
 
-    ORGANIZATION_NAME_SHORT = "OGC"
-    ORGANIZATION_NAME_LONG = "Open Geospatial Consortium"
-    DOCUMENT_NAMESPACE = "https://standards.opengeospatial.org/document"
-
+    ORGANIZATION_NAME_SHORT = "OGC".freeze
+    ORGANIZATION_NAME_LONG = "Open Geospatial Consortium".freeze
+    DOCUMENT_NAMESPACE = "https://standards.opengeospatial.org/document".freeze
   end
 end

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "1.3.4".freeze
+    VERSION = "1.3.8".freeze
   end
 end

data/metanorma-ogc.gemspec

@@ -22,11 +22,11 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "iso-639"
-  spec.add_dependency "isodoc", "~> 1.6.0"
-  spec.add_dependency "metanorma-standoc", "~> 1.9.0"
+  spec.add_dependency "isodoc", "~> 1.7.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.10.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -292,7 +292,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="