stepmod-utils 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1006db3b3828bc38932f36a4f410cf6f8a0d5669bf0c3357c7a204c84e587a44
-  data.tar.gz: 7fa819c6ee34eef23ad8ab20fd3a833296a36bf99ca48cb624a81a04049871ff
+  metadata.gz: a0bf29e9cab4e7f1564993380efa536e105ad6f7aa54612b242d1bd993a4b06f
+  data.tar.gz: 68bae8817c50a70a89fb1b159e0b600ced160435ff45c75f6af063eb6a640c6f
 SHA512:
-  metadata.gz: 40f09784e7aeac5e8e35c24079e84c5119dc9cd00f9555a4c24c1ce389e4b28bb32e0f6ec8c4408b3a1fea0445cfa16ca3700a263517b28c935c9ddca7de8cbb
-  data.tar.gz: dd35cce57f836527e31a6bd36576f6966494f558d1a0cc87486632c3149b1eecf66f37493f188f0a1ff685b804ddedb33bc13c1c6d45e5142335710ea7dea88c
+  metadata.gz: 58071bec7536d36329370d7be259b7a23efd00870e8aac6d2ecb116a568ec87f08bed596ce3d85e4be3e58b9603e7d4d040f0220d3709ffa8063eb12e77ba9f1
+  data.tar.gz: c48c7d2b6ed22d2b6dd80a3d4ce4ba574f793bc1005ee4e8512b7c696bd06d802bce681ade9919e3ae606ef8807f8993f9ee26d77a12c4430aed23340c8546f9

data/exe/stepmod-extract-terms

@@ -170,6 +170,7 @@ files.each do |file_path|
       reference_clause: ref_clause,
       file_path: fpath + revision_string
     )
+    next unless concept
 
     unless term_special_category(bibdata)
       # log "INFO: this part is generic"
@@ -183,34 +184,38 @@ files.each do |file_path|
     parsed_bibliography << bibdata
   end
 
-  current_document.xpath('//arm').each do |arm_node|
-    index = max_encountered_refs_indexes[bibdata.anchor] || 1
-
+  part_modules = []
+  current_document.xpath('//arm/uof').each do |uof_node|
     concept = Stepmod::Utils::Concept.parse(
-      arm_node,
+      uof_node,
       reference_anchor: bibdata.anchor,
       reference_clause: nil,
       file_path: fpath + revision_string
     )
+    # puts concept.inspect
 
-    module_concepts << concept
-    # unless term_special_category(bibdata)
-    #   # log "INFO: this part is generic"
-    #   general_concepts << concept
-    # else
-    #   # log "INFO: this part is special"
-    #   part_concepts << concept
-    # end
+    next unless concept
+
+    unless term_special_category(bibdata)
+      # log "INFO: this part is generic"
+      module_concepts << concept
+    else
+      # log "INFO: this part is special"
+      part_modules << concept
+    end
 
-    max_encountered_refs_indexes[bibdata.anchor] = index + 1
     parsed_bibliography << bibdata
   end
 
+  part_resources = []
+  # Assumption: every schema is only linked by a single resource_docs document.
   current_document.xpath('//schema').each do |schema_node|
-    Dir["#{stepmod_dir}/**/#{schema_node['name']}/descriptions.xml"].each do |description|
-      description_document = Nokogiri::XML(File.read(description)).root
+    schema_name = schema_node['name']
+
+    Dir["#{stepmod_path}/*/#{schema_name}/descriptions.xml"].each do |description_xml_path|
+      log "INFO: Processing resources schema #{description_xml_path}"
+      description_document = Nokogiri::XML(File.read(description_xml_path)).root
       description_document.xpath('//ext_description').each do |ext_description|
-        index = max_encountered_refs_indexes[bibdata.anchor] || 1
 
         concept = Stepmod::Utils::Concept.parse(
           ext_description,
@@ -218,17 +223,16 @@ files.each do |file_path|
           reference_clause: nil,
           file_path: fpath + revision_string
         )
+        next unless concept
 
-        resource_concepts << concept
-        # unless term_special_category(bibdata)
-        #   # log "INFO: this part is generic"
-        #   general_concepts << concept
-        # else
-        #   # log "INFO: this part is special"
-        #   part_concepts << concept
-        # end
+        unless term_special_category(bibdata)
+          # log "INFO: this part is generic"
+          resource_concepts << concept
+        else
+          # log "INFO: this part is special"
+          part_resources << concept
+        end
 
-        max_encountered_refs_indexes[bibdata.anchor] = index + 1
         parsed_bibliography << bibdata
       end
     end
@@ -236,7 +240,7 @@ files.each do |file_path|
 
   log "INFO: Completed processing XML file #{fpath}"
 
-  if part_concepts.length == 0
+  if part_concepts.empty?
     log "INFO: Skipping #{fpath} (#{bibdata.docid}) because it contains no concepts."
     next
   elsif part_concepts.length < 3
@@ -254,6 +258,24 @@ files.each do |file_path|
     log "INFO: written to: #{fn}"
   end
 
+  unless part_resources.empty?
+    fn = "04x-stepmod-entities-resources-#{bibdata.part}.adoc"
+    File.open(fn, 'w') { |file|
+      file.puts("== #{part_to_title(bibdata)}\n\n")
+      file.puts(part_resources.map(&:to_mn_adoc).join("\n"))
+    }
+    log "INFO: written to: #{fn}"
+  end
+
+  unless part_modules.empty?
+    fn = "04x-stepmod-entities-modules-#{bibdata.part}.adoc"
+    File.open(fn, 'w') { |file|
+      file.puts("== #{part_to_title(bibdata)}\n\n")
+      file.puts(part_modules.map(&:to_mn_adoc).join("\n"))
+    }
+    log "INFO: written to: #{fn}"
+  end
+
 end
 
 File.open('031-stepmod-general.adoc', 'w') { |file|

data/lib/stepmod/utils/concept.rb

@@ -23,7 +23,10 @@ module Stepmod
       def self.parse(definition_xml, reference_anchor:, reference_clause:, file_path:)
         converted_definition = Stepmod::Utils::StepmodDefinitionConverter
                                   .convert(definition_xml, { reference_anchor: reference_anchor })
-        if definition_xml.name == 'arm' || definition_xml.name == 'ext_description'
+
+        return nil if converted_definition.nil? || converted_definition.strip.empty?
+
+        if definition_xml.name == 'uof' || definition_xml.name == 'ext_description'
           converted_definition = <<~TEXT
             #{converted_definition.split("\n")[0..3].join("\n")}
 

data/lib/stepmod/utils/converters/stepmod_ext_description.rb

@@ -4,6 +4,11 @@ module Stepmod
       class StepmodExtDescription < ReverseAdoc::Converters::Base
         def convert(node, state = {})
           state = state.merge(schema_name: node['linkend'])
+          linkend = node['linkend'].split('.')
+
+          # We ignore all the WHERE and IP rules because those are not terms
+          return nil if linkend.last =~ /^wr/
+
           <<~TEMPLATE
             === #{node['linkend'].split('.').last}
 

data/lib/stepmod/utils/stepmod_definition_converter.rb

@@ -40,19 +40,21 @@ module Stepmod
   module Utils
     class StepmodDefinitionConverter
       def self.convert(input, options = {})
-        root = if input.is_a?(String)
-                  then Nokogiri::XML(input).root
-                elsif input.is_a?(Nokogiri::XML::Document)
-                  then input.root
-                elsif input.is_a?(Nokogiri::XML::Node)
-                  then input
-                end
+        root = case input
+               when String
+                 Nokogiri::XML(input).root
+               when Nokogiri::XML::Document
+                 input.root
+               when Nokogiri::XML::Node
+                 input
+               end
 
-        root || (return '')
+        return '' unless root
 
         ReverseAdoc.config.with(options) do
           result = ReverseAdoc::Converters.lookup(root.name).convert(root)
-          ReverseAdoc.cleaner.tidy(result)
+          return '' unless result
+          ReverseAdoc.cleaner.tidy(result.dup)
         end
       end
     end

data/lib/stepmod/utils/version.rb

@@ -1,5 +1,5 @@
 module Stepmod
   module Utils
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stepmod-utils
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ribose Inc.