ea 0.6.23 → 0.6.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97806417f959531420feddb1143826efed14a41349b2e8909402dfba9fa8ba79
-  data.tar.gz: c312c7a1706cb9c1d42aa72c254665eea5dc8dc39435f6b8d2531a569bf33566
+  metadata.gz: 6a72022a4812f53c8a781acb37516bd893f69a5213a30f7f82b1f288649e2625
+  data.tar.gz: 6a82f59b5fa348f14d89c18b2af5169f91a35cd4000c29e10f6c828661b78626
 SHA512:
-  metadata.gz: 0df1c576f75d366c43d724f665328602b8ed8f82bf6ff49062e815956f63acd8f624ebb746624092b49307ffbbb28f39ffd22dbac522d32262020416f8e06c6a
-  data.tar.gz: e2b89b4df82927308d368fa3896abb5022957fc2b5235ef6f040b1f220aeab10617cca6831784457003aa7e213f13730a40b00e30897fe2dfff5e468d421db41
+  metadata.gz: b7c1c47b59c593cf59c2f039419280963db21de104b3f84f4b32e9d95f7073d9e2356e068271145276a325c266ac3a5e93255bc7faa6932f0dd5b46323fec8c0
+  data.tar.gz: 4e3f163d3001eef153396e3eb1be9ecb4fdf8460fcc27c83f3c03f87fff249f6cd8d0fd6e7b2d4e7539cb613d3327955c2837f9b4af436f427fc813c89a8fd29

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

@@ -74,7 +74,8 @@ module Ea
                                                                 foreign_package_name: foreign_package_name_for(classifier)) : []
           is_classifier = classifier.is_a?(Ea::Model::Classifier)
           attr_lines = if is_classifier && show_attributes? &&
-                          !classifier.is_a?(Ea::Model::Interface)
+                          !classifier.is_a?(Ea::Model::Interface) &&
+                          attributes_visible?(element)
                          Element::AttributeRenderer.lines_for(
                            classifier, lookup: attribute_lookup,
                            exclude_association_ids: drawn_association_ids
@@ -82,7 +83,11 @@ module Ea
                        else
                          []
                        end
-          op_lines = (is_classifier && show_operations?) ? Element::OperationRenderer.lines_for(classifier) : []
+          op_lines = if is_classifier && show_operations? && operations_visible?(element)
+                        Element::OperationRenderer.lines_for(classifier)
+                      else
+                        []
+                      end
           geometry = compartment_geometry(bounds, size, attr_lines, op_lines,
                                            tagged_values_for(classifier).size,
                                            header_lines, classifier: classifier,
@@ -97,7 +102,7 @@ module Ea
           # TK_PositionType keeps 7 rows ending 6px above the bottom,
           # while a 13px-tighter box loses them all.
           if attr_lines.any? &&
-             geometry.attr_bottom_y.to_i + 4 > bounds.y + bounds.height
+             geometry.attr_bottom_y.to_i + 3 > bounds.y + bounds.height
             attr_lines = []
             geometry = compartment_geometry(bounds, size, attr_lines, op_lines,
                                              tagged_values_for(classifier).size,
@@ -109,7 +114,7 @@ module Ea
           # EA suppresses the operations compartment when its rows
           # overflow the stored box height (same rule as attributes).
           if op_lines.any? && geometry.op_first_y &&
-             geometry.op_bottom_y.to_i + 4 > bounds.y + bounds.height
+             geometry.op_bottom_y.to_i + 3 > bounds.y + bounds.height
             op_lines = []
             geometry = compartment_geometry(bounds, size, attr_lines, op_lines,
                                              tagged_values_for(classifier).size,
@@ -194,6 +199,32 @@ module Ea
           attr_lines.first.to_s.start_with?("«") ? 11 : 7
         end
 
+        # EA's per-instance attribute visibility toggles (ObjectStyle
+        # AttPub/AttPri/AttPro/AttPkg). When ANY toggle is stored, only
+        # attributes of an enabled visibility class render; the GM_*
+        # geometry boxes carry all four at 0 and render header-only.
+        def attributes_visible?(element)
+          toggles = visibility_toggles(element)
+          return true if toggles.empty?
+
+          toggles.values.any? { |v| v == "1" }
+        end
+
+        def visibility_toggles(element)
+          style = element.style || {}
+          %i[attpub attpri attpro attpkg]
+            .each_with_object({}) { |k, acc| acc[k] = style[k] if style.key?(k) }
+        end
+
+        def operations_visible?(element)
+          style = element.style || {}
+          keys = %i[oppub oppri oppro oppkg]
+          present = keys.select { |k| style.key?(k) }
+          return true if present.empty?
+
+          present.any? { |k| style[k] == "1" }
+        end
+
         def drawn_association_ids
           (diagram.connectors || []).select(&:renderable?)
                                     .map(&:relationship_ref).compact.to_set

data/lib/ea/version.rb

@@ -4,5 +4,5 @@ module Ea
   # Gem release version. Extracted to its own file so the
   # `gem-release` tool's `gem bump` can find and update it via the
   # standard `lib/<gem>/version.rb` convention.
-  VERSION = "0.6.23"
+  VERSION = "0.6.24"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.23
+  version: 0.6.24
 platform: ruby
 authors:
 - Ribose Inc.