ea 0.5.0 → 0.5.2

data/lib/ea/ocl/evaluator.rb

@@ -17,6 +17,9 @@ module Ea
         when Nodes::StringMatches then eval_string_matches(ast, context)
         when Nodes::CollectionExists then eval_exists(ast, context)
         when Nodes::CollectionForAll then eval_for_all(ast, context)
+        when Nodes::CollectionSize then eval_size(ast, context)
+        when Nodes::CollectionIsEmpty then eval_is_empty(ast, context)
+        when Nodes::Comparison then eval_comparison(ast, context)
         when Nodes::BinaryOp then eval_binary(ast, context)
         when Nodes::UnaryOp then eval_unary(ast, context)
         else
@@ -38,7 +41,7 @@ module Ea
 
       def eval_exists(ast, context)
         collection = evaluate(ast.collection, context)
-        return false unless collection.respond_to?(:each)
+        return false unless collection.is_a?(Array)
 
         var_name = ast.var
         predicate = ast.predicate
@@ -49,7 +52,7 @@ module Ea
 
       def eval_for_all(ast, context)
         collection = evaluate(ast.collection, context)
-        return true unless collection.respond_to?(:each)
+        return true unless collection.is_a?(Array)
 
         var_name = ast.var
         predicate = ast.predicate
@@ -58,6 +61,40 @@ module Ea
         end
       end
 
+      def eval_size(ast, context)
+        collection = evaluate(ast.collection, context)
+        return 0 unless collection.respond_to?(:size)
+
+        collection.size
+      end
+
+      def eval_is_empty(ast, context)
+        collection = evaluate(ast.collection, context)
+        return true unless collection.respond_to?(:empty?)
+
+        collection.empty?
+      end
+
+      def eval_comparison(ast, context)
+        left = evaluate(ast.left, context)
+        right = evaluate(ast.right, context)
+        unless left.is_a?(Numeric) && right.is_a?(Numeric)
+          raise UnsupportedError,
+                "Comparison requires numeric operands: #{ast.op} on #{left.inspect}, #{right.inspect}"
+        end
+
+        case ast.op
+        when ">"  then left > right
+        when "<"  then left < right
+        when ">=" then left >= right
+        when "<=" then left <= right
+        when "="  then left == right
+        when "==" then left == right
+        when "!=" then left != right
+        else raise UnsupportedError, "Unknown comparison op: #{ast.op}"
+        end
+      end
+
       def eval_binary(ast, context)
         left = evaluate(ast.left, context)
         right = evaluate(ast.right, context)

data/lib/ea/ocl/nodes.rb

@@ -25,6 +25,15 @@ module Ea
       # `<a> and <b>`, `<a> or <b>`, `not <a>`
       BinaryOp = Struct.new(:op, :left, :right, keyword_init: true)
       UnaryOp = Struct.new(:op, :operand, keyword_init: true)
+
+      # `<collection>->size()` — returns integer cardinality.
+      CollectionSize = Struct.new(:collection, keyword_init: true)
+
+      # `<collection>->isEmpty()` — returns boolean.
+      CollectionIsEmpty = Struct.new(:collection, keyword_init: true)
+
+      # `<a> op <b>` where op ∈ {>, <, >=, <=, =, ==, !=}.
+      Comparison = Struct.new(:op, :left, :right, keyword_init: true)
     end
   end
 end

data/lib/ea/ocl/parser.rb

@@ -33,7 +33,7 @@ module Ea
       end
 
       # Parse one expression. Returns a single AST node.
-      def parse_expression(source)
+      def parse_expression(source) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
         s = source.strip
 
         # Strip outer parens
@@ -45,7 +45,14 @@ module Ea
                                     operand: parse_expression(s[4..]))
         end
 
-        # 'and' / 'or' at top level (find the operator not inside parens)
+        # 'and' / 'or' / comparison ops — comparison has higher
+        # precedence than logical, so check it first.
+        if (split = split_on_comparison_op(s))
+          op, left, right = split
+          return Nodes::Comparison.new(op: op,
+                                       left: parse_expression(left),
+                                       right: parse_expression(right))
+        end
         if (split = split_on_logical_op(s))
           op, left, right = split
           return Nodes::BinaryOp.new(op: op,
@@ -58,6 +65,16 @@ module Ea
           return collection_node(m[2].to_sym, m[1], m[3], m[4])
         end
 
+        # Collection ->size() — integer cardinality
+        if (m = s.match(/^(.+?)->size\(\)\z/))
+          return Nodes::CollectionSize.new(collection: parse_expression(m[1]))
+        end
+
+        # Collection ->isEmpty() — boolean
+        if (m = s.match(/^(.+?)->isEmpty\(\)\z/))
+          return Nodes::CollectionIsEmpty.new(collection: parse_expression(m[1]))
+        end
+
         # String.matches('regex')
         if (m = s.match(/^(.+?)\.matches\(\s*['"](.+?)['"]\s*\)\z/))
           return Nodes::StringMatches.new(string: parse_expression(m[1]),
@@ -99,7 +116,6 @@ module Ea
       # Find the topmost ` and ` or ` or ` outside of parens.
       # Returns [op, left_str, right_str] or nil.
       def split_on_logical_op(source)
-        depth = 0
         # Look for ' or ' first (lower precedence than 'and' in OCL?)
         # Actually OCL: 'or' < 'xor' < 'and' < 'implies'. We pick the
         # rightmost top-level operator (left-associative).
@@ -113,6 +129,45 @@ module Ea
         nil
       end
 
+      # Split on top-level comparison operator (>, <, >=, <=, =, ==, !=).
+      # Comparison has higher precedence than and/or, so we split here
+      # BEFORE calling split_on_logical_op.
+      def split_on_comparison_op(source)
+        %w[>= <= == != = > <].each do |op|
+          # Need to be careful with `>=` vs `>`: scan in order so
+          # multi-char operators are detected first.
+          idx = find_top_level_op(source, op)
+          next unless idx
+
+          return [op, source[0...idx], source[(idx + op.length)..]]
+        end
+        nil
+      end
+
+      def find_top_level_op(source, op) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+        depth = 0
+        i = 0
+        while i < source.length
+          c = source[i]
+          depth += 1 if c == "("
+          depth -= 1 if c == ")"
+          if depth.zero? && source[i, op.length] == op
+            # Each `next` clause below MUST fall through to `i += 1`
+            # at the loop's tail — using `next` here would skip the
+            # increment and infinite-loop on the same matching char.
+            should_skip =
+              (op == ">" && source[i + 1, 1] == "=") || # >= matches as >
+              (op == "<" && source[i + 1, 1] == "=") || # <= matches as <
+              (op == "=" && source[i + 1, 1] == "=") || # == matches as =
+              (op == ">" && source[i - 1, 1] == "-") || # -> arrow
+              (op == "<" && source[i - 1, 1] == "-") # <- arrow
+            return i unless should_skip
+          end
+          i += 1
+        end
+        nil
+      end
+
       # Find substring at depth 0 (not inside parens).
       def find_top_level(source, substring)
         depth = 0
@@ -121,9 +176,8 @@ module Ea
           c = source[i]
           depth += 1 if c == "("
           depth -= 1 if c == ")"
-          if depth.zero? && source[i, substring.length] == substring
-            return i
-          end
+          return i if depth.zero? && source[i, substring.length] == substring
+
           i += 1
         end
         nil

data/lib/ea/qea/models/ea_implement.rb

@@ -6,7 +6,7 @@ module Ea
       # UML-to-code mapping hint from t_implement.
       class EaImplement < BaseModel
         attribute :implement_id, :integer
-        attribute :object_id, :integer
+        attribute :ea_object_id, :integer
         attribute :language, :string
         attribute :code, :string
 
@@ -20,7 +20,7 @@ module Ea
 
         COLUMN_MAP = {
           "ImplementID" => :implement_id,
-          "Object_ID" => :object_id
+          "Object_ID" => :ea_object_id
         }.freeze
 
         def self.column_map

data/lib/ea/qea/models/ea_object_effort.rb

@@ -6,7 +6,7 @@ module Ea
       # Effort estimate from t_objecteffort.
       class EaObjectEffort < BaseModel
         attribute :object_effort_id, :integer
-        attribute :object_id, :integer
+        attribute :ea_object_id, :integer
         attribute :effort, :string
         attribute :effort_type, :string
         attribute :notes, :string
@@ -21,7 +21,7 @@ module Ea
 
         COLUMN_MAP = {
           "ObjectEffortID" => :object_effort_id,
-          "Object_ID" => :object_id,
+          "Object_ID" => :ea_object_id,
           "EffortType" => :effort_type
         }.freeze
 

data/lib/ea/qea/models/ea_object_problem.rb

@@ -6,7 +6,7 @@ module Ea
       # Object problem record from t_objectproblems.
       class EaObjectProblem < BaseModel
         attribute :object_problem_id, :integer
-        attribute :object_id, :integer
+        attribute :ea_object_id, :integer
         attribute :problem, :string
         attribute :problem_type, :string
         attribute :date_resolved, :string
@@ -23,7 +23,7 @@ module Ea
 
         COLUMN_MAP = {
           "ObjectProblemID" => :object_problem_id,
-          "Object_ID" => :object_id,
+          "Object_ID" => :ea_object_id,
           "ProblemType" => :problem_type,
           "DateResolved" => :date_resolved
         }.freeze

data/lib/ea/qea/models/ea_object_require.rb

@@ -6,7 +6,7 @@ module Ea
       # Requirement trace from t_objectrequires.
       class EaObjectRequire < BaseModel
         attribute :object_require_id, :integer
-        attribute :object_id, :integer
+        attribute :ea_object_id, :integer
         attribute :requirement, :string
         attribute :requirement_type, :string
         attribute :notes, :string
@@ -21,7 +21,7 @@ module Ea
 
         COLUMN_MAP = {
           "ObjectReqID" => :object_require_id,
-          "Object_ID" => :object_id,
+          "Object_ID" => :ea_object_id,
           "ReqType" => :requirement_type
         }.freeze
 

data/lib/ea/qea/models/ea_object_resource.rb

@@ -6,7 +6,7 @@ module Ea
       # Resource allocation from t_objectresource.
       class EaObjectResource < BaseModel
         attribute :object_resource_id, :integer
-        attribute :object_id, :integer
+        attribute :ea_object_id, :integer
         attribute :resource, :string
         attribute :role, :string
         attribute :time_allocated, :string
@@ -22,7 +22,7 @@ module Ea
 
         COLUMN_MAP = {
           "ObjectResourceID" => :object_resource_id,
-          "Object_ID" => :object_id
+          "Object_ID" => :ea_object_id
         }.freeze
 
         def self.column_map

data/lib/ea/qea/models/ea_object_risk.rb

@@ -6,7 +6,7 @@ module Ea
       # Risk register entry from t_objectrisks.
       class EaObjectRisk < BaseModel
         attribute :object_risk_id, :integer
-        attribute :object_id, :integer
+        attribute :ea_object_id, :integer
         attribute :risk, :string
         attribute :risk_type, :string
         attribute :notes, :string
@@ -21,7 +21,7 @@ module Ea
 
         COLUMN_MAP = {
           "ObjectRiskID" => :object_risk_id,
-          "Object_ID" => :object_id,
+          "Object_ID" => :ea_object_id,
           "RiskType" => :risk_type
         }.freeze
 

data/lib/ea/qea/models/ea_object_scenario.rb

@@ -6,7 +6,7 @@ module Ea
       # Use case scenario from t_objectscenarios.
       class EaObjectScenario < BaseModel
         attribute :object_scenario_id, :integer
-        attribute :object_id, :integer
+        attribute :ea_object_id, :integer
         attribute :scenario, :string
         attribute :scenario_type, :string
         attribute :notes, :string
@@ -21,7 +21,7 @@ module Ea
 
         COLUMN_MAP = {
           "ObjectScenarioID" => :object_scenario_id,
-          "Object_ID" => :object_id,
+          "Object_ID" => :ea_object_id,
           "ScenarioType" => :scenario_type
         }.freeze
 

data/lib/ea/qea/models/ea_object_test.rb

@@ -6,7 +6,7 @@ module Ea
       # Test case from t_objecttests.
       class EaObjectTest < BaseModel
         attribute :object_test_id, :integer
-        attribute :object_id, :integer
+        attribute :ea_object_id, :integer
         attribute :test, :string
         attribute :test_type, :string
         attribute :status, :string
@@ -22,7 +22,7 @@ module Ea
 
         COLUMN_MAP = {
           "ObjectTestID" => :object_test_id,
-          "Object_ID" => :object_id,
+          "Object_ID" => :ea_object_id,
           "TestType" => :test_type
         }.freeze
 

data/lib/ea/qea/models/ea_object_trx.rb

@@ -6,7 +6,7 @@ module Ea
       # Transaction record from t_objecttrx.
       class EaObjectTrx < BaseModel
         attribute :object_trx_id, :integer
-        attribute :object_id, :integer
+        attribute :ea_object_id, :integer
         attribute :trx, :string
         attribute :trx_type, :string
         attribute :notes, :string
@@ -21,7 +21,7 @@ module Ea
 
         COLUMN_MAP = {
           "ObjectTrxID" => :object_trx_id,
-          "Object_ID" => :object_id,
+          "Object_ID" => :ea_object_id,
           "TrxType" => :trx_type
         }.freeze
 

data/lib/ea/qea/models/ea_palette_item.rb

@@ -7,7 +7,7 @@ module Ea
       # entry to its visual icon and default toolbox slot.
       class EaPaletteItem < BaseModel
         attribute :palette_id, :string
-        attribute :object_id, :integer
+        attribute :ea_object_id, :integer
         attribute :name, :string
         attribute :alias, :string
         attribute :image_id, :integer
@@ -23,7 +23,7 @@ module Ea
 
         COLUMN_MAP = {
           "PaletteID" => :palette_id,
-          "Object_ID" => :object_id,
+          "Object_ID" => :ea_object_id,
           "Image_ID" => :image_id
         }.freeze
 

data/lib/ea/qea/models/ea_role_constraint.rb

@@ -6,7 +6,7 @@ module Ea
       # Role-based constraint from t_roleconstraint.
       class EaRoleConstraint < BaseModel
         attribute :roleconstraint_id, :integer
-        attribute :object_id, :integer
+        attribute :ea_object_id, :integer
         attribute :role, :string
         attribute :notes, :string
 
@@ -20,7 +20,7 @@ module Ea
 
         COLUMN_MAP = {
           "RoleConstraintID" => :roleconstraint_id,
-          "Object_ID" => :object_id
+          "Object_ID" => :ea_object_id
         }.freeze
 
         def self.column_map

data/lib/ea/qea/models/ea_secrypt.rb

@@ -7,7 +7,7 @@ module Ea
       # the QEA are encrypted and what algorithm was used.
       class EaSecrypt < BaseModel
         attribute :secrypt_id, :integer
-        attribute :object_id, :integer
+        attribute :ea_object_id, :integer
         attribute :encrypt, :string
         attribute :password_hash, :string
 
@@ -21,7 +21,7 @@ module Ea
 
         COLUMN_MAP = {
           "SecryptID" => :secrypt_id,
-          "Object_ID" => :object_id,
+          "Object_ID" => :ea_object_id,
           "PasswordHash" => :password_hash
         }.freeze
 

data/lib/ea/qea/validation/database/ocl_constraint_validator.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module Ea
+  module Qea
+    module Validation
+      # Evaluates OCL invariants stored in t_objectconstraint.
+      # For each constraint, parse its OCL expression via
+      # Ea::Ocl::Parser and evaluate it against the owning
+      # object's attribute values. Failures surface as :warning
+      # messages — OCL failures aren't structural errors.
+      class OclConstraintValidator < BaseValidator
+        def validate
+          constraints = database.collections[:object_constraints] || []
+          constraints.each { |c| check_constraint(c) }
+        end
+
+        private
+
+        def check_constraint(constraint)
+          owner = owner_for(constraint)
+          return unless owner
+
+          ast = parse(constraint.constraint)
+          return unless ast
+
+          if evaluate(ast, owner)
+            result.add(:info, "OCL constraint '#{constraint.constraint_type}' " \
+                              "passed for #{owner.name}",
+                       entity_name: owner.name)
+          else
+            result.add(:warning, "OCL constraint '#{constraint.constraint_type}' " \
+                                 "failed for #{owner.name}: #{constraint.constraint}",
+                       entity_name: owner.name)
+          end
+        rescue Ea::Ocl::UnsupportedError => e
+          result.add(:info, "Skipping OCL constraint on #{owner&.name} " \
+                            "(unsupported syntax): #{e.message}",
+                     entity_name: owner&.name)
+        end
+
+        # Parse the OCL body. Returns nil for empty / non-invariant
+        # constraints (we don't try to evaluate non-invariant forms).
+        def parse(body)
+          return nil if body.nil? || body.empty?
+
+          Ea::Ocl::Parser.parse(body)
+        end
+
+        def evaluate(ast, owner)
+          Ea::Ocl::Evaluator.evaluate(ast, owner)
+        end
+
+        def owner_for(constraint)
+          object_id = constraint.respond_to?(:ea_object_id) ?
+                       constraint.ea_object_id :
+                       constraint.object_id
+          return nil unless object_id
+
+          (database.collections[:objects] || [])
+            .find { |o| o.object_id == object_id }
+        end
+      end
+    end
+  end
+end

data/lib/ea/qea/validation/database.rb

@@ -10,6 +10,8 @@ module Ea
                  "ea/qea/validation/database/orphan_validator"
         autoload :ReferentialIntegrityValidator,
                  "ea/qea/validation/database/referential_integrity_validator"
+        autoload :OclConstraintValidator,
+                 "ea/qea/validation/database/ocl_constraint_validator"
       end
     end
   end

data/lib/ea/qea/validation/validation_engine.rb

@@ -83,6 +83,7 @@ module Ea
             orphan
             circular_reference
             package
+            ocl_constraint
           ]
 
           validator_names = if validators
@@ -213,6 +214,7 @@ module Ea
           @registry.register(:circular_reference,
                              CircularReferenceValidator)
           @registry.register(:package, PackageValidator)
+          @registry.register(:ocl_constraint, OclConstraintValidator)
 
           # Phase 2: UML Tree Structure Validators
           # DocumentStructureValidator lives in lutaml-uml and may not be

data/lib/ea/qea/validation.rb

@@ -20,6 +20,8 @@ module Ea
                "ea/qea/validation/database/orphan_validator"
       autoload :CircularReferenceValidator,
                "ea/qea/validation/database/circular_reference_validator"
+      autoload :OclConstraintValidator,
+               "ea/qea/validation/database/ocl_constraint_validator"
       autoload :Database, "ea/qea/validation/database"
       autoload :Formatters, "ea/qea/validation/formatters"
       autoload :ValidationEngine, "ea/qea/validation/validation_engine"

data/lib/ea/query/builder.rb

@@ -58,13 +58,15 @@ module Ea
         filter_by { |o| o.package_id == pkg.package_id }
       end
 
-      # Filter by applied stereotype name.
+      # Filter by applied stereotype name. Stereotype lookup walks
+      # t_xref for @STEREO blocks referencing the object's ea_guid.
       # @param name [String]
       # @return [Builder]
       def with_stereotype(name)
+        xrefs = model.collections[:xrefs] || []
         filter_by do |o|
-          refs = o.respond_to?(:stereotype_refs) ? o.stereotype_refs : nil
-          refs&.any? { |r| r == name }
+          applied = stereotype_names_for(o, xrefs)
+          applied.any? { |r| r == name }
         end
       end
 
@@ -90,6 +92,23 @@ module Ea
         Builder.new(model, filters: filters + [block], kind: @kind)
       end
 
+      # Extract stereotype names applied to an object via t_xref.
+      # Returns [] when no @STEREO block references the object's GUID.
+      # @param object [Ea::Qea::Models::EaObject]
+      # @param xrefs [Array<Ea::Qea::Models::EaXref>]
+      # @return [Array<String>]
+      def stereotype_names_for(object, xrefs)
+        return [] unless object.is_a?(Ea::Qea::Models::EaObject)
+        return [] unless object.ea_guid
+
+        xrefs.select do |xr|
+          xr.client == object.ea_guid && xr.description&.include?("@STEREO")
+        end.map do |xr|
+          xr.description.match(/Name=([^;]+)/)[1]
+        end.compact
+      end
+      private :stereotype_names_for
+
       # Materialize the filtered collection.
       # @return [Array]
       def call

data/lib/ea/svg/ea_emitter/compartment/stereotype_icon.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Ea
+  module Svg
+    module EaEmitter
+      module Compartment
+        # Stereotype decorator icon compartment. Emits the small
+        # symbolic polygon that EA renders inside an element's body
+        # when a stereotype provides a custom icon (FeatureType
+        # diamond, Type polygon, etc.). Delegates to
+        # Element::StereotypeIconRenderer.
+        #
+        # Rendered after the header so the icon sits inside the
+        # element body below the stereotype label.
+        module StereotypeIcon
+          module_function
+
+          def render(context)
+            return nil unless context.classifier
+
+            svg = Element::StereotypeIconRenderer.render(
+              classifier: context.classifier,
+              bounds: context.bounds,
+              canvas: context.canvas
+            )
+            svg.empty? ? nil : svg
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ea/svg/ea_emitter/compartment.rb

@@ -14,6 +14,7 @@ module Ea
         autoload :NoteBody, "ea/svg/ea_emitter/compartment/note_body"
         autoload :Header, "ea/svg/ea_emitter/compartment/header"
         autoload :HeaderDivider, "ea/svg/ea_emitter/compartment/header_divider"
+        autoload :StereotypeIcon, "ea/svg/ea_emitter/compartment/stereotype_icon"
         autoload :Attributes, "ea/svg/ea_emitter/compartment/attributes"
         autoload :Operations, "ea/svg/ea_emitter/compartment/operations"
         autoload :EnumLiterals, "ea/svg/ea_emitter/compartment/enum_literals"
@@ -32,6 +33,7 @@ module Ea
           NoteBody,
           Header,
           HeaderDivider,
+          StereotypeIcon,
           Attributes,
           Operations,
           EnumLiterals,

data/lib/ea/svg/ea_emitter/document.rb

@@ -26,9 +26,42 @@ module Ea
                                         document: document)
                                   .layers
                                   .reject { |s| s.nil? || s.empty? }
+          image_layer = emit_images
+          layers << image_layer if image_layer
 
           %(<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\n\n<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="#{canvas.width_cm}" height="#{canvas.height_cm}" viewBox="#{canvas.view_box}">\n<title></title>\n<desc>Created with Enterprise Architect (Build: #{BUILD_ID}) 2</desc>\n#{layers.join("\n")}\n</svg>)
         end
+
+        # Walks t_image rows (when the document carries a Database
+        # with an :images collection) and invokes EmfRenderer on
+        # each. Emits an `<image>` element per successfully converted
+        # SVG, or returns nil when no images or all conversions fail.
+        #
+        # The emfsvg gem currently can't parse EA's specific EMF
+        # variant (see TODO.diagrams/87 + TODO.complete/56). Until
+        # upstream emfsvg supports it, this method returns nil
+        # gracefully. The wiring is correct infrastructure for when
+        # emfsvg catches up.
+        def emit_images
+          return nil unless document
+          return nil unless document.is_a?(Ea::Qea::Database)
+
+          images = document.collections[:images] || []
+          return nil if images.empty?
+
+          fragments = images.filter_map { |image| render_image(image) }
+          return nil if fragments.empty?
+
+          %(<g id="images">\n#{fragments.join("\n")}\n</g>)
+        end
+
+        def render_image(image)
+          svg = Ea::Image::EmfRenderer.render(image.bytes)
+          return nil unless svg
+
+          %(<g>#{svg}</g>)
+        end
+        private :render_image
       end
     end
   end