stepmod-utils 0.4.12 → 0.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 277e199cae63ff4916555e4d208672a1d561809e7abb921eff70e022e781e5c1
-  data.tar.gz: c4762ca7dc28641cbca3c1eebcc393940963d702acd83ef183ad42bf44fb6944
+  metadata.gz: e899495da23543691f64da8ac653723b58d18d6c56dc3079d03de2ff4c82b76d
+  data.tar.gz: c7c95af88056dc3afccdd7e2a627539027fafe58b984e55f89f4d4e84d5d5466
 SHA512:
-  metadata.gz: 8999ccb49cae3922ed4c8ef8cdeece7f80ede6501dfe75219d6e6ba0749013850ccfcd6a0d55ecb479441e3210e5a1064a17cbfff9d0348c273b5e999670ae05
-  data.tar.gz: '039013eaddf84f1afc779b4311c254ace92513a0652418b1648d8da0dbbdb7cc86cad0efb4ba11670a5d5df4b8b56889e788cc73f4a98098e8b27857e74b9e6b'
+  metadata.gz: 599a6815246bc9a9242be9bafd86e9adb0ad16d29f93295b2772eeceffe5773a6560a23a563890f7ef8d1a1a3e23e849b9f2f3d6abfc3f7a3de55d554c17491e
+  data.tar.gz: af84267ff33afbb543de2b491b7c4bbc1ecd7c837235a75a5cee8e4136d4b8fffb89b5778a6b9448a5f787fffbe31775a6e5c800c057375189dfb031f9957e4d

data/exe/stepmod-srl-migrate

@@ -4,6 +4,7 @@
 
 require "pathname"
 require "fileutils"
+require "nokogiri"
 bin_file = Pathname.new(__FILE__).realpath
 
 # add self to libpath
@@ -17,11 +18,11 @@ def log(message, indent = 0)
   puts "[stepmod-utils] #{message}"
 end
 
-def copy_files_to_schemas(path, stepmod_path, srl_output_docs_dir)
+def copy_files_to_schemas(path, stepmod_path, srl_output_schemas_dir)
   base_path = path.dirname.relative_path_from(File.join(stepmod_path, "data"))
   file_name = path.basename
 
-  new_dir = File.join(srl_output_docs_dir, base_path.to_s)
+  new_dir = File.join(srl_output_schemas_dir, base_path.to_s)
   new_file_path = File.join(new_dir, file_name)
 
   unless Dir.exist?(new_dir)
@@ -32,6 +33,29 @@ def copy_files_to_schemas(path, stepmod_path, srl_output_docs_dir)
   log("Copied #{path.basename} to #{new_file_path}", 1)
 end
 
+def copy_files_to_document(path, stepmod_path, srl_output_docs_dir)
+  base_path = path.dirname.relative_path_from(File.join(stepmod_path, "data"))
+  file_name = path.basename
+  module_xml_path = path.dirname.join('module.xml')
+  # puts "module_xml_path #{module_xml_path}"
+  module_xml = Nokogiri::XML(IO.read(module_xml_path)).root
+
+  part_number = module_xml.xpath('//module').first.attr('part')
+  # module_name = module_xml.xpath('//module').first.attr('name')
+
+  new_dir = File.join(srl_output_docs_dir, "iso-10303-#{part_number}")
+  new_file_path = File.join(new_dir, file_name)
+  # new_file_path = File.join(new_dir, "#{module_name}.#{file_name}")
+
+  ## The document directory should already exist.
+  # unless Dir.exist?(new_dir)
+  #   FileUtils.mkdir_p(new_dir)
+  # end
+
+  FileUtils.copy_file(path, new_file_path)
+  log("Copied #{path.basename} to #{new_file_path}", 1)
+end
+
 options = {}
 OptionParser.new do |opts|
   opts.banner = "Usage: #{$0} [options]"
@@ -171,10 +195,19 @@ log("[SRL MIGRATION: stepmod-utils] COMPLETE Annotated EXPRESS generation.")
 log("*"*30)
 log("[SRL MIGRATION: stepmod-utils] START EXPRESS change YAML extraction.")
 system "stepmod-extract-changes -p #{stepmod_dir}"
+
+# Move arm/mim/arm_lf/mim_lf/mapping changes into schema directories
 Dir.glob("#{stepmod_dir}/data/**/*.changes.yaml").each do |filepath|
   path = Pathname.new(filepath)
   copy_files_to_schemas(path, stepmod_dir, srl_output_schemas_dir)
 end
+
+# Move document changes into document directories
+Dir.glob("#{stepmod_dir}/data/**/changes.yaml").each do |filepath|
+  path = Pathname.new(filepath)
+  copy_files_to_document(path, stepmod_dir, srl_output_docs_dir)
+end
+
 log("*"*30)
 log("[SRL MIGRATION: stepmod-utils] COMPLETE EXPRESS change YAML extraction.")
 

data/lib/stepmod/utils/change.rb

@@ -13,6 +13,8 @@ module Stepmod
         mim: "mim",
         arm_longform: "arm_lf",
         mim_longform: "mim_lf",
+        mapping: "mapping",
+        changes: "",
       }.freeze
 
       def initialize(stepmod_dir:, schema_name:, type:)
@@ -40,13 +42,20 @@ module Stepmod
       alias_method :[], :fetch_change_edition
 
       def save_to_file
-        File.write(filepath(@type), Psych.dump(to_h))
+        change_hash = to_h
+        return if change_hash.empty?
+
+        File.write(filepath(@type), Psych.dump(change_hash))
       end
 
       def to_h
+        change_editions_list = change_editions.to_h
+
+        return {} if change_editions_list.empty?
+
         {
           "schema" => schema_name,
-          "change_edition" => change_editions.to_h,
+          "change_edition" => change_editions_list,
         }
       end
 
@@ -58,10 +67,16 @@ module Stepmod
           "data",
           base_folder,
           schema_name,
-          "#{MODULE_TYPES[type.to_sym] || schema_name}.changes.yaml",
+          filename(type),
         )
       end
 
+      def filename(type)
+        return "changes.yaml" if type.to_s == "changes"
+
+        "#{MODULE_TYPES[type.to_sym] || schema_name}.changes.yaml"
+      end
+
       def base_folder
         if resource?
           "resources"

data/lib/stepmod/utils/change_edition.rb

@@ -2,7 +2,7 @@ module Stepmod
   module Utils
     class ChangeEdition
       attr_accessor :version, :description
-      attr_reader :additions, :modifications, :deletions, :mapping
+      attr_reader :additions, :modifications, :deletions, :changes
 
       def initialize(options)
         @version = options[:version]
@@ -10,7 +10,7 @@ module Stepmod
         self.additions = options[:additions] || []
         self.modifications = options[:modifications] || []
         self.deletions = options[:deletions] || []
-        self.mapping = options[:mapping] || []
+        self.changes = options[:changes] || []
       end
 
       def additions=(additions)
@@ -31,10 +31,10 @@ module Stepmod
         @deletions = deletions
       end
 
-      def mapping=(mapping)
-        validate_type("mapping", mapping, Array)
+      def changes=(changes)
+        validate_type("changes", changes, Array)
 
-        @mapping = mapping
+        @changes = changes
       end
 
       def to_h
@@ -44,7 +44,7 @@ module Stepmod
           "additions" => additions,
           "modifications" => modifications,
           "deletions" => deletions,
-          "mapping" => mapping,
+          "changes" => changes,
         }.reject { |_k, v| v.nil? || v.empty? }
       end
 

data/lib/stepmod/utils/changes_extractor.rb

@@ -64,9 +64,12 @@ module Stepmod
             options = {
               schema_name: schema_name,
               version: change_node.attr("version"),
-              description: converted_description(change_node.at("description")),
+              # description: converted_description(change_node.xpath("description").first),
             }
 
+            add_mapping_changes(collection, change_node, options)
+            add_changes(collection, change_node, options)
+
             MODULE_TYPES.each do |type|
               add_module_changes(
                 collection,
@@ -97,21 +100,34 @@ module Stepmod
         schema_name = options[:schema_name]
         change = collection.fetch_or_initialize(schema_name, type)
 
+        return if changes.nil?
+
         change_edition = extract_change_edition(changes, options)
         change.add_change_edition(change_edition)
-
-        if type == "arm"
-          add_mapping_changes(collection, change_node, options)
-        end
       end
 
       def add_mapping_changes(collection, change_node, options)
+        mapping_changes = extract_mapping_changes(change_node)
+        return if mapping_changes.empty?
+
         change_edition = collection
-                         .fetch_or_initialize(options[:schema_name], "arm")
+                         .fetch_or_initialize(options[:schema_name], "mapping")
                          .change_editions
                          .fetch_or_initialize(options[:version])
 
-        change_edition.mapping = extract_mapping_changes(change_node)
+        change_edition.changes = mapping_changes
+      end
+
+      def add_changes(collection, change_node, options)
+        description = converted_description(change_node.xpath("description").first)
+        return if description.nil? || description.empty?
+
+        change_edition = collection
+                         .fetch_or_initialize(options[:schema_name], "changes")
+                         .change_editions
+                         .fetch_or_initialize(options[:version])
+
+        change_edition.description = description
       end
 
       def extract_mapping_changes(change_node)
@@ -132,9 +148,11 @@ module Stepmod
 
       def extract_change_edition(schema_changes, options)
         type = options[:type] || "schema"
-        addition_nodes = schema_changes&.xpath("#{type}.additions") || []
-        modification_nodes = schema_changes&.xpath("#{type}.modifications") || []
-        deletion_nodes = schema_changes&.xpath("#{type}.deletions") || []
+        node_type = type.gsub("_longform", "")
+
+        addition_nodes = schema_changes&.xpath("#{node_type}.additions") || []
+        modification_nodes = schema_changes&.xpath("#{node_type}.modifications") || []
+        deletion_nodes = schema_changes&.xpath("#{node_type}.deletions") || []
 
         {
           version: options[:version],

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

@@ -36,6 +36,7 @@ module Stepmod
           text = preserve_keychars_within_backticks(text)
 
           text = preserve_pipes_within_tables(text, state)
+          text = wrap_if_contains_spaces(text, state)
           preserve_tags(text, state)
         end
 
@@ -53,6 +54,12 @@ module Stepmod
           text.gsub(/\A\n+/, "").gsub(/\n+\z/, "")
         end
 
+        def wrap_if_contains_spaces(text, state)
+          return "(#{text})" if state[:equation] && text.strip.match?(/\s/) && text.match?(/^[A-Za-z ]+$/)
+
+          text
+        end
+
         def remove_inner_newlines(text)
           text.tr("\n\t", " ").squeeze(" ")
         end

data/lib/stepmod/utils/version.rb

@@ -1,5 +1,5 @@
 module Stepmod
   module Utils
-    VERSION = "0.4.12".freeze
+    VERSION = "0.4.14".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stepmod-utils
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.14
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-02 00:00:00.000000000 Z
+date: 2024-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby