Extract code from `Namespace#clean_path` for ghost user generation.
1. Create a `Uniquify` class, which generalizes the process of generating unique strings, by accepting a function that defines what "uniqueness" means in a given context. 2. WIP: Make sure tests for `Namespace` pass, add more if necessary. 3. WIP: Add tests for `Uniquify`
This commit is contained in:
parent
ff19bbd3b4
commit
ca16c3734b
|
@ -0,0 +1,25 @@
|
|||
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 `exists_fn`.
|
||||
#
|
||||
# If `base` is a function/proc, we expect that calling it with a
|
||||
# candidate counter returns a string to test/return.
|
||||
def string(base, exists_fn)
|
||||
@counter = nil
|
||||
|
||||
if base.respond_to?(:call)
|
||||
increment_counter! while exists_fn[base.call(@counter)]
|
||||
base.call(@counter)
|
||||
else
|
||||
increment_counter! while exists_fn["#{base}#{@counter}"]
|
||||
"#{base}#{@counter}"
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def increment_counter!
|
||||
@counter = @counter ? @counter.next : 1
|
||||
end
|
||||
end
|
|
@ -98,14 +98,8 @@ class Namespace < ActiveRecord::Base
|
|||
# Work around that by setting their username to "blank", followed by a counter.
|
||||
path = "blank" if path.blank?
|
||||
|
||||
counter = 0
|
||||
base = path
|
||||
while Namespace.find_by_path_or_name(path)
|
||||
counter += 1
|
||||
path = "#{base}#{counter}"
|
||||
end
|
||||
|
||||
path
|
||||
uniquify = Uniquify.new
|
||||
uniquify.string(path, -> (s) { Namespace.find_by_path_or_name(s) })
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -351,20 +351,19 @@ class User < ActiveRecord::Base
|
|||
|
||||
ghost_user ||
|
||||
begin
|
||||
users = Enumerator.new do |y|
|
||||
n = nil
|
||||
loop do
|
||||
user = User.new(
|
||||
username: "ghost#{n}", password: Devise.friendly_token,
|
||||
email: "ghost#{n}@example.com", name: "Ghost User", state: :ghost
|
||||
)
|
||||
uniquify = Uniquify.new
|
||||
|
||||
y.yield(user)
|
||||
n = n ? n.next : 0
|
||||
end
|
||||
end
|
||||
username = uniquify.string("ghost", -> (s) { User.find_by_username(s) })
|
||||
|
||||
users.lazy.select { |user| user.valid? }.first.tap(&:save!)
|
||||
email = uniquify.string(
|
||||
-> (n) { "ghost#{n}@example.com" },
|
||||
-> (s) { User.find_by_email(s) }
|
||||
)
|
||||
|
||||
User.create(
|
||||
username: username, password: Devise.friendly_token,
|
||||
email: email, name: "Ghost User", state: :ghost
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1513,7 +1513,7 @@ describe User, models: true do
|
|||
ghost = User.ghost
|
||||
|
||||
expect(ghost).to be_persisted
|
||||
expect(ghost.username).to eq('ghost0')
|
||||
expect(ghost.username).to eq('ghost1')
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -1523,7 +1523,7 @@ describe User, models: true do
|
|||
ghost = User.ghost
|
||||
|
||||
expect(ghost).to be_persisted
|
||||
expect(ghost.email).to eq('ghost0@example.com')
|
||||
expect(ghost.email).to eq('ghost1@example.com')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue