Labels are now split on numbers

[erd-marker.git] / lib / erd_handler / label.rb

diff --git a/lib/erd_handler/label.rb b/lib/erd_handler/label.rb
index ad816182ff4be9c58f62ff53819c26579862cfab..6c197588c08157320a5fde3c4818db24005a80cc 100644 (file)
--- a/lib/erd_handler/label.rb
+++ b/lib/erd_handler/label.rb
@@ -18,6 +18,11 @@ class Label
       else
         split_camel_case = true
       end
+      if opts.has_key? :numbers
+        split_numbers = opts[:numbers]
+      else
+        split_numbers = true
+      end
     end
     @processed = @processed.map do |segment|
       segment.split(regexp)
@@ -25,7 +30,13 @@ class Label
     
     if split_camel_case
       @processed = @processed.map do |segment|
-        segment.split(/(?=[A-Z])/)
+        segment.split(/(?<=[a-z])(?=[A-Z])/)
+      end.flatten
+    end
+    
+    if split_numbers
+      @processed = @processed.map do |segment|
+        segment.split(/(?:(?<!\d)(?=\d))|(?:(?<=\d)(?!\d))/)
       end.flatten
     end
     self