Solve inconsistency between network graph & stat graphs

Dmitriy Zaporozhets
1 parent 9e2c8d94
Showing 21 changed files with 173 additions and 167 deletions Show diff stats
app/controllers/graph_controller.rb
app/controllers/graphs_controller.rb
app/controllers/network_controller.rb
app/controllers/refs_controller.rb
app/controllers/stat_graph_controller.rb
app/views/graph/_head.html.haml
app/views/graph/show.html.haml
app/views/graph/show.json.erb
app/views/graphs/show.html.haml
app/views/graphs/show.js.haml
app/views/layouts/nav/_project.html.haml
app/views/network/_head.html.haml
app/views/network/show.html.haml
app/views/network/show.json.erb
app/views/stat_graph/show.html.haml
app/views/stat_graph/show.js.haml
config/routes.rb
features/steps/project/project_graph.rb
features/steps/project/project_network_graph.rb
features/steps/shared/paths.rb
@@ -1,23 +0,0 @@
-class GraphController < ProjectResourceController
-  include ExtractsPath
-  include ApplicationHelper
-
-  # Authorize
-  before_filter :authorize_read_project!
-  before_filter :authorize_code_access!
-  before_filter :require_non_empty_project
-
-  def show
-    if @options[:q]
-      @commit = @project.repository.commit(@options[:q]) || @commit
-    end
-
-    respond_to do |format|
-      format.html
-
-      format.json do
-        @graph = Network::Graph.new(project, @ref, @commit, @options[:filter_ref])
-      end
-    end
-  end
-end
@@ -0,0 +1,17 @@
+class GraphsController < ProjectResourceController
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  def show
+    respond_to do |format|
+      format.html
+      format.js do
+        @repo = @project.repository
+        @stats = Gitlab::Git::GitStats.new(@repo.raw, @repo.root_ref)
+        @log = @stats.parsed_log.to_json
+      end
+    end
+  end
+end
@@ -0,0 +1,23 @@
+class NetworkController < ProjectResourceController
+  include ExtractsPath
+  include ApplicationHelper
+
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  def show
+    if @options[:q]
+      @commit = @project.repository.commit(@options[:q]) || @commit
+    end
+
+    respond_to do |format|
+      format.html
+
+      format.json do
+        @graph = Network::Graph.new(project, @ref, @commit, @options[:filter_ref])
+      end
+    end
+  end
+end
@@ -14,7 +14,7 @@ class RefsController &lt; ProjectResourceController
                    elsif params[:destination] == "blob"
                      project_blob_path(@project, (@id))
                    elsif params[:destination] == "graph"
-                     project_graph_path(@project, @id, @options)
+                     project_network_path(@project, @id, @options)
                    else
                      project_commits_path(@project, @id)
                    end
@@ -1,17 +0,0 @@
-class StatGraphController < ProjectResourceController
-  # Authorize
-  before_filter :authorize_read_project!
-  before_filter :authorize_code_access!
-  before_filter :require_non_empty_project
-
-  def show
-    respond_to do |format|
-      format.html
-      format.js do
-        @repo = @project.repository
-        @stats = Gitlab::Git::GitStats.new(@repo.raw, @repo.root_ref)
-        @log = @stats.parsed_log.to_json
-      end
-    end
-  end
-end
@@ -1,26 +0,0 @@
-%h3.page_title Project Network Graph
-%hr
-
-.clearfix
-  .pull-left
-    = render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
-  .pull-left
-    = form_tag project_graph_path(@project, @id), method: :get do |f|
-      .control-group
-        = label_tag :filter_ref, "Show only selected ref", class: 'control-label light'
-        .controls
-          = check_box_tag :filter_ref, 1, @options[:filter_ref]
-    - @options.each do |key, value|
-      = hidden_field_tag(key, value, id: nil) unless key == "filter_ref"
-
-  .search.pull-right
-    = form_tag project_graph_path(@project, @id), method: :get do |f|
-      .control-group
-        = label_tag :search , "Looking for commit:", class: 'control-label light'
-        .controls
-          = text_field_tag :q, @options[:q], placeholder: "Input SHA", class: "search-input xlarge"
-          = button_tag type: 'submit', class: 'btn vtop' do
-            %i.icon-search
-          - @options.each do |key, value|
-            = hidden_field_tag(key, value, id: nil) unless key == "q"
-
@@ -1,18 +0,0 @@
-= render "head"
-.graph_holder
-  %h4
-    %small You can move around the graph by using the arrow keys.
-  #holder.graph
-    .loading.loading-gray
-
-:javascript
-  var branch_graph;
-  $("#filter_ref").click(function() {
-    $(this).closest('form').submit();
-  });
-  branch_graph = new BranchGraph($("#holder"), {
-    url: '#{project_graph_path(@project, @ref, @options.merge(format: :json))}',
-    commit_url: '#{project_commit_path(@project, 'ae45ca32').gsub("ae45ca32", "%s")}',
-    ref: '#{@ref}',
-    commit_id: '#{@commit.id}'
-  });
@@ -1,23 +0,0 @@
-<% self.formats = ["html"] %>
-
-<%= raw(
-  {
-    days: @graph.days.compact.map { |d| [d.day, d.strftime("%b")] },
-    commits: @graph.commits.map do |c|
-      {
-        parents: parents_zip_spaces(c.parents(@graph.map), c.parent_spaces),
-        author: {
-          name: c.author_name,
-          email: c.author_email,
-          icon: gravatar_icon(c.author_email, 20)
-        },
-        time: c.time,
-        space: c.spaces.first,
-        refs: get_refs(c),
-        id: c.sha,
-        date: c.date,
-        message: c.message,
-      }
-    end
-  }.to_json
-) %>
@@ -0,0 +1,31 @@
+.loading-graph
+  %center
+    .loading
+    %h3.page_title Building repository graph. Please wait a moment.
+
+.stat-graph
+  .header.clearfix
+    .pull-right
+      %select
+        %option{:value => "commits"} Commits
+        %option{:value => "additions"} Additions
+        %option{:value => "deletions"} Deletions
+    %h3#date_header.page_title
+    %input#brush_change{:type => "hidden"}
+  .graphs
+    #contributors-master
+    #contributors.clearfix
+      %ol.contributors-list.clearfix
+
+:javascript
+  $(".stat-graph").hide();
+
+  $.ajax({
+    type: "GET",
+    url: location.href,
+    complete: function() {
+      $(".loading-graph").hide();
+      $(".stat-graph").show();
+    },
+    dataType: "script"
+  });
@@ -0,0 +1,16 @@
+:plain
+  controller = new ContributorsStatGraph
+  controller.init(#{@log})
+
+  $("select").change( function () {
+    var field = $(this).val()
+    controller.set_current_field(field)
+    controller.redraw_master()
+    controller.redraw_authors()
+  })
+
+  $("#brush_change").change( function () {
+    controller.change_date_header()
+    controller.redraw_authors()
+  })
+
@@ -9,10 +9,10 @@
         = link_to 'Files', project_tree_path(@project, @ref || @repository.root_ref)
       = nav_link(controller: %w(commit commits compare repositories protected_branches)) do
         = link_to "Commits", project_commits_path(@project, @ref || @repository.root_ref)
-      = nav_link(controller: %w(graph)) do
-        = link_to "Network", project_graph_path(@project, @ref || @repository.root_ref)
-      = nav_link(controller: %w(stat_graph)) do
-        = link_to "Graphs", project_stat_graph_path(@project, @ref || @repository.root_ref)
+      = nav_link(controller: %w(network)) do
+        = link_to "Network", project_network_path(@project, @ref || @repository.root_ref)
+      = nav_link(controller: %w(graphs)) do
+        = link_to "Graphs", project_graph_path(@project, @ref || @repository.root_ref)
   - if @project.issues_enabled
     = nav_link(controller: %w(issues milestones labels)) do
@@ -0,0 +1,26 @@
+%h3.page_title Project Network Graph
+%hr
+
+.clearfix
+  .pull-left
+    = render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
+  .pull-left
+    = form_tag project_network_path(@project, @id), method: :get do |f|
+      .control-group
+        = label_tag :filter_ref, "Show only selected ref", class: 'control-label light'
+        .controls
+          = check_box_tag :filter_ref, 1, @options[:filter_ref]
+    - @options.each do |key, value|
+      = hidden_field_tag(key, value, id: nil) unless key == "filter_ref"
+
+  .search.pull-right
+    = form_tag project_network_path(@project, @id), method: :get do |f|
+      .control-group
+        = label_tag :search , "Looking for commit:", class: 'control-label light'
+        .controls
+          = text_field_tag :q, @options[:q], placeholder: "Input SHA", class: "search-input xlarge"
+          = button_tag type: 'submit', class: 'btn vtop' do
+            %i.icon-search
+          - @options.each do |key, value|
+            = hidden_field_tag(key, value, id: nil) unless key == "q"
+
@@ -0,0 +1,18 @@
+= render "head"
+.graph_holder
+  %h4
+    %small You can move around the graph by using the arrow keys.
+  #holder.graph
+    .loading.loading-gray
+
+:javascript
+  var branch_graph;
+  $("#filter_ref").click(function() {
+    $(this).closest('form').submit();
+  });
+  branch_graph = new BranchGraph($("#holder"), {
+    url: '#{project_network_path(@project, @ref, @options.merge(format: :json))}',
+    commit_url: '#{project_commit_path(@project, 'ae45ca32').gsub("ae45ca32", "%s")}',
+    ref: '#{@ref}',
+    commit_id: '#{@commit.id}'
+  });
@@ -0,0 +1,23 @@
+<% self.formats = ["html"] %>
+
+<%= raw(
+  {
+    days: @graph.days.compact.map { |d| [d.day, d.strftime("%b")] },
+    commits: @graph.commits.map do |c|
+      {
+        parents: parents_zip_spaces(c.parents(@graph.map), c.parent_spaces),
+        author: {
+          name: c.author_name,
+          email: c.author_email,
+          icon: gravatar_icon(c.author_email, 20)
+        },
+        time: c.time,
+        space: c.spaces.first,
+        refs: get_refs(c),
+        id: c.sha,
+        date: c.date,
+        message: c.message,
+      }
+    end
+  }.to_json
+) %>
@@ -1,31 +0,0 @@
-.loading-graph
-  %center
-    .loading
-    %h3.page_title Building repository graph. Please wait a moment.
-
-.stat-graph
-  .header.clearfix
-    .pull-right
-      %select
-        %option{:value => "commits"} Commits
-        %option{:value => "additions"} Additions
-        %option{:value => "deletions"} Deletions
-    %h3#date_header.page_title
-    %input#brush_change{:type => "hidden"}
-  .graphs
-    #contributors-master
-    #contributors.clearfix
-      %ol.contributors-list.clearfix
-
-:javascript
-  $(".stat-graph").hide();
-
-  $.ajax({
-    type: "GET",
-    url: location.href,
-    complete: function() {
-      $(".loading-graph").hide();
-      $(".stat-graph").show();
-    },
-    dataType: "script"
-  });
@@ -1,16 +0,0 @@
-:plain
-  controller = new ContributorsStatGraph
-  controller.init(#{@log})
-
-  $("select").change( function () {
-    var field = $(this).val()
-    controller.set_current_field(field)
-    controller.redraw_master()
-    controller.redraw_authors()
-  })
-
-  $("#brush_change").change( function () {
-    controller.change_date_header()
-    controller.redraw_authors()
-  })
-
@@ -190,8 +190,8 @@ Gitlab::Application.routes.draw do
     resources :commits, only: [:show], constraints: {id: /(?:[^.]|\.(?!atom$))+/, format: /atom/}
     resources :compare, only: [:index, :create]
     resources :blame,   only: [:show], constraints: {id: /.+/}
-    resources :graph,   only: [:show], constraints: {id: /(?:[^.]|\.(?!json$))+/, format: /json/}
-    resources :stat_graph, only: [:show], constraints: {id: /(?:[^.]|\.(?!json$))+/, format: /json/}
+    resources :network,   only: [:show], constraints: {id: /(?:[^.]|\.(?!json$))+/, format: /json/}
+    resources :graphs, only: [:show], constraints: {id: /(?:[^.]|\.(?!json$))+/, format: /json/}
     match "/compare/:from...:to" => "compare#show", as: "compare", via: [:get, :post], constraints: {from: /.+/, to: /.+/}
     scope module: :projects do
@@ -8,6 +8,6 @@ class ProjectGraph &lt; Spinach::FeatureSteps
   When 'I visit project "Shop" graph page' do
     project = Project.find_by_name("Shop")
-    visit project_stat_graph_path(project, "master")
+    visit project_graph_path(project, "master")
   end
 end
@@ -12,7 +12,7 @@ class ProjectNetworkGraph &lt; Spinach::FeatureSteps
     Network::Graph.stub(max_count: 10)
     project = Project.find_by_name("Shop")
-    visit project_graph_path(project, "master")
+    visit project_network_path(project, "master")
   end
   And 'page should select "master" in select box' do
@@ -149,7 +149,7 @@ module SharedPaths
     # Stub Graph max_size to speed up test (10 commits vs. 650)
     Network::Graph.stub(max_count: 10)
-    visit project_graph_path(@project, root_ref)
+    visit project_network_path(@project, root_ref)
   end
   step "I visit my project's issues page" do
@@ -446,9 +446,15 @@ describe CompareController, &quot;routing&quot; do
   end
 end
-describe GraphController, "routing" do
+describe NetworkController, "routing" do
   it "to #show" do
-    get("/gitlabhq/graph/master").should route_to('graph#show', project_id: 'gitlabhq', id: 'master')
-    get("/gitlabhq/graph/master.json").should route_to('graph#show', project_id: 'gitlabhq', id: 'master', format: "json")
+    get("/gitlabhq/network/master").should route_to('network#show', project_id: 'gitlabhq', id: 'master')
+    get("/gitlabhq/network/master.json").should route_to('network#show', project_id: 'gitlabhq', id: 'master', format: "json")
+  end
+end
+
+describe GraphsController, "routing" do
+  it "to #show" do
+    get("/gitlabhq/graphs/master").should route_to('graphs#show', project_id: 'gitlabhq', id: 'master')
   end
 end
	@@ -1,23 +0,0 @@	@@ -1,23 +0,0 @@
1	-class GraphController < ProjectResourceController
2	- include ExtractsPath
3	- include ApplicationHelper
4	-
5	- # Authorize
6	- before_filter :authorize_read_project!
7	- before_filter :authorize_code_access!
8	- before_filter :require_non_empty_project
9	-
10	- def show
11	- if @options[:q]
12	- @commit = @project.repository.commit(@options[:q]) \|\| @commit
13	- end
14	-
15	- respond_to do \|format\|
16	- format.html
17	-
18	- format.json do
19	- @graph = Network::Graph.new(project, @ref, @commit, @options[:filter_ref])
20	- end
21	- end
22	- end
23	-end
@@ -0,0 +1,17 @@		@@ -0,0 +1,17 @@
	1	+class GraphsController < ProjectResourceController
	2	+ # Authorize
	3	+ before_filter :authorize_read_project!
	4	+ before_filter :authorize_code_access!
	5	+ before_filter :require_non_empty_project
	6	+
	7	+ def show
	8	+ respond_to do \|format\|
	9	+ format.html
	10	+ format.js do
	11	+ @repo = @project.repository
	12	+ @stats = Gitlab::Git::GitStats.new(@repo.raw, @repo.root_ref)
	13	+ @log = @stats.parsed_log.to_json
	14	+ end
	15	+ end
	16	+ end
	17	+end
@@ -0,0 +1,23 @@		@@ -0,0 +1,23 @@
	1	+class NetworkController < ProjectResourceController
	2	+ include ExtractsPath
	3	+ include ApplicationHelper
	4	+
	5	+ # Authorize
	6	+ before_filter :authorize_read_project!
	7	+ before_filter :authorize_code_access!
	8	+ before_filter :require_non_empty_project
	9	+
	10	+ def show
	11	+ if @options[:q]
	12	+ @commit = @project.repository.commit(@options[:q]) \|\| @commit
	13	+ end
	14	+
	15	+ respond_to do \|format\|
	16	+ format.html
	17	+
	18	+ format.json do
	19	+ @graph = Network::Graph.new(project, @ref, @commit, @options[:filter_ref])
	20	+ end
	21	+ end
	22	+ end
	23	+end
	@@ -14,7 +14,7 @@ class RefsController < ProjectResourceController		@@ -14,7 +14,7 @@ class RefsController < ProjectResourceController
14	elsif params[:destination] == "blob"	14	elsif params[:destination] == "blob"
15	project_blob_path(@project, (@id))	15	project_blob_path(@project, (@id))
16	elsif params[:destination] == "graph"	16	elsif params[:destination] == "graph"
17	- project_graph_path(@project, @id, @options)	17	+ project_network_path(@project, @id, @options)
18	else	18	else
19	project_commits_path(@project, @id)	19	project_commits_path(@project, @id)
20	end	20	end
	@@ -1,17 +0,0 @@	@@ -1,17 +0,0 @@
1	-class StatGraphController < ProjectResourceController
2	- # Authorize
3	- before_filter :authorize_read_project!
4	- before_filter :authorize_code_access!
5	- before_filter :require_non_empty_project
6	-
7	- def show
8	- respond_to do \|format\|
9	- format.html
10	- format.js do
11	- @repo = @project.repository
12	- @stats = Gitlab::Git::GitStats.new(@repo.raw, @repo.root_ref)
13	- @log = @stats.parsed_log.to_json
14	- end
15	- end
16	- end
17	-end
	@@ -1,26 +0,0 @@	@@ -1,26 +0,0 @@
1	-%h3.page_title Project Network Graph
2	-%hr
3	-
4	-.clearfix
5	- .pull-left
6	- = render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
7	- .pull-left
8	- = form_tag project_graph_path(@project, @id), method: :get do \|f\|
9	- .control-group
10	- = label_tag :filter_ref, "Show only selected ref", class: 'control-label light'
11	- .controls
12	- = check_box_tag :filter_ref, 1, @options[:filter_ref]
13	- - @options.each do \|key, value\|
14	- = hidden_field_tag(key, value, id: nil) unless key == "filter_ref"
15	-
16	- .search.pull-right
17	- = form_tag project_graph_path(@project, @id), method: :get do \|f\|
18	- .control-group
19	- = label_tag :search , "Looking for commit:", class: 'control-label light'
20	- .controls
21	- = text_field_tag :q, @options[:q], placeholder: "Input SHA", class: "search-input xlarge"
22	- = button_tag type: 'submit', class: 'btn vtop' do
23	- %i.icon-search
24	- - @options.each do \|key, value\|
25	- = hidden_field_tag(key, value, id: nil) unless key == "q"
26	-
	@@ -1,18 +0,0 @@	@@ -1,18 +0,0 @@
1	-= render "head"
2	-.graph_holder
3	- %h4
4	- %small You can move around the graph by using the arrow keys.
5	- #holder.graph
6	- .loading.loading-gray
7	-
8	-:javascript
9	- var branch_graph;
10	- $("#filter_ref").click(function() {
11	- $(this).closest('form').submit();
12	- });
13	- branch_graph = new BranchGraph($("#holder"), {
14	- url: '#{project_graph_path(@project, @ref, @options.merge(format: :json))}',
15	- commit_url: '#{project_commit_path(@project, 'ae45ca32').gsub("ae45ca32", "%s")}',
16	- ref: '#{@ref}',
17	- commit_id: '#{@commit.id}'
18	- });
	@@ -1,23 +0,0 @@	@@ -1,23 +0,0 @@
1	-<% self.formats = ["html"] %>
2	-
3	-<%= raw(
4	- {
5	- days: @graph.days.compact.map { \|d\| [d.day, d.strftime("%b")] },
6	- commits: @graph.commits.map do \|c\|
7	- {
8	- parents: parents_zip_spaces(c.parents(@graph.map), c.parent_spaces),
9	- author: {
10	- name: c.author_name,
11	- email: c.author_email,
12	- icon: gravatar_icon(c.author_email, 20)
13	- },
14	- time: c.time,
15	- space: c.spaces.first,
16	- refs: get_refs(c),
17	- id: c.sha,
18	- date: c.date,
19	- message: c.message,
20	- }
21	- end
22	- }.to_json
23	-) %>
@@ -0,0 +1,31 @@		@@ -0,0 +1,31 @@
	1	+.loading-graph
	2	+ %center
	3	+ .loading
	4	+ %h3.page_title Building repository graph. Please wait a moment.
	5	+
	6	+.stat-graph
	7	+ .header.clearfix
	8	+ .pull-right
	9	+ %select
	10	+ %option{:value => "commits"} Commits
	11	+ %option{:value => "additions"} Additions
	12	+ %option{:value => "deletions"} Deletions
	13	+ %h3#date_header.page_title
	14	+ %input#brush_change{:type => "hidden"}
	15	+ .graphs
	16	+ #contributors-master
	17	+ #contributors.clearfix
	18	+ %ol.contributors-list.clearfix
	19	+
	20	+:javascript
	21	+ $(".stat-graph").hide();
	22	+
	23	+ $.ajax({
	24	+ type: "GET",
	25	+ url: location.href,
	26	+ complete: function() {
	27	+ $(".loading-graph").hide();
	28	+ $(".stat-graph").show();
	29	+ },
	30	+ dataType: "script"
	31	+ });
@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
	1	+:plain
	2	+ controller = new ContributorsStatGraph
	3	+ controller.init(#{@log})
	4	+
	5	+ $("select").change( function () {
	6	+ var field = $(this).val()
	7	+ controller.set_current_field(field)
	8	+ controller.redraw_master()
	9	+ controller.redraw_authors()
	10	+ })
	11	+
	12	+ $("#brush_change").change( function () {
	13	+ controller.change_date_header()
	14	+ controller.redraw_authors()
	15	+ })
	16	+