stepmod-utils 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10c93752f86abb0c914b9041affef80fdedec72e4ccac9a53b382735013230cb
-  data.tar.gz: 94f588ae4c287ac44910212b00c298542855999eea610e9e84274f338d825fc8
+  metadata.gz: dd6272ff4c3c263a1bb31f5dabb58058d933a2fa0ef9c9711d23152f79f3634a
+  data.tar.gz: cf84426917abec57f8abf4af78f23089bc50eb475103860672a748f9023155bf
 SHA512:
-  metadata.gz: b59490db126c0b56b96cb295a68d9e226049a85006083d141580e10545db0ae56e93250a069cc607485ddc46c47d466e6da4af7295d3d27fce4a63bbd94a4370
-  data.tar.gz: b04a75dfdcfd88c9a20be4a499c7785990efbc6c91632f5635cbbe79b4c8582d1c6e6681a34b189d00255f0d32013a7fe9fcdb37cfbc71155ee2da3e0c575275
+  metadata.gz: 6342de4cb0ebb220c0d8f0849796e738e75d9ec2182120471af41e11f6eb65f8c1f1944386ec42e7639ba7f69a915c6e4e25552f119fdfb43e0cb35dc7b022fb
+  data.tar.gz: e78c8c07b90fe7e27521849235dc3c60e3be12eb2e122eca8c2ea5a06701c764205ac8f346714114cf3b5c9470753ee04abcf2da8f9f52f302e51862c0cfbcb9

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.4".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.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-02 00:00:00.000000000 Z
+date: 2024-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby