Merge pull request #1355 from tsigo/gfm_spec_cleanup

app/decorators/commit_decorator.rb

 class CommitDecorator < ApplicationDecorator
   decorates :commit
 
+  # Returns a string describing the commit for use in a link title
+  #
+  # Example
+  #
+  #   "Commit: Alex Denisov - Project git clone panel"
+  def link_title
+    "Commit: #{author_name} - #{title}"
+  end
+
   # Returns the commits title.
   #
   # Usually, the commit title is the first line of the commit message.

app/models/commit.rb

 class Commit
   include ActiveModel::Conversion
   include Gitlab::Encode
+  include StaticModel
   extend ActiveModel::Naming
 
   attr_accessor :commit
@@ -22,8 +23,7 @@ class Commit
     :to_patch,
     to: :commit
 
-
-  class << self 
+  class << self
     def find_or_first(repo, commit_id = nil, root_ref)
       commit = if commit_id
                  repo.commit(commit_id)
@@ -85,7 +85,7 @@ class Commit
       first = project.commit(to.try(:strip))
       last = project.commit(from.try(:strip))
 
-      result = { 
+      result = {
         commits: [],
         diffs: [],
         commit: nil
@@ -105,10 +105,6 @@ class Commit
     end
   end
 
-  def persisted?
-    false
-  end
-
   def initialize(raw_commit, head = nil)
     @commit = raw_commit
     @head = head
@@ -155,7 +151,7 @@ class Commit
     prev_commit.try :id
   end
 
-  def parents_count 
+  def parents_count
     parents && parents.count || 0
   end
 end

app/roles/static_model.rb

+# Provides an ActiveRecord-like interface to a model whose data is not persisted to a database.
+module StaticModel
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    # Used by ActiveRecord's polymorphic association to set object_id
+    def primary_key
+      'id'
+    end
+
+    # Used by ActiveRecord's polymorphic association to set object_type
+    def base_class
+      self
+    end
+  end
+
+  # Used by AR for fetching attributes
+  #
+  # Pass it along if we respond to it.
+  def [](key)
+    send(key) if respond_to?(key)
+  end
+
+  def to_param
+    id
+  end
+
+  def persisted?
+    false
+  end
+
+  def destroyed?
+    false
+  end
+end

lib/gitlab/markdown.rb

@@ -100,7 +100,7 @@ module Gitlab
 
     def reference_commit(identifier)
       if commit = @project.commit(identifier)
-        link_to(identifier, project_commit_path(@project, id: commit.id), html_options.merge(title: "Commit: #{commit.author_name} - #{CommitDecorator.new(commit).title}", class: "gfm gfm-commit #{html_options[:class]}"))
+        link_to(identifier, project_commit_path(@project, id: commit.id), html_options.merge(title: CommitDecorator.new(commit).link_title, class: "gfm gfm-commit #{html_options[:class]}"))
       end
     end
   end