From b54c03389bcfd3a87bbdba1bb07f78c748625a28 Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Tue, 19 Jul 2022 13:47:28 +0300
Subject: [PATCH] Strip leading/trailing whitespace from comma-separated trace
 tags

---
 app/models/trace.rb       |  2 +-
 test/models/trace_test.rb | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 957bea8bc..0b9877225 100644
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -57,7 +57,7 @@ class Trace < ApplicationRecord
 
   def tagstring=(s)
     self.tags = if s.include? ","
-                  s.split(/\s*,\s*/).grep_v(/^\s*$/).collect do |tag|
+                  s.split(",").map(&:strip).reject(&:empty?).collect do |tag|
                     tt = Tracetag.new
                     tt.tag = tag
                     tt
diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index 2dcae58d0..8fa09f4d7 100644
--- a/test/models/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -73,7 +73,7 @@ class TraceTest < ActiveSupport::TestCase
     trace_valid({ :visibility => "foo" }, :valid => false)
   end
 
-  def test_tagstring
+  def test_tagstring_handles_space_separated_tags
     trace = build(:trace)
     trace.tagstring = "foo bar baz"
     assert_predicate trace, :valid?
@@ -82,6 +82,10 @@ class TraceTest < ActiveSupport::TestCase
     assert_equal "bar", trace.tags[1].tag
     assert_equal "baz", trace.tags[2].tag
     assert_equal "foo, bar, baz", trace.tagstring
+  end
+
+  def test_tagstring_handles_comma_separated_tags
+    trace = build(:trace)
     trace.tagstring = "foo, bar baz ,qux"
     assert_predicate trace, :valid?
     assert_equal 3, trace.tags.length
@@ -91,6 +95,17 @@ class TraceTest < ActiveSupport::TestCase
     assert_equal "foo, bar baz, qux", trace.tagstring
   end
 
+  def test_tagstring_strips_whitespace
+    trace = build(:trace)
+    trace.tagstring = "   zero  ,  one , two  "
+    assert_predicate trace, :valid?
+    assert_equal 3, trace.tags.length
+    assert_equal "zero", trace.tags[0].tag
+    assert_equal "one", trace.tags[1].tag
+    assert_equal "two", trace.tags[2].tag
+    assert_equal "zero, one, two", trace.tagstring
+  end
+
   def test_public?
     assert_predicate build(:trace, :visibility => "public"), :public?
     assert_not build(:trace, :visibility => "private").public?
-- 
2.39.5