Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
4e96b175
Commit
4e96b175
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'refactoring/services' of /home/git/repositories/gitlab/gitlabhq
parents
1fc42d99
4e2c34d8
No related merge requests found
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
71 additions
and
74 deletions
+71
-74
app/contexts/commit_load_context.rb
app/contexts/commit_load_context.rb
+0
-34
app/contexts/test_hook_context.rb
app/contexts/test_hook_context.rb
+0
-7
app/controllers/projects/commit_controller.rb
app/controllers/projects/commit_controller.rb
+21
-16
app/controllers/projects/hooks_controller.rb
app/controllers/projects/hooks_controller.rb
+8
-3
app/observers/system_hook_observer.rb
app/observers/system_hook_observer.rb
+8
-2
app/services/system_hooks_service.rb
app/services/system_hooks_service.rb
+5
-5
app/services/test_hook_service.rb
app/services/test_hook_service.rb
+6
-0
features/steps/project/project_hooks.rb
features/steps/project/project_hooks.rb
+4
-2
lib/api/repositories.rb
lib/api/repositories.rb
+3
-3
spec/services/system_hooks_service_spec.rb
spec/services/system_hooks_service_spec.rb
+2
-2
spec/services/test_hook_service_spec.rb
spec/services/test_hook_service_spec.rb
+14
-0
No files found.
app/contexts/commit_load_context.rb
deleted
100644 → 0
View file @
1fc42d99
class
CommitLoadContext
<
BaseContext
def
execute
result
=
{
commit:
nil
,
suppress_diff:
false
,
line_notes:
[],
notes_count:
0
,
note:
nil
,
status: :ok
}
commit
=
project
.
repository
.
commit
(
params
[
:id
])
if
commit
line_notes
=
project
.
notes
.
for_commit_id
(
commit
.
id
).
inline
result
[
:commit
]
=
commit
result
[
:note
]
=
project
.
build_commit_note
(
commit
)
result
[
:line_notes
]
=
line_notes
result
[
:notes_count
]
=
project
.
notes
.
for_commit_id
(
commit
.
id
).
count
result
[
:branches
]
=
project
.
repository
.
branch_names_contains
(
commit
.
id
)
begin
result
[
:suppress_diff
]
=
true
if
commit
.
diff_suppress?
&&
!
params
[
:force_show_diff
]
result
[
:force_suppress_diff
]
=
commit
.
diff_force_suppress?
rescue
Grit
::
Git
::
GitTimeout
result
[
:suppress_diff
]
=
true
result
[
:status
]
=
:huge_commit
end
end
result
end
end
This diff is collapsed.
Click to expand it.
app/contexts/test_hook_context.rb
deleted
100644 → 0
View file @
1fc42d99
class
TestHookContext
<
BaseContext
def
execute
hook
=
project
.
hooks
.
find
(
params
[
:id
])
data
=
GitPushService
.
new
.
sample_data
(
project
,
current_user
)
hook
.
execute
(
data
)
end
end
This diff is collapsed.
Click to expand it.
app/controllers/projects/commit_controller.rb
View file @
4e96b175
...
...
@@ -6,34 +6,35 @@ class Projects::CommitController < Projects::ApplicationController
before_filter
:authorize_read_project!
before_filter
:authorize_code_access!
before_filter
:require_non_empty_project
before_filter
:commit
def
show
re
sult
=
CommitLoadContext
.
new
(
project
,
current_user
,
params
).
execute
re
turn
git_not_found!
unless
@commit
@commit
=
result
[
:commit
]
@line_notes
=
project
.
notes
.
for_commit_id
(
commit
.
id
).
inline
@branches
=
project
.
repository
.
branch_names_contains
(
commit
.
id
)
if
@commit
.
nil?
git_not_found!
return
begin
@suppress_diff
=
true
if
commit
.
diff_suppress?
&&
!
params
[
:force_show_diff
]
@force_suppress_diff
=
commit
.
diff_force_suppress?
rescue
Grit
::
Git
::
GitTimeout
@suppress_diff
=
true
@status
=
:huge_commit
end
@suppress_diff
=
result
[
:suppress_diff
]
@force_suppress_diff
=
result
[
:force_suppress_diff
]
@note
=
result
[
:note
]
@line_notes
=
result
[
:line_notes
]
@branches
=
result
[
:branches
]
@notes_count
=
result
[
:notes_count
]
@note
=
project
.
build_commit_note
(
commit
)
@notes_count
=
project
.
notes
.
for_commit_id
(
commit
.
id
).
count
@notes
=
project
.
notes
.
for_commit_id
(
@commit
.
id
).
not_inline
.
fresh
@noteable
=
@commit
@comments_allowed
=
@reply_allowed
=
true
@comments_target
=
{
noteable_type:
'Commit'
,
commit_id:
@commit
.
id
}
@comments_target
=
{
noteable_type:
'Commit'
,
commit_id:
@commit
.
id
}
respond_to
do
|
format
|
format
.
html
do
if
result
[
:status
]
==
:huge_commit
if
@status
==
:huge_commit
render
"huge_commit"
and
return
end
end
...
...
@@ -42,4 +43,8 @@ class Projects::CommitController < Projects::ApplicationController
format
.
patch
{
render
text:
@commit
.
to_patch
}
end
end
def
commit
@commit
||=
project
.
repository
.
commit
(
params
[
:id
])
end
end
This diff is collapsed.
Click to expand it.
app/controllers/projects/hooks_controller.rb
View file @
4e96b175
...
...
@@ -24,15 +24,20 @@ class Projects::HooksController < Projects::ApplicationController
end
def
test
TestHook
Context
.
new
(
project
,
current_user
,
params
).
execute
TestHook
Service
.
new
.
execute
(
hook
,
current_user
)
redirect_to
:back
end
def
destroy
@hook
=
@project
.
hooks
.
find
(
params
[
:id
])
@hook
.
destroy
hook
.
destroy
redirect_to
project_hooks_path
(
@project
)
end
private
def
hook
@hook
||=
@project
.
hooks
.
find
(
params
[
:id
])
end
end
This diff is collapsed.
Click to expand it.
app/observers/system_hook_observer.rb
View file @
4e96b175
...
...
@@ -2,10 +2,16 @@ class SystemHookObserver < BaseObserver
observe
:user
,
:project
,
:users_project
def
after_create
(
model
)
SystemHooksS
ervice
.
execute_hooks_for
(
model
,
:create
)
system_hook_s
ervice
.
execute_hooks_for
(
model
,
:create
)
end
def
after_destroy
(
model
)
SystemHooksService
.
execute_hooks_for
(
model
,
:destroy
)
system_hook_service
.
execute_hooks_for
(
model
,
:destroy
)
end
private
def
system_hook_service
SystemHooksService
.
new
end
end
This diff is collapsed.
Click to expand it.
app/services/system_hooks_service.rb
View file @
4e96b175
class
SystemHooksService
def
self
.
execute_hooks_for
(
model
,
event
)
def
execute_hooks_for
(
model
,
event
)
execute_hooks
(
build_event_data
(
model
,
event
))
end
private
def
self
.
execute_hooks
(
data
)
def
execute_hooks
(
data
)
SystemHook
.
all
.
each
do
|
sh
|
async_execute_hook
sh
,
data
end
end
def
self
.
async_execute_hook
(
hook
,
data
)
def
async_execute_hook
(
hook
,
data
)
Sidekiq
::
Client
.
enqueue
(
SystemHookWorker
,
hook
.
id
,
data
)
end
def
self
.
build_event_data
(
model
,
event
)
def
build_event_data
(
model
,
event
)
data
=
{
event_name:
build_event_name
(
model
,
event
),
created_at:
model
.
created_at
...
...
@@ -51,7 +51,7 @@ class SystemHooksService
end
end
def
self
.
build_event_name
(
model
,
event
)
def
build_event_name
(
model
,
event
)
case
model
when
UsersProject
return
"user_add_to_team"
if
event
==
:create
...
...
This diff is collapsed.
Click to expand it.
app/services/test_hook_service.rb
0 → 100644
View file @
4e96b175
class
TestHookService
def
execute
(
hook
,
current_user
)
data
=
GitPushService
.
new
.
sample_data
(
hook
.
project
,
current_user
)
hook
.
execute
(
data
)
end
end
This diff is collapsed.
Click to expand it.
features/steps/project/project_hooks.rb
View file @
4e96b175
require
'webmock'
class
ProjectHooks
<
Spinach
::
FeatureSteps
include
SharedAuthentication
include
SharedProject
include
SharedPaths
include
RSpec
::
Matchers
include
RSpec
::
Mocks
::
ExampleMethods
include
WebMock
::
API
Given
'project has hook'
do
@hook
=
create
(
:project_hook
,
project:
current_project
)
...
...
@@ -25,8 +28,7 @@ class ProjectHooks < Spinach::FeatureSteps
end
When
'I click test hook button'
do
test_hook_context
=
double
(
execute:
true
)
TestHookContext
.
should_receive
(
:new
).
and_return
(
test_hook_context
)
stub_request
(
:post
,
@hook
.
url
).
to_return
(
status:
200
)
click_link
'Test Hook'
end
...
...
This diff is collapsed.
Click to expand it.
lib/api/repositories.rb
View file @
4e96b175
...
...
@@ -124,9 +124,9 @@ module API
# GET /projects/:id/repository/commits/:sha/diff
get
":id/repository/commits/:sha/diff"
do
sha
=
params
[
:sha
]
result
=
CommitLoadContext
.
new
(
user_project
,
current_user
,
{
id:
sha
}).
execute
not_found!
"Commit"
unless
result
[
:commit
]
result
[
:commit
]
.
diffs
commit
=
user_project
.
repository
.
commit
(
sha
)
not_found!
"Commit"
unless
commit
commit
.
diffs
end
# Get a project repository tree
...
...
This diff is collapsed.
Click to expand it.
spec/services/system_hooks_service_spec.rb
View file @
4e96b175
...
...
@@ -24,10 +24,10 @@ describe SystemHooksService do
end
def
event_data
(
*
args
)
SystemHooksService
.
build_event_data
(
*
args
)
SystemHooksService
.
new
.
send
:build_event_data
,
*
args
end
def
event_name
(
*
args
)
SystemHooksService
.
build_event_name
(
*
args
)
SystemHooksService
.
new
.
send
:build_event_name
,
*
args
end
end
This diff is collapsed.
Click to expand it.
spec/services/test_hook_service_spec.rb
0 → 100644
View file @
4e96b175
require
'spec_helper'
describe
TestHookService
do
let
(
:user
)
{
create
:user
}
let
(
:project
)
{
create
:project_with_code
}
let
(
:hook
)
{
create
:project_hook
,
project:
project
}
describe
:execute
do
it
"should execute successfully"
do
stub_request
(
:post
,
hook
.
url
).
to_return
(
status:
200
)
TestHookService
.
new
.
execute
(
hook
,
user
).
should
be_true
end
end
end
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment