Add BlameController, remove Refs#blame action

This commit is contained in:
Robert Speicher 2012-09-17 13:36:13 -04:00
parent 37f0b600bc
commit 39c6579306
8 changed files with 57 additions and 27 deletions

View file

@ -0,0 +1,45 @@
# Controller for viewing a file's blame
class BlameController < ApplicationController
# Thrown when given an invalid path
class InvalidPathError < StandardError; end
include RefExtractor
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
@blame = Grit::Blob.blame(@repo, @commit.id, @path)
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

View file

@ -9,7 +9,7 @@ class RefsController < ApplicationController
before_filter :require_non_empty_project
before_filter :ref
before_filter :define_tree_vars, only: [:tree, :blob, :blame, :logs_tree]
before_filter :define_tree_vars, only: [:blob, :logs_tree]
before_filter :render_full_content
layout "project"
@ -79,10 +79,6 @@ class RefsController < ApplicationController
end
end
def blame
@blame = Grit::Blob.blame(@repo, @commit.id, params[:path])
end
protected
def define_tree_vars