Improved graph reports

Author: matsoftware

swift_code_metrics/_graphics.py

@@ -1,6 +1,7 @@
 import string
 
 import matplotlib.pyplot as plt
+from math import ceil
 import os
 
 from adjustText import adjust_text
@@ -14,10 +15,17 @@ def __init__(self, path=None):
     def bar_plot(self, title, data):
         plt.title(title)
         plt.ylabel(title)
-        bar_width = 0.35
+        bar_width = 0.75
         opacity = 0.4
-        plotted_data = plt.bar(data[1], data[0], bar_width, alpha=opacity)
-        plt.legend(plotted_data, data[2], loc='upper left')
+        plotted_data = plt.barh(data[1], data[0], bar_width, alpha=opacity)
+
+        texts = []
+        for i, v in enumerate(data[0]):
+            texts.append(plt.text(v, i, f' {str(v)}', va='center', color='blue', size='smaller'))
+
+        adjust_text(texts, autoalign='x', only_move={'text': 'x'})
+
+        plt.legend(plotted_data, data[2], loc='lower right')
 
         self.__render(plt, title)
 
@@ -101,5 +109,3 @@ def format_filename(s):
         filename = ''.join(c for c in s if c in valid_chars)
         filename = filename.replace(' ', '_').lower()
         return filename
-
-

swift_code_metrics/_metrics.py

@@ -226,10 +226,8 @@ def number_of_imports(self) -> int:
     @property
     def compact_name(self) -> str:
         all_capitals = ''.join(c for c in self.name if c.isupper())
-        if len(all_capitals) > 3:
+        if len(all_capitals) > 4:
             return all_capitals[0] + all_capitals[-1:]
-        elif len(all_capitals) > 1:
-            return all_capitals
         elif len(all_capitals) == 0:
             return self.name[0]
         else:

swift_code_metrics/tests/test_metrics.py

@@ -15,8 +15,16 @@ def setUp(self):
     def test_representation(self):
         self.assertEqual(str(self.framework), 'AwesomeName(0 files)')
 
-    def test_compact_name(self):
-        self.assertEqual(self.framework.compact_name, 'AN')
+    def test_compact_name_morethanfourcapitals(self):
+        test_framework = Framework('FrameworkWithMoreThanFourCapitals')
+        self.assertEqual('FC', test_framework.compact_name)
+
+    def test_compact_name_lessthanfourcapitals(self):
+        self.assertEqual('AN', self.framework.compact_name)
+
+    def test_compact_name_nocapitals(self):
+        test_framework = Framework('nocapitals')
+        self.assertEqual('n', test_framework.compact_name)
 
     def test_compact_name_description(self):
         self.assertEqual(self.framework.compact_name_description, 'AN = AwesomeName')