Add a "patch" MIME type, and render it like a normal view in Commit#show

Robert Speicher
1 parent c058e390
Showing 4 changed files with 17 additions and 22 deletions Show diff stats
app/controllers/commit_controller.rb
app/controllers/commits_controller.rb
app/views/commit/show.patch.erb
config/initializers/mime_types.rb
@@ -15,19 +15,22 @@ class CommitController &lt; ApplicationController
     result = CommitLoad.new(project, current_user, params).execute
  
     @commit = result[:commit]
+    git_not_found! unless @commit
  
-    if @commit
-      @suppress_diff = result[:suppress_diff]
-      @note          = result[:note]
-      @line_notes    = result[:line_notes]
-      @notes_count   = result[:notes_count]
-      @comments_allowed = true
-    else
-      return git_not_found!
-    end
+    @suppress_diff    = result[:suppress_diff]
+    @note             = result[:note]
+    @line_notes       = result[:line_notes]
+    @notes_count      = result[:notes_count]
+    @comments_allowed = true
+
+    respond_to do |format|
+      format.html do
+        if result[:status] == :huge_commit
+          render "huge_commit" and return
+        end
+      end
  
-    if result[:status] == :huge_commit
-      render "huge_commit" and return
+      format.patch
     end
   end
 end
@@ -25,15 +25,4 @@ class CommitsController &lt; ApplicationController
       format.atom { render layout: false }
     end
   end
-
-  def patch
-    @commit = project.commit(params[:id])
-
-    send_data(
-      @commit.to_patch,
-      type: "text/plain",
-      disposition: 'attachment',
-      filename: "#{@commit.id}.patch"
-    )
-  end
 end
@@ -0,0 +1 @@
+<%= @commit.to_patch %>
@@ -3,3 +3,5 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register_alias "text/html", :iphone
+
+Mime::Type.register_alias 'text/plain', :patch
...	...	@@ -15,19 +15,22 @@ class CommitController < ApplicationController
15	15	result = CommitLoad.new(project, current_user, params).execute
16	16
17	17	@commit = result[:commit]
	18	+ git_not_found! unless @commit
18	19
19		- if @commit
20		- @suppress_diff = result[:suppress_diff]
21		- @note = result[:note]
22		- @line_notes = result[:line_notes]
23		- @notes_count = result[:notes_count]
24		- @comments_allowed = true
25		- else
26		- return git_not_found!
27		- end
	20	+ @suppress_diff = result[:suppress_diff]
	21	+ @note = result[:note]
	22	+ @line_notes = result[:line_notes]
	23	+ @notes_count = result[:notes_count]
	24	+ @comments_allowed = true
	25	+
	26	+ respond_to do \|format\|
	27	+ format.html do
	28	+ if result[:status] == :huge_commit
	29	+ render "huge_commit" and return
	30	+ end
	31	+ end
28	32
29		- if result[:status] == :huge_commit
30		- render "huge_commit" and return
	33	+ format.patch
31	34	end
32	35	end
33	36	end
...	...
...	...	@@ -25,15 +25,4 @@ class CommitsController < ApplicationController
25	25	format.atom { render layout: false }
26	26	end
27	27	end
28		-
29		- def patch
30		- @commit = project.commit(params[:id])
31		-
32		- send_data(
33		- @commit.to_patch,
34		- type: "text/plain",
35		- disposition: 'attachment',
36		- filename: "#{@commit.id}.patch"
37		- )
38		- end
39	28	end
...	...
...	...	@@ -3,3 +3,5 @@
3	3	# Add new mime types for use in respond_to blocks:
4	4	# Mime::Type.register "text/richtext", :rtf
5	5	# Mime::Type.register_alias "text/html", :iphone
	6	+
	7	+Mime::Type.register_alias 'text/plain', :patch
...	...