Moves Uniquify counter in the initializer

1 files changed, 16 insertions, 11 deletions

diff --git a/app/models/concerns/uniquify.rb b/app/models/concerns/uniquify.rb
index db51ed2dbeb..549a76da20e 100644
--- a/app/models/concerns/uniquify.rb
+++ b/app/models/concerns/uniquify.rb
@@ -1,16 +1,21 @@
+# Uniquify
+#
+# Return a version of the given 'base' string that is unique
+# by appending a counter to it. Uniqueness is determined by
+# repeated calls to the passed block.
+#
+# You can pass an initial value for the counter, if not given
+# counting starts from 1.
+#
+# If `base` is a function/proc, we expect that calling it with a
+# candidate counter returns a string to test/return.
 class Uniquify
-  # Return a version of the given 'base' string that is unique
-  # by appending a counter to it. Uniqueness is determined by
-  # repeated calls to the passed block.
-  #
-  # You can pass an initial value for the counter, if not given
-  # counting starts from 1.
-  #
-  # If `base` is a function/proc, we expect that calling it with a
-  # candidate counter returns a string to test/return.
-  def string(base, counter = nil)
-    @base = base
+  def initialize(counter = nil)
     @counter = counter
+  end
+
+  def string(base)
+    @base = base
 
     increment_counter! while yield(base_string)
     base_string