ucd 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bded63756cb059b1bf533324437fce70480ef263
-  data.tar.gz: 3d501486676a8d08b794ee646990935dc7b323fd
+  metadata.gz: 20a0c5aea325b83fbc5a0f08bb4a45aefe97a399
+  data.tar.gz: a8b2aa083f8f4fdbc5cf0106a0e2b61be3da753c
 SHA512:
-  metadata.gz: 2ff41f9774f80876e95ffc19b66d2cda5f3048da368c678ba0f8aa6a19404a4b2c12f5938220369faee913a6672a1cdcf38fef1c369c03a700d104463d325c3c
-  data.tar.gz: 2f04d70df43b8f5be60acb6098f44b2b78576d0a8e20a6daac7974fd6daa41afb430d5cadac3e3ee4ec5989749ceaa3ba5eb61c92656b82a59736eb9217ca63f
+  metadata.gz: a7436fac89357c2ad5acf494f81608f56396bbbb24d0a8cc0251c4606456ca3afa55478397dc4826d6f3786d30684c99d86d14b9d6bdba8cc3679ee461cc3d72
+  data.tar.gz: 2b71e4c7632308f556b71f9cf835850ddd33e423f24e84dd69e5fe6c73cf416ce198b9bec8f07b65a820197cdad4a0a9802f4e3b75e62680e3c5dbfc6f5b9c90

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/examples/composite.dot

@@ -63,4 +63,4 @@ digraph G {
   ClassComposite -> ClassComponent [arrowhead="onormal"]
 
   ClassComposite -> ClassComponent [dir="back" arrowtail="odiamond" headlabel="*"]
-}
+}

data/examples/generic.dot

@@ -0,0 +1,41 @@
+digraph G {
+  graph [splines="ortho" rankdir="BT"]
+  edge [color="gray50"]
+  node [shape="plain"]
+
+  ClassAssetT [label=<
+    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+      <TR>
+        <TD>«abstract»<BR/><I><B>Asset(T)</B></I></TD>
+      </TR>
+      <TR>
+        <TD>
+          <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0">
+            <TR><TD ALIGN="LEFT">+ value : T</TD></TR>
+          </TABLE>
+        </TD>
+      </TR>
+      <TR>
+        <TD></TD>
+      </TR>
+    </TABLE>
+  >]
+
+  ClassTexture [label=<
+    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+      <TR>
+        <TD><B>Texture</B></TD>
+      </TR>
+      <TR>
+        <TD></TD>
+      </TR>
+      <TR>
+        <TD></TD>
+      </TR>
+    </TABLE>
+  >]
+
+  ClassTexture -> ClassAssetT [arrowhead="onormal"]
+
+
+}

data/examples/generic.ucd

@@ -0,0 +1,7 @@
+abstract class Asset(T) {
+  field value : T
+}
+
+class Texture {
+  generalizes Asset(T)
+}

data/lib/ucd/formatter/graphviz.rb

@@ -89,7 +89,10 @@ module UCD
         attributes["headlabel"] = node.from if node.from
         attributes["taillabel"] = node.to if node.to
 
-        %Q{Class#{node.parent.name} -> Class#{node.name} [#{attributes}]}
+        graph_parent_name = generate_graph_name(node.parent.name)
+        graph_node_name = generate_graph_name(node.name)
+
+        %Q{Class#{graph_parent_name} -> Class#{graph_node_name} [#{attributes}]}
       end
 
       def format_class_relationship(node)
@@ -98,7 +101,10 @@ module UCD
         attributes["arrowhead"] = "onormal"
         attributes["style"] = "dashed" if node.type == "realizes"
 
-        %Q{Class#{node.parent.name} -> Class#{node.name} [#{attributes}]}
+        graph_parent_name = generate_graph_name(node.parent.name)
+        graph_node_name = generate_graph_name(node.name)
+
+        %Q{Class#{graph_parent_name} -> Class#{graph_node_name} [#{attributes}]}
       end
 
       def format_class(node)
@@ -144,8 +150,10 @@ HEREDOC
 
       def format_document(node)
         classes = node.classes.map do |node|
+          graph_node_name = generate_graph_name(node.name)
+
           <<-HEREDOC
-Class#{node.name} [label=<
+Class#{graph_node_name} [label=<
   #{format_class(node)}
 >]
           HEREDOC
@@ -185,6 +193,10 @@ HEREDOC
         end
       end
 
+      def generate_graph_name(name)
+        name.gsub(/[^0-9a-zA-Z]/i, '')
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucd
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ryan Scott Lewis
@@ -105,6 +105,9 @@ files:
 - examples/composite.dot
 - examples/composite.png
 - examples/composite.ucd
+- examples/generic.dot
+- examples/generic.png
+- examples/generic.ucd
 - exe/ucd
 - lib/ucd.rb
 - lib/ucd/formatter.rb