stepmod-utils 0.3.17 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8be21fe4d04046487ecb36fdebeb74f8dbbb7bda473cbb1b3451b62b15d62a0
-  data.tar.gz: f3005c150d30d5c8aac9b77f9221cfcfc575e0d541208152087f6ff88623375d
+  metadata.gz: 7d666c11f9282db59fefb04c07c40a88f6167cd214d316f2b1a14ae7117ce898
+  data.tar.gz: fe07f66170d74a97a95003b0f5e3594c5f2bbeaa3d431b716ce52f01d13d418d
 SHA512:
-  metadata.gz: b004697a0c9eeecc570ba7e184fd7165fa991be9b0046f13305106a6cbdff123aca57299c340ce72fb95214ad878a0d0aff140af5e07308070d1c8a336c09921
-  data.tar.gz: 9aaa80fff000066c954b660592626a9ee0132cfca173c0d93aeb572211adf1929d79dc1f1336858725b031b287d1a9d07f9e4d79e45b8d4a4727819fbe303b9f
+  metadata.gz: 7b2fea45d8a30e633e393afac572894481d7de3bf5a33cd19043b6b55cb5b2c948666eb705b4cc9e69a12fe7b43217ca80f8f9a47d7aab4507b1b00c4136476e
+  data.tar.gz: 8e5334b99ece0ad5bff37d8ffd7cd70c64fd4998c3e0f4da58825802420f8537493a7858a6158b00ffcfdb3907a532e44067ab4ba07f7cc8f6091b5bb7912517

data/lib/stepmod/utils/terms_extractor.rb

@@ -238,7 +238,7 @@ module Stepmod
                     id: "#{reference_anchor}.#{reference_clause}",
                     reference_anchor: reference_anchor,
                     reference_clause: reference_clause,
-                    file_path: Pathname.new(file_path)
+                    file_path: Pathname.new(exp_annotated_path)
                                 .relative_path_from(stepmod_path),
                     language_code: "en",
                   )
@@ -297,7 +297,7 @@ module Stepmod
                     id: "#{reference_anchor}.#{reference_clause}",
                     reference_anchor: reference_anchor,
                     reference_clause: reference_clause,
-                    file_path: Pathname.new(file_path)
+                    file_path: Pathname.new(exp_annotated_path)
                                 .relative_path_from(stepmod_path),
                     language_code: "en",
                   )
@@ -340,7 +340,7 @@ module Stepmod
                     id: "#{reference_anchor}.#{reference_clause}",
                     reference_anchor: reference_anchor,
                     reference_clause: reference_clause,
-                    file_path: Pathname.new(file_path)
+                    file_path: Pathname.new(exp_annotated_path)
                                 .relative_path_from(stepmod_path),
                     language_code: "en",
                   )
@@ -397,6 +397,81 @@ module Stepmod
         concept.add_l10n(localized_concept)
       end
 
+      def combine_paragraphs(full_paragraph, next_paragraph)
+        # If full_paragraph already contains a period, extract that.
+        if m = full_paragraph.match(/\A(?<inner_first>[^\n]*?\.)\s/)
+          # puts "CONDITION 1"
+          if m[:inner_first]
+            return m[:inner_first]
+          else
+            return full_paragraph
+          end
+        end
+
+        # If full_paragraph ends with a period, this is the last.
+        if full_paragraph =~ /\.\s*\Z/
+          # puts "CONDITION 2"
+          return full_paragraph
+        end
+
+        # If next_paragraph is a list
+        if next_paragraph.match(/\A\*/)
+          # puts "CONDITION 3"
+          return full_paragraph + "\n\n" + next_paragraph
+        end
+
+        # If next_paragraph is a continuation of a list
+        if next_paragraph.match(/\Awhich/) || next_paragraph.match(/\Athat/)
+          # puts "CONDITION 4"
+          return full_paragraph + "\n\n" + next_paragraph
+        end
+
+        # puts "CONDITION 5"
+        full_paragraph
+      end
+
+      def trim_definition(definition)
+        # Unless the first paragraph ends with "between" and is followed by a
+        # list, don't split
+        paragraphs = definition.split("\n\n")
+
+        # puts paragraphs.inspect
+
+        first_paragraph = paragraphs.first
+
+        if paragraphs.length > 1
+          combined = paragraphs[1..-1].inject(first_paragraph) do |acc, p|
+            combine_paragraphs(acc, p)
+          end
+        else
+          combined = combine_paragraphs(first_paragraph, "")
+        end
+
+        # puts "combined--------- #{combined}"
+
+        # Remove comments until end of line
+        combined = combined + "\n"
+        combined.gsub!(/\n\/\/.*?\n/, "\n")
+        combined.strip!
+
+        combined
+        # # TODO: If the definition contains a list immediately after the first paragraph, don't split
+        # return definition if definition =~ /\n\* /
+
+        # unless (
+        #   first_paragraph =~ /between:?\s*\Z/ ||
+        #   first_paragraph =~ /include:?\s*\Z/ ||
+        #   first_paragraph =~ /of:?\s*\Z/ ||
+        #   first_paragraph =~ /[:;]\s*\Z/
+        #   ) &&
+        #   definition =~ /\n\n\*/
+
+        #   # Only taking the first paragraph of the definition
+        #   first_paragraph
+        # end
+      end
+
+
       # rubocop:disable Layout/LineLength
       def generate_entity_definition(entity, domain, old_definition)
         return "" if entity.nil?
@@ -419,10 +494,12 @@ module Stepmod
         DEFINITION
 
         unless old_definition.nil? || old_definition.blank?
+          old_definition = trim_definition(old_definition)
+
           definition << <<~OLD_DEFINITION
             [NOTE]
             --
-            #{old_definition&.strip}
+            #{old_definition.strip}
             --
           OLD_DEFINITION
         end

data/lib/stepmod/utils/version.rb

@@ -1,5 +1,5 @@
 module Stepmod
   module Utils
-    VERSION = "0.3.17".freeze
+    VERSION = "0.3.18".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stepmod-utils
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -253,7 +253,7 @@ homepage: https://github.com/metanorma/stepmod-utils
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -268,8 +268,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Stepmod-utils is a toolkit that works on STEPmod data.
 test_files: []