Decorate Gitlab::Git::Commit with Commit

Dmitriy Zaporozhets
1 parent 9dc64463
Showing 5 changed files with 13 additions and 3 deletions Show diff stats
app/contexts/commit_load_context.rb
app/controllers/commits_controller.rb
app/models/commit.rb
lib/gitlab/git/commit.rb
spec/helpers/gitlab_markdown_helper_spec.rb
@@ -12,6 +12,7 @@ class CommitLoadContext &lt; BaseContext
     commit = project.repository.commit(params[:id])
  
     if commit
+      commit = Commit.new(commit)
       commit = CommitDecorator.decorate(commit)
       line_notes = project.notes.for_commit_id(commit.id).inline
  
@@ -13,6 +13,7 @@ class CommitsController &lt; ProjectResourceController
     @limit, @offset = (params[:limit] || 40), (params[:offset] || 0)
  
     @commits = @repo.commits(@ref, @path, @limit, @offset)
+    @commits = Commit.decorate(@commits)
     @commits = CommitDecorator.decorate_collection(@commits)
  
     respond_to do |format|
@@ -10,12 +10,20 @@ class Commit
  
   attr_accessor :raw
  
+  def self.decorate(commits)
+    commits.map { |c| Commit.new(c) }
+  end
+
   def initialize(raw_commit)
     raise "Nil as raw commit passed" unless raw_commit
  
     @raw = raw_commit
   end
  
+  def id
+    @raw.id
+  end
+
   def method_missing(m, *args, &block)
     @raw.send(m, *args, &block)
   end
@@ -7,8 +7,8 @@ module Gitlab
       attr_accessor :raw_commit, :head, :refs
  
       delegate  :message, :authored_date, :committed_date, :parents, :sha,
-        :date, :committer, :author, :diffs, :tree, :id, :stats,
-        :to_patch, to: :raw_commit
+        :date, :committer, :author, :diffs, :tree, :id, :stats, :to_patch,
+        to: :raw_commit
  
       class << self
         def find_or_first(repo, commit_id = nil, root_ref)
@@ -7,7 +7,7 @@ describe GitlabMarkdownHelper do
   let!(:project) { create(:project) }
  
   let(:user)          { create(:user, username: 'gfm') }
-  let(:commit)        { CommitDecorator.decorate(project.repository.commit) }
+  let(:commit)        { CommitDecorator.decorate(Commit.new(project.repository.commit)) }
   let(:issue)         { create(:issue, project: project) }
   let(:merge_request) { create(:merge_request, project: project) }
   let(:snippet)       { create(:snippet, project: project) }
...	...	@@ -12,6 +12,7 @@ class CommitLoadContext < BaseContext
12	12	commit = project.repository.commit(params[:id])
13	13
14	14	if commit
	15	+ commit = Commit.new(commit)
15	16	commit = CommitDecorator.decorate(commit)
16	17	line_notes = project.notes.for_commit_id(commit.id).inline
17	18
...	...
...	...	@@ -13,6 +13,7 @@ class CommitsController < ProjectResourceController
13	13	@limit, @offset = (params[:limit] \|\| 40), (params[:offset] \|\| 0)
14	14
15	15	@commits = @repo.commits(@ref, @path, @limit, @offset)
	16	+ @commits = Commit.decorate(@commits)
16	17	@commits = CommitDecorator.decorate_collection(@commits)
17	18
18	19	respond_to do \|format\|
...	...
...	...	@@ -10,12 +10,20 @@ class Commit
10	10
11	11	attr_accessor :raw
12	12
	13	+ def self.decorate(commits)
	14	+ commits.map { \|c\| Commit.new(c) }
	15	+ end
	16	+
13	17	def initialize(raw_commit)
14	18	raise "Nil as raw commit passed" unless raw_commit
15	19
16	20	@raw = raw_commit
17	21	end
18	22
	23	+ def id
	24	+ @raw.id
	25	+ end
	26	+
19	27	def method_missing(m, *args, &block)
20	28	@raw.send(m, *args, &block)
21	29	end
...	...
...	...	@@ -7,8 +7,8 @@ module Gitlab
7	7	attr_accessor :raw_commit, :head, :refs
8	8
9	9	delegate :message, :authored_date, :committed_date, :parents, :sha,
10		- :date, :committer, :author, :diffs, :tree, :id, :stats,
11		- :to_patch, to: :raw_commit
	10	+ :date, :committer, :author, :diffs, :tree, :id, :stats, :to_patch,
	11	+ to: :raw_commit
12	12
13	13	class << self
14	14	def find_or_first(repo, commit_id = nil, root_ref)
...	...
...	...	@@ -7,7 +7,7 @@ describe GitlabMarkdownHelper do
7	7	let!(:project) { create(:project) }
8	8
9	9	let(:user) { create(:user, username: 'gfm') }
10		- let(:commit) { CommitDecorator.decorate(project.repository.commit) }
	10	+ let(:commit) { CommitDecorator.decorate(Commit.new(project.repository.commit)) }
11	11	let(:issue) { create(:issue, project: project) }
12	12	let(:merge_request) { create(:merge_request, project: project) }
13	13	let(:snippet) { create(:snippet, project: project) }
...	...