mn-requirements 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f30b7b9d9468a1d20886f1d84d6992071a95a2376a5f066bd9b455571e7e425d
-  data.tar.gz: 2888d62224f0110f4a23980042c34490f7f32889146304c56847f0d3b2d18ddc
+  metadata.gz: c2e26c223fccd1addd079ca0f89fe9fad9f81e7fa1e43c4607245cb95e5c3292
+  data.tar.gz: f6765320c97a6a49b164973d39084b72b57206f4a8b3e9eeb86a3835df1cbad0
 SHA512:
-  metadata.gz: 289876376e7c00e2c120fb64f1c4be5ab19dba91db83036c6be974eadf8f6f0d291e6316219fad482f0d5df04dee9362afb15e6844ec84ae3029bbf1860242ff
-  data.tar.gz: a868912d83376103770d8602b56fa0643da967a2833e9d9df59fe72f6469d1c6901edb0ef879c78cd5eaa8577f1e6d053269a7ef8eec5c2d5d1fae604c03aab0
+  metadata.gz: 4eb0f1c8d3782eea7066f71809ee2ac05d5cc7d6fa470dee2054c4a4154cb08eda814b5fcc2241cdbe345b3f149b15a0152a2daa76d5fb5df4c1ce41b26cb6e4
+  data.tar.gz: 76b1638cdc8a99eb7d6ff2fdfd321fff08fe64bf40b07a2b5ec46aecc7a1110a2feee171b25b334a6b468ab4636056511ad002aec3e78ba67c63d1d3f4ee3cc7

data/.github/workflows/release.yml

@@ -18,6 +18,9 @@ jobs:
     uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
     with:
       next_version: ${{ github.event.inputs.next_version }}
+      release_command: rake release
+      bundler_cache: false
+      post_install: gem install bundler rake rspec
     secrets:
       rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
       pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/Gemfile

@@ -10,3 +10,4 @@ if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
 
+gem "isodoc", "~> 2.2.3.1"

data/lib/metanorma/default/isodoc.rb

@@ -70,7 +70,7 @@ module Metanorma
       end
 
       def recommendation_attr_parse(node, label)
-        "#{label}: #{node.children.to_xml}"
+        l10n("#{label}: #{node.children.to_xml}")
       end
 
       def recommendation_attr_keyvalue(node, key, value)

data/lib/metanorma/modspec/cleanup.rb

@@ -1,28 +1,41 @@
 module Metanorma
   class Requirements
     class Modspec < Default
+      REQT_TYPE_NORM = {
+        requirement: "general",
+        recommendation: "general",
+        permission: "general",
+        requirements_class: "class",
+        requirement_class: "class",
+        recommendation_class: "class",
+        permission_class: "class",
+        conformance_test: "verification",
+        conformance_class: "conformanceclass",
+        abstract_test: "abstracttest",
+      }.freeze
+
       def requirement_type_cleanup(reqt)
-        reqt["type"] = case reqt["type"]
-                       when "requirement", "recommendation", "permission"
-                         "general"
-                       when "requirements_class" then "class"
-                       when "conformance_test" then "verification"
-                       when "conformance_class" then "conformanceclass"
-                       when "abstract_test" then "abstracttest"
-                       else reqt["type"]
-                       end
+        ret = REQT_TYPE_NORM[reqt["type"]&.to_sym] or return
+        reqt["type"] = ret
       end
 
       def requirement_metadata_component_tags
         %w(test-purpose test-method test-method-type conditions part description
-           reference step requirement permission recommendation guidance)
+           reference step guidance) +
+          requirement_metadata_requirement_tags
+      end
+
+      def requirement_metadata_requirement_tags
+        %w(conformance-test conformance-class abstract-test requirement-class
+           recommendation-class permission-class requirement permission
+           recommendation)
       end
 
       def requirement_metadata1(reqt, dlist, ins)
         ins1 = super
         dlist.xpath("./dt").each do |e|
-          tag = e&.text&.gsub(/ /, "-")&.downcase
-          next unless requirement_metadata_component_tags.include? tag
+          tag = e.text&.gsub(/ /, "-")&.downcase
+          next unless requirement_metadata_component_tags.include?(tag)
 
           ins1.next = requirement_metadata1_component(e, tag)
           ins1 = ins1.next
@@ -36,9 +49,9 @@ module Metanorma
           requirement_metadata1(val, d, d)
           d.remove
         end
-        if REQS.include?(term.text) && !val.text.empty?
+        requirement_metadata_requirement_tags.include?(term.text) &&
+          !val.text.empty? and
           val.children = "<identifier>#{val.text.strip}</identifier>"
-        end
         val
       end
 
@@ -59,8 +72,8 @@ module Metanorma
       end
 
       def requirement_metadata_to_component(reqt)
-        xpath = requirement_metadata_component_tags -
-          %w(description requirement permission recommendation)
+        xpath = requirement_metadata_component_tags - %w(description) -
+          requirement_metadata_requirement_tags
         reqt.xpath(xpath.map { |x| ".//#{x}" }.join(" | ")).each do |c|
           c["class"] = c.name
           c.name = "component"
@@ -68,13 +81,25 @@ module Metanorma
       end
 
       def requirement_metadata_to_requirement(reqt)
-        reqt.xpath("./requirement | ./permission | ./recommendation")
-          .each do |c|
+        xpath = requirement_metadata_requirement_tags
+        reqt.xpath(xpath.map { |x| "./#{x}" }.join(" | ")).each do |c|
           c["id"] = Metanorma::Utils::anchor_or_uuid
           c["model"] = reqt["model"] # all requirements must have a model
+          requirement_metadata_to_requirement1(c)
         end
       end
 
+      def requirement_metadata_to_requirement1(reqt)
+        reqt["type"] = reqt.name.sub(/-/, "_")
+        reqt.name =
+          case reqt.name
+          when "recommendation-class", "recommendation" then "recommendation"
+          when "permission-class", "permission" then "permission"
+          else "requirement"
+          end
+        requirement_type_cleanup(reqt)
+      end
+
       def requirement_subparts_to_blocks(reqt)
         reqt.xpath(".//component | .//description").each do |c|
           next if %w(p ol ul dl table component description)

data/lib/metanorma/requirements/selector.rb

@@ -13,6 +13,7 @@ module Metanorma
       @default = options[:default]
       @i18n = i18n_klass(options[:lang] || "en",
                          options[:script] || "Latn",
+                         options[:locale],
                          options[:i18nhash])
       @labels = @i18n.get.deep_merge(options[:labels] || {})["requirements"]
       @models =
@@ -23,8 +24,9 @@ module Metanorma
       %i[default ogc]
     end
 
-    def i18n_klass(lang = "en", script = "Latn", i18nhash = nil)
-      ::IsoDoc::MnRequirementsI18n.new(lang, script, i18nhash: i18nhash)
+    def i18n_klass(lang, script, locale = nil, i18nhash = nil)
+      ::IsoDoc::MnRequirementsI18n.new(lang, script, locale: locale,
+                                                     i18nhash: i18nhash)
     end
 
     # all roles that can be assigned to an example to make it a reqt,

data/lib/metanorma/requirements/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   class Requirements
-    VERSION = "0.1.5".freeze
+    VERSION = "0.1.7".freeze
   end
 end

data/mn-requirements.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "isodoc-i18n", "~> 1.0.7"
+  spec.add_dependency "isodoc-i18n", "~> 1.1.0"
   spec.add_dependency "metanorma-utils", "~> 1.4.0"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: metanorma-utils
   requirement: !ruby/object:Gem::Requirement