iev 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ade271f8d92cb9e91edef67cd761835b01475b71be9c8fd58fc6bdb31c06ce40
-  data.tar.gz: 18d6111223f6555060d72360f4b636fba9f81a3341d4f80fd0fa8b4c4bbd3d69
+  metadata.gz: e35fa5a8cd6a260517986026015f363ac5114c548e44885a41a160d46e069a21
+  data.tar.gz: e412000b685994129c1fec6426e2e4795883d5dabccd6ffb67afc258b397ddd0
 SHA512:
-  metadata.gz: 3e3c8ca862f48a4b8c206f976de1f53b33a146a2e7f1643e212134d2db421ea8331ff57134258df82f7546eb2c6e4fce99e5811850b3ffedfb3d7e0ba6f39120
-  data.tar.gz: ea4678480997b220c9228cc364dd148779d35ac4c4582813e0b7aed1bcd9aa1700be63caf97f0254f83f40b0bbb7d10995c92cf7f3352a507d04f48d1b86150b
+  metadata.gz: 84f480fd9eaccfa0ee7e457f19b55af593680f9f858a838599a97c09de56d33b1b3afcf16b9a3a4359932beca6eca56eab0b69183bc95e75b5e3b8cff1efecab
+  data.tar.gz: 2345069a32ad7ab2b08d80d1508c9b6cead36dcc2a549e2744bc7f37ccec857a63e6d672d8d8d1c4fb019c406e05ff8abb1a3827455857553ffe2462654cc574

data/.github/workflows/rake.yml

@@ -1,10 +1,14 @@
 name: rake
 
+permissions:
+  contents: read
+
 on:
   push:
     branches: [ master, main ]
     tags: [ v* ]
   pull_request:
+  workflow_dispatch:
 
 jobs:
   rake:

data/.github/workflows/release.yml

@@ -1,5 +1,8 @@
 name: release
 
+permissions:
+  contents: write
+
 on:
   workflow_dispatch:
     inputs:
@@ -19,4 +22,4 @@ jobs:
       next_version: ${{ github.event.inputs.next_version }}
     secrets:
       rubygems-api-key: ${{ secrets.GLOSSARIST_CI_RUBYGEMS_API_KEY }}
-
+      pat_token: ${{ secrets.GITHUB_TOKEN }}

data/.rubocop_todo.yml

@@ -1,33 +1,18 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-01-06 12:27:40 UTC using RuboCop version 1.69.2.
+# on 2025-11-14 11:14:05 UTC using RuboCop version 1.81.7.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentOneStep, IndentationWidth.
-# SupportedStyles: case, end
-Layout/CaseIndentation:
-  Exclude:
-    - 'lib/iev/iso_639_code.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleAlignWith, Severity.
-# SupportedStylesAlignWith: keyword, variable, start_of_line
-Layout/EndAlignment:
-  Exclude:
-    - 'lib/iev/iso_639_code.rb'
-
-# Offense count: 45
+# Offense count: 43
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
+# Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Exclude:
+    - 'iev.gemspec'
     - 'lib/iev/cli/command.rb'
     - 'lib/iev/cli/command_helper.rb'
     - 'lib/iev/db_cache.rb'
@@ -36,6 +21,13 @@ Layout/LineLength:
     - 'spec/acceptance/xlsx2yaml_spec.rb'
     - 'spec/iev_spec.rb'
 
+# Offense count: 7
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
+Lint/DuplicateBranch:
+  Exclude:
+    - 'lib/iev/source_parser.rb'
+    - 'lib/iev/term_builder.rb'
+
 # Offense count: 1
 Lint/MixedRegexpCaptureTypes:
   Exclude:
@@ -59,7 +51,7 @@ Metrics/CyclomaticComplexity:
     - 'lib/iev/source_parser.rb'
     - 'lib/iev/term_builder.rb'
 
-# Offense count: 21
+# Offense count: 20
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 74
@@ -71,11 +63,3 @@ Metrics/PerceivedComplexity:
     - 'lib/iev.rb'
     - 'lib/iev/converter/mathml_to_asciimath.rb'
     - 'lib/iev/term_builder.rb'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: literals, strict
-Style/MutableConstant:
-  Exclude:
-    - 'lib/iev/iso_639_code.rb'

data/Gemfile

@@ -2,13 +2,14 @@
 
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in lutaml-model.gemspec
-gemspec
-
-gem "rake", "~> 13.0"
-gem "rspec", "~> 3.0"
-gem "rubocop", "~> 1.21"
-gem "rubocop-performance", require: false
-gem "rubocop-rake", require: false
-gem "rubocop-rspec", require: false
+gem "canon"
+gem "openssl"
+gem "rake"
+gem "rspec"
+gem "rubocop"
+gem "rubocop-performance"
+gem "rubocop-rake"
+gem "rubocop-rspec"
 gem "simplecov"
+
+gemspec

data/bin/console

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 require "bundler/setup"
-require "iev"
+require_relative "../lib/iev"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/iev.gemspec

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "iev/version"
+require_relative "lib/iev/version"
 
 Gem::Specification.new do |spec|
   spec.name = "iev"
@@ -10,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.authors = ["Ribose Inc."]
   spec.email = ["open.source@ribose.com"]
 
-  spec.summary = "Iev: Fetch and encode Iev term from Electropedia"
-  spec.description = "Iev: Fetch and encode Iev term from Electropedia"
-  spec.homepage = "https://github.com/metanorma/iev"
+  spec.summary = "Glossarist toolkit for working with IEV terms from Electropedia"
+  spec.description = "Glossarist toolkit for working with IEV terms from Electropedia"
+  spec.homepage = "https://github.com/glossarist/iev"
   spec.license = "BSD-2-Clause"
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
@@ -23,14 +21,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "creek", "~> 2.5"
+  spec.add_dependency "creek", "~> 2.6"
   spec.add_dependency "glossarist", ">= 2.3.0"
-  spec.add_dependency "nokogiri", ">= 1.16.5"
+  spec.add_dependency "nokogiri", "~> 1.17"
   spec.add_dependency "plurimath"
   spec.add_dependency "relaton", "~> 1.18"
   spec.add_dependency "sequel", "~> 5.40"
   spec.add_dependency "sqlite3", "~> 1.7.0"
   spec.add_dependency "thor", "~> 1.0"
   spec.add_dependency "unitsml"
-  spec.add_dependency "zeitwerk", "~> 2.4"
 end

data/lib/iev/cli/command_helper.rb

@@ -72,10 +72,10 @@ module Iev
           Glossarist::ManagedConceptCollection.new.tap do |concept_collection|
             dataset.each do |row|
               term = TermBuilder.build_from(row)
-              if term
-                concept = concept_collection.fetch_or_initialize(term.id)
-                concept.add_l10n(term)
-              end
+              next unless term
+
+              concept = concept_collection.fetch_or_initialize(term.id)
+              concept.add_l10n(term)
             end
           end
         end

data/lib/iev/cli/ui.rb

@@ -62,7 +62,7 @@ module Iev
         end
 
         def should_out?(level, topic)
-          topic.nil? || level == :warn || $IEV_DEBUG[topic]
+          topic.nil? || level == :warn || ($IEV_DEBUG && $IEV_DEBUG[topic])
         end
       end
     end

data/lib/iev/cli.rb

@@ -5,6 +5,10 @@
 
 module Iev
   module Cli
+    autoload :Command, "iev/cli/command"
+    autoload :CommandHelper, "iev/cli/command_helper"
+    autoload :Ui, "iev/cli/ui"
+
     def self.start(arguments)
       Signal.trap("INT") do
         Ui.info "Signal SIGINT received, quitting!"

data/lib/iev/converter.rb

@@ -2,6 +2,8 @@
 
 module Iev
   module Converter
+    autoload :MathmlToAsciimath, "iev/converter/mathml_to_asciimath"
+
     def self.mathml_to_asciimath(input)
       Iev::Converter::MathmlToAsciimath.convert(input)
     end

data/lib/iev/data_conversions.rb

@@ -3,6 +3,8 @@
 # (c) Copyright 2020 Ribose Inc.
 #
 
+require "htmlentities"
+
 module Iev
   module DataConversions
     refine String do

data/lib/iev/iso_639_code.rb

@@ -7,16 +7,18 @@ module Iev
   # @todo This needs to be rewritten.
   class Iso639Code
     COUNTRY_CODES = YAML.load(IO.read(File.join(__dir__, "iso_639_2.yaml")))
-    THREE_CHAR_MEMO = {}
+    # rubocop:disable Style/MutableConstant
+    THREE_CHAR_MEMO = {} # Memoization cache, must be mutable
+    # rubocop:enable Style/MutableConstant
 
     def initialize(two_char_code)
       @code = case two_char_code.length
-        when 2
-          two_char_code
-        else
-          # This is to handle code "nl BE" in the Iev sheet
-          two_char_code.split(" ").first
-        end
+              when 2
+                two_char_code
+              else
+                # This is to handle code "nl BE" in the Iev sheet
+                two_char_code.split.first
+              end
     end
 
     def find(code_type)

data/lib/iev/source_parser.rb

@@ -5,7 +5,6 @@
 
 # rubocop:todo Style/RedundantRegexpEscape
 
-require "English"
 module Iev
   # Parses information from the spreadsheet's SOURCE column.
   #

data/lib/iev/term_attrs_parser.rb

@@ -65,14 +65,22 @@ module Iev
     end
 
     def extract_gender(str)
-      gender_rx = /\b[mfn]\b/
-
-      @gender = remove_from_string(str, gender_rx)
+      # Match gender either:
+      # 1. Inside brackets/parentheses: (m), [f], (n)
+      # 2. As standalone word with boundaries: m, f, n
+      gender_rx = /(?:\(|\[)[mfn](?:\)|\])|\b[mfn]\b/
+
+      match = remove_from_string(str, gender_rx)
+      # Extract just the letter from the match (remove brackets if present)
+      @gender = match&.gsub(/[\[\]()]/, "")
     end
 
     # Must happen after #extract_gender
     def extract_plurality(str)
-      plural_rx = /\bpl\b/
+      # Match plurality either:
+      # 1. Inside brackets/parentheses: (pl), [pl]
+      # 2. As standalone word with boundaries: pl
+      plural_rx = /(?:\(|\[)pl(?:\)|\])|\bpl\b/
 
       if remove_from_string(str, plural_rx)
         @plurality = "plural"

data/lib/iev/term_builder.rb

@@ -44,7 +44,7 @@ module Iev
 
       split_definition
 
-      Glossarist::LocalizedConcept.new(term_hash)
+      Glossarist::LocalizedConcept.from_hash(term_hash)
     end
 
     def term_hash
@@ -65,19 +65,22 @@ module Iev
 
       {
         id: term_id,
-        entry_status: extract_entry_status,
         classification: extract_classification,
-        dates: dates,
-        review_date: flesh_date(find_value_for("PUBLICATIONDATE")),
-        review_decision_date: flesh_date(find_value_for("PUBLICATIONDATE")),
-        review_decision_event: "published",
-        terms: extract_terms,
-        notes: extract_notes,
-        examples: extract_examples,
-        definition: [{ "content" => extract_definition_value }],
-        sources: extract_authoritative_source,
-        language_code: term_language,
-        related: extract_superseded_concepts,
+        entry_status: extract_entry_status,
+        data: {
+          id: term_id,
+          dates: dates,
+          definition: [{ "content" => extract_definition_value }],
+          examples: extract_examples,
+          notes: extract_notes,
+          terms: extract_terms,
+          review_date: flesh_date(find_value_for("PUBLICATIONDATE")),
+          review_decision_date: flesh_date(find_value_for("PUBLICATIONDATE")),
+          review_decision_event: "published",
+          language_code: term_language,
+          sources: extract_authoritative_source,
+          related: extract_superseded_concepts,
+        }.compact,
       }.compact
     end
 
@@ -215,17 +218,21 @@ module Iev
 
     def extract_examples
       @examples.map do |str|
-        Iev::Converter.mathml_to_asciimath(
-          replace_newlines(parse_anchor_tag(str, term_domain)),
-        ).strip
+        {
+          content: Iev::Converter.mathml_to_asciimath(
+            replace_newlines(parse_anchor_tag(str, term_domain)),
+          ).strip,
+        }
       end
     end
 
     def extract_notes
       @notes.map do |str|
-        Iev::Converter.mathml_to_asciimath(
-          replace_newlines(parse_anchor_tag(str, term_domain)),
-        ).strip
+        {
+          content: Iev::Converter.mathml_to_asciimath(
+            replace_newlines(parse_anchor_tag(str, term_domain)),
+          ).strip,
+        }
       end
     end
 

data/lib/iev/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Iev
-  VERSION = "0.3.5"
+  VERSION = "0.3.7"
 end

data/lib/iev.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require "iev/version"
-require "iev/db"
+require_relative "iev/version"
 require "open-uri"
 require "nokogiri"
 
@@ -15,17 +14,28 @@ require "relaton_bib"
 require "sequel"
 require "thor"
 require "yaml"
-require "zeitwerk"
-
-loader = Zeitwerk::Loader.for_gem
-loader.setup
 
 module Iev
+  autoload :Cli, "iev/cli"
+  autoload :Converter, "iev/converter"
+  autoload :DataConversions, "iev/data_conversions"
+  autoload :Db, "iev/db"
+  autoload :DbCache, "iev/db_cache"
+  autoload :DbWriter, "iev/db_writer"
+  autoload :Iso639Code, "iev/iso_639_code"
+  autoload :Profiler, "iev/profiler"
+  autoload :RelatonDb, "iev/relaton_db"
+  autoload :SourceParser, "iev/source_parser"
+  autoload :SupersessionParser, "iev/supersession_parser"
+  autoload :TermAttrsParser, "iev/term_attrs_parser"
+  autoload :TermBuilder, "iev/term_builder"
+  autoload :Utilities, "iev/utilities"
+
   #
   # Scrape Electropedia for term.
   #
   # @param [String] code for example "103-01-02"
-  # @param [String] lang language code, for examle "en"
+  # @param [String] lang language code, for example "en"
   #
   # @return [String, nil] if found than term,
   # if code not found then empty string,
@@ -44,4 +54,4 @@ module Iev
   end
 end
 
-require "iev/cli"
+require_relative "iev/cli"

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iev
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - Ribose Inc.
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-06 00:00:00.000000000 Z
+date: 2025-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: creek
@@ -15,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: glossarist
   requirement: !ruby/object:Gem::Requirement
@@ -41,16 +42,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.5
+        version: '1.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.5
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: plurimath
   requirement: !ruby/object:Gem::Requirement
@@ -135,21 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: zeitwerk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-description: 'Iev: Fetch and encode Iev term from Electropedia'
+description: Glossarist toolkit for working with IEV terms from Electropedia
 email:
 - open.source@ribose.com
 executables:
@@ -160,7 +147,6 @@ files:
 - ".github/workflows/rake.yml"
 - ".github/workflows/release.yml"
 - ".gitignore"
-- ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -193,10 +179,11 @@ files:
 - lib/iev/term_builder.rb
 - lib/iev/utilities.rb
 - lib/iev/version.rb
-homepage: https://github.com/metanorma/iev
+homepage: https://github.com/glossarist/iev
 licenses:
 - BSD-2-Clause
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -211,7 +198,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
-summary: 'Iev: Fetch and encode Iev term from Electropedia'
+summary: Glossarist toolkit for working with IEV terms from Electropedia
 test_files: []

data/.hound.yml

@@ -1,5 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-ruby:
-  enabled: true
-  config_file: .rubocop.yml