stepmod-utils 0.3.23 → 0.3.25

data/lib/stepmod/utils/version.rb

@@ -1,5 +1,5 @@
 module Stepmod
   module Utils
-    VERSION = "0.3.23".freeze
+    VERSION = "0.3.25".freeze
   end
 end

data/stepmod-utils.gemspec

@@ -33,9 +33,10 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "concurrent-ruby"
   spec.add_runtime_dependency "expressir"
-  spec.add_runtime_dependency "glossarist", "~> 0.1.0"
+  spec.add_runtime_dependency "glossarist", "~> 1.0.5"
   spec.add_runtime_dependency "indefinite_article"
   spec.add_runtime_dependency "ptools"
+  spec.add_runtime_dependency "pubid-iso"
   spec.add_runtime_dependency "reverse_adoc", ">= 0.3.5"
   spec.add_runtime_dependency "thor", ">= 0.20.3"
   spec.add_development_dependency "rubocop"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stepmod-utils
 version: !ruby/object:Gem::Version
-  version: 0.3.23
+  version: 0.3.25
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-15 00:00:00.000000000 Z
+date: 2023-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: indefinite_article
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pubid-iso
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: reverse_adoc
   requirement: !ruby/object:Gem::Requirement
@@ -157,16 +171,16 @@ email:
 - open.source@ribose.com
 executables:
 - stepmod-annotate-all
-- stepmod-build-resource-docs-cache
 - stepmod-convert-express-description
 - stepmod-convert-express-resource
-- stepmod-extract-terms
-- stepmod-find-express-files
+- stepmod-extract-changes
+- stepmod-extract-concepts
 extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
 - ".github/workflows/release.yml"
+- ".github/workflows/test-concept-generation.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
@@ -179,13 +193,17 @@ files:
 - bin/console
 - bin/setup
 - exe/stepmod-annotate-all
-- exe/stepmod-build-resource-docs-cache
 - exe/stepmod-convert-express-description
 - exe/stepmod-convert-express-resource
-- exe/stepmod-extract-terms
-- exe/stepmod-find-express-files
+- exe/stepmod-extract-changes
+- exe/stepmod-extract-concepts
 - lib/stepmod/utils.rb
 - lib/stepmod/utils/bibdata.rb
+- lib/stepmod/utils/change.rb
+- lib/stepmod/utils/change_collection.rb
+- lib/stepmod/utils/change_edition.rb
+- lib/stepmod/utils/change_edition_collection.rb
+- lib/stepmod/utils/changes_extractor.rb
 - lib/stepmod/utils/cleaner.rb
 - lib/stepmod/utils/concept.rb
 - lib/stepmod/utils/converters/a.rb
@@ -199,6 +217,7 @@ files:
 - lib/stepmod/utils/converters/dd.rb
 - lib/stepmod/utils/converters/def.rb
 - lib/stepmod/utils/converters/definition.rb
+- lib/stepmod/utils/converters/description.rb
 - lib/stepmod/utils/converters/dl.rb
 - lib/stepmod/utils/converters/drop.rb
 - lib/stepmod/utils/converters/dt.rb
@@ -241,6 +260,7 @@ files:
 - lib/stepmod/utils/converters/term.rb
 - lib/stepmod/utils/converters/text.rb
 - lib/stepmod/utils/converters/uof.rb
+- lib/stepmod/utils/express_bibdata.rb
 - lib/stepmod/utils/html_to_asciimath.rb
 - lib/stepmod/utils/smrl_description_converter.rb
 - lib/stepmod/utils/smrl_resource_converter.rb
@@ -270,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Stepmod-utils is a toolkit that works on STEPmod data.

data/exe/stepmod-build-resource-docs-cache

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-
-require "nokogiri"
-require "json"
-
-stepmod_dir = ARGV.first || Dir.pwd
-
-schemas = {}
-Dir.glob(File.join(stepmod_dir,
-                   "data/resource_docs/*/resource.xml")).each do |resource_docs_file|
-  match = resource_docs_file.match("data/resource_docs/([^/]+)/resource.xml")
-  resource_docs_dir = match.captures[0]
-
-  resource_docs = Nokogiri::XML(File.read(resource_docs_file)).root
-  resource_docs.xpath("schema").each do |schema|
-    schemas[schema["name"]] = resource_docs_dir
-  end
-end
-
-puts JSON.pretty_generate(schemas)

data/exe/stepmod-extract-terms

@@ -1,237 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require "pry"
-# resolve bin path, ignoring symlinks
-require "pathname"
-bin_file = Pathname.new(__FILE__).realpath
-
-# add self to libpath
-$:.unshift File.expand_path("../../lib", bin_file)
-
-# Fixes https://github.com/rubygems/rubygems/issues/1420
-require "rubygems/specification"
-
-module Gem
-  class Specification
-    def this; self; end
-  end
-end
-
-require "bundler/setup"
-require "stepmod/utils/terms_extractor"
-require 'optparse'
-
-def log(message)
-  puts "[stepmod-utils] #{message}"
-end
-
-options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: #{$0} [options]"
-
-  opts.on("-p", "--path STEPMOD_DATA_PATH", String, "Path to STEPmod data directory") do |path|
-    options[:stepmod_dir] = path
-  end
-
-  opts.on("-i", "--index INDEX_PATH", String, "Path to repository_index.xml") do |path|
-    unless path.nil?
-      options[:index_path] = Pathname.new(path).to_s
-    end
-  end
-
-  opts.on_tail("-h", "--help", "Show this message") do
-    puts opts
-    exit
-  end
-end.parse!
-
-stepmod_dir = options[:stepmod_dir]
-if stepmod_dir.nil?
-  raise StandardError.new("STEPmod data path not set, set with the `-p` option.")
-else
-  log "STEPmod data path: `#{stepmod_dir}`"
-end
-
-index_path = options[:index_path] || File.join(stepmod_dir, "repository_index.xml")
-unless File.exists?(index_path)
-  raise StandardError.new("Index file not present at #{index_path}, set with the `-i` option.")
-else
-  log "Repository index path: `#{index_path}`"
-end
-
-general_concepts,
-resource_concepts,
-parsed_bibliography,
-part_concepts,
-part_resources,
-part_modules = Stepmod::Utils::TermsExtractor.call(stepmod_dir, index_path)
-
-def part_to_title(bibdata)
-  case bibdata.part.to_i
-  when 41
-    "Fundamentals of product description and support"
-  when 42
-    "Geometric and topological representation"
-  when 43
-    "Foundation representation"
-  when 44
-    "Product structure, concept and configuration"
-  when 45
-    "Material and other engineering properties"
-  when 46
-    "Visual presentation"
-  when 47
-    "Shape tolerance"
-  when 51
-    "Mathematical representation"
-  else
-    bibdata.title_en
-  end
-end
-
-IMAGE_REPLACEMENTS = {
-  'image::eq01.gif[]' => 'stem:[H(A,B) = max {h(A, B), h(B,A)}]',
-  'image::eq02.gif[]' => 'stem:[max_{a in A} { min_{b in B} d(a,b) }]',
-  'image::vector_z_c.gif[]' => 'stem:[bar z_{c}]',
-  'image::one_direction_repeat_factor_expression.gif[]' => 'stem:[I + k cdot R; k = -1, 1]',
-  'image::two_direction_repeat_factor_expression.gif[]' => 'stem:[I + k_1 cdot R_1 + k_2 cdot R_2; k_1, k_2 = -1, 0, 1, k^2_1 + k^2_2 != 0]',
-}
-
-TEXT_REPLACEMENTS = {
-  ' (see <module_ref linkend="ply_orientation_specification:4_entities:figure:f2"> Figure 2</module_ref>)' => '',
-  ' (see <module_ref linkend="ply_orientation_specification:4_entities:figure:f3"> Figure 3</module_ref>)' => ''
-}
-
-def replace_content(content)
-  IMAGE_REPLACEMENTS.each_pair do |k, v|
-    content.gsub!(k, v)
-  end
-  TEXT_REPLACEMENTS.each_pair do |k, v|
-    content.gsub!(k, v)
-  end
-
-  content
-end
-
-## Skip all Clause 3 terms
-# part_concepts.each do |(bibdata, current_part_concepts)|
-#   current_part_concepts = current_part_concepts.to_a.map do |n|
-#     n.localizations["en"]
-#   end
-#   fn = "03x-stepmod-#{bibdata.part}.adoc"
-#   File.open(fn, "w") do |file|
-#     file.puts("== #{part_to_title(bibdata)}\n\n")
-#     file.puts(replace_images(current_part_concepts.map(&:to_mn_adoc).join("\n")))
-#   end
-#   log "INFO: written to: #{fn}"
-# end
-
-# File.open("03x-stepmod.adoc", "w") do |file|
-#   part_concepts.sort_by do |(bibdata, current_part_concepts)|
-#     bibdata.part.to_i
-#   end.each do |(bibdata, current_part_concepts)|
-#     fn = "03x-stepmod-#{bibdata.part}.adoc"
-#     file.puts("\ninclude::#{fn}[]\n")
-#   end
-# end
-
-# log "INFO: written summary file to: 03x-stepmod.adoc"
-
-part_resources.each do |(bibdata, current_part_resources)|
-  current_part_resources = current_part_resources.to_a.map do |n|
-    n.localizations["en"]
-  end
-  fn = "04x-stepmod-entities-resources-#{bibdata.part}.adoc"
-  File.open(fn, "w") do |file|
-    # file.puts("== #{part_to_title(bibdata)}\n\n")
-    file.puts(replace_content(current_part_resources.map(&:to_mn_adoc).join("\n")))
-  end
-  log "INFO: written to: #{fn}"
-end
-
-File.open("04x-stepmod-entities-resources.adoc", "w") do |file|
-  part_resources.sort_by do |(bibdata, current_part_resources)|
-    bibdata.part.to_i
-  end.each do |(bibdata, current_part_resources)|
-    fn = "04x-stepmod-entities-resources-#{bibdata.part}.adoc"
-    file.puts("\ninclude::#{fn}[]\n")
-  end
-end
-
-log "INFO: written summary file to: 04x-stepmod-entities-resources.adoc"
-
-part_modules.sort_by do |(bibdata, part_modules_arm, part_modules_mim)|
-  bibdata.part.to_i
-end.each do |(bibdata, part_modules_arm, part_modules_mim)|
-  fn = "05x-stepmod-entities-modules-#{bibdata.part}.adoc"
-  File.open(fn, "w") do |file|
-    file.puts("")
-
-    unless part_modules_arm.empty?
-      schema_name = part_modules_arm.first.first
-      concepts = part_modules_arm.first.last.to_a.map do |n|
-        n.localizations["en"]
-      end
-
-      # puts "SCHEMA NAME ARM: #{schema_name}"
-      file.puts("== #{schema_name}\n\n")
-      file.puts(concepts.map(&:to_mn_adoc).join("\n"))
-    end
-
-    file.puts("")
-
-    unless part_modules_mim.empty?
-      schema_name = part_modules_mim.first.first
-
-      # puts "SCHEMA NAME MIM: #{schema_name}"
-      concepts = part_modules_mim.first.last.to_a.map do |n|
-        n.localizations["en"]
-      end
-      file.puts("== #{schema_name}\n\n")
-      file.puts(replace_content(concepts.map(&:to_mn_adoc).join("\n")))
-    end
-  end
-
-  log "INFO: written to: #{fn}"
-end
-
-File.open("05x-stepmod-entities-modules.adoc", "w") do |file|
-  part_modules.sort_by do |(bibdata, part_modules_arm, part_modules_mim)|
-    bibdata.part.to_i
-  end.each do |(bibdata, part_modules_arm, part_modules_mim)|
-    fn = "05x-stepmod-entities-modules-#{bibdata.part}.adoc"
-    file.puts("\ninclude::#{fn}[]\n")
-  end
-end
-
-log "INFO: written summary file to: 05x-stepmod-entities-modules.adoc"
-
-## Skipping all Clause 3 terms
-# File.open("031-stepmod-general.adoc", "w") do |file|
-#   file.puts(
-#     replace_images(
-#       general_concepts.to_a.map do |n|
-#         n.localizations["en"]
-#       end.map(&:to_mn_adoc).join("\n")
-#     )
-#   )
-# end
-
-# log "INFO: written to: 031-stepmod-general.adoc"
-
-File.open("041-stepmod-entities-resources.adoc", "w") do |file|
-  file.puts(
-    replace_content(
-      resource_concepts.to_a.map do |n|
-        n.localizations["en"]
-      end.map(&:to_mn_adoc).join("\n")
-    )
-  )
-end
-log "INFO: written to: 041-stepmod-entities-resources.adoc"
-
-File.open("991-generated-bibliography.adoc", "w") do |file|
-  file.puts(parsed_bibliography.map(&:to_mn_adoc).sort.uniq.join("\n"))
-end
-log "INFO: written to: 991-generated-bibliography.adoc"

data/exe/stepmod-find-express-files

@@ -1,24 +0,0 @@
-#!/usr/bin/env ruby
-
-require "nokogiri"
-
-stepmod_dir = ARGV.first || Dir.pwd
-
-index = Nokogiri::XML(File.read(File.join(stepmod_dir,
-                                          "repository_index.xml"))).root
-
-files = []
-index.xpath("modules/module").each do |item|
-  files << "#{stepmod_dir}/data/modules/#{item['name']}/arm.exp"
-  files << "#{stepmod_dir}/data/modules/#{item['name']}/mim.exp"
-end
-index.xpath("resources/resource").each do |item|
-  files << "#{stepmod_dir}/data/resources/#{item['name']}/#{item['name']}.exp"
-end
-index.xpath("business_object_models/business_object_model").each do |item|
-  files << "#{stepmod_dir}/data/business_object_models/#{item['name']}/bom.exp"
-  files << "#{stepmod_dir}/data/business_object_models/#{item['name']}/DomainModel.exp"
-end
-
-existing_files = files.filter { |file| File.exists?(file) }
-puts existing_files