Add BlobController, remove Refs#blob

Robert Speicher
1 parent 39c65793
Showing 8 changed files with 83 additions and 65 deletions Show diff stats
app/controllers/blob_controller.rb
app/controllers/refs_controller.rb
app/views/blame/show.html.haml
app/views/commits/_diffs.html.haml
app/views/tree/_tree_file.html.haml
config/routes.rb
spec/requests/security/project_access_spec.rb
spec/routing/project_routing_spec.rb
@@ -0,0 +1,62 @@
+# Controller for viewing a file's blame
+class BlobController < ApplicationController
+  # Thrown when given an invalid path
+  class InvalidPathError < StandardError; end
+
+  include RefExtractor
+  include Gitlab::Encode
+
+  layout "project"
+
+  before_filter :project
+
+  # Authorize
+  before_filter :add_project_abilities
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  before_filter :define_tree_vars
+
+  def show
+    if @tree.is_blob?
+      if @tree.text?
+        encoding = detect_encoding(@tree.data)
+        mime_type = encoding ? "text/plain; charset=#{encoding}" : "text/plain"
+      else
+        mime_type = @tree.mime_type
+      end
+
+      send_data(
+        @tree.data,
+        type: mime_type,
+        disposition: 'inline',
+        filename: @tree.name
+      )
+    else
+      not_found!
+    end
+  end
+
+  private
+
+  def define_tree_vars
+    @ref, @path = extract_ref(params[:id])
+
+    @id     = File.join(@ref, @path)
+    @repo   = @project.repo
+    @commit = CommitDecorator.decorate(@project.commit(@ref))
+
+    @tree = Tree.new(@commit.tree, @project, @ref, @path)
+    @tree = TreeDecorator.new(@tree)
+
+    raise InvalidPathError if @tree.invalid?
+
+    @hex_path = Digest::SHA1.hexdigest(@path)
+
+    @history_path = project_tree_path(@project, @id)
+    @logs_path    = logs_file_project_ref_path(@project, @ref, @path)
+  rescue NoMethodError, InvalidPathError
+    not_found!
+  end
+end
@@ -18,14 +18,14 @@ class RefsController &lt; ApplicationController
     respond_to do |format| 
       format.html do 
         new_path = if params[:destination] == "tree"
-                     project_tree_path(@project, params[:ref])
+                     project_tree_path(@project, @ref)
                    else
-                     project_commits_path(@project, ref: params[:ref])
+                     project_commits_path(@project, ref: @ref)
                    end
-        redirect_to new_path 
+        redirect_to new_path
       end
-      format.js do 
+      format.js do
         @ref = params[:ref]
         define_tree_vars
         render "tree"
@@ -33,19 +33,6 @@ class RefsController &lt; ApplicationController
     end
   end
-  #
-  # Repository preview
-  #
-  def tree
-    respond_to do |format|
-      format.html
-      format.js do
-        # disable cache to allow back button works
-        no_cache_headers
-      end
-    end
-  end
-
   def logs_tree
     contents = @tree.contents
     @logs = contents.map do |content|
@@ -53,32 +40,12 @@ class RefsController &lt; ApplicationController
       last_commit = @project.commits(@commit.id, file, 1).last
       last_commit = CommitDecorator.decorate(last_commit)
       {
-        file_name: content.name, 
+        file_name: content.name,
         commit: last_commit
       }
     end
   end
-  def blob
-    if @tree.is_blob?
-      if @tree.text?
-        encoding = detect_encoding(@tree.data)
-        mime_type = encoding ? "text/plain; charset=#{encoding}" : "text/plain"
-      else
-        mime_type = @tree.mime_type
-      end
-
-      send_data(
-        @tree.data,
-        type: mime_type,
-        disposition: 'inline',
-        filename: @tree.name
-      )
-    else
-      head(404)
-    end
-  end
-
   protected
   def define_tree_vars
@@ -93,15 +60,15 @@ class RefsController &lt; ApplicationController
     if params[:path]
       @history_path = project_tree_path(@project, File.join(@ref, params[:path]))
-      @logs_path = logs_file_project_ref_path(@project, @ref, params[:path]) 
+      @logs_path = logs_file_project_ref_path(@project, @ref, params[:path])
     else
       @history_path = project_tree_path(@project, @ref)
-      @logs_path = logs_tree_project_ref_path(@project, @ref) 
+      @logs_path = logs_tree_project_ref_path(@project, @ref)
     end
   rescue
     return render_404
   end
-    
+
   def ref
     @ref = params[:id]
   end
@@ -18,7 +18,7 @@
         = @tree.name
         %small blame
       %span.options
-        = link_to "raw", blob_project_ref_path(@project, @ref, path: params[:path]), class: "btn very_small", target: "_blank"
+        = link_to "raw", project_blob_path(@project, @id), class: "btn very_small", target: "_blank"
         = link_to "history", project_commits_path(@project, path: params[:path], ref: @ref), class: "btn very_small"
         = link_to "source", project_tree_path(@project, @id), class: "btn very_small"
     .file_content.blame
@@ -24,7 +24,7 @@
           %i.icon-file
           %span{id: "#{diff.old_path}"}= diff.old_path
         - else
-          = link_to project_tree_path(@project, @commit, diff.new_path) do
+          = link_to project_tree_path(@project, tree_join(@commit.id, diff.new_path)) do
             %i.icon-file
             %span{id: "#{diff.new_path}"}= diff.new_path
         %br/
@@ -5,8 +5,8 @@
       = name.force_encoding('utf-8')
       %small #{file.mode}
     %span.options
-      = link_to "raw", blob_project_ref_path(@project, @ref, path: @path), class: "btn very_small", target: "_blank"
-      = link_to "history", project_commits_path(@project, path: params[:path], ref: @ref), class: "btn very_small"
+      = link_to "raw", project_blob_path(@project, @id), class: "btn very_small", target: "_blank"
+      = link_to "history", project_commits_path(@project, path: @path, ref: @ref), class: "btn very_small"
       = link_to "blame", project_blame_path(@project, @id), class: "btn very_small"
   - if file.text?
     - if gitlab_markdown?(name)
@@ -32,7 +32,7 @@
   - else
     .file_content.blob_file
       %center
-        = link_to blob_project_ref_path(@project, @ref, path: params[:path]) do
+        = link_to project_blob_path(@project, @id) do
           %div.padded
             %br
             = image_tag "download.png", width: 64
@@ -122,12 +122,6 @@ Gitlab::Application.routes.draw do
       end
       member do
-        get "blob",
-          constraints: {
-            id:   /[a-zA-Z.0-9\/_\-]+/,
-            path: /.*/
-          }
-
         # tree viewer logs
         get "logs_tree", constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }
         get "logs_tree/:path" => "refs#logs_tree",
@@ -197,7 +191,7 @@ Gitlab::Application.routes.draw do
     # XXX: WIP
     resources :blame,  only: [:show], constraints: {id: /.+/}
-    # resources :blob,   only: [:show], constraints: {id: /.+/}
+    resources :blob,   only: [:show], constraints: {id: /.+/}
     # resources :raw,    only: [:show], constraints: {id: /.+/}
     resources :tree,   only: [:show], constraints: {id: /.+/}
   end
@@ -95,7 +95,7 @@ describe &quot;Application access&quot; do
       before do
         commit = @project.commit
         path = commit.tree.contents.select { |i| i.is_a?(Grit::Blob)}.first.name
-        @blob_path = blob_project_ref_path(@project, commit.id, path: path)
+        @blob_path = project_blob_path(@project, File.join(commit.id, path))
       end
       it { @blob_path.should be_allowed_for @u1 }
@@ -192,7 +192,6 @@ describe ProtectedBranchesController, &quot;routing&quot; do
 end
 #    switch_project_refs GET    /:project_id/switch(.:format)              refs#switch
-#       blob_project_ref GET    /:project_id/:id/blob(.:format)            refs#blob
 #  logs_tree_project_ref GET    /:project_id/:id/logs_tree(.:format)       refs#logs_tree
 #  logs_file_project_ref GET    /:project_id/:id/logs_tree/:path(.:format) refs#logs_tree
 describe RefsController, "routing" do
@@ -204,10 +203,6 @@ describe RefsController, &quot;routing&quot; do
     get("/gitlabhq/stable/logs_tree").should             route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable')
     get("/gitlabhq/stable/logs_tree/foo/bar/baz").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz')
   end
-
-  it "to #blob" do
-    get("/gitlabhq/stable/blob").should route_to('refs#blob', project_id: 'gitlabhq', id: 'stable')
-  end
 end
 #           diffs_project_merge_request GET    /:project_id/merge_requests/:id/diffs(.:format)           merge_requests#diffs
@@ -400,6 +395,12 @@ describe BlameController, &quot;routing&quot; do
   end
 end
+describe BlobController, "routing" do
+  it "to #show" do
+    get("/gitlabhq/blob/master/app/models/project.rb").should route_to('blob#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb')
+  end
+end
+
 describe TreeController, "routing" do
   it "to #show" do
     get("/gitlabhq/tree/master/app/models/project.rb").should route_to('tree#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb')
@@ -435,12 +436,6 @@ end
 describe "pending routing" do
   before { pending }
-  describe "/:project_id/blob/:id" do
-    it "routes to a ref with a path" do
-      get("/gitlabhq/blob/master/app/models/project.rb").should route_to('blob#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb')
-    end
-  end
-
   describe "/:project_id/commit/:id" do
     it "routes to a specific commit" do
       get("/gitlabhq/commit/f4b1449").should route_to('commit#show', project_id: 'gitlabhq', id: 'f4b1449')
@@ -0,0 +1,62 @@		@@ -0,0 +1,62 @@
	1	+# Controller for viewing a file's blame
	2	+class BlobController < ApplicationController
	3	+ # Thrown when given an invalid path
	4	+ class InvalidPathError < StandardError; end
	5	+
	6	+ include RefExtractor
	7	+ include Gitlab::Encode
	8	+
	9	+ layout "project"
	10	+
	11	+ before_filter :project
	12	+
	13	+ # Authorize
	14	+ before_filter :add_project_abilities
	15	+ before_filter :authorize_read_project!
	16	+ before_filter :authorize_code_access!
	17	+ before_filter :require_non_empty_project
	18	+
	19	+ before_filter :define_tree_vars
	20	+
	21	+ def show
	22	+ if @tree.is_blob?
	23	+ if @tree.text?
	24	+ encoding = detect_encoding(@tree.data)
	25	+ mime_type = encoding ? "text/plain; charset=#{encoding}" : "text/plain"
	26	+ else
	27	+ mime_type = @tree.mime_type
	28	+ end
	29	+
	30	+ send_data(
	31	+ @tree.data,
	32	+ type: mime_type,
	33	+ disposition: 'inline',
	34	+ filename: @tree.name
	35	+ )
	36	+ else
	37	+ not_found!
	38	+ end
	39	+ end
	40	+
	41	+ private
	42	+
	43	+ def define_tree_vars
	44	+ @ref, @path = extract_ref(params[:id])
	45	+
	46	+ @id = File.join(@ref, @path)
	47	+ @repo = @project.repo
	48	+ @commit = CommitDecorator.decorate(@project.commit(@ref))
	49	+
	50	+ @tree = Tree.new(@commit.tree, @project, @ref, @path)
	51	+ @tree = TreeDecorator.new(@tree)
	52	+
	53	+ raise InvalidPathError if @tree.invalid?
	54	+
	55	+ @hex_path = Digest::SHA1.hexdigest(@path)
	56	+
	57	+ @history_path = project_tree_path(@project, @id)
	58	+ @logs_path = logs_file_project_ref_path(@project, @ref, @path)
	59	+ rescue NoMethodError, InvalidPathError
	60	+ not_found!
	61	+ end
	62	+end
	@@ -18,7 +18,7 @@		@@ -18,7 +18,7 @@
18	= @tree.name	18	= @tree.name
19	%small blame	19	%small blame
20	%span.options	20	%span.options
21	- = link_to "raw", blob_project_ref_path(@project, @ref, path: params[:path]), class: "btn very_small", target: "_blank"	21	+ = link_to "raw", project_blob_path(@project, @id), class: "btn very_small", target: "_blank"
22	= link_to "history", project_commits_path(@project, path: params[:path], ref: @ref), class: "btn very_small"	22	= link_to "history", project_commits_path(@project, path: params[:path], ref: @ref), class: "btn very_small"
23	= link_to "source", project_tree_path(@project, @id), class: "btn very_small"	23	= link_to "source", project_tree_path(@project, @id), class: "btn very_small"
24	.file_content.blame	24	.file_content.blame
	@@ -24,7 +24,7 @@		@@ -24,7 +24,7 @@
24	%i.icon-file	24	%i.icon-file
25	%span{id: "#{diff.old_path}"}= diff.old_path	25	%span{id: "#{diff.old_path}"}= diff.old_path
26	- else	26	- else
27	- = link_to project_tree_path(@project, @commit, diff.new_path) do	27	+ = link_to project_tree_path(@project, tree_join(@commit.id, diff.new_path)) do
28	%i.icon-file	28	%i.icon-file
29	%span{id: "#{diff.new_path}"}= diff.new_path	29	%span{id: "#{diff.new_path}"}= diff.new_path
30	%br/	30	%br/
	@@ -95,7 +95,7 @@ describe "Application access" do		@@ -95,7 +95,7 @@ describe "Application access" do
95	before do	95	before do
96	commit = @project.commit	96	commit = @project.commit
97	path = commit.tree.contents.select { \|i\| i.is_a?(Grit::Blob)}.first.name	97	path = commit.tree.contents.select { \|i\| i.is_a?(Grit::Blob)}.first.name
98	- @blob_path = blob_project_ref_path(@project, commit.id, path: path)	98	+ @blob_path = project_blob_path(@project, File.join(commit.id, path))
99	end	99	end
100		100
101	it { @blob_path.should be_allowed_for @u1 }	101	it { @blob_path.should be_allowed_for @u1 }
	@@ -192,7 +192,6 @@ describe ProtectedBranchesController, "routing" do		@@ -192,7 +192,6 @@ describe ProtectedBranchesController, "routing" do
192	end	192	end
193		193
194	# switch_project_refs GET /:project_id/switch(.:format) refs#switch	194	# switch_project_refs GET /:project_id/switch(.:format) refs#switch
195	-# blob_project_ref GET /:project_id/:id/blob(.:format) refs#blob
196	# logs_tree_project_ref GET /:project_id/:id/logs_tree(.:format) refs#logs_tree	195	# logs_tree_project_ref GET /:project_id/:id/logs_tree(.:format) refs#logs_tree
197	# logs_file_project_ref GET /:project_id/:id/logs_tree/:path(.:format) refs#logs_tree	196	# logs_file_project_ref GET /:project_id/:id/logs_tree/:path(.:format) refs#logs_tree
198	describe RefsController, "routing" do	197	describe RefsController, "routing" do
	@@ -204,10 +203,6 @@ describe RefsController, "routing" do		@@ -204,10 +203,6 @@ describe RefsController, "routing" do
204	get("/gitlabhq/stable/logs_tree").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable')	203	get("/gitlabhq/stable/logs_tree").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable')
205	get("/gitlabhq/stable/logs_tree/foo/bar/baz").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz')	204	get("/gitlabhq/stable/logs_tree/foo/bar/baz").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz')
206	end	205	end
207	-
208	- it "to #blob" do
209	- get("/gitlabhq/stable/blob").should route_to('refs#blob', project_id: 'gitlabhq', id: 'stable')
210	- end
211	end	206	end
212		207
213	# diffs_project_merge_request GET /:project_id/merge_requests/:id/diffs(.:format) merge_requests#diffs	208	# diffs_project_merge_request GET /:project_id/merge_requests/:id/diffs(.:format) merge_requests#diffs
	@@ -400,6 +395,12 @@ describe BlameController, "routing" do		@@ -400,6 +395,12 @@ describe BlameController, "routing" do
400	end	395	end
401	end	396	end
402		397
		398	+describe BlobController, "routing" do
		399	+ it "to #show" do
		400	+ get("/gitlabhq/blob/master/app/models/project.rb").should route_to('blob#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb')
		401	+ end
		402	+end
		403	+
403	describe TreeController, "routing" do	404	describe TreeController, "routing" do
404	it "to #show" do	405	it "to #show" do
405	get("/gitlabhq/tree/master/app/models/project.rb").should route_to('tree#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb')	406	get("/gitlabhq/tree/master/app/models/project.rb").should route_to('tree#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb')
	@@ -435,12 +436,6 @@ end		@@ -435,12 +436,6 @@ end
435	describe "pending routing" do	436	describe "pending routing" do
436	before { pending }	437	before { pending }
437		438
438	- describe "/:project_id/blob/:id" do
439	- it "routes to a ref with a path" do
440	- get("/gitlabhq/blob/master/app/models/project.rb").should route_to('blob#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb')
441	- end
442	- end
443	-
444	describe "/:project_id/commit/:id" do	439	describe "/:project_id/commit/:id" do
445	it "routes to a specific commit" do	440	it "routes to a specific commit" do
446	get("/gitlabhq/commit/f4b1449").should route_to('commit#show', project_id: 'gitlabhq', id: 'f4b1449')	441	get("/gitlabhq/commit/f4b1449").should route_to('commit#show', project_id: 'gitlabhq', id: 'f4b1449')