Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
9000626a
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9000626a
编写于
4月 19, 2018
作者:
J
Jacopo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Moves Uniquify counter in the initializer
上级
6ae3098e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
13 deletion
+20
-13
app/models/concerns/uniquify.rb
app/models/concerns/uniquify.rb
+16
-11
app/models/issue.rb
app/models/issue.rb
+1
-1
spec/models/concerns/uniquify_spec.rb
spec/models/concerns/uniquify_spec.rb
+3
-1
未找到文件。
app/models/concerns/uniquify.rb
浏览文件 @
9000626a
# 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
...
...
app/models/issue.rb
浏览文件 @
9000626a
...
...
@@ -198,7 +198,7 @@ class Issue < ActiveRecord::Base
return
to_branch_name
unless
project
.
repository
.
branch_exists?
(
to_branch_name
)
start_counting_from
=
2
Uniquify
.
new
.
string
(
->
(
counter
)
{
"
#{
to_branch_name
}
-
#{
counter
}
"
},
start_counting_from
)
do
|
suggested_branch_name
|
Uniquify
.
new
(
start_counting_from
).
string
(
->
(
counter
)
{
"
#{
to_branch_name
}
-
#{
counter
}
"
}
)
do
|
suggested_branch_name
|
project
.
repository
.
branch_exists?
(
suggested_branch_name
)
end
end
...
...
spec/models/concerns/uniquify_spec.rb
浏览文件 @
9000626a
...
...
@@ -24,7 +24,9 @@ describe Uniquify do
it
'allows to pass an initial value for the counter'
do
start_counting_from
=
2
result
=
uniquify
.
string
(
'test_string'
,
start_counting_from
)
{
|
s
|
s
==
'test_string'
}
uniquify
=
described_class
.
new
(
start_counting_from
)
result
=
uniquify
.
string
(
'test_string'
)
{
|
s
|
s
==
'test_string'
}
expect
(
result
).
to
eq
(
'test_string2'
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录