From 97c3aff16fa94cee622cd00ffaa2e3a6469c1439 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Thu, 14 Apr 2016 17:10:57 +0200 Subject: [PATCH] refactored import stuff, moved to lib --- app/services/projects/import_export/import_service.rb | 2 +- .../gitlab}/import_export/members_mapper.rb | 2 +- .../gitlab}/import_export/project_factory.rb | 2 +- .../gitlab}/import_export/project_tree_restorer.rb | 10 +++++----- .../gitlab}/import_export/relation_factory.rb | 2 +- .../gitlab}/import_export/members_mapper_spec.rb | 4 ++-- .../import_export/project_tree_restorer_spec.rb | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) rename {app/services/projects => lib/gitlab}/import_export/members_mapper.rb (99%) rename {app/services/projects => lib/gitlab}/import_export/project_factory.rb (98%) rename {app/services/projects => lib/gitlab}/import_export/project_tree_restorer.rb (89%) rename {app/services/projects => lib/gitlab}/import_export/relation_factory.rb (99%) rename spec/{services/projects => lib/gitlab}/import_export/members_mapper_spec.rb (91%) rename spec/{services/projects => lib/gitlab}/import_export/project_tree_restorer_spec.rb (59%) diff --git a/app/services/projects/import_export/import_service.rb b/app/services/projects/import_export/import_service.rb index 3efddf75e48..d188b2dc83b 100644 --- a/app/services/projects/import_export/import_service.rb +++ b/app/services/projects/import_export/import_service.rb @@ -8,7 +8,7 @@ module Projects private def restore_project_tree - Projects::ImportExport::ProjectTreeRestorer.new(path: @import_path).restore + Gitlab::ImportExport::ProjectTreeRestorer.new(path: @import_path).restore end def restore_repo diff --git a/app/services/projects/import_export/members_mapper.rb b/lib/gitlab/import_export/members_mapper.rb similarity index 99% rename from app/services/projects/import_export/members_mapper.rb rename to lib/gitlab/import_export/members_mapper.rb index 6d49d901bf3..d6124106f57 100644 --- a/app/services/projects/import_export/members_mapper.rb +++ b/lib/gitlab/import_export/members_mapper.rb @@ -1,4 +1,4 @@ -module Projects +module Gitlab module ImportExport class MembersMapper diff --git a/app/services/projects/import_export/project_factory.rb b/lib/gitlab/import_export/project_factory.rb similarity index 98% rename from app/services/projects/import_export/project_factory.rb rename to lib/gitlab/import_export/project_factory.rb index 1ca0cfb8673..c7137844a0a 100644 --- a/app/services/projects/import_export/project_factory.rb +++ b/lib/gitlab/import_export/project_factory.rb @@ -1,4 +1,4 @@ -module Projects +module Gitlab module ImportExport module ProjectFactory extend self diff --git a/app/services/projects/import_export/project_tree_restorer.rb b/lib/gitlab/import_export/project_tree_restorer.rb similarity index 89% rename from app/services/projects/import_export/project_tree_restorer.rb rename to lib/gitlab/import_export/project_tree_restorer.rb index 62d3e06fdcd..4c0f6a2267b 100644 --- a/app/services/projects/import_export/project_tree_restorer.rb +++ b/lib/gitlab/import_export/project_tree_restorer.rb @@ -1,4 +1,4 @@ -module Projects +module Gitlab module ImportExport class ProjectTreeRestorer attr_reader :project @@ -18,7 +18,7 @@ module Projects private def members_map - @members ||= Projects::ImportExport::MembersMapper.map( + @members ||= Gitlab::ImportExport::MembersMapper.map( exported_members: @project_members, user: @user, project_id: project.id) end @@ -37,7 +37,7 @@ module Projects end def default_relation_list - Projects::ImportExport::ImportExportReader.tree.reject { |model| model.is_a?(Hash) && model[:project_members] } + Gitlab::ImportExport::ImportExportReader.tree.reject { |model| model.is_a?(Hash) && model[:project_members] } end def project @@ -46,7 +46,7 @@ module Projects def create_project project_params = @tree_hash.reject { |_key, value| value.is_a?(Array) } - project = Projects::ImportExport::ProjectFactory.create( + project = Gitlab::ImportExport::ProjectFactory.create( project_params: project_params, user: @user) project.save project @@ -79,7 +79,7 @@ module Projects end def relation_from_factory(relation, relation_hash) - Projects::ImportExport::RelationFactory.create( + Gitlab::ImportExport::RelationFactory.create( relation_sym: relation, relation_hash: relation_hash.merge('project_id' => project.id), members_map: members_map) end end diff --git a/app/services/projects/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb similarity index 99% rename from app/services/projects/import_export/relation_factory.rb rename to lib/gitlab/import_export/relation_factory.rb index 8fce8757228..dd992ef443e 100644 --- a/app/services/projects/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -1,4 +1,4 @@ -module Projects +module Gitlab module ImportExport module RelationFactory extend self diff --git a/spec/services/projects/import_export/members_mapper_spec.rb b/spec/lib/gitlab/import_export/members_mapper_spec.rb similarity index 91% rename from spec/services/projects/import_export/members_mapper_spec.rb rename to spec/lib/gitlab/import_export/members_mapper_spec.rb index e222dd42053..9175356c641 100644 --- a/spec/services/projects/import_export/members_mapper_spec.rb +++ b/spec/lib/gitlab/import_export/members_mapper_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Projects::ImportExport::MembersMapper, services: true do +describe Gitlab::ImportExport::MembersMapper, services: true do describe :map do let(:user) { create(:user) } @@ -31,7 +31,7 @@ describe Projects::ImportExport::MembersMapper, services: true do end let(:members_mapper) do - Projects::ImportExport::MembersMapper.new( + Gitlab::ImportExport::MembersMapper.new( exported_members: exported_members, user: user, project_id: project.id) end diff --git a/spec/services/projects/import_export/project_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb similarity index 59% rename from spec/services/projects/import_export/project_tree_restorer_spec.rb rename to spec/lib/gitlab/import_export/project_tree_restorer_spec.rb index 4c8d182a213..f3d3a57ddd7 100644 --- a/spec/services/projects/import_export/project_tree_restorer_spec.rb +++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb @@ -1,10 +1,10 @@ require 'spec_helper' -describe Projects::ImportExport::ProjectTreeRestorer, services: true do +describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do describe :restore do let(:user) { create(:user) } - let(:project_tree_restorer) { Projects::ImportExport::ProjectTreeRestorer.new(path: "fixtures/import_export/project.json", user: user) } + let(:project_tree_restorer) { Gitlab::ImportExport::ProjectTreeRestorer.new(path: "fixtures/import_export/project.json", user: user) } context 'JSON' do let(:restored_project_json) do -- GitLab