stepmod-utils 0.6.3 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10c93752f86abb0c914b9041affef80fdedec72e4ccac9a53b382735013230cb
-  data.tar.gz: 94f588ae4c287ac44910212b00c298542855999eea610e9e84274f338d825fc8
+  metadata.gz: 17f10378d866d0d9f21341181a3c49fd9fc20c791acc86043bed786df886d9c7
+  data.tar.gz: 10bc583e2f40b9331cf6eb2f17d762ed1e4c99286f03764c8678b5160d35a00d
 SHA512:
-  metadata.gz: b59490db126c0b56b96cb295a68d9e226049a85006083d141580e10545db0ae56e93250a069cc607485ddc46c47d466e6da4af7295d3d27fce4a63bbd94a4370
-  data.tar.gz: b04a75dfdcfd88c9a20be4a499c7785990efbc6c91632f5635cbbe79b4c8582d1c6e6681a34b189d00255f0d32013a7fe9fcdb37cfbc71155ee2da3e0c575275
+  metadata.gz: 40e340a93b7f95d56c3c1754ee1725dc0267c6a62d9a1f5838c39fd22ddc9e834e1d4a6c41c1598f791aaf50cbb03c265f1031650f61a1ba21b01ae6a728d3b5
+  data.tar.gz: f3f564dea2531731ebeea9c1dbe23e9b8597fe6400efa70b17888ff771edea063c35d5de94c4eedf8fe6968b8ed1f52d564b15b4f0b1e1900d270695ed8e43bb

data/exe/stepmod-srl-migrate

@@ -37,6 +37,10 @@ def copy_files_to_document(path, stepmod_path, srl_output_docs_dir)
   file_name = path.basename
   module_xml_path = path.dirname.join("module.xml")
   # puts "module_xml_path #{module_xml_path}"
+  unless File.exist?(module_xml_path)
+    puts "[ERROR] Attempting to copy but does not exist: #{module_xml_path}"
+    return
+  end
   module_xml = Nokogiri::XML(IO.read(module_xml_path)).root
 
   part_number = module_xml.xpath("//module").first.attr("part")

data/lib/stepmod/utils/changes_extractor.rb

@@ -175,11 +175,11 @@ collection)
         deletion_nodes = schema_changes&.xpath("#{node_type}.deletions") || []
 
         {
-          version: options[:version],
-          description: options[:description],
-          additions: extract_modified_objects(addition_nodes),
-          modifications: extract_modified_objects(modification_nodes),
-          deletions: extract_modified_objects(deletion_nodes),
+          "version" => options[:version],
+          "description" => options[:description] || converted_description(schema_changes.xpath("description").first),
+          "additions" => extract_modified_objects(addition_nodes),
+          "modifications" => extract_modified_objects(modification_nodes),
+          "deletions" => extract_modified_objects(deletion_nodes),
         }
       end
       # rubocop:enable Metrics/MethodLength
@@ -188,10 +188,10 @@ collection)
         nodes.map do |node|
           node.xpath("modified.object").map do |object|
             {
-              type: object.attr("type"),
-              name: object.attr("name"),
-              description: converted_description(object.at("description")),
-              interfaced_items: object.attr("interfaced.items"),
+              "type" => object.attr("type"),
+              "name" => object.attr("name"),
+              "description" => converted_description(object.at("description")),
+              "interfaced_items" => object.attr("interfaced.items"),
             }.compact
           end
         end.flatten

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

@@ -29,17 +29,21 @@ module Stepmod
             ====
             image::#{svg_filename}.svg[]
 
-            #{image_document.xpath('//img.area').map.with_index(1) { |n, i| schema_reference(n['href'], i) }.join("\n")}
+            #{image_document.xpath("//img.area").map.with_index(1) { |n, i| schema_reference(n["href"], i) }.join("\n")}
             ====
           SVGMAP
         end
 
         def schema_reference(xml_path, index)
-          if /#/.match?(xml_path)
+          if xml_path.include?("#")
             _, express_path_part = xml_path.split("#")
-            "* <<express:#{express_path_part.strip}>>; #{index}"
+            return "* <<express:#{express_path_part.strip}>>; #{index}"
+          end
+
+          schema_name = File.basename(xml_path, ".*")
+          if schema_name.include?("expg")
+            "* <<#{schema_name.strip}>>; #{index}"
           else
-            schema_name = File.basename(xml_path, ".*")
             "* <<express:#{schema_name.strip}>>; #{index}"
           end
         end

data/lib/stepmod/utils/stepmod_file_annotator.rb

@@ -43,7 +43,7 @@ module Stepmod
         end
       end
 
-      SCHEMA_VERSION_MATCH_REGEX = /^SCHEMA [0-9a-zA-Z_]+;\s*$/
+      SCHEMA_VERSION_MATCH_REGEX = /^[[:space:]]*?SCHEMA [0-9a-zA-Z_]+;(?<trailing>.*)[[:space:]]*$/
       def is_missing_version(schema_content)
         m = schema_content.match(SCHEMA_VERSION_MATCH_REGEX)
         if m.nil?
@@ -55,6 +55,16 @@ module Stepmod
         end
       end
 
+      def replace_schema_string_with_version(content)
+        m = content.match(SCHEMA_VERSION_MATCH_REGEX)
+        result = build_schema_string_with_version
+        unless m['trailing'].nil?
+          result = "#{result}#{m['trailing']}"
+        end
+
+        content.gsub!(SCHEMA_VERSION_MATCH_REGEX, result)
+      end
+
       def build_schema_string_with_version
         # Geometric_tolerance_arm => geometric-tolarance-arm
         name_in_asn1 = @schema_name.downcase.gsub("_", "-")
@@ -80,7 +90,7 @@ module Stepmod
         edition = @identifier.edition
         schema_or_object = (schema_type == :module) ? "schema" : "object"
 
-        "SCHEMA #{@schema_name} '{ " \
+        "\nSCHEMA #{@schema_name} '{ " \
           "iso standard 10303 part(#{part}) " \
           "version(#{edition}) " \
           "#{schema_or_object}(1) " \
@@ -186,10 +196,7 @@ module Stepmod
           puts "[annotator-WARNING] schema (#{@schema_name}) missing version string. "\
             "Adding: `#{build_schema_string_with_version}` to schema."
 
-          output_express.gsub!(
-            SCHEMA_VERSION_MATCH_REGEX,
-            build_schema_string_with_version
-          )
+          output_express = replace_schema_string_with_version(output_express)
         end
 
         {

data/lib/stepmod/utils/version.rb

@@ -1,5 +1,5 @@
 module Stepmod
   module Utils
-    VERSION = "0.6.3".freeze
+    VERSION = "0.6.5".freeze
   end
 end

metadata

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