Remove Commits#compare, add CompareController

Robert Speicher
1 parent 5a5d214d
Showing 7 changed files with 106 additions and 74 deletions Show diff stats
app/controllers/commits_controller.rb
app/controllers/compare_controller.rb
app/views/commits/compare.html.haml
app/views/compare/_head.html.haml
app/views/compare/show.html.haml
config/routes.rb
spec/routing/project_routing_spec.rb
@@ -45,18 +45,6 @@ class CommitsController &lt; ApplicationController
   #   end
   # end
-  def compare
-    result = Commit.compare(project, params[:from], params[:to])
-
-    @commits = result[:commits]
-    @commit  = result[:commit]
-    @diffs   = result[:diffs]
-    @refs_are_same = result[:same]
-    @line_notes = []
-
-    @commits = CommitDecorator.decorate(@commits)
-  end
-
   def patch
     @commit = project.commit(params[:id])
@@ -0,0 +1,22 @@
+class CompareController < ApplicationController
+  before_filter :project
+  layout "project"
+
+  # Authorize
+  before_filter :add_project_abilities
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  def show
+    result = Commit.compare(project, params[:from], params[:to])
+
+    @commits       = result[:commits]
+    @commit        = result[:commit]
+    @diffs         = result[:diffs]
+    @refs_are_same = result[:same]
+    @line_notes    = []
+
+    @commits = CommitDecorator.decorate(@commits)
+  end
+end
@@ -1,53 +0,0 @@
-= render "head"
-
-%h3.page_title
-  Compare View
-%hr
-
-%div
-  %p.slead
-    Fill input field with commit id like
-    %code.label_branch 4eedf23
-    or branch/tag name like
-    %code.label_branch master
-    and press compare button for commits list, code diff.
-
-  %br
-
-  = form_tag compare_project_commits_path(@project), method: :get do
-    .clearfix
-      = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge"
-      = "..."
-      = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge"
-    - if @refs_are_same
-      .alert
-        %span Refs are the same
-    .actions
-      = submit_tag "Compare", class: "btn primary wide commits-compare-btn"
-
-- if @commits.present?
-  %div.ui-box
-    %h5.small Commits (#{@commits.count})
-    %ul.unstyled= render @commits
-
-  - unless @diffs.empty?
-    %h4 Diff
-    = render "commits/diffs", diffs: @diffs
-
-:javascript
-  $(function() {
-    var availableTags = #{@project.ref_names.to_json};
-
-    $("#from").autocomplete({
-      source: availableTags,
-      minLength: 1
-    });
-
-    $("#to").autocomplete({
-      source: availableTags,
-      minLength: 1
-    });
-
-    disableButtonIfEmptyField('#to', '.commits-compare-btn');
-  });
-
@@ -0,0 +1,23 @@
+%ul.nav.nav-tabs
+  %li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'}
+  %li{class: "#{'active' if current_page?(project_commits_path(@project)) }"}
+    = link_to project_commits_path(@project) do
+      Commits
+  %li{class: "#{'active' if current_page?(compare_project_commits_path(@project)) }"}
+    = link_to compare_project_commits_path(@project) do
+      Compare
+  %li{class: "#{branches_tab_class}"}
+    = link_to project_repository_path(@project) do
+      Branches
+      %span.badge= @project.repo.branch_count
+
+  %li{class: "#{'active' if current_page?(tags_project_repository_path(@project)) }"}
+    = link_to tags_project_repository_path(@project) do
+      Tags
+      %span.badge= @project.repo.tag_count
+
+  - if current_page?(project_commits_path(@project)) && current_user.private_token
+    %li.right
+      %span.rss-icon
+        = link_to project_commits_path(@project, :atom, { private_token: current_user.private_token, ref: @ref }), title: "Feed" do
+          = image_tag "rss_ui.png", title: "feed"
@@ -0,0 +1,53 @@
+= render "head"
+
+%h3.page_title
+  Compare View
+%hr
+
+%div
+  %p.slead
+    Fill input field with commit id like
+    %code.label_branch 4eedf23
+    or branch/tag name like
+    %code.label_branch master
+    and press compare button for commits list, code diff.
+
+  %br
+
+  = form_tag compare_project_commits_path(@project), method: :get do
+    .clearfix
+      = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge"
+      = "..."
+      = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge"
+    - if @refs_are_same
+      .alert
+        %span Refs are the same
+    .actions
+      = submit_tag "Compare", class: "btn primary wide commits-compare-btn"
+
+- if @commits.present?
+  %div.ui-box
+    %h5.small Commits (#{@commits.count})
+    %ul.unstyled= render @commits
+
+  - unless @diffs.empty?
+    %h4 Diff
+    = render "commits/diffs", diffs: @diffs
+
+:javascript
+  $(function() {
+    var availableTags = #{@project.ref_names.to_json};
+
+    $("#from").autocomplete({
+      source: availableTags,
+      minLength: 1
+    });
+
+    $("#to").autocomplete({
+      source: availableTags,
+      minLength: 1
+    });
+
+    disableButtonIfEmptyField('#to', '.commits-compare-btn');
+  });
+
@@ -162,10 +162,6 @@ Gitlab::Application.routes.draw do
     resources :commit, only: [:show], constraints: {id: /[[:alnum:]]{6,40}/}
     resources :commits, only: [:index, :show] do
-      collection do
-        get :compare
-      end
-
       member do
         get :patch
       end
@@ -194,6 +190,7 @@ Gitlab::Application.routes.draw do
     resources :blob,   only: [:show], constraints: {id: /.+/}
     # resources :raw,    only: [:show], constraints: {id: /.+/}
     resources :tree,   only: [:show], constraints: {id: /.+/}
+    match "/compare/:from...:to" => "compare#show", as: "compare", constraints: {from: /.+/, to: /.+/}
   end
   root to: "dashboard#index"
@@ -289,16 +289,11 @@ describe CommitController, &quot;routing&quot; do
   end
 end
-# compare_project_commits GET    /:project_id/commits/compare(.:format)   commits#compare
 #    patch_project_commit GET    /:project_id/commits/:id/patch(.:format) commits#patch
 #         project_commits GET    /:project_id/commits(.:format)           commits#index
 #                         POST   /:project_id/commits(.:format)           commits#create
 #          project_commit GET    /:project_id/commits/:id(.:format)       commits#show
 describe CommitsController, "routing" do
-  it "to #compare" do
-    get("/gitlabhq/commits/compare").should route_to('commits#compare', project_id: 'gitlabhq')
-  end
-
   it "to #patch" do
     get("/gitlabhq/commits/1/patch").should route_to('commits#patch', project_id: 'gitlabhq', id: '1')
   end
@@ -407,6 +402,13 @@ describe TreeController, &quot;routing&quot; do
   end
 end
+describe CompareController, "routing" do
+  it "to #show" do
+    get("/gitlabhq/compare/master...stable").should     route_to('compare#show', project_id: 'gitlabhq', from: 'master', to: 'stable')
+    get("/gitlabhq/compare/issue/1234...stable").should route_to('compare#show', project_id: 'gitlabhq', from: 'issue/1234', to: 'stable')
+  end
+end
+
 # TODO: Pending
 #
 # /:project_id/blame/*path
	@@ -45,18 +45,6 @@ class CommitsController < ApplicationController		@@ -45,18 +45,6 @@ class CommitsController < ApplicationController
45	# end	45	# end
46	# end	46	# end
47		47
48	- def compare
49	- result = Commit.compare(project, params[:from], params[:to])
50	-
51	- @commits = result[:commits]
52	- @commit = result[:commit]
53	- @diffs = result[:diffs]
54	- @refs_are_same = result[:same]
55	- @line_notes = []
56	-
57	- @commits = CommitDecorator.decorate(@commits)
58	- end
59	-
60	def patch	48	def patch
61	@commit = project.commit(params[:id])	49	@commit = project.commit(params[:id])
62		50
@@ -0,0 +1,22 @@		@@ -0,0 +1,22 @@
	1	+class CompareController < ApplicationController
	2	+ before_filter :project
	3	+ layout "project"
	4	+
	5	+ # Authorize
	6	+ before_filter :add_project_abilities
	7	+ before_filter :authorize_read_project!
	8	+ before_filter :authorize_code_access!
	9	+ before_filter :require_non_empty_project
	10	+
	11	+ def show
	12	+ result = Commit.compare(project, params[:from], params[:to])
	13	+
	14	+ @commits = result[:commits]
	15	+ @commit = result[:commit]
	16	+ @diffs = result[:diffs]
	17	+ @refs_are_same = result[:same]
	18	+ @line_notes = []
	19	+
	20	+ @commits = CommitDecorator.decorate(@commits)
	21	+ end
	22	+end
	@@ -1,53 +0,0 @@	@@ -1,53 +0,0 @@
1	-= render "head"
2	-
3	-%h3.page_title
4	- Compare View
5	-%hr
6	-
7	-%div
8	- %p.slead
9	- Fill input field with commit id like
10	- %code.label_branch 4eedf23
11	- or branch/tag name like
12	- %code.label_branch master
13	- and press compare button for commits list, code diff.
14	-
15	- %br
16	-
17	- = form_tag compare_project_commits_path(@project), method: :get do
18	- .clearfix
19	- = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge"
20	- = "..."
21	- = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge"
22	- - if @refs_are_same
23	- .alert
24	- %span Refs are the same
25	- .actions
26	- = submit_tag "Compare", class: "btn primary wide commits-compare-btn"
27	-
28	-- if @commits.present?
29	- %div.ui-box
30	- %h5.small Commits (#{@commits.count})
31	- %ul.unstyled= render @commits
32	-
33	- - unless @diffs.empty?
34	- %h4 Diff
35	- = render "commits/diffs", diffs: @diffs
36	-
37	-:javascript
38	- $(function() {
39	- var availableTags = #{@project.ref_names.to_json};
40	-
41	- $("#from").autocomplete({
42	- source: availableTags,
43	- minLength: 1
44	- });
45	-
46	- $("#to").autocomplete({
47	- source: availableTags,
48	- minLength: 1
49	- });
50	-
51	- disableButtonIfEmptyField('#to', '.commits-compare-btn');
52	- });
53	-
@@ -0,0 +1,23 @@		@@ -0,0 +1,23 @@
	1	+%ul.nav.nav-tabs
	2	+ %li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'}
	3	+ %li{class: "#{'active' if current_page?(project_commits_path(@project)) }"}
	4	+ = link_to project_commits_path(@project) do
	5	+ Commits
	6	+ %li{class: "#{'active' if current_page?(compare_project_commits_path(@project)) }"}
	7	+ = link_to compare_project_commits_path(@project) do
	8	+ Compare
	9	+ %li{class: "#{branches_tab_class}"}
	10	+ = link_to project_repository_path(@project) do
	11	+ Branches
	12	+ %span.badge= @project.repo.branch_count
	13	+
	14	+ %li{class: "#{'active' if current_page?(tags_project_repository_path(@project)) }"}
	15	+ = link_to tags_project_repository_path(@project) do
	16	+ Tags
	17	+ %span.badge= @project.repo.tag_count
	18	+
	19	+ - if current_page?(project_commits_path(@project)) && current_user.private_token
	20	+ %li.right
	21	+ %span.rss-icon
	22	+ = link_to project_commits_path(@project, :atom, { private_token: current_user.private_token, ref: @ref }), title: "Feed" do
	23	+ = image_tag "rss_ui.png", title: "feed"
@@ -0,0 +1,53 @@		@@ -0,0 +1,53 @@
	1	+= render "head"
	2	+
	3	+%h3.page_title
	4	+ Compare View
	5	+%hr
	6	+
	7	+%div
	8	+ %p.slead
	9	+ Fill input field with commit id like
	10	+ %code.label_branch 4eedf23
	11	+ or branch/tag name like
	12	+ %code.label_branch master
	13	+ and press compare button for commits list, code diff.
	14	+
	15	+ %br
	16	+
	17	+ = form_tag compare_project_commits_path(@project), method: :get do
	18	+ .clearfix
	19	+ = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge"
	20	+ = "..."
	21	+ = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge"
	22	+ - if @refs_are_same
	23	+ .alert
	24	+ %span Refs are the same
	25	+ .actions
	26	+ = submit_tag "Compare", class: "btn primary wide commits-compare-btn"
	27	+
	28	+- if @commits.present?
	29	+ %div.ui-box
	30	+ %h5.small Commits (#{@commits.count})
	31	+ %ul.unstyled= render @commits
	32	+
	33	+ - unless @diffs.empty?
	34	+ %h4 Diff
	35	+ = render "commits/diffs", diffs: @diffs
	36	+
	37	+:javascript
	38	+ $(function() {
	39	+ var availableTags = #{@project.ref_names.to_json};
	40	+
	41	+ $("#from").autocomplete({
	42	+ source: availableTags,
	43	+ minLength: 1
	44	+ });
	45	+
	46	+ $("#to").autocomplete({
	47	+ source: availableTags,
	48	+ minLength: 1
	49	+ });
	50	+
	51	+ disableButtonIfEmptyField('#to', '.commits-compare-btn');
	52	+ });
	53	+