diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-17 09:47:47 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-17 09:47:47 +0000 |
commit | f0d2d28118354b6362988687757b63dc7be611e5 (patch) | |
tree | c6b1abb371822ba5dd1f7fe4d92b494a30dae9bd /app/services/files | |
parent | 7527408ad0c72ea7b7aba5c14550c5b08b6aae60 (diff) | |
parent | 4d82e9ed0b6ddb45663bde71412de9c840c58337 (diff) | |
download | gitlab-ce-f0d2d28118354b6362988687757b63dc7be611e5.tar.gz |
Merge branch 'refactoring/context_into_services' into 'master'
Refactoring context Into services
To prevent confusion where to write logic. Context or Service?
Diffstat (limited to 'app/services/files')
-rw-r--r-- | app/services/files/base_service.rb | 31 | ||||
-rw-r--r-- | app/services/files/create_service.rb | 47 | ||||
-rw-r--r-- | app/services/files/delete_service.rb | 40 | ||||
-rw-r--r-- | app/services/files/update_service.rb | 40 |
4 files changed, 158 insertions, 0 deletions
diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb new file mode 100644 index 00000000000..f1765d38976 --- /dev/null +++ b/app/services/files/base_service.rb @@ -0,0 +1,31 @@ +module Files + class BaseService < ::BaseService + attr_reader :ref, :path + + def initialize(project, user, params, ref, path = nil) + @project, @current_user, @params = project, user, params.dup + @ref = ref + @path = path + end + + private + + def error(message) + { + error: message, + status: :error + } + end + + def success + { + error: '', + status: :success + } + end + + def repository + project.repository + end + end +end diff --git a/app/services/files/create_service.rb b/app/services/files/create_service.rb new file mode 100644 index 00000000000..185ab26d96b --- /dev/null +++ b/app/services/files/create_service.rb @@ -0,0 +1,47 @@ +require_relative "base_service" + +module Files + class CreateService < BaseService + def execute + allowed = if project.protected_branch?(ref) + can?(current_user, :push_code_to_protected_branches, project) + else + can?(current_user, :push_code, project) + end + + unless allowed + return error("You are not allowed to create file in this branch") + end + + unless repository.branch_names.include?(ref) + return error("You can only create files if you are on top of a branch") + end + + file_name = File.basename(path) + file_path = path + + unless file_name =~ Gitlab::Regex.path_regex + return error("Your changes could not be committed, because file name contains not allowed characters") + end + + blob = repository.blob_at(ref, file_path) + + if blob + return error("Your changes could not be committed, because file with such name exists") + end + + new_file_action = Gitlab::Satellite::NewFileAction.new(current_user, project, ref, file_path) + created_successfully = new_file_action.commit!( + params[:content], + params[:commit_message], + params[:encoding] + ) + + if created_successfully + success + else + error("Your changes could not be committed, because the file has been changed") + end + end + end +end diff --git a/app/services/files/delete_service.rb b/app/services/files/delete_service.rb new file mode 100644 index 00000000000..30e512d0912 --- /dev/null +++ b/app/services/files/delete_service.rb @@ -0,0 +1,40 @@ +require_relative "base_service" + +module Files + class DeleteService < BaseService + def execute + allowed = if project.protected_branch?(ref) + can?(current_user, :push_code_to_protected_branches, project) + else + can?(current_user, :push_code, project) + end + + unless allowed + return error("You are not allowed to push into this branch") + end + + unless repository.branch_names.include?(ref) + return error("You can only create files if you are on top of a branch") + end + + blob = repository.blob_at(ref, path) + + unless blob + return error("You can only edit text files") + end + + delete_file_action = Gitlab::Satellite::DeleteFileAction.new(current_user, project, ref, path) + + deleted_successfully = delete_file_action.commit!( + nil, + params[:commit_message] + ) + + if deleted_successfully + success + else + error("Your changes could not be committed, because the file has been changed") + end + end + end +end diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb new file mode 100644 index 00000000000..d59802ae485 --- /dev/null +++ b/app/services/files/update_service.rb @@ -0,0 +1,40 @@ +require_relative "base_service" + +module Files + class UpdateService < BaseService + def execute + allowed = if project.protected_branch?(ref) + can?(current_user, :push_code_to_protected_branches, project) + else + can?(current_user, :push_code, project) + end + + unless allowed + return error("You are not allowed to push into this branch") + end + + unless repository.branch_names.include?(ref) + return error("You can only create files if you are on top of a branch") + end + + blob = repository.blob_at(ref, path) + + unless blob + return error("You can only edit text files") + end + + edit_file_action = Gitlab::Satellite::EditFileAction.new(current_user, project, ref, path) + created_successfully = edit_file_action.commit!( + params[:content], + params[:commit_message], + params[:encoding] + ) + + if created_successfully + success + else + error("Your changes could not be committed, because the file has been changed") + end + end + end +end |