Merge branch 'minor_refactoring' into 'master'

Minor refactoring Add Repository#blob_at_branch method

Merge branch 'minor_refactoring' into 'master'
Minor refactoring Add Repository#blob_at_branch method
Dmitriy Zaporozhets
2 parents d701d586 55572c4e
Showing 4 changed files with 13 additions and 6 deletions Show diff stats
app/models/repository.rb
app/services/files/create_service.rb
app/services/files/delete_service.rb
app/services/files/update_service.rb
@@ -178,4 +178,14 @@ class Repository
  
     Tree.new(self, sha, path)
   end
+
+  def blob_at_branch(branch_name, path)
+     last_commit = commit(branch_name)
+
+     if last_commit
+       blob_at(last_commit.sha, path)
+     else
+       nil
+     end
+  end
 end
@@ -24,8 +24,7 @@ module Files
         return error("Your changes could not be committed, because file name contains not allowed characters")
       end
  
-      commit = repository.commit(ref)
-      blob = repository.blob_at(commit.sha, file_path)
+      blob = repository.blob_at_branch(ref, file_path)
  
       if blob
         return error("Your changes could not be committed, because file with such name exists")
@@ -17,8 +17,7 @@ module Files
         return error("You can only create files if you are on top of a branch")
       end
  
-      commit = repository.commit(ref)
-      blob = repository.blob_at(commit.sha, path)
+      blob = repository.blob_at_branch(ref, path)
  
       unless blob
         return error("You can only edit text files")
@@ -17,8 +17,7 @@ module Files
         return error("You can only create files if you are on top of a branch")
       end
  
-      commit = repository.commit(ref)
-      blob = repository.blob_at(commit.sha, path)
+      blob = repository.blob_at_branch(ref, path)
  
       unless blob
         return error("You can only edit text files")
...	...	@@ -178,4 +178,14 @@ class Repository
178	178
179	179	Tree.new(self, sha, path)
180	180	end
	181	+
	182	+ def blob_at_branch(branch_name, path)
	183	+ last_commit = commit(branch_name)
	184	+
	185	+ if last_commit
	186	+ blob_at(last_commit.sha, path)
	187	+ else
	188	+ nil
	189	+ end
	190	+ end
181	191	end
...	...
...	...	@@ -24,8 +24,7 @@ module Files
24	24	return error("Your changes could not be committed, because file name contains not allowed characters")
25	25	end
26	26
27		- commit = repository.commit(ref)
28		- blob = repository.blob_at(commit.sha, file_path)
	27	+ blob = repository.blob_at_branch(ref, file_path)
29	28
30	29	if blob
31	30	return error("Your changes could not be committed, because file with such name exists")
...	...
...	...	@@ -17,8 +17,7 @@ module Files
17	17	return error("You can only create files if you are on top of a branch")
18	18	end
19	19
20		- commit = repository.commit(ref)
21		- blob = repository.blob_at(commit.sha, path)
	20	+ blob = repository.blob_at_branch(ref, path)
22	21
23	22	unless blob
24	23	return error("You can only edit text files")
...	...