Improve Extract path

Dmitriy Zaporozhets
1 parent 07a5cb2e
Showing 1 changed file with 4 additions and 2 deletions Show diff stats
lib/extracts_path.rb
@@ -51,7 +51,7 @@ module ExtractsPath
     return pair unless @project
  
     # Remove project, actions and all other staff from path
-    input.gsub!("/#{@project.path_with_namespace}", "")
+    input.gsub!(/^\/#{Regexp.escape(@project.path_with_namespace)}/, "")
     input.gsub!(/^\/(tree|commits|blame|blob)\//, "") # remove actions
     input.gsub!(/\?.*$/, "") # remove stamps suffix
     input.gsub!(/.atom$/, "") # remove rss feed
@@ -108,7 +108,9 @@ module ExtractsPath
       request.format = :atom
     end
  
-    @ref, @path = extract_ref(request.fullpath)
+    path = request.fullpath.dup
+
+    @ref, @path = extract_ref(path)
  
     @id = File.join(@ref, @path)
...	...	@@ -51,7 +51,7 @@ module ExtractsPath
51	51	return pair unless @project
52	52
53	53	# Remove project, actions and all other staff from path
54		- input.gsub!("/#{@project.path_with_namespace}", "")
	54	+ input.gsub!(/^\/#{Regexp.escape(@project.path_with_namespace)}/, "")
55	55	input.gsub!(/^\/(tree\|commits\|blame\|blob)\//, "") # remove actions
56	56	input.gsub!(/\?.*$/, "") # remove stamps suffix
57	57	input.gsub!(/.atom$/, "") # remove rss feed
...	...	@@ -108,7 +108,9 @@ module ExtractsPath
108	108	request.format = :atom
109	109	end
110	110
111		- @ref, @path = extract_ref(request.fullpath)
	111	+ path = request.fullpath.dup
	112	+
	113	+ @ref, @path = extract_ref(path)
112	114
113	115	@id = File.join(@ref, @path)
114	116
...	...