Update usages of tree_file_project_ref_path to project_tree_path

diff --git a/app/controllers/refs_controller.rb b/app/controllers/refs_controller.rb
index 3f81a2c..6cdd095 100644 (file)
--- a/app/controllers/refs_controller.rb
+++ b/app/controllers/refs_controller.rb
@@ -18,7 +18,7 @@ class RefsController < ApplicationController
     respond_to do |format| 
       format.html do 
         new_path = if params[:destination] == "tree"
-                     tree_project_ref_path(@project, params[:ref]) 
+                     project_tree_path(@project, params[:ref])
                    else
                      project_commits_path(@project, ref: params[:ref])
                    end
@@ -96,10 +96,10 @@ class RefsController < ApplicationController
     @hex_path = Digest::SHA1.hexdigest(params[:path] || "/")
 
     if params[:path]
-      @history_path = tree_file_project_ref_path(@project, @ref, params[:path])
+      @history_path = project_tree_path(@project, File.join(@ref, params[:path]))
       @logs_path = logs_file_project_ref_path(@project, @ref, params[:path]) 
     else
-      @history_path = tree_project_ref_path(@project, @ref)
+      @history_path = project_tree_path(@project, @ref)
       @logs_path = logs_tree_project_ref_path(@project, @ref) 
     end
   rescue

diff --git a/app/decorators/tree_decorator.rb b/app/decorators/tree_decorator.rb
index 80c48da..05f029d 100644 (file)
--- a/app/decorators/tree_decorator.rb
+++ b/app/decorators/tree_decorator.rb
@@ -15,7 +15,7 @@ class TreeDecorator < ApplicationDecorator
         part_path = part if part_path.empty?
 
         next unless parts.last(2).include?(part) if parts.count > max_links
-        yield(h.link_to(h.truncate(part, length: 40), h.tree_file_project_ref_path(project, ref, path: part_path), remote: :true))
+        yield(h.link_to(h.truncate(part, length: 40), h.project_tree_path(project, h.tree_join(ref, part_path)), remote: :true))
       end
     end
   end
@@ -26,7 +26,7 @@ class TreeDecorator < ApplicationDecorator
 
   def up_dir_path
     file = File.join(path, "..")
-    h.tree_file_project_ref_path(project, ref, file)
+    h.project_tree_path(project, h.tree_join(ref, file))
   end
 
   def history_path

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0938dc2..d90fb32 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -58,11 +58,11 @@ module ApplicationHelper
 
     if @project && !@project.new_record?
       project_nav = [
-        { label: "#{@project.name} / Issues", url: project_issues_path(@project) },
-        { label: "#{@project.name} / Wall", url: wall_project_path(@project) },
-        { label: "#{@project.name} / Tree", url: tree_project_ref_path(@project, @project.root_ref) },
-        { label: "#{@project.name} / Commits", url: project_commits_path(@project) },
-        { label: "#{@project.name} / Team", url: project_team_index_path(@project) }
+        { label: "#{@project.name} / Issues",  url: project_issues_path(@project) },
+        { label: "#{@project.name} / Wall",    url: wall_project_path(@project) },
+        { label: "#{@project.name} / Tree",    url: project_tree_path(@project, @ref || @project.root_ref) },
+        { label: "#{@project.name} / Commits", url: project_commits_path(@project, @ref || @project.root_ref) },
+        { label: "#{@project.name} / Team",    url: project_team_index_path(@project) }
       ]
     end
 

diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb
index 2b7265c..81a1698 100644 (file)
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
@@ -39,4 +39,9 @@ module TreeHelper
   def gitlab_markdown?(filename)
     filename.end_with?(*%w(.mdown .md .markdown))
   end
+
+  # Simple shortcut to File.join
+  def tree_join(*args)
+    File.join(*args)
+  end
 end

diff --git a/app/views/commits/_commit.html.haml b/app/views/commits/_commit.html.haml
index 6abea76..259e8e2 100644 (file)
--- a/app/views/commits/_commit.html.haml
+++ b/app/views/commits/_commit.html.haml
@@ -1,7 +1,7 @@
 %li.commit
   .browse_code_link_holder
     %p
-      %strong= link_to "Browse Code »", tree_project_ref_path(@project, commit), class: "right"
+      %strong= link_to "Browse Code »", project_tree_path(@project, commit), class: "right"
   %p
     = link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id"
     %strong.commit-author-name= commit.author_name

diff --git a/app/views/commits/_commit_box.html.haml b/app/views/commits/_commit_box.html.haml
index 572337d..3daf63f 100644 (file)
--- a/app/views/commits/_commit_box.html.haml
+++ b/app/views/commits/_commit_box.html.haml
@@ -8,7 +8,7 @@
       = link_to patch_project_commit_path(@project, @commit.id), class: "btn small grouped" do
         %i.icon-download-alt
         Get Patch
-      = link_to tree_project_ref_path(@project, @commit.id), class: "browse-button primary grouped" do
+      = link_to project_tree_path(@project, @commit), class: "browse-button primary grouped" do
         %strong Browse Code »
     %h3.commit-title.page_title
       = gfm escape_once(@commit.title)

diff --git a/app/views/commits/_diffs.html.haml b/app/views/commits/_diffs.html.haml
index b590d64..bc53911 100644 (file)
--- a/app/views/commits/_diffs.html.haml
+++ b/app/views/commits/_diffs.html.haml
@@ -24,7 +24,7 @@
           %i.icon-file
           %span{id: "#{diff.old_path}"}= diff.old_path
         - else
-          = link_to tree_file_project_ref_path(@project, @commit.id, diff.new_path) do
+          = link_to project_tree_path(@project, @commit, diff.new_path) do
             %i.icon-file
             %span{id: "#{diff.new_path}"}= diff.new_path
         %br/

diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index c076a3a..06da82d 100644 (file)
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -10,7 +10,7 @@
   - if controller_name == 'projects' && action_name == 'index'
     = auto_discovery_link_tag :atom, projects_url(:atom, private_token: current_user.private_token), title: "Dashboard feed"
   - if @project && !@project.new_record?
-    - if current_page?(tree_project_ref_path(@project, @project.root_ref)) || current_page?(project_commits_path(@project))
+    - if current_page?(project_tree_path(@project, @project.root_ref)) || current_page?(project_commits_path(@project))
       = auto_discovery_link_tag(:atom, project_commits_url(@project, :atom, ref: @ref, private_token: current_user.private_token), title: "Recent commits to #{@project.name}:#{@ref}")
     - if request.path == project_issues_path(@project)
       = auto_discovery_link_tag(:atom, project_issues_url(@project, :atom, private_token: current_user.private_token), title: "#{@project.name} issues")

diff --git a/app/views/layouts/_project_menu.html.haml b/app/views/layouts/_project_menu.html.haml
index 04eaec5..11e632b 100644 (file)
--- a/app/views/layouts/_project_menu.html.haml
+++ b/app/views/layouts/_project_menu.html.haml
@@ -5,7 +5,7 @@
   - if @project.repo_exists?
     - if can? current_user, :download_code, @project
       %li{class: tree_tab_class}
-        = link_to tree_project_ref_path(@project, @project.root_ref) do
+        = link_to project_tree_path(@project, @project.root_ref) do
           Files
       %li{class: commit_tab_class}
         = link_to "Commits", project_commits_path(@project)

diff --git a/app/views/refs/_head.html.haml b/app/views/refs/_head.html.haml
index 3592f57..2a6052a 100644 (file)
--- a/app/views/refs/_head.html.haml
+++ b/app/views/refs/_head.html.haml
@@ -2,7 +2,7 @@
   %li
     = render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: params[:path]}
   %li{class: "#{'active' if (controller.controller_name == "refs") }"}
-    = link_to tree_project_ref_path(@project, @ref) do
+    = link_to project_tree_path(@project, @ref) do
       Source
   %li.right
     .input-prepend.project_clone_holder

diff --git a/app/views/refs/blame.html.haml b/app/views/refs/blame.html.haml
index ba0fad5..75b8631 100644 (file)
--- a/app/views/refs/blame.html.haml
+++ b/app/views/refs/blame.html.haml
@@ -4,7 +4,7 @@
   %ul.breadcrumb
     %li
       %span.arrow
-      = link_to tree_project_ref_path(@project, @ref, path: nil) do
+      = link_to project_tree_path(@project, @ref) do
         = @project.name
     - @tree.breadcrumbs(6) do |link|
       \/
@@ -20,7 +20,7 @@
       %span.options
         = link_to "raw", blob_project_ref_path(@project, @ref, path: params[: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 "source", tree_file_project_ref_path(@project, @ref, path: params[:path]), class: "btn very_small"
+        = link_to "source", project_tree_path(@project, tree_join(@ref, params[:path])), class: "btn very_small"
     .file_content.blame
       %table
         - @blame.each do |commit, lines|

diff --git a/app/views/refs/logs_tree.js.haml b/app/views/refs/logs_tree.js.haml
index 61ccbae..b0ac0c4 100644 (file)
--- a/app/views/refs/logs_tree.js.haml
+++ b/app/views/refs/logs_tree.js.haml
@@ -6,4 +6,4 @@
   :plain
     var row = $("table.table_#{@hex_path} tr.file_#{hexdigest(file_name)}");
     row.find("td.tree_time_ago").html('#{escape_javascript(time_ago_in_words(content_commit.committed_date))} ago');
-    row.find("td.tree_commit").html('#{escape_javascript(render("tree_commit", tm: tm, content_commit: content_commit))}');
+    row.find("td.tree_commit").html('#{escape_javascript(render("tree/tree_commit", tm: tm, content_commit: content_commit))}');

diff --git a/app/views/tree/_head.html.haml b/app/views/tree/_head.html.haml
index 3592f57..5126891 100644 (file)
--- a/app/views/tree/_head.html.haml
+++ b/app/views/tree/_head.html.haml
@@ -1,8 +1,8 @@
 %ul.nav.nav-tabs
   %li
     = render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: params[:path]}
-  %li{class: "#{'active' if (controller.controller_name == "refs") }"}
-    = link_to tree_project_ref_path(@project, @ref) do
+  %li{class: "#{'active' if (controller.controller_name == "tree") }"}
+    = link_to project_tree_path(@project, @ref) do
       Source
   %li.right
     .input-prepend.project_clone_holder

diff --git a/app/views/tree/_tree.html.haml b/app/views/tree/_tree.html.haml
index 5507871..439b4ec 100644 (file)
--- a/app/views/tree/_tree.html.haml
+++ b/app/views/tree/_tree.html.haml
@@ -1,7 +1,7 @@
 %ul.breadcrumb
   %li
     %span.arrow
-    = link_to tree_project_ref_path(@project, @ref, path: nil), remote: true do
+    = link_to project_tree_path(@project, @ref), remote: true do
       = @project.name
   - tree.breadcrumbs(6) do |link|
     \/
@@ -10,7 +10,7 @@
 %div.tree_progress
 #tree-content-holder
   - if tree.is_blob?
-    = render partial: "refs/tree_file", locals: { name: tree.name, content: tree.data, file: tree }
+    = render partial: "tree/tree_file", locals: { name: tree.name, content: tree.data, file: tree }
   - else
     - contents = tree.contents
     %table#tree-slider{class: "table_#{@hex_path}" }
@@ -31,11 +31,11 @@
 
       - index = 0
       - contents.select{ |i| i.is_a?(Grit::Tree)}.each do |content|
-        = render partial: "refs/tree_item", locals: { content: content, index: (index += 1) }
+        = render partial: "tree/tree_item", locals: { content: content, index: (index += 1) }
       - contents.select{ |i| i.is_a?(Grit::Blob)}.each do |content|
-        = render partial: "refs/tree_item", locals: { content: content, index: (index += 1) }
+        = render partial: "tree/tree_item", locals: { content: content, index: (index += 1) }
       - contents.select{ |i| i.is_a?(Grit::Submodule)}.each do |content|
-        = render partial: "refs/submodule_item", locals: { content: content, index: (index += 1) }
+        = render partial: "tree/submodule_item", locals: { content: content, index: (index += 1) }
 
     - if content = contents.select{ |c| c.is_a?(Grit::Blob) and c.name =~ /^readme/i }.first
       .file_holder#README

diff --git a/app/views/tree/_tree_file.html.haml b/app/views/tree/_tree_file.html.haml
index 76173e2..ae8f1cc 100644 (file)
--- a/app/views/tree/_tree_file.html.haml
+++ b/app/views/tree/_tree_file.html.haml
@@ -5,9 +5,9 @@
       = name.force_encoding('utf-8')
       %small #{file.mode}
     %span.options
-      = link_to "raw", blob_project_ref_path(@project, @ref, path: params[:path]), class: "btn very_small", target: "_blank"
+      = 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 "blame", blame_file_project_ref_path(@project, @ref, path: params[:path]), class: "btn very_small"
+      = link_to "blame", blame_file_project_ref_path(@project, @ref, path: @path.gsub(/^\//, '')), class: "btn very_small"
   - if file.text?
     - if gitlab_markdown?(name)
       .file_content.wiki

diff --git a/app/views/tree/_tree_item.html.haml b/app/views/tree/_tree_item.html.haml
index d4c4ee8..226c380 100644 (file)
--- a/app/views/tree/_tree_item.html.haml
+++ b/app/views/tree/_tree_item.html.haml
@@ -1,8 +1,8 @@
 - file = tree_full_path(content)
-%tr{ class: "tree-item #{tree_hex_class(content)}", url: tree_file_project_ref_path(@project, @ref, file) }
+%tr{ class: "tree-item #{tree_hex_class(content)}", url: project_tree_path(@project, tree_join(@id, file)) }
   %td.tree-item-file-name
     = tree_icon(content)
-    %strong= link_to truncate(content.name, length: 40), tree_file_project_ref_path(@project, @ref || @commit.id, file), remote: :true
+    %strong= link_to truncate(content.name, length: 40), project_tree_path(@project, tree_join(@id || @commit.id, file)), remote: :true
   %td.tree_time_ago.cgray
     - if index == 1
       %span.log_loading

diff --git a/features/steps/project/project_browse_files.rb b/features/steps/project/project_browse_files.rb
index 67c553c..652daba 100644 (file)
--- a/features/steps/project/project_browse_files.rb
+++ b/features/steps/project/project_browse_files.rb
@@ -10,7 +10,7 @@ class ProjectBrowseFiles < Spinach::FeatureSteps
   end
 
   Then 'I should see files from repository for "8470d70"' do
-    current_path.should == tree_project_ref_path(@project, "8470d70")
+    current_path.should == project_tree_path(@project, "8470d70")
     page.should have_content "app"
     page.should have_content "History"
     page.should have_content "Gemfile"

diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index 93ad021..1839bc8 100644 (file)
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -51,15 +51,15 @@ module SharedPaths
   end
 
   Given 'I visit project source page' do
-    visit tree_project_ref_path(@project, @project.root_ref)
+    visit project_tree_path(@project, @project.root_ref)
   end
 
   Given 'I visit blob file from repo' do
-    visit tree_project_ref_path(@project, ValidCommit::ID, :path => ValidCommit::BLOB_FILE_PATH)
+    visit project_tree_path(@project, File.join(ValidCommit::ID, ValidCommit::BLOB_FILE_PATH))
   end
 
   Given 'I visit project source page for "8470d70"' do
-    visit tree_project_ref_path(@project, "8470d70")
+    visit project_tree_path(@project, "8470d70")
   end
 
   Given 'I visit project tags page' do

diff --git a/spec/requests/gitlab_flavored_markdown_spec.rb b/spec/requests/gitlab_flavored_markdown_spec.rb
index 807d17d..db3f89c 100644 (file)
--- a/spec/requests/gitlab_flavored_markdown_spec.rb
+++ b/spec/requests/gitlab_flavored_markdown_spec.rb
@@ -61,7 +61,7 @@ describe "Gitlab Flavored Markdown" do
     end
 
     it "should render title in refs#tree", js: true do
-      visit tree_project_ref_path(project, id: @branch_name)
+      visit project_tree_path(project, @branch_name)
 
       within(".tree_commit") do
         page.should have_link("##{issue.id}")

diff --git a/spec/requests/security/project_access_spec.rb b/spec/requests/security/project_access_spec.rb
index af0d5fc..4b6abd3 100644 (file)
--- a/spec/requests/security/project_access_spec.rb
+++ b/spec/requests/security/project_access_spec.rb
@@ -37,7 +37,7 @@ describe "Application access" do
     end
 
     describe "GET /project_code/master/tree" do
-      subject { tree_project_ref_path(@project, @project.root_ref) }
+      subject { project_tree_path(@project, @project.root_ref) }
 
       it { should be_allowed_for @u1 }
       it { should be_allowed_for @u3 }