modspec 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cd4badc4f810933f2fec27871086eefcc0158e211e13330fb254c6c6b434eb0
-  data.tar.gz: b43653c35d01208efe9fb99114397488428904549deb1a10db84394b9bdd1b0a
+  metadata.gz: c39d089400518c8882fa0cfc55582fa27cd73c9358faf2224aeb5535a238fc55
+  data.tar.gz: c7b5fcf2a9c36ab12751ac964b6d95528a21330228872c75851bdf2211a8d885
 SHA512:
-  metadata.gz: 2767799e906ee065a3df1eb05b74f53acb839a0e34e37ed70a1a1418a0f80bdfc0de90e0b3155a958da6f5f35dfcb090c06657e882e17f4f86b0c72b4f42a293
-  data.tar.gz: '08f9a6974ea4726b0d062338f0e687c8c99a74494ff4a62f56b481c01bd72aa62fda8ef164840d1acef0d5b178e3cc9a4f59d51d137cba9cad10280e559d8b03'
+  metadata.gz: d8e4371eea18c40f1b660841ff6d1723b8a8536acd248a65d87d6d4526bba35ea0b00970e7199bdeaee51114c1cd214233859c2265d1f43fb742831f19c71568
+  data.tar.gz: 7f6f7f555aaa1ce91e300240ce57f37e69d77e1fb4f1ff0fb020e8afc69c195c3a287f2540bbcce31019481915a2fb2d1ba748670f1c9f6ce622eb6d4b720e58

data/Gemfile

@@ -9,3 +9,4 @@ gem "equivalent-xml"
 gem "pry"
 gem "rake"
 gem "rspec"
+gem "rubocop"

data/lib/modspec/conformance_class.rb

@@ -42,7 +42,7 @@ module Modspec
     private
 
     def validate_class_children_mapping
-      if tests.empty?
+      if tests.nil? || tests.empty?
         ["Conformance class #{identifier} has no child conformance tests"]
       else
         []
@@ -52,8 +52,10 @@ module Modspec
     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)
+      if tests
+        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
       end
       errors
     end

data/lib/modspec/conformance_test.rb

@@ -46,7 +46,7 @@ module Modspec
     private
 
     def validate_requirement_mapping
-      if corresponding_requirements.empty?
+      if corresponding_requirements.nil? || corresponding_requirements.empty?
         ["Conformance test #{identifier} has no corresponding requirements"]
       else
         []
@@ -54,7 +54,7 @@ module Modspec
     end
 
     def validate_class_mapping
-      if parent_class.nil? || !parent_class.tests.include?(self)
+      if parent_class.nil? || parent_class.tests.nil? || !parent_class.tests.include?(self)
         ["Conformance test #{identifier} does not belong to its parent class"]
       else
         []

data/lib/modspec/normative_statement.rb

@@ -55,9 +55,16 @@ module Modspec
 
     private
 
+    def all_dependencies
+      (
+        (dependencies || []) +
+        (indirect_dependency || []) +
+        (implements || [])
+      ).flatten.compact
+    end
+
     def validate_dependencies(suite)
       errors = []
-      all_dependencies = (dependencies + indirect_dependency + implements).flatten.compact.map(&:to_s)
       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)

data/lib/modspec/normative_statements_class.rb

@@ -42,16 +42,16 @@ module Modspec
     private
 
     def validate_identifier_prefix
-      errors = []
+      return [] if normative_statements.nil? || normative_statements.empty?
+
       expected_prefix = "#{identifier}/"
-      normative_statements.each do |statement|
+      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
-      errors
     end
 
     def validate_class_children_mapping
-      if normative_statements.empty?
+      if normative_statements.nil? || normative_statements.empty?
         ["Requirement class #{identifier} has no child requirements"]
       else
         []

data/lib/modspec/suite.rb

@@ -20,12 +20,12 @@ module Modspec
     def validate
       setup_relationships
       self.all_identifiers = nil
-      errors = super()
+      errors = super
       errors.concat(validate_cycles)
       errors.concat(validate_label_uniqueness)
       errors.concat(validate_dependencies)
-      errors.concat(normative_statements_classes.flat_map { |n| n.validate(self) })
-      errors.concat(conformance_classes.flat_map(&:validate))
+      errors.concat(normative_statements_classes.flat_map { |n| n.validate(self) }) unless normative_statements_classes.nil?
+      errors.concat(conformance_classes.flat_map(&:validate)) unless conformance_classes.nil?
       errors
     end
 
@@ -34,12 +34,20 @@ module Modspec
 
       combined_suite = dup
       combined_suite.all_identifiers = nil
-      combined_suite.normative_statements_classes += other_suite.normative_statements_classes
-      combined_suite.conformance_classes += other_suite.conformance_classes
+      if other_suite.normative_statements_classes
+        combined_suite.normative_statements_classes ||= []
+        combined_suite.normative_statements_classes += other_suite.normative_statements_classes
+      end
+
+      if other_suite.conformance_classes
+        combined_suite.conformance_classes ||= []
+        combined_suite.conformance_classes += other_suite.conformance_classes
+      end
 
       # Ensure uniqueness of identifiers
-      combined_suite.normative_statements_classes.uniq!(&:identifier)
-      combined_suite.conformance_classes.uniq!(&:identifier)
+      combined_suite.normative_statements_classes.uniq!(&:identifier) if combined_suite.normative_statements_classes
+
+      combined_suite.conformance_classes.uniq!(&:identifier) if combined_suite.conformance_classes
 
       combined_suite.name = "#{name} + #{other_suite.name}"
 
@@ -47,10 +55,15 @@ module Modspec
     end
 
     def all_identifiers
-      @all_identifiers ||= (normative_statements_classes.flat_map(&:normative_statements) +
-                            conformance_classes.flat_map(&:tests) +
-                            normative_statements_classes +
-                            conformance_classes).map(&:identifier)
+      return @all_identifiers if @all_identifiers
+
+      nsc = normative_statements_classes || []
+      cc = conformance_classes || []
+
+      @all_identifiers = (nsc.flat_map(&:normative_statements) +
+              cc.flat_map(&:tests) +
+              nsc +
+              cc).map(&:identifier)
     end
 
     attr_writer :all_identifiers
@@ -71,7 +84,13 @@ module Modspec
     end
 
     def setup_relationships
-      all_requirements = normative_statements_classes.flat_map(&:normative_statements)
+      all_requirements = if normative_statements_classes
+                           normative_statements_classes.flat_map(&:normative_statements)
+                         else
+                           []
+                         end
+
+      return unless conformance_classes
 
       conformance_classes.each do |cc|
         cc.tests.each do |ct|
@@ -86,6 +105,8 @@ module Modspec
     private
 
     def resolve_conflicts_for(self_collection, other_collection)
+      return if self_collection.nil? || other_collection.nil?
+
       other_collection.each do |other_item|
         existing_item = self_collection.find { |item| item.identifier == other_item.identifier }
         if existing_item
@@ -115,18 +136,36 @@ 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
+    end
+
     def build_dependency_graph
       graph = {}
-      all_statements = normative_statements_classes.flat_map(&:normative_statements) +
-                       conformance_classes.flat_map(&:tests)
 
       all_statements.each do |statement|
         id = statement.identifier.to_s
         graph[id] = Set.new
-        graph[id].merge(statement.dependencies.map(&:to_s)) if statement.respond_to?(:dependencies)
-        graph[id].merge(statement.indirect_dependency.map(&:to_s)) if statement.respond_to?(:indirect_dependency)
-        graph[id].merge(statement.implements.map(&:to_s)) if statement.respond_to?(:implements)
-        graph[id].merge(statement.targets.map(&:to_s)) if statement.respond_to?(:targets)
+
+        # Define all dependency-like properties to check
+        dependency_properties = %i[dependencies indirect_dependency implements targets]
+
+        dependency_properties.each do |property|
+          graph[id].merge(statement.send(property).map(&:to_s)) if statement.respond_to?(property) && !statement.send(property).nil?
+        end
       end
 
       graph
@@ -175,8 +214,6 @@ module Modspec
     def validate_label_uniqueness
       labels = {}
       errors = []
-      all_statements = normative_statements_classes.flat_map(&:normative_statements) +
-                       conformance_classes.flat_map(&:tests)
       all_statements.each do |statement|
         if labels[statement.identifier]
           errors << "Duplicate identifier found: #{statement.identifier}"
@@ -191,17 +228,21 @@ module Modspec
       all_identifiers = collect_all_identifiers
 
       errors = []
-      normative_statements_classes.each do |nsc|
-        errors.concat(validate_class_dependencies(nsc, all_identifiers))
-        nsc.normative_statements.each do |ns|
-          errors.concat(validate_statement_dependencies(ns, all_identifiers))
+      if normative_statements_classes
+        normative_statements_classes.each do |nsc|
+          errors.concat(validate_class_dependencies(nsc, all_identifiers))
+          nsc.normative_statements.each do |ns|
+            errors.concat(validate_statement_dependencies(ns, all_identifiers))
+          end
         end
       end
 
-      conformance_classes.each do |cc|
-        errors.concat(validate_class_dependencies(cc, all_identifiers))
-        cc.tests.each do |ct|
-          errors.concat(validate_test_targets(ct, all_identifiers))
+      if conformance_classes
+        conformance_classes.each do |cc|
+          errors.concat(validate_class_dependencies(cc, all_identifiers))
+          cc.tests.each do |ct|
+            errors.concat(validate_test_targets(ct, all_identifiers))
+          end
         end
       end
 
@@ -211,17 +252,21 @@ module Modspec
     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
+      if normative_statements_classes
+        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
       end
 
-      conformance_classes.each do |cc|
-        identifiers[cc.identifier.to_s] = cc
-        cc.tests.each do |ct|
-          identifiers[ct.identifier.to_s] = ct
+      if conformance_classes
+        conformance_classes.each do |cc|
+          identifiers[cc.identifier.to_s] = cc
+          cc.tests.each do |ct|
+            identifiers[ct.identifier.to_s] = ct
+          end
         end
       end
 

data/lib/modspec/version.rb

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

data/modspec.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "lutaml-model", "~> 0.6"
+  spec.add_dependency "lutaml-model", "~>0.7"
   spec.add_dependency "nokogiri"
   spec.add_dependency "toml-rb"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modspec
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-28 00:00:00.000000000 Z
+date: 2025-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Library to work with OGC ModSpec.