glossarist 2.8.1 → 2.8.4

data/lib/glossarist/v2.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require_relative "v2/configuration"
-require_relative "v2/citation"
-require_relative "v2/concept_source"
-require_relative "v2/detailed_definition"
-require_relative "v2/concept_ref"
-require_relative "v2/related_concept"
-require_relative "v2/concept_data"
-require_relative "v2/localized_concept"
-require_relative "v2/managed_concept_data"
-require_relative "v2/managed_concept"
-require_relative "v2/concept_document"
-
 module Glossarist
   module V2
+    autoload :Configuration, "glossarist/v2/configuration"
+    autoload :Citation, "glossarist/v2/citation"
+    autoload :ConceptSource, "glossarist/v2/concept_source"
+    autoload :DetailedDefinition, "glossarist/v2/detailed_definition"
+    autoload :ConceptRef, "glossarist/v2/concept_ref"
+    autoload :RelatedConcept, "glossarist/v2/related_concept"
+    autoload :ConceptData, "glossarist/v2/concept_data"
+    autoload :LocalizedConcept, "glossarist/v2/localized_concept"
+    autoload :ManagedConceptData, "glossarist/v2/managed_concept_data"
+    autoload :ManagedConcept, "glossarist/v2/managed_concept"
+    autoload :ConceptDocument, "glossarist/v2/concept_document"
+
     Configuration.register_model(Citation, id: :citation)
     Configuration.register_model(ConceptSource, id: :concept_source)
     Configuration.register_model(DetailedDefinition, id: :detailed_definition)

data/lib/glossarist/v3/concept_data.rb

@@ -37,7 +37,8 @@ module Glossarist
         map :system, to: :system
         map %i[entry_status entryStatus], to: :entry_status
         map %i[review_date reviewDate], to: :review_date
-        map %i[review_decision_date reviewDecisionDate], to: :review_decision_date
+        map %i[review_decision_date reviewDecisionDate],
+            to: :review_decision_date
         map %i[review_decision_event reviewDecisionEvent],
             to: :review_decision_event
       end

data/lib/glossarist/v3/concept_document.rb

@@ -10,7 +10,7 @@ module Glossarist
         sequence do
           map_document 0, to: :concept, type: V3::ManagedConcept
           map_document 1.., to: :localizations, type: V3::LocalizedConcept,
-                                             collection: true
+                            collection: true
         end
       end
     end

data/lib/glossarist/v3/configuration.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../context_configuration"
-
 module Glossarist
   module V3
     module Configuration

data/lib/glossarist/v3/managed_concept_data.rb

@@ -15,6 +15,7 @@ module Glossarist
         map %i[localized_concepts localizedConcepts], to: :localized_concepts
         map %i[domains groups], to: :domains,
                                 with: { from: :domains_from_yaml, to: :domains_to_yaml }
+        map :tags, to: :tags
         map :sources, to: :sources
         map :localizations, to: :localizations,
                             with: { from: :localizations_from_yaml, to: :localizations_to_yaml }

data/lib/glossarist/v3.rb

@@ -1,23 +1,23 @@
 # frozen_string_literal: true
 
-require_relative "v3/configuration"
-require_relative "v3/citation"
-require_relative "v3/concept_source"
-require_relative "v3/detailed_definition"
-require_relative "v3/concept_ref"
-require_relative "v3/related_concept"
-require_relative "v3/concept_data"
-require_relative "v3/localized_concept"
-require_relative "v3/managed_concept_data"
-require_relative "v3/managed_concept"
-require_relative "v3/concept_document"
-require_relative "v3/bibliography_entry"
-require_relative "v3/bibliography_file"
-require_relative "v3/image_entry"
-require_relative "v3/image_file"
-
 module Glossarist
   module V3
+    autoload :Configuration, "glossarist/v3/configuration"
+    autoload :Citation, "glossarist/v3/citation"
+    autoload :ConceptSource, "glossarist/v3/concept_source"
+    autoload :DetailedDefinition, "glossarist/v3/detailed_definition"
+    autoload :ConceptRef, "glossarist/v3/concept_ref"
+    autoload :RelatedConcept, "glossarist/v3/related_concept"
+    autoload :ConceptData, "glossarist/v3/concept_data"
+    autoload :LocalizedConcept, "glossarist/v3/localized_concept"
+    autoload :ManagedConceptData, "glossarist/v3/managed_concept_data"
+    autoload :ManagedConcept, "glossarist/v3/managed_concept"
+    autoload :ConceptDocument, "glossarist/v3/concept_document"
+    autoload :BibliographyEntry, "glossarist/v3/bibliography_entry"
+    autoload :BibliographyFile, "glossarist/v3/bibliography_file"
+    autoload :ImageEntry, "glossarist/v3/image_entry"
+    autoload :ImageFile, "glossarist/v3/image_file"
+
     Configuration.register_model(Citation, id: :citation)
     Configuration.register_model(ConceptSource, id: :concept_source)
     Configuration.register_model(DetailedDefinition, id: :detailed_definition)

data/lib/glossarist/validation/asset_index.rb

@@ -23,8 +23,8 @@ module Glossarist
         @paths.include?(normalize_path(path))
       end
 
-      def each_path(&block)
-        @paths.each(&block)
+      def each_path(&)
+        @paths.each(&)
       end
 
       def self.build_from_directory(dataset_path)

data/lib/glossarist/validation/bibliography_index.rb

@@ -21,8 +21,8 @@ module Glossarist
         @entries.keys
       end
 
-      def each_entry(&block)
-        @entries.each_value(&block)
+      def each_entry(&)
+        @entries.each_value(&)
       end
 
       def self.build_from_concepts(concepts, dataset_path: nil)
@@ -35,7 +35,8 @@ module Glossarist
         index
       end
 
-      def self.build_from_yaml(concepts, bibliography_yaml: nil, images_yaml: nil)
+      def self.build_from_yaml(concepts, bibliography_yaml: nil,
+images_yaml: nil)
         index = new
 
         concepts.each { |concept| index_concept_sources(index, concept) }
@@ -85,14 +86,14 @@ module Glossarist
 
         def register_origin_text(index, origin)
           ref = origin.ref
-          return unless ref && ref.source && !ref.source.strip.empty?
+          return unless ref&.source && !ref.source.strip.empty?
 
           index.register(ref.source, origin)
         end
 
         def register_origin_ref(index, origin)
           ref = origin.ref
-          return unless ref && ref.source && ref.id
+          return unless ref&.source && ref.id
 
           key = "#{ref.source} #{ref.id}"
           index.register(key, origin)
@@ -108,9 +109,10 @@ module Glossarist
           return unless bib
 
           Array(bib.entries).each do |entry|
-            next unless entry.respond_to?(:id)
+            next unless entry&.id
+
             index.register(entry.id, entry)
-            index.register(entry.reference, entry) if entry.respond_to?(:reference) && entry.reference
+            index.register(entry.reference, entry) if entry.reference
           end
         rescue StandardError
           nil
@@ -125,7 +127,8 @@ module Glossarist
           return unless images
 
           Array(images.entries).each do |entry|
-            next unless entry.respond_to?(:id)
+            next unless entry&.id
+
             index.register(entry.id, entry)
           end
         rescue StandardError

data/lib/glossarist/validation/rules/asciidoc_xref_rule.rb

@@ -24,6 +24,7 @@ module Glossarist
 
             l10n.text_content.each do |text|
               next unless text
+
               extractor.extract_from_text(text).each do |ref|
                 next unless ref.is_a?(BibliographicReference)
                 next if context.bibliography_index.resolve?(ref.anchor)
@@ -33,7 +34,7 @@ module Glossarist
                   code: code, severity: severity,
                   location: "#{fname}/#{lang}",
                   suggestion: "add '#{ref.anchor}' as a source, " \
-                              "or verify it exists in bibliography.yaml",
+                              "or verify it exists in bibliography.yaml"
                 )
               end
             end

data/lib/glossarist/validation/rules/authoritative_source_rule.rb

@@ -25,7 +25,7 @@ module Glossarist
             "no authoritative source defined",
             code: code, severity: severity,
             location: fname,
-            suggestion: "Add at least one source with type: authoritative",
+            suggestion: "Add at least one source with type: authoritative"
           )]
         end
       end

data/lib/glossarist/validation/rules/bibliography_yaml_rule.rb

@@ -24,7 +24,7 @@ module Glossarist
               "bibliography.yaml is invalid YAML: #{e.message}",
               code: code, severity: severity,
               location: "bibliography.yaml",
-              suggestion: "Fix YAML syntax errors in bibliography.yaml",
+              suggestion: "Fix YAML syntax errors in bibliography.yaml"
             )]
           end
 

data/lib/glossarist/validation/rules/citation_completeness_rule.rb

@@ -28,7 +28,7 @@ module Glossarist
                 "source #{idx + 1} has empty origin (no ref source or id)",
                 code: "GLS-304", severity: severity,
                 location: fname,
-                suggestion: "Add at minimum an origin.ref with source or id",
+                suggestion: "Add at minimum an origin.ref with source or id"
               )
             end
           end

data/lib/glossarist/validation/rules/concept_count_rule.rb

@@ -10,7 +10,7 @@ module Glossarist
         def scope = :collection
 
         def applicable?(context)
-          context.metadata && context.metadata.concept_count
+          context.metadata&.concept_count
         end
 
         def check(context)
@@ -24,11 +24,10 @@ module Glossarist
             "but found #{actual} concept files",
             code: code, severity: severity,
             location: "metadata.yaml",
-            suggestion: "Update concept_count or add/remove concept files",
+            suggestion: "Update concept_count or add/remove concept files"
           )]
         end
       end
     end
   end
 end
-

data/lib/glossarist/validation/rules/concept_id_rule.rb

@@ -26,4 +26,3 @@ module Glossarist
     end
   end
 end
-

data/lib/glossarist/validation/rules/concept_id_uniqueness_rule.rb

@@ -39,4 +39,3 @@ module Glossarist
     end
   end
 end
-

data/lib/glossarist/validation/rules/concept_mention_rule.rb

@@ -31,7 +31,7 @@ module Glossarist
               code: "GLS-100", severity: severity,
               location: fname,
               suggestion: "add concept '#{ref.concept_id}' to the dataset " \
-                          "or verify the reference",
+                          "or verify the reference"
             )
           end
 
@@ -41,4 +41,3 @@ module Glossarist
     end
   end
 end
-

data/lib/glossarist/validation/rules/concept_status_rule.rb

@@ -26,11 +26,10 @@ module Glossarist
             "invalid concept status '#{status}'",
             code: code, severity: severity,
             location: fname,
-            suggestion: "Use one of: #{VALID_STATUSES.join(', ')}",
+            suggestion: "Use one of: #{VALID_STATUSES.join(', ')}"
           )]
         end
       end
     end
   end
 end
-

data/lib/glossarist/validation/rules/concept_uri_rule.rb

@@ -21,7 +21,7 @@ module Glossarist
             "no concept URI prefix or template defined in metadata",
             code: code, severity: severity,
             location: "metadata.yaml",
-            suggestion: "Add uri_prefix or concept_uri_template to metadata.yaml",
+            suggestion: "Add uri_prefix or concept_uri_template to metadata.yaml"
           )]
         end
       end

data/lib/glossarist/validation/rules/date_type_rule.rb

@@ -13,7 +13,7 @@ module Glossarist
 
         def applicable?(context)
           concept = context.concept
-          (concept.dates&.any?) || concept.date_accepted
+          concept.dates&.any? || concept.date_accepted
         end
 
         def check(context)
@@ -23,8 +23,9 @@ module Glossarist
 
           check_date_collection(concept.dates, fname, issues)
 
-          if concept.date_accepted && concept.date_accepted.type
-            validate_date_type(concept.date_accepted, "date_accepted", fname, issues)
+          if concept.date_accepted&.type
+            validate_date_type(concept.date_accepted, "date_accepted", fname,
+                               issues)
           end
 
           issues
@@ -35,6 +36,7 @@ module Glossarist
         def check_date_collection(dates, fname, issues)
           (dates || []).each_with_index do |date, idx|
             next unless date.type
+
             validate_date_type(date, "date #{idx + 1}", fname, issues)
           end
         end

data/lib/glossarist/validation/rules/date_validity_rule.rb

@@ -13,7 +13,7 @@ module Glossarist
 
         def applicable?(context)
           concept = context.concept
-          (concept.dates&.any?) || concept.date_accepted
+          concept.dates&.any? || concept.date_accepted
         end
 
         def check(context)

data/lib/glossarist/validation/rules/definition_content_rule.rb

@@ -26,7 +26,7 @@ module Glossarist
                   "definition #{idx + 1} has empty content",
                   code: code, severity: severity,
                   location: "#{fname}/#{lang}",
-                  suggestion: "Add definition text or remove the empty entry",
+                  suggestion: "Add definition text or remove the empty entry"
                 )
               end
             end
@@ -38,4 +38,3 @@ module Glossarist
     end
   end
 end
-

data/lib/glossarist/validation/rules/domain_target_rule.rb

@@ -6,7 +6,7 @@ module Glossarist
       # Validates that domain references point to concepts that exist in the
       # dataset (for local refs with concept_id) or have a valid URN.
       class DomainTargetRule < Base
-        URN_RE = %r{\Aurn:[a-z0-9][a-z0-9-]{0,31}:[a-z0-9()+,\-.:=@;$_!*'%/?#]+\z}i.freeze
+        URN_RE = %r{\Aurn:[a-z0-9][a-z0-9-]{0,31}:[a-z0-9()+,\-.:=@;$_!*'%/?#]+\z}i
 
         def code = "GLS-111"
         def category = :references

data/lib/glossarist/validation/rules/duplicate_term_rule.rb

@@ -25,7 +25,7 @@ module Glossarist
               "concepts #{ids.join(', ')}",
               code: code, severity: severity,
               location: lang,
-              suggestion: "Differentiate the terms or consolidate the concepts",
+              suggestion: "Differentiate the terms or consolidate the concepts"
             )
           end
 
@@ -60,4 +60,3 @@ module Glossarist
     end
   end
 end
-

data/lib/glossarist/validation/rules/entry_status_rule.rb

@@ -26,7 +26,7 @@ module Glossarist
               "#{fname}/#{lang}: invalid entry_status '#{status}' " \
               "(expected one of: #{VALID_STATUSES.join(', ')})",
               code: code, severity: "error",
-              location: "#{fname}/#{lang}",
+              location: "#{fname}/#{lang}"
             )
           end
 
@@ -36,4 +36,3 @@ module Glossarist
     end
   end
 end
-

data/lib/glossarist/validation/rules/filename_id_rule.rb

@@ -17,7 +17,7 @@ module Glossarist
           concept = context.concept
           fname = context.file_name
           expected_id = concept.data&.id&.to_s
-          actual_name = fname.sub(/\.yaml\z/, "").sub(%r{\Aconcepts/}, "")
+          actual_name = fname.delete_suffix(".yaml").delete_prefix("concepts/")
 
           return [] unless expected_id && expected_id != actual_name
 
@@ -25,11 +25,10 @@ module Glossarist
             "filename '#{actual_name}' does not match concept id '#{expected_id}'",
             code: code, severity: severity,
             location: "concepts/#{fname}",
-            suggestion: "Rename the entry or fix the concept id",
+            suggestion: "Rename the entry or fix the concept id"
           )]
         end
       end
     end
   end
 end
-

data/lib/glossarist/validation/rules/image_reference_rule.rb

@@ -24,6 +24,7 @@ module Glossarist
 
             l10n.text_content.each do |text|
               next unless text
+
               extractor.extract_from_text(text).each do |ref|
                 next unless ref.is_a?(AssetReference)
                 next if context.asset_index.resolve?(ref.path)
@@ -32,7 +33,7 @@ module Glossarist
                   "unresolved image reference #{ref.path}",
                   code: "GLS-103", severity: severity,
                   location: "#{fname}/#{lang}",
-                  suggestion: "add '#{ref.path}' to the dataset's images/ directory",
+                  suggestion: "add '#{ref.path}' to the dataset's images/ directory"
                 )
               end
             end
@@ -46,7 +47,7 @@ module Glossarist
               "unresolved asset reference #{ref.path}",
               code: "GLS-104", severity: "error",
               location: fname,
-              suggestion: "add '#{ref.path}' to the dataset's images/ directory",
+              suggestion: "add '#{ref.path}' to the dataset's images/ directory"
             )
           end
 

data/lib/glossarist/validation/rules/l10n_uuid_integrity_rule.rb

@@ -27,7 +27,7 @@ module Glossarist
               "localized_concepts '#{lang}' => '#{uuid}' has no matching file",
               code: code, severity: severity,
               location: fname,
-              suggestion: "Add the missing localization file or remove the UUID",
+              suggestion: "Add the missing localization file or remove the UUID"
             )
           end
 
@@ -37,4 +37,3 @@ module Glossarist
     end
   end
 end
-

data/lib/glossarist/validation/rules/language_coverage_rule.rb

@@ -27,11 +27,10 @@ module Glossarist
             "missing localizations for declared languages: #{missing.join(', ')}",
             code: code, severity: severity,
             location: fname,
-            suggestion: "Add localizations for: #{missing.join(', ')}",
+            suggestion: "Add localizations for: #{missing.join(', ')}"
           )]
         end
       end
     end
   end
 end
-

data/lib/glossarist/validation/rules/language_list_rule.rb

@@ -24,7 +24,7 @@ module Glossarist
             issues << issue(
               "declared languages not found in concepts: #{missing.sort.join(', ')}",
               code: code, severity: severity,
-              suggestion: "Update the languages list or add missing localizations",
+              suggestion: "Update the languages list or add missing localizations"
             )
           end
 
@@ -33,7 +33,7 @@ module Glossarist
             issues << issue(
               "concepts use languages not declared: #{extra.sort.join(', ')}",
               code: code, severity: severity,
-              suggestion: "Add these languages to the languages list in metadata",
+              suggestion: "Add these languages to the languages list in metadata"
             )
           end
 
@@ -43,4 +43,3 @@ module Glossarist
     end
   end
 end
-

data/lib/glossarist/validation/rules/locality_completeness_rule.rb

@@ -48,7 +48,9 @@ module Glossarist
         def all_origins(concept)
           origins = []
           concept.localizations.each do |l10n|
-            (l10n.data&.sources || []).each { |s| origins << s.origin if s.origin }
+            (l10n.data&.sources || []).each do |s|
+              origins << s.origin if s.origin
+            end
           end
           origins
         end

data/lib/glossarist/validation/rules/localization_consistency_rule.rb

@@ -23,7 +23,7 @@ module Glossarist
           issues = []
 
           lc_map = concept.data&.localized_concepts || {}
-          loaded_langs = concept.localizations&.map(&:language_code)&.compact || []
+          loaded_langs = concept.localizations&.filter_map(&:language_code) || []
 
           # Map has entry but no loaded localization
           lc_map.each_key do |lang|

data/lib/glossarist/validation/rules/localization_presence_rule.rb

@@ -22,4 +22,3 @@ module Glossarist
     end
   end
 end
-

data/lib/glossarist/validation/rules/model_validity_rule.rb

@@ -38,7 +38,7 @@ module Glossarist
         def recurse_attributes(model, location, path)
           issues = []
 
-          model.class.attributes.each do |name, _|
+          model.class.attributes.each_key do |name|
             value = model.public_send(name)
             next if value.nil?
 

data/lib/glossarist/validation/rules/orphaned_bibliography_rule.rb

@@ -22,6 +22,7 @@ module Glossarist
             concept.localizations.each do |l10n|
               l10n.text_content.each do |text|
                 next unless text
+
                 extractor.extract_from_text(text).each do |ref|
                   if ref.is_a?(BibliographicReference)
                     referenced_anchors.add(ref.anchor)
@@ -40,7 +41,7 @@ module Glossarist
               "Orphaned bibliography entry: '#{anchor}'",
               code: code, severity: severity,
               location: "bibliography.yaml",
-              suggestion: "Remove the entry or reference it from a concept",
+              suggestion: "Remove the entry or reference it from a concept"
             )
           end
 

data/lib/glossarist/validation/rules/orphaned_images_rule.rb

@@ -21,6 +21,7 @@ module Glossarist
             concept.localizations.each do |l10n|
               l10n.text_content.each do |text|
                 next unless text
+
                 extractor.extract_from_text(text).each do |ref|
                   if ref.is_a?(AssetReference)
                     referenced_paths.add(ref.path)
@@ -38,6 +39,7 @@ module Glossarist
           if images_file
             context.bibliography_index.entries.each_value do |entry|
               next unless entry[:source].is_a?(V3::ImageEntry)
+
               path = entry[:source].path
               referenced_paths.add(path) if path
             end
@@ -51,7 +53,7 @@ module Glossarist
               "Orphaned image: #{path} (not referenced by any concept)",
               code: code, severity: severity,
               location: path,
-              suggestion: "Remove the image or reference it from a concept",
+              suggestion: "Remove the image or reference it from a concept"
             )
           end
 
@@ -61,10 +63,10 @@ module Glossarist
         private
 
         def load_images_file(context)
-          return @images_file if defined?(@images_file)
+          return @load_images_file if defined?(@load_images_file)
 
-          @images_file = V3::ImageFile.from_file(
-            File.join(context.path, "images.yaml")
+          @load_images_file = V3::ImageFile.from_file(
+            File.join(context.path, "images.yaml"),
           )
         end
       end

data/lib/glossarist/validation/rules/orphaned_l10n_files_rule.rb

@@ -26,7 +26,7 @@ module Glossarist
               "(not referenced by any concept)",
               code: code, severity: severity,
               location: File.basename(path),
-              suggestion: "Delete the file or add a reference from a managed concept",
+              suggestion: "Delete the file or add a reference from a managed concept"
             )
           end
 
@@ -36,4 +36,3 @@ module Glossarist
     end
   end
 end
-

data/lib/glossarist/validation/rules/preferred_term_rule.rb

@@ -28,7 +28,7 @@ module Glossarist
               "has #{terms.size} term(s) but none are preferred",
               code: code, severity: severity,
               location: "#{fname}/#{lang}",
-              suggestion: "Set normative_status: preferred on the primary term",
+              suggestion: "Set normative_status: preferred on the primary term"
             )
           end
 
@@ -38,4 +38,3 @@ module Glossarist
     end
   end
 end
-

data/lib/glossarist/validation/rules/related_concept_cycle_rule.rb

@@ -66,7 +66,7 @@ module Glossarist
           stack = Set.new
           cycles = []
 
-          graph.keys.each do |node|
+          graph.each_key do |node|
             next if visited.include?(node)
 
             dfs(node, graph, visited, stack, [], cycles)
@@ -80,7 +80,7 @@ module Glossarist
 
           if stack.include?(node)
             cycle_start = path.index(node)
-            cycles << path[cycle_start..] + [node] if cycle_start
+            cycles << (path[cycle_start..] + [node]) if cycle_start
             return
           end