glossarist 2.13.3 → 2.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ffd41dbfe184c1b47711cb7b38b10c136fca8fcdac813baf2f070f99b5f5212
-  data.tar.gz: caaa34a425e82a8e79f20870ca4c49fcbe8b8bcb391ad1a5597f5c2904d3c242
+  metadata.gz: ebf6ec1d9cc3f2c1932fff4d389b19e60dff4846e3f82167fa6e13bef8347f7d
+  data.tar.gz: 2aee9b19e15588b9fc74a973d02406de96b1ed01ebefcdd7b87bc472d3b8d53b
 SHA512:
-  metadata.gz: ef5b2c5cd5f4055b725399445d58246463c432b7d0a69ba2f81610b53dd9a5b5701963a5a7461add48da294d904f0faba5709c8bacfd79ac13415cecb61baa34
-  data.tar.gz: 16eb1b43dd51bcc39c6da768a2edddbe33d01fd59af0ec972494c9a2f629f17a2b45ab120a218abd423605c7afa6ed54b405ec3088bd682804e9bc1bbad0c13d
+  metadata.gz: '09eeb3261b6e753a4e1690496f13db04053429318108d52a031963087a9c908f842a12802b310014874f78f5d47bfd3a54dd1672e610e0b55684133a82ec2331'
+  data.tar.gz: de663d1b6fe2581a17ae52e2fb69d2ea6accf6ca46f92be084ec603c5b8f0f3d614a5dbeaf5a20178bb8d08511ea046210ed09a183c9c35b0f9d462b0dcb62d6

data/config.yml

@@ -212,17 +212,25 @@ completeness:
     - partial
 
 multiplicity:
-  # ISO 704:2022 partitive member multiplicity. Encodes the diagram
-  # line notation as structured data:
-  #   compulsory          — 1 solid line (must exist in every instance)
-  #   optional            — 1 dashed line (exists in some instances only)
-  #   compulsory_multiple — 2 solid lines (multiple must exist)
-  #   optional_multiple   — 2 dashed lines (multiple may exist)
-  #   compulsory_at_least_one        — 1 solid + 1 dashed line (at least one must exist)
-  # Default: compulsory.
-  value:
-    - compulsory
+  # MECE decomposition of ISO 704:2022 partitive member multiplicity.
+  # Two orthogonal dimensions replace the prior flat 5-value enum.
+  #
+  # presence (line style):
+  #   required — solid line (must exist)
+  #   optional — dashed line (may exist)
+  #
+  # count (line count):
+  #   exactly_one  — 1 line (exactly one instance)
+  #   at_least_one — 1 solid + 1 dashed (at least one instance)
+  #   multiple     — 2 lines (multiple instances)
+  #
+  # Valid combinations (5): required+exactly_one, optional+exactly_one,
+  # required+multiple, optional+multiple, required+at_least_one.
+  # Invalid: optional+at_least_one (collapses to optional+multiple).
+  presence:
+    - required
     - optional
-    - compulsory_multiple
-    - optional_multiple
-    - compulsory_at_least_one
+  count:
+    - exactly_one
+    - at_least_one
+    - multiple

data/lib/glossarist/glossary_definition.rb

@@ -37,6 +37,10 @@ module Glossarist
     # PartitiveRelation redesign (TODO.partitive-relation-v2).
     COMPLETENESS_VALUES = config.dig("completeness", "value").freeze
 
-    MULTIPLICITY_VALUES = config.dig("multiplicity", "value").freeze
+    PARTITIVE_PRESENCE_VALUES =
+      config.dig("multiplicity", "presence").freeze
+
+    PARTITIVE_COUNT_VALUES =
+      config.dig("multiplicity", "count").freeze
   end
 end

data/lib/glossarist/rdf/gloss_partitive_member.rb

@@ -5,13 +5,14 @@ require "lutaml/model"
 module Glossarist
   module Rdf
     # RDF view for V3::PartitiveMember. Emits a
-    # gloss:PartitiveMember subject with ref, multiplicity, and
+    # gloss:PartitiveMember subject with ref, presence, count, and
     # is_delimiting properties.
     class GlossPartitiveMember < Lutaml::Model::Serializable
       attribute :ref_id, :string
       attribute :ref_source, :string
       attribute :ref_text, :string
-      attribute :multiplicity, :string
+      attribute :presence, :string
+      attribute :count, :string
       attribute :is_delimiting, :boolean
 
       rdf do
@@ -27,8 +28,10 @@ module Glossarist
                           to: :ref_id
         predicate :refText, namespace: Namespaces::GlossaristNamespace,
                             to: :ref_text
-        predicate :multiplicity, namespace: Namespaces::GlossaristNamespace,
-                                 to: :multiplicity
+        predicate :presence, namespace: Namespaces::GlossaristNamespace,
+                             to: :presence
+        predicate :count, namespace: Namespaces::GlossaristNamespace,
+                          to: :count
         predicate :isDelimiting, namespace: Namespaces::GlossaristNamespace,
                                  to: :is_delimiting
       end

data/lib/glossarist/v3/partitive_member.rb

@@ -6,56 +6,88 @@ module Glossarist
     # a ConceptRef to the partitive concept plus ISO 704:2022
     # multiplicity and delimiting metadata.
     #
-    # ISO 704:2022 partitive member notation:
+    # ISO 704:2022 partitive member notation uses two orthogonal
+    # dimensions (MECE decomposition):
     #
-    #   multiplicity (diagram line notation):
-    #     compulsory          — 1 solid line (must exist in every instance)
-    #     optional            — 1 dashed line (exists in some instances only)
-    #     compulsory_multiple — 2 solid lines (multiple must exist)
-    #     optional_multiple   — 2 dashed lines (multiple may exist)
-    #     compulsory_at_least_one        — 1 solid + 1 dashed line (≥1 must exist)
+    #   presence (line style — solid vs dashed):
+    #     required   — solid line (must exist in every instance)
+    #     optional   — dashed line (may exist; exists in some instances)
     #
-    #   is_delimiting (orthogonal, bold 3x-width line in diagram):
-    #     A delimiting part behaves like a delimiting characteristic:
-    #     it distinguishes the comprehensive from coordinate concepts.
-    #     Example (ISO 704 §5.5.4.2.2): for "optomechanical mouse",
-    #     the delimiting parts are mouse ball, x/y-axis rollers,
-    #     infrared emitter/sensor — they distinguish it from
-    #     "mechanical mouse" and "optical mouse". Mouse button is
-    #     NOT delimiting (all computer mice have buttons).
+    #   count (line count — how many):
+    #     exactly_one  — 1 line
+    #     at_least_one — 1 solid + 1 dashed
+    #     multiple     — 2 lines
+    #
+    # Valid combinations (5):
+    #   required + exactly_one    = compulsory (1 solid)
+    #   optional + exactly_one    = optional (1 dashed)
+    #   required + multiple       = compulsory_multiple (2 solid)
+    #   optional + multiple       = optional_multiple (2 dashed)
+    #   required + at_least_one   = compulsory_at_least_one (1 solid + 1 dashed)
+    #
+    # Invalid: optional + at_least_one (collapses to optional + multiple
+    # because "at least one, if present" = "zero or more" = optional_multiple).
+    #
+    # is_delimiting (orthogonal, bold 3x-width line in diagram):
+    #   A delimiting part behaves like a delimiting characteristic:
+    #   it distinguishes the comprehensive from coordinate concepts.
+    #   Example (ISO 704 §5.5.4.2.2): for "optomechanical mouse",
+    #   the delimiting parts are mouse ball, x/y-axis rollers,
+    #   infrared emitter/sensor — they distinguish it from
+    #   "mechanical mouse" and "optical mouse". Mouse button is
+    #   NOT delimiting (all computer mice have buttons).
     class PartitiveMember < Lutaml::Model::Serializable
-      DEFAULT_MULTIPLICITY = "compulsory"
+      DEFAULT_PRESENCE = "required"
+      DEFAULT_COUNT = "exactly_one"
 
       attribute :ref, ConceptRef
-      attribute :multiplicity, :string,
-                values: Glossarist::GlossaryDefinition::MULTIPLICITY_VALUES,
-                default: -> { DEFAULT_MULTIPLICITY }
+      attribute :presence, :string,
+                values: Glossarist::GlossaryDefinition::PARTITIVE_PRESENCE_VALUES,
+                default: -> { DEFAULT_PRESENCE }
+      attribute :count, :string,
+                values: Glossarist::GlossaryDefinition::PARTITIVE_COUNT_VALUES,
+                default: -> { DEFAULT_COUNT }
       attribute :is_delimiting, :boolean, default: -> { false }
 
       key_value do
         map :ref, to: :ref
-        map :multiplicity, to: :multiplicity
+        map :presence, to: :presence
+        map :count, to: :count
         map :is_delimiting, to: :is_delimiting
       end
 
       def validate!
         validate_ref!
-        validate_multiplicity!
+        validate_presence_count!
         self
       end
 
-      def compulsory?
-        multiplicity == "compulsory"
+      def required?
+        presence == "required"
       end
 
       def optional?
-        multiplicity == "optional"
+        presence == "optional"
       end
 
       def delimiting?
         is_delimiting == true
       end
 
+      # Derived ISO 704 name for display. Returns the flat-enum
+      # name that corresponds to this (presence, count) pair.
+      def iso704_name
+        case [presence, count]
+        when ["required", "exactly_one"] then "compulsory"
+        when ["optional", "exactly_one"] then "optional"
+        when ["required", "multiple"] then "compulsory_multiple"
+        when ["optional", "multiple"] then "optional_multiple"
+        when ["required", "at_least_one"] then "compulsory_at_least_one"
+        else raise ArgumentError,
+                     "invalid combination presence=#{presence} count=#{count}"
+        end
+      end
+
       private
 
       def validate_ref!
@@ -66,15 +98,28 @@ module Glossarist
               "(source, id, or text required)"
       end
 
-      def validate_multiplicity!
-        return if multiplicity.nil?
+      def validate_presence_count!
+        unless Glossarist::GlossaryDefinition::PARTITIVE_PRESENCE_VALUES
+                 .include?(presence)
+          raise ArgumentError,
+                "PartitiveMember#presence has invalid value " \
+                "#{presence.inspect}; must be one of " \
+                "#{GlossaryDefinition::PARTITIVE_PRESENCE_VALUES.join(', ')}"
+        end
+
+        unless Glossarist::GlossaryDefinition::PARTITIVE_COUNT_VALUES
+                 .include?(count)
+          raise ArgumentError,
+                "PartitiveMember#count has invalid value " \
+                "#{count.inspect}; must be one of " \
+                "#{GlossaryDefinition::PARTITIVE_COUNT_VALUES.join(', ')}"
+        end
 
-        unless Glossarist::GlossaryDefinition::MULTIPLICITY_VALUES
-                 .include?(multiplicity)
+        if presence == "optional" && count == "at_least_one"
           raise ArgumentError,
-                "PartitiveMember#multiplicity has invalid value " \
-                "#{multiplicity.inspect}; must be one of " \
-                "#{GlossaryDefinition::MULTIPLICITY_VALUES.join(', ')}"
+                "PartitiveMember presence=optional + count=at_least_one is " \
+                "invalid — it collapses to optional + multiple (zero or more). " \
+                "Use presence: optional, count: multiple instead."
         end
       end
     end

data/lib/glossarist/v3/partitive_relation.rb

@@ -12,10 +12,9 @@ module Glossarist
     # within one relation are coordinate concepts: they share the
     # comprehensive AND share the criterion of subdivision.
     #
-    # Per-partitive metadata (ISO 704:2022):
-    #   - multiplicity (compulsory, optional, compulsory_multiple,
-    #     optional_multiple, compulsory_at_least_one) — encodes the diagram
-    #     line notation as data
+    # Per-partitive metadata (ISO 704:2022, MECE decomposition):
+    #   - presence (required, optional) — line style: solid vs dashed
+    #   - count (exactly_one, at_least_one, multiple) — line count
     #   - is_delimiting — orthogonal flag; a delimiting part behaves
     #     like a delimiting characteristic (distinguishes the
     #     comprehensive from coordinate concepts)

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

@@ -87,12 +87,12 @@ module Glossarist
 
         def check_member_multiplicity(rel, idx, fname, issues)
           rel.partitives.each_with_index do |member, mi|
-            unless member.compulsory?
+            unless member.required? && member.count == "exactly_one"
               issues << issue(
                 "partitive_relation #{idx + 1}.partitives[#{mi}] has " \
-                "non-default multiplicity '#{member.multiplicity}'; " \
-                "ISO 704 diagram uses dashed/multiple-line notation for " \
-                "this — confirm the optionality is intentional",
+                "non-default presence='#{member.presence}' count='#{member.count}' " \
+                "(ISO 704 name: #{member.iso704_name}); confirm the " \
+                "optionality is intentional",
                 severity: "warning",
                 location: fname,
               )

data/lib/glossarist/version.rb

@@ -4,5 +4,5 @@
 #
 
 module Glossarist
-  VERSION = "2.13.3"
+  VERSION = "2.13.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glossarist
 version: !ruby/object:Gem::Version
-  version: 2.13.3
+  version: 2.13.4
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-27 00:00:00.000000000 Z
+date: 2026-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model