modspec 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 925062f2457c7aa978de3d2eabc679f4a33b9177e8ba2f3a80494c46377ff0b8
-  data.tar.gz: '083c357ffd578b297ae28753e48dccacd08a10d202f336299b037d1d6b08fe9a'
+  metadata.gz: 2ca0254068b698f935d90fbfb963362136ae975df3f2dea02d946bd38b53d07b
+  data.tar.gz: 0f24f91cbfdd1674e39a1b37a2cd7ac736771d2edefbfc7930dac858a17d03f5
 SHA512:
-  metadata.gz: ce9246f0f6b4ce811bf498d52a59c25949ad0016b024ab215c332ce7e1e34fa311c2a78267a3a1b07cb1a2f0f468559c1aeaedb638c4552e9500016ad8a3235b
-  data.tar.gz: 7132a3d0194c87222d077752784d1d1d7197481d1db1ae356c9f959d8cccd8163f3ef268a2e4e6b75812095768e133ab6da81c629fd3d33b0122f7f2789079fe
+  metadata.gz: 5a467d5f5cf70c4df7f20e1b17960f9fc169cd793bfab169f639fee73a4a9838af1f4b6778c7b1e045546ccd3a87fb07f0c3f7a8d4427ea8405acf5aba1c63b4
+  data.tar.gz: a2b9ba6b8545bcb5cf7af9a8118f079d3758be7a4342d2aab7342078962308967cfed9b8eb139b86e5ee84aa9f12e9d11a2799b719a12bdb82b3920f06f0b57d

data/.rubocop.yml

@@ -17,3 +17,9 @@ plugins:
 
 AllCops:
   TargetRubyVersion: 3.0
+
+RSpec/ExampleLength:
+  Max: 30
+
+RSpec/MultipleMemoizedHelpers:
+  Max: 14

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-05-05 14:09:35 UTC using RuboCop version 1.86.1.
+# on 2026-05-06 04:01:19 UTC using RuboCop version 1.86.1.
 # 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
@@ -11,16 +11,13 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'modspec.gemspec'
 
-# Offense count: 33
+# Offense count: 31
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Exclude:
-    - 'lib/modspec/conformance_class.rb'
     - 'lib/modspec/conformance_test.rb'
-    - 'lib/modspec/normative_statement.rb'
-    - 'lib/modspec/normative_statements_class.rb'
     - 'lib/modspec/suite.rb'
     - 'spec/modspec/conformance_class_spec.rb'
     - 'spec/modspec/conformance_test_spec.rb'
@@ -28,28 +25,14 @@ Layout/LineLength:
     - 'spec/modspec/normative_statements_class_spec.rb'
     - 'spec/modspec/suite_spec.rb'
 
-# Offense count: 4
-# Configuration parameters: AllowComments, AllowEmptyLambdas.
-Lint/EmptyBlock:
-  Exclude:
-    - 'spec/modspec/conformance_class_spec.rb'
-    - 'spec/modspec/suite_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
-# NotImplementedExceptions: NotImplementedError
-Lint/UnusedMethodArgument:
-  Exclude:
-    - 'lib/modspec/normative_statement.rb'
-
-# Offense count: 7
+# Offense count: 6
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
+    - 'lib/modspec/child_container.rb'
     - 'lib/modspec/suite.rb'
 
-# Offense count: 5
+# Offense count: 4
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
@@ -58,9 +41,9 @@ Metrics/CyclomaticComplexity:
 # Offense count: 9
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 21
+  Max: 20
 
-# Offense count: 3
+# Offense count: 2
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Exclude:
@@ -72,11 +55,6 @@ Performance/CollectionLiteralInLoop:
   Exclude:
     - 'lib/modspec/suite.rb'
 
-# Offense count: 5
-# Configuration parameters: CountAsOne.
-RSpec/ExampleLength:
-  Max: 15
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 RSpec/ExpectActual:
@@ -90,15 +68,10 @@ RSpec/IndexedLet:
     - 'spec/modspec/normative_statements_class_spec.rb'
     - 'spec/modspec/suite_spec.rb'
 
-# Offense count: 7
+# Offense count: 13
 RSpec/MultipleExpectations:
   Max: 9
 
-# Offense count: 7
-# Configuration parameters: AllowSubject.
-RSpec/MultipleMemoizedHelpers:
-  Max: 12
-
 # Offense count: 2
 RSpec/RepeatedExample:
   Exclude:

data/lib/modspec/child_container.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Modspec
+  module ChildContainer
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def validates_children(collection_name, empty_label:, child_label:)
+        define_method(:validate_children_presence) do
+          children = send(collection_name)
+          if children.nil? || children.empty?
+            ["#{empty_label} #{identifier} has no child #{child_label}"]
+          else
+            []
+          end
+        end
+
+        define_method(:validate_children_identifier_prefix) do
+          children = send(collection_name)
+          return [] unless children
+
+          expected_prefix = "#{identifier}/"
+          children.filter_map do |child|
+            unless child.identifier.to_s.start_with?(expected_prefix)
+              msg = "#{child_label} #{child.identifier} "
+              msg += "does not share the expected prefix #{expected_prefix}"
+              msg
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/modspec/conformance_class.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "conformance_test"
-require_relative "identifier"
 
 module Modspec
   class ConformanceClass < Lutaml::Model::Serializable
+    include ChildContainer
+
     attribute :identifier, Identifier
     attribute :name, :string
     attribute :description, :string
@@ -17,6 +17,9 @@ module Modspec
     attribute :belongs_to, Identifier, collection: true
     attribute :reference, :string
 
+    validates_children :tests, empty_label: "Conformance class",
+                               child_label: "conformance tests"
+
     xml do
       element "conformance-class"
       map_attribute "identifier", to: :identifier
@@ -33,29 +36,10 @@ module Modspec
 
     def validate
       errors = super
-      errors.concat(validate_identifier_prefix)
-      errors.concat(validate_class_children_mapping)
+      errors.concat(validate_children_identifier_prefix)
+      errors.concat(validate_children_presence)
       errors.concat(tests.flat_map(&:validate))
       errors
     end
-
-    private
-
-    def validate_class_children_mapping
-      if tests.nil? || tests.empty?
-        ["Conformance class #{identifier} has no child conformance tests"]
-      else
-        []
-      end
-    end
-
-    def validate_identifier_prefix
-      errors = []
-      expected_prefix = "#{identifier}/"
-      tests&.each do |test|
-        errors << "Conformance test #{test.identifier} does not share the expected prefix #{expected_prefix}" unless test.identifier.to_s.start_with?(expected_prefix)
-      end
-      errors
-    end
   end
 end

data/lib/modspec/conformance_test.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "identifier"
 
 module Modspec
   class ConformanceTest < Lutaml::Model::Serializable

data/lib/modspec/identifier.rb

@@ -4,6 +4,5 @@ require "lutaml/model"
 
 module Modspec
   class Identifier < Lutaml::Model::Type::String
-    # attribute :identifier, :string
   end
 end

data/lib/modspec/normative_statement.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "identifier"
 
 module Modspec
   class NormativeStatementPart < Lutaml::Model::Serializable
@@ -46,43 +45,8 @@ module Modspec
       map_element "parts", to: :parts
     end
 
-    def validate(suite = nil, register: Lutaml::Model::Config.default_register)
-      errors = super()
-      errors.concat(validate_dependencies(suite)) if suite
-      errors.concat(validate_nested_requirement)
-      errors
-    end
-
-    private
-
-    def all_dependencies
-      (
-        (dependencies || []) +
-        (indirect_dependency || []) +
-        (implements || [])
-      ).flatten.compact
-    end
-
-    def validate_dependencies(suite)
-      errors = []
-      all_identifiers = suite.all_identifiers.map(&:to_s)
-      all_dependencies.each do |dep|
-        errors << "Requirement #{identifier} has an invalid dependency: #{dep}" unless all_identifiers.include?(dep)
-      end
-      errors
-    end
-
-    def validate_nested_requirement
-      if has_parent_requirement?
-        ["Nested requirement detected: #{identifier}"]
-      else
-        []
-      end
-    end
-
-    def has_parent_requirement?
-      # Implementation depends on how you determine if a requirement is nested
-      false
+    def validate(register: Lutaml::Model::Config.default_register)
+      super
     end
   end
 end

data/lib/modspec/normative_statements_class.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "normative_statement"
-require_relative "identifier"
 
 module Modspec
   class NormativeStatementsClass < Lutaml::Model::Serializable
+    include ChildContainer
+
     attribute :identifier, Identifier
     attribute :name, :string
     attribute :description, :string
@@ -18,6 +18,9 @@ module Modspec
     attribute :reference, :string
     attribute :source, :string
 
+    validates_children :normative_statements, empty_label: "Requirement class",
+                                              child_label: "requirements"
+
     xml do
       element "normative-statements-class"
       map_attribute "identifier", to: :identifier
@@ -33,31 +36,12 @@ module Modspec
       map_element "source", to: :source
     end
 
-    def validate(suite = nil)
-      errors = super()
-      errors.concat(validate_identifier_prefix)
-      errors.concat(validate_class_children_mapping)
-      errors.concat(normative_statements.flat_map { |n| n.validate(suite) })
+    def validate
+      errors = super
+      errors.concat(validate_children_identifier_prefix)
+      errors.concat(validate_children_presence)
+      errors.concat(normative_statements.flat_map(&:validate))
       errors
     end
-
-    private
-
-    def validate_identifier_prefix
-      return [] if normative_statements.nil? || normative_statements.empty?
-
-      expected_prefix = "#{identifier}/"
-      normative_statements.each_with_object([]) do |statement, errors|
-        errors << "Normative statement #{statement.identifier} does not share the expected prefix #{expected_prefix}" unless statement.identifier.to_s.start_with?(expected_prefix)
-      end
-    end
-
-    def validate_class_children_mapping
-      if normative_statements.nil? || normative_statements.empty?
-        ["Requirement class #{identifier} has no child requirements"]
-      else
-        []
-      end
-    end
   end
 end

data/lib/modspec/suite.rb

@@ -21,15 +21,13 @@ module Modspec
 
     def validate
       setup_relationships
-      self.all_identifiers = nil
+      reset_statement_index
       errors = super
       errors.concat(validate_cycles)
       errors.concat(validate_label_uniqueness)
       errors.concat(validate_dependencies)
       unless normative_statements_classes.nil?
-        errors.concat(normative_statements_classes.flat_map do |n|
-          n.validate(self)
-        end)
+        errors.concat(normative_statements_classes.flat_map(&:validate))
       end
       errors.concat(conformance_classes.flat_map(&:validate)) unless conformance_classes.nil?
       errors
@@ -42,7 +40,7 @@ module Modspec
       end
 
       combined_suite = dup
-      combined_suite.all_identifiers = nil
+      combined_suite.reset_statement_index
       if other_suite.normative_statements_classes
         combined_suite.normative_statements_classes ||= []
         combined_suite.normative_statements_classes += other_suite.normative_statements_classes
@@ -63,19 +61,17 @@ module Modspec
       combined_suite
     end
 
-    def all_identifiers
-      return @all_identifiers if @all_identifiers
-
-      nsc = normative_statements_classes || []
-      cc = conformance_classes || []
+    def statement_index
+      @statement_index ||= build_statement_index
+    end
 
-      @all_identifiers = (nsc.flat_map(&:normative_statements) +
-              cc.flat_map(&:tests) +
-              nsc +
-              cc).map(&:identifier)
+    def reset_statement_index
+      @statement_index = nil
     end
 
-    attr_writer :all_identifiers
+    def all_identifiers
+      statement_index.keys
+    end
 
     def resolve_conflicts(other_suite)
       resolve_conflicts_for(normative_statements_classes,
@@ -95,18 +91,17 @@ module Modspec
     end
 
     def setup_relationships
-      all_requirements = if normative_statements_classes
-                           normative_statements_classes.flat_map(&:normative_statements)
-                         else
-                           []
-                         end
+      return unless normative_statements_classes && conformance_classes
 
-      return unless conformance_classes
+      req_index = normative_statements_classes
+        .flat_map(&:normative_statements)
+        .to_h { |r| [r.identifier.to_s, r] }
 
       conformance_classes.each do |cc|
         cc.tests.each do |ct|
-          ct.corresponding_requirements = all_requirements.select do |r|
-            Array(ct.targets).map(&:to_s).include?(r.identifier.to_s)
+          targets = Array(ct.targets).map(&:to_s)
+          ct.corresponding_requirements = targets.filter_map do |t|
+            req_index[t]
           end
           ct.parent_class = cc
         end
@@ -132,13 +127,16 @@ module Modspec
     end
 
     def merge_attributes(existing_item, other_item)
-      existing_item.class.attribute_names.each do |attr|
+      existing_item.class.attributes.each_key do |attr|
         next if %i[identifier name].include?(attr)
 
-        if existing_item.send(attr).is_a?(Array)
-          existing_item.send(attr).concat(other_item.send(attr)).uniq!
-        elsif existing_item.send(attr).nil?
-          existing_item.send("#{attr}=", other_item.send(attr))
+        existing_val = existing_item.send(attr)
+        other_val = other_item.send(attr)
+
+        if existing_val.is_a?(Array)
+          existing_item.send(attr).concat(other_val).uniq!
+        elsif existing_val.nil? && !other_val.nil?
+          existing_item.send("#{attr}=", other_val)
         end
       end
     end
@@ -149,21 +147,20 @@ module Modspec
       cycles.map { |cycle| "Cycle detected: #{cycle.join(' -> ')}" }
     end
 
-    # Combine all statements into a single array
-    # This includes both normative statements and conformance tests
     def all_statements
-      nsc = if normative_statements_classes
-              normative_statements_classes.flat_map(&:normative_statements)
-            else
-              []
-            end
-      cc = if conformance_classes
-             conformance_classes.flat_map(&:tests)
-           else
-             []
-           end
-
-      nsc + cc
+      statement_index.values
+    end
+
+    def each_statement(&block)
+      normative_statements_classes&.each do |nsc|
+        yield nsc
+        nsc.normative_statements.each(&block)
+      end
+
+      conformance_classes&.each do |cc|
+        yield cc
+        cc.tests.each(&block)
+      end
     end
 
     def build_dependency_graph
@@ -171,15 +168,14 @@ module Modspec
 
       all_statements.each do |statement|
         id = statement.identifier.to_s
-        graph[id] = Set.new
-
-        # Define all dependency-like properties to check
-        dependency_properties = %i[dependencies indirect_dependency implements
-                                   targets]
+        deps = Set.new
 
-        dependency_properties.each do |property|
-          graph[id].merge(statement.send(property).map(&:to_s)) if statement.respond_to?(property) && !statement.send(property).nil?
+        %i[dependencies indirect_dependency implements targets].each do |prop|
+          refs = statement.send(prop) if statement.respond_to?(prop)
+          deps.merge(refs.map(&:to_s)) if refs
         end
+
+        graph[id] = deps
       end
 
       graph
@@ -205,20 +201,14 @@ module Modspec
       recursion_stack.add(node)
       path.push(node)
 
-      # Check if the node exists in the graph and has dependencies
-      if graph[node]
-        graph[node].each do |neighbor|
-          if !visited.include?(neighbor)
-            cycle = detect_cycle_util(neighbor, graph, visited,
-                                      recursion_stack, path)
-            return cycle if cycle
-          elsif recursion_stack.include?(neighbor)
-            return path[path.index(neighbor)..] + [neighbor]
-          end
+      graph[node]&.each do |neighbor|
+        if !visited.include?(neighbor)
+          cycle = detect_cycle_util(neighbor, graph, visited,
+                                    recursion_stack, path)
+          return cycle if cycle
+        elsif recursion_stack.include?(neighbor)
+          return path[path.index(neighbor)..] + [neighbor]
         end
-      else
-        # If the node doesn't exist in the graph, log a warning
-        puts "Warning: Node #{node} referenced but not found in the graph"
       end
 
       path.pop
@@ -227,81 +217,60 @@ module Modspec
     end
 
     def validate_label_uniqueness
-      labels = {}
+      seen = {}
       errors = []
-      all_statements.each do |statement|
-        if labels[statement.identifier]
+      each_statement do |statement|
+        id = statement.identifier.to_s
+        if seen[id]
           errors << "Duplicate identifier found: #{statement.identifier}"
         else
-          labels[statement.identifier] = true
+          seen[id] = true
         end
       end
       errors
     end
 
     def validate_dependencies
-      all_identifiers = collect_all_identifiers
+      all_ids = statement_index
 
       errors = []
       normative_statements_classes&.each do |nsc|
-        errors.concat(validate_class_dependencies(nsc, all_identifiers))
+        errors.concat(validate_refs(nsc, all_ids, :dependencies))
+        errors.concat(validate_refs(nsc, all_ids, :implements))
         nsc.normative_statements.each do |ns|
-          errors.concat(validate_statement_dependencies(ns, all_identifiers))
+          errors.concat(validate_refs(ns, all_ids, :dependencies))
+          errors.concat(validate_refs(ns, all_ids, :indirect_dependency))
+          errors.concat(validate_refs(ns, all_ids, :implements))
         end
       end
 
       conformance_classes&.each do |cc|
-        errors.concat(validate_class_dependencies(cc, all_identifiers))
+        errors.concat(validate_refs(cc, all_ids, :dependencies))
         cc.tests.each do |ct|
-          errors.concat(validate_test_targets(ct, all_identifiers))
+          errors.concat(validate_refs(ct, all_ids, :dependencies))
+          errors.concat(validate_refs(ct, all_ids, :targets))
         end
       end
 
       errors
     end
 
-    def collect_all_identifiers
-      identifiers = {}
-
-      normative_statements_classes&.each do |nsc|
-        identifiers[nsc.identifier.to_s] = nsc
-        nsc.normative_statements.each do |ns|
-          identifiers[ns.identifier.to_s] = ns
-        end
-      end
-
-      conformance_classes&.each do |cc|
-        identifiers[cc.identifier.to_s] = cc
-        cc.tests.each do |ct|
-          identifiers[ct.identifier.to_s] = ct
-        end
-      end
-
-      identifiers
-    end
-
-    def validate_class_dependencies(klass, all_identifiers)
-      errors = []
-      klass.dependencies&.each do |dep|
-        errors << "Invalid dependency #{dep} in #{klass.identifier}" unless all_identifiers.key?(dep.to_s)
-      end
-      errors
+    def build_statement_index
+      index = {}
+      each_statement { |s| index[s.identifier.to_s] = s }
+      index
     end
 
-    def validate_statement_dependencies(statement, all_identifiers)
-      errors = []
-      statement.dependencies&.each do |dep|
-        errors << "Invalid dependency #{dep} in #{statement.identifier}" unless all_identifiers.key?(dep.to_s)
-      end
-      errors
-    end
+    def validate_refs(obj, all_ids, property)
+      refs = obj.send(property)
+      return [] unless refs
 
-    def validate_test_targets(test, all_identifiers)
-      errors = []
-      test.targets&.each do |target|
-        errors << "Invalid target #{target} in #{test.identifier}" unless all_identifiers.key?(target.to_s)
+      refs.filter_map do |ref|
+        unless all_ids.key?(ref.to_s)
+          "Invalid #{property.to_s.tr('_',
+                                      ' ')} #{ref} in #{obj.identifier}"
+        end
       end
-      errors
     end
   end
 end

data/lib/modspec/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Modspec
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/lib/modspec.rb

@@ -5,14 +5,12 @@ require "lutaml/model"
 require "set"
 
 module Modspec
-  class Error < StandardError; end
-
-  # Your code goes here...
+  autoload :ChildContainer, "modspec/child_container"
+  autoload :Identifier, "modspec/identifier"
+  autoload :NormativeStatement, "modspec/normative_statement"
+  autoload :NormativeStatementPart, "modspec/normative_statement"
+  autoload :NormativeStatementsClass, "modspec/normative_statements_class"
+  autoload :ConformanceTest, "modspec/conformance_test"
+  autoload :ConformanceClass, "modspec/conformance_class"
+  autoload :Suite, "modspec/suite"
 end
-
-require_relative "modspec/identifier"
-require_relative "modspec/normative_statement"
-require_relative "modspec/normative_statements_class"
-require_relative "modspec/conformance_test"
-require_relative "modspec/conformance_class"
-require_relative "modspec/suite"

data/spec/modspec/conformance_class_spec.rb

@@ -11,12 +11,12 @@ RSpec.describe Modspec::ConformanceClass do
         Modspec::NormativeStatement.new(
           identifier: "/req/basic-ypr/position",
           name: "Expression of outer frame",
-          statement: "The `Basic_YPR.position` attribute shall represent the outer frame, specified by an implicit WGS-84 CRS and an implicit EPSG 4461-CS (LTP-ENU) coordinate system and explicit parameters to define the tangent point.",
+          statement: "The `Basic_YPR.position` attribute shall represent the outer frame.",
         ),
         Modspec::NormativeStatement.new(
           identifier: "/req/basic-ypr/angles",
           name: "Expression of inner frame",
-          statement: "The `Basic_YPR.angles` attribute shall represent the inner frame, which is a rotation-only transformation with Yaw, Pitch, and Roll (YPR) angles.",
+          statement: "The `Basic_YPR.angles` attribute shall represent the inner frame.",
         ),
       ],
     )
@@ -35,7 +35,7 @@ RSpec.describe Modspec::ConformanceClass do
           identifier: "/conf/basic-ypr/position",
           name: "Verify expression of outer frame",
           targets: ["/req/basic-ypr/position"],
-          description: "To confirm that an implementation of a Basic-YPR consists of an Outer Frame specified by an implicit WGS-84 CRS and an implicit EPSG 4461-CS (LTP-ENU) coordinate system and explicit parameters to define the tangent point.",
+          description: "To confirm outer frame.",
           purpose: "Verify that this requirement is satisfied.",
           test_method: "Inspection",
         ),
@@ -43,7 +43,7 @@ RSpec.describe Modspec::ConformanceClass do
           identifier: "/conf/basic-ypr/angles",
           name: "Verify expression of inner frame",
           targets: ["/req/basic-ypr/angles"],
-          description: "To confirm that the Inner Frame is expressed as a rotation-only transformation using Yaw, Pitch, and Roll angles.",
+          description: "To confirm inner frame.",
           purpose: "Verify that this requirement is satisfied.",
           test_method: "Inspection",
         ),
@@ -88,7 +88,7 @@ RSpec.describe Modspec::ConformanceClass do
           identifier: "/conf/global/sdu",
           name: "Verify SDU conformance",
           targets: ["/req/global/sdu"],
-          description: "To confirm that an implementation of an SDU conforms to the logical model.",
+          description: "To confirm SDU conformance.",
           purpose: "Verify that this requirement is satisfied.",
           test_method: "Inspection",
         ),
@@ -105,11 +105,10 @@ RSpec.describe Modspec::ConformanceClass do
           identifier: "/conf/tangent-point/height",
           name: "Verify tangent point height",
           targets: ["/req/tangent-point/height"],
-          description: "To confirm that an implementation of a Tangent Point specifies the height of the Tangent Point.",
+          description: "To confirm tangent point height.",
           purpose: "Verify that this requirement is satisfied.",
           test_method: "Inspection",
         ),
-
       ],
     )
   end
@@ -140,17 +139,25 @@ RSpec.describe Modspec::ConformanceClass do
   describe "#validate" do
     it "returns no errors for a valid conformance class" do
       errors = suite.validate
-      if errors.any?
-
-        errors.each { |error| }
-      end
       expect(errors).to be_empty
     end
 
     it "returns errors if there are no conformance tests" do
       conformance_class.tests = []
       errors = conformance_class.validate
-      expect(errors).not_to be_empty
+      expect(errors).to include(a_string_matching(/no child conformance tests/))
+    end
+
+    it "returns errors if test identifier does not share prefix" do
+      conformance_class.tests = [
+        Modspec::ConformanceTest.new(
+          identifier: "/conf/other/test",
+          name: "Mismatched test",
+          targets: ["/req/basic-ypr/position"],
+        ),
+      ]
+      errors = conformance_class.validate
+      expect(errors).to include(a_string_matching(/does not share the expected prefix/))
     end
   end
 end

data/spec/modspec/conformance_test_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Modspec::ConformanceTest do
     Modspec::NormativeStatement.new(
       identifier: "/req/basic-ypr/position",
       name: "Expression of outer frame",
-      statement: "The `Basic_YPR.position` attribute shall represent the outer frame, specified by an implicit WGS-84 CRS and an implicit EPSG 4461-CS (LTP-ENU) coordinate system and explicit parameters to define the tangent point.",
+      statement: "The `Basic_YPR.position` attribute shall represent the outer frame.",
     )
   end
 
@@ -22,7 +22,7 @@ RSpec.describe Modspec::ConformanceTest do
       identifier: "/conf/basic-ypr/position",
       name: "Verify expression of outer frame",
       targets: ["/req/basic-ypr/position"],
-      description: "To confirm that an implementation of a Basic-YPR consists of an Outer Frame specified by an implicit WGS-84 CRS and an implicit EPSG 4461-CS (LTP-ENU) coordinate system and explicit parameters to define the tangent point.",
+      description: "To confirm outer frame.",
       purpose: "Verify that this requirement is satisfied.",
       test_method: "Inspection",
     )
@@ -45,7 +45,7 @@ RSpec.describe Modspec::ConformanceTest do
   end
 
   before do
-    suite # Ensure the suite is created and relationships are set up
+    suite
   end
 
   it "has an identifier" do
@@ -65,6 +65,24 @@ RSpec.describe Modspec::ConformanceTest do
       errors = conformance_test.validate
       expect(errors).to be_empty
     end
+
+    it "returns errors when corresponding_requirements is nil" do
+      conformance_test.corresponding_requirements = nil
+      errors = conformance_test.validate
+      expect(errors).to include(a_string_matching(/no corresponding requirements/))
+    end
+
+    it "returns errors when corresponding_requirements is empty" do
+      conformance_test.corresponding_requirements = []
+      errors = conformance_test.validate
+      expect(errors).to include(a_string_matching(/no corresponding requirements/))
+    end
+
+    it "returns errors when parent_class is nil" do
+      conformance_test.parent_class = nil
+      errors = conformance_test.validate
+      expect(errors).to include(a_string_matching(/does not belong to its parent class/))
+    end
   end
 
   it "has a corresponding requirement" do

data/spec/modspec/normative_statements_class_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Modspec::NormativeStatementsClass do
     Modspec::NormativeStatement.new(
       identifier: "/req/basic-ypr/position",
       name: "Expression of outer frame",
-      statement: "The `Basic_YPR.position` attribute shall represent the outer frame, specified by an implicit WGS-84 CRS and an implicit EPSG 4461-CS (LTP-ENU) coordinate system and explicit parameters to define the tangent point.",
+      statement: "The `Basic_YPR.position` attribute shall represent the outer frame.",
     )
   end
 
@@ -13,7 +13,7 @@ RSpec.describe Modspec::NormativeStatementsClass do
     Modspec::NormativeStatement.new(
       identifier: "/req/basic-ypr/angles",
       name: "Expression of inner frame",
-      statement: "The `Basic_YPR.angles` attribute shall represent the inner frame, which is a rotation-only transformation with Yaw, Pitch, and Roll (YPR) angles.",
+      statement: "The `Basic_YPR.angles` attribute shall represent the inner frame.",
     )
   end
 
@@ -21,7 +21,7 @@ RSpec.describe Modspec::NormativeStatementsClass do
     described_class.new(
       identifier: "/req/basic-ypr",
       name: "Basic-YPR logical model SDU",
-      description: "The Basic-YPR Target has a simple structure with no options. Position is specified as a point in an LTP-ENU frame and rotation is specified by yaw, pitch, and roll angles specified in decimal degrees.",
+      description: "The Basic-YPR Target has a simple structure.",
       dependencies: ["/req/global", "/req/tangent-point"],
       normative_statements: [normative_statement1, normative_statement2],
     )
@@ -55,7 +55,19 @@ RSpec.describe Modspec::NormativeStatementsClass do
     it "returns errors if there are no normative statements" do
       normative_statements_class.normative_statements = []
       errors = normative_statements_class.validate
-      expect(errors).not_to be_empty
+      expect(errors).to include(a_string_matching(/no child requirements/))
+    end
+
+    it "returns errors if statement identifier does not share prefix" do
+      normative_statements_class.normative_statements = [
+        Modspec::NormativeStatement.new(
+          identifier: "/req/other/mismatch",
+          name: "Mismatched",
+          statement: "stmt",
+        ),
+      ]
+      errors = normative_statements_class.validate
+      expect(errors).to include(a_string_matching(/does not share the expected prefix/))
     end
   end
 end

data/spec/modspec/suite_spec.rb

@@ -38,12 +38,204 @@ RSpec.describe Modspec::Suite do
         .combine(frame_spec_suite)
 
       errors = combined_suite.validate
-      if errors.any?
-
-        errors.each { |error| }
-      end
       expect(errors).to be_empty
     end
+
+    it "detects duplicate identifiers" do
+      suite = described_class.new(
+        identifier: "/suite",
+        name: "Test",
+        normative_statements_classes: [
+          Modspec::NormativeStatementsClass.new(
+            identifier: "/req/test",
+            normative_statements: [
+              Modspec::NormativeStatement.new(identifier: "/req/test/a",
+                                              name: "A", statement: "a"),
+              Modspec::NormativeStatement.new(identifier: "/req/test/a",
+                                              name: "A2", statement: "a2"),
+            ],
+          ),
+        ],
+        conformance_classes: [],
+      )
+
+      errors = suite.validate
+      expect(errors).to include(a_string_matching(/Duplicate identifier/))
+    end
+
+    it "detects cross-type identifier collisions" do
+      suite = described_class.new(
+        identifier: "/suite",
+        name: "Test",
+        normative_statements_classes: [
+          Modspec::NormativeStatementsClass.new(
+            identifier: "/req/test",
+            normative_statements: [
+              Modspec::NormativeStatement.new(identifier: "/req/test/a",
+                                              name: "A", statement: "a"),
+            ],
+          ),
+        ],
+        conformance_classes: [
+          Modspec::ConformanceClass.new(
+            identifier: "/conf/test",
+            tests: [
+              Modspec::ConformanceTest.new(
+                identifier: "/req/test/a",
+                name: "CT collision",
+              ),
+            ],
+          ),
+        ],
+      )
+
+      errors = suite.validate
+      expect(errors).to include(a_string_matching(/Duplicate identifier.*\/req\/test\/a/))
+    end
+
+    it "detects dependency cycles" do
+      ns_a = Modspec::NormativeStatement.new(
+        identifier: "/req/test/a", name: "A", statement: "a",
+        dependencies: ["/req/test/b"]
+      )
+      ns_b = Modspec::NormativeStatement.new(
+        identifier: "/req/test/b", name: "B", statement: "b",
+        dependencies: ["/req/test/a"]
+      )
+
+      suite = described_class.new(
+        identifier: "/suite",
+        name: "Test",
+        normative_statements_classes: [
+          Modspec::NormativeStatementsClass.new(
+            identifier: "/req/test",
+            normative_statements: [ns_a, ns_b],
+          ),
+        ],
+        conformance_classes: [],
+      )
+
+      errors = suite.validate
+      expect(errors).to include(a_string_matching(/Cycle detected/))
+    end
+
+    it "detects invalid dependencies" do
+      suite = described_class.new(
+        identifier: "/suite",
+        name: "Test",
+        normative_statements_classes: [
+          Modspec::NormativeStatementsClass.new(
+            identifier: "/req/test",
+            dependencies: ["/req/nonexistent"],
+            normative_statements: [
+              Modspec::NormativeStatement.new(
+                identifier: "/req/test/a", name: "A", statement: "a",
+                dependencies: ["/req/missing"]
+              ),
+            ],
+          ),
+        ],
+        conformance_classes: [],
+      )
+
+      errors = suite.validate
+      expect(errors).to include(a_string_matching(/Invalid dependencies .* in \/req\/test\b/))
+      expect(errors).to include(a_string_matching(/Invalid dependencies .* in \/req\/test\/a/))
+    end
+
+    it "detects invalid conformance test targets" do
+      suite = described_class.new(
+        identifier: "/suite",
+        name: "Test",
+        normative_statements_classes: [
+          Modspec::NormativeStatementsClass.new(
+            identifier: "/req/test",
+            normative_statements: [
+              Modspec::NormativeStatement.new(identifier: "/req/test/a",
+                                              name: "A", statement: "a"),
+            ],
+          ),
+        ],
+        conformance_classes: [
+          Modspec::ConformanceClass.new(
+            identifier: "/conf/test",
+            tests: [
+              Modspec::ConformanceTest.new(
+                identifier: "/conf/test/a",
+                name: "CT-A",
+                targets: ["/req/nonexistent"],
+              ),
+            ],
+          ),
+        ],
+      )
+
+      errors = suite.validate
+      expect(errors).to include(a_string_matching(/Invalid targets .* in \/conf\/test\/a/))
+    end
+
+    it "detects invalid indirect_dependency references" do
+      suite = described_class.new(
+        identifier: "/suite",
+        name: "Test",
+        normative_statements_classes: [
+          Modspec::NormativeStatementsClass.new(
+            identifier: "/req/test",
+            normative_statements: [
+              Modspec::NormativeStatement.new(
+                identifier: "/req/test/a", name: "A", statement: "a",
+                indirect_dependency: ["/req/ghost"]
+              ),
+            ],
+          ),
+        ],
+        conformance_classes: [],
+      )
+
+      errors = suite.validate
+      expect(errors).to include(a_string_matching(/indirect dependency.*in \/req\/test\/a/))
+    end
+
+    it "detects invalid implements references" do
+      suite = described_class.new(
+        identifier: "/suite",
+        name: "Test",
+        normative_statements_classes: [
+          Modspec::NormativeStatementsClass.new(
+            identifier: "/req/test",
+            implements: ["/req/phantom"],
+            normative_statements: [],
+          ),
+        ],
+        conformance_classes: [],
+      )
+
+      errors = suite.validate
+      expect(errors).to include(a_string_matching(/implements.*in \/req\/test/))
+    end
+
+    it "detects invalid conformance test dependencies" do
+      suite = described_class.new(
+        identifier: "/suite",
+        name: "Test",
+        normative_statements_classes: [],
+        conformance_classes: [
+          Modspec::ConformanceClass.new(
+            identifier: "/conf/test",
+            tests: [
+              Modspec::ConformanceTest.new(
+                identifier: "/conf/test/a",
+                name: "CT-A",
+                dependencies: ["/conf/nonexistent"],
+              ),
+            ],
+          ),
+        ],
+      )
+
+      errors = suite.validate
+      expect(errors).to include(a_string_matching(/Invalid dependencies .* in \/conf\/test\/a/))
+    end
   end
 
   describe "#combine" do
@@ -63,6 +255,16 @@ RSpec.describe Modspec::Suite do
       )
     end
 
+    it "raises ArgumentError for non-Suite argument" do
+      expect { suite1.combine("not a suite") }.to raise_error(ArgumentError)
+    end
+
+    it "deduplicates by identifier" do
+      combined = suite1.combine(suite1)
+      nsc_count = combined.normative_statements_classes.count
+      expect(nsc_count).to eq(suite1.normative_statements_classes.count)
+    end
+
     it "resolves conflicts when combining suites" do
       combined_suite = suite1
         .combine(suite2)
@@ -72,10 +274,6 @@ RSpec.describe Modspec::Suite do
         .combine(frame_spec_suite)
 
       errors = combined_suite.validate
-      if errors.any?
-
-        errors.each { |error|  }
-      end
       expect(errors).to be_empty
     end
   end
@@ -89,25 +287,212 @@ RSpec.describe Modspec::Suite do
       expect(combined_suite).to be_a(described_class)
       expect(combined_suite.name).to eq("Combined Suite")
 
-      # Ensure the combined suite has content
       expect(combined_suite.normative_statements_classes).not_to be_empty
       expect(combined_suite.conformance_classes).not_to be_empty
 
-      # Validate the combined suite
       errors = combined_suite.validate
+      expect(errors).not_to include(a_string_matching(/has no corresponding requirement/))
+      expect(errors).not_to include(a_string_matching(/Cycle detected/))
+      expect(errors).not_to include(a_string_matching(/has an invalid dependency/))
+      expect(errors).to be_empty
+    end
+  end
+
+  describe "#setup_relationships" do
+    it "links conformance tests to their target normative statements" do
+      suite = described_class.new(
+        identifier: "/suite",
+        name: "Test",
+        normative_statements_classes: [
+          Modspec::NormativeStatementsClass.new(
+            identifier: "/req/test",
+            normative_statements: [
+              Modspec::NormativeStatement.new(identifier: "/req/test/a",
+                                              name: "A", statement: "a"),
+            ],
+          ),
+        ],
+        conformance_classes: [
+          Modspec::ConformanceClass.new(
+            identifier: "/conf/test",
+            tests: [
+              Modspec::ConformanceTest.new(
+                identifier: "/conf/test/a",
+                name: "CT-A",
+                targets: ["/req/test/a"],
+              ),
+            ],
+          ),
+        ],
+      )
 
-      if errors.any?
+      suite.setup_relationships
+      ct = suite.conformance_classes.first.tests.first
+      expect(ct.corresponding_requirements.map(&:identifier)).to eq(["/req/test/a"])
+      expect(ct.parent_class).to eq(suite.conformance_classes.first)
+    end
 
-        errors.each { |error|  }
-      end
+    it "handles missing target gracefully (no matching requirement)" do
+      suite = described_class.new(
+        identifier: "/suite",
+        name: "Test",
+        normative_statements_classes: [
+          Modspec::NormativeStatementsClass.new(
+            identifier: "/req/test",
+            normative_statements: [
+              Modspec::NormativeStatement.new(identifier: "/req/test/a",
+                                              name: "A", statement: "a"),
+            ],
+          ),
+        ],
+        conformance_classes: [
+          Modspec::ConformanceClass.new(
+            identifier: "/conf/test",
+            tests: [
+              Modspec::ConformanceTest.new(
+                identifier: "/conf/test/a",
+                name: "CT-A",
+                targets: ["/req/test/missing"],
+              ),
+            ],
+          ),
+        ],
+      )
 
-      # Check for specific error types
-      expect(errors).not_to include(a_string_matching(/Conformance test .* has no corresponding requirement/))
-      expect(errors).not_to include(a_string_matching(/Cycle detected/))
-      expect(errors).not_to include(a_string_matching(/Requirement .* has an invalid dependency/))
+      suite.setup_relationships
+      ct = suite.conformance_classes.first.tests.first
+      expect(ct.corresponding_requirements).to be_empty
+    end
 
-      # If there are still errors, they should be of a different nature
-      expect(errors).to be_empty
+    it "returns early when conformance_classes is nil" do
+      suite = described_class.new(
+        identifier: "/suite",
+        name: "Test",
+        normative_statements_classes: [
+          Modspec::NormativeStatementsClass.new(
+            identifier: "/req/test",
+            normative_statements: [],
+          ),
+        ],
+        conformance_classes: nil,
+      )
+
+      expect { suite.setup_relationships }.not_to raise_error
+    end
+  end
+
+  describe "#resolve_conflicts" do
+    let(:nsc_with_data) do
+      Modspec::NormativeStatementsClass.new(
+        identifier: "/req/test",
+        name: "Original",
+        description: "First description",
+        normative_statements: [
+          Modspec::NormativeStatement.new(identifier: "/req/test/a",
+                                          name: "A", statement: "a"),
+        ],
+      )
+    end
+
+    let(:nsc_partial) do
+      Modspec::NormativeStatementsClass.new(
+        identifier: "/req/test",
+        name: "Original",
+        description: "Second description",
+        subject: "Added subject",
+        normative_statements: [],
+      )
+    end
+
+    let(:nsc_other) do
+      Modspec::NormativeStatementsClass.new(
+        identifier: "/req/test2",
+        name: "Two",
+        normative_statements: [
+          Modspec::NormativeStatement.new(identifier: "/req/test2/b",
+                                          name: "B", statement: "b"),
+        ],
+      )
+    end
+
+    it "merges attributes of items with matching identifiers" do
+      suite1 = described_class.new(
+        identifier: "/suite", name: "Test1",
+        normative_statements_classes: [nsc_with_data],
+        conformance_classes: []
+      )
+      suite2 = described_class.new(
+        identifier: "/suite", name: "Test2",
+        normative_statements_classes: [nsc_partial],
+        conformance_classes: []
+      )
+
+      suite1.resolve_conflicts(suite2)
+      nsc = suite1.normative_statements_classes.first
+      expect(nsc.description).to eq("First description")
+      expect(nsc.subject).to eq("Added subject")
+    end
+
+    it "appends items with new identifiers" do
+      suite1 = described_class.new(
+        identifier: "/suite", name: "Test1",
+        normative_statements_classes: [nsc_with_data],
+        conformance_classes: []
+      )
+      suite2 = described_class.new(
+        identifier: "/suite", name: "Test2",
+        normative_statements_classes: [nsc_other],
+        conformance_classes: []
+      )
+
+      suite1.resolve_conflicts(suite2)
+      expect(suite1.normative_statements_classes.map(&:identifier)).to eq(
+        ["/req/test", "/req/test2"],
+      )
+    end
+  end
+
+  describe "YAML round-trip" do
+    it "serializes and deserializes a normative statements class" do
+      original = described_class.from_yaml(rc_yaml)
+      yaml_out = original.to_yaml
+      round_tripped = described_class.from_yaml(yaml_out)
+
+      expect(round_tripped.identifier).to eq(original.identifier)
+      expect(round_tripped.name).to eq(original.name)
+      expect(round_tripped.normative_statements_classes.count).to eq(
+        original.normative_statements_classes.count,
+      )
+    end
+
+    it "serializes and deserializes a conformance class" do
+      original = described_class.from_yaml(cc_yaml)
+      yaml_out = original.to_yaml
+      round_tripped = described_class.from_yaml(yaml_out)
+
+      expect(round_tripped.identifier).to eq(original.identifier)
+      expect(round_tripped.conformance_classes.count).to eq(
+        original.conformance_classes.count,
+      )
+    end
+  end
+
+  describe "JSON round-trip" do
+    let(:json_rc) { File.read("spec/fixtures/basic-ypr-json-rc.yaml") }
+    let(:json_cc) { File.read("spec/fixtures/basic-ypr-json-cc.yaml") }
+
+    it "parses JSON-format YAML fixtures" do
+      suite = described_class.from_yaml(json_rc)
+      expect(suite.normative_statements_classes).not_to be_empty
+    end
+
+    it "round-trips through JSON serialization" do
+      original = described_class.from_yaml(rc_yaml)
+      json_out = original.to_json
+      round_tripped = described_class.from_json(json_out)
+
+      expect(round_tripped.identifier).to eq(original.identifier)
+      expect(round_tripped.name).to eq(original.name)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modspec
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-05 00:00:00.000000000 Z
+date: 2026-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -71,6 +71,7 @@ files:
 - README.adoc
 - Rakefile
 - lib/modspec.rb
+- lib/modspec/child_container.rb
 - lib/modspec/conformance_class.rb
 - lib/modspec/conformance_test.rb
 - lib/modspec/identifier.rb