From 5baa5fad0a1c6e2b8790f07f62c088fd505406d9 Mon Sep 17 00:00:00 2001
From: gitlabhq <m@gitlabhq.com>
Date: Mon, 24 Oct 2011 22:38:03 +0300
Subject: [PATCH] Issue #149

---
 app/helpers/commits_helper.rb                 | 9 ---------
 app/views/commits/_commits.html.haml          | 2 +-
 app/views/commits/show.html.haml              | 2 +-
 app/views/projects/_recent_commits.html.haml  | 2 +-
 app/views/projects/_recent_messages.html.haml | 2 +-
 app/views/projects/_tree_item.html.haml       | 2 +-
 config/initializers/grit_ext.rb               | 4 ++++
 lib/commit_ext.rb                             | 9 +++++++++
 8 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 lib/commit_ext.rb

diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index b79e5718..f1b54668 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -21,13 +21,4 @@ module CommitsHelper
     link_to "More", project_commits_path(@project, :offset =>  offset.to_i + limit.to_i, :limit => limit),
       :remote => true, :class => "lite_button vm", :style => "text-align:center; width:930px; ", :id => "more-commits-link"
   end
-
-  # Cause some errors with trucate & encoding use this method
-  def truncate_commit_message(commit, size = 60)
-    message = commit.message
-    message.length > size ? (message[0..(size - 1)] + "...") : message
-  # if special characters occurs
-  rescue
-    commit.message
-  end
 end
diff --git a/app/views/commits/_commits.html.haml b/app/views/commits/_commits.html.haml
index 94a1bd1b..3ed70f1c 100644
--- a/app/views/commits/_commits.html.haml
+++ b/app/views/commits/_commits.html.haml
@@ -11,7 +11,7 @@
             = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
           %p
             %strong
-              = truncate_commit_message(commit)
+              = commit.truncated_message
             = link_to "Browse Code", tree_project_path(@project, :commit_id => commit.id), :class => "lite_button", :style => "float:right"
             = link_to truncate(commit.id.to_s, :length => 16), project_commit_path(@project, :id => commit.id), :class => "lite_button", :style => "width:120px;float:right"
           %span
diff --git a/app/views/commits/show.html.haml b/app/views/commits/show.html.haml
index a2c9149d..0ba42618 100644
--- a/app/views/commits/show.html.haml
+++ b/app/views/commits/show.html.haml
@@ -1,5 +1,5 @@
 %h3
-  = "[ #{@commit.committer} ]  #{truncate_commit_message(@commit, 80)}"
+  = "[ #{@commit.committer} ]  #{@commit.truncated_message(40)}"
 -#= link_to 'Back', project_commits_path(@project), :class => "button"
 %table.round-borders
   %tr
diff --git a/app/views/projects/_recent_commits.html.haml b/app/views/projects/_recent_commits.html.haml
index e435ea30..36f4b636 100644
--- a/app/views/projects/_recent_commits.html.haml
+++ b/app/views/projects/_recent_commits.html.haml
@@ -6,7 +6,7 @@
       = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
     %p{:style => "margin-bottom: 3px;"}
       %strong
-        = link_to truncate_commit_message(commit, 60), project_commit_path(@project, :id => commit.id) 
+        = link_to commit.truncated_message(60), project_commit_path(@project, :id => commit.id) 
       
     %span
       %span.author
diff --git a/app/views/projects/_recent_messages.html.haml b/app/views/projects/_recent_messages.html.haml
index 1af7fe3b..36f1435b 100644
--- a/app/views/projects/_recent_messages.html.haml
+++ b/app/views/projects/_recent_messages.html.haml
@@ -19,7 +19,7 @@
     - css_class = "dash_commit"
     - commit = parent
     - item_code = commit.author.email
-    - link_item_name = truncate_commit_message(commit, 50)
+    - link_item_name = commit.truncated_message(50)
     - link_to_item = project_commit_path(@project, :id => commit.id)
   - else
     - css_class = "dash_wall"
diff --git a/app/views/projects/_tree_item.html.haml b/app/views/projects/_tree_item.html.haml
index 4ebcfbef..538d2cc6 100644
--- a/app/views/projects/_tree_item.html.haml
+++ b/app/views/projects/_tree_item.html.haml
@@ -12,4 +12,4 @@
     = time_ago_in_words(content_commit.committed_date)
     ago
   %td
-    = link_to truncate_commit_message(content_commit, 40), project_commit_path(@project, content_commit)
+    = link_to content_commit.truncated_message(40), project_commit_path(@project, content_commit)
diff --git a/config/initializers/grit_ext.rb b/config/initializers/grit_ext.rb
index 4bd71003..9231da6f 100644
--- a/config/initializers/grit_ext.rb
+++ b/config/initializers/grit_ext.rb
@@ -6,3 +6,7 @@ Grit::Blob.class_eval do
   include Utils::FileHelper
   include Utils::Colorize
 end
+
+Grit::Commit.class_eval do 
+  include CommitExt
+end
diff --git a/lib/commit_ext.rb b/lib/commit_ext.rb
new file mode 100644
index 00000000..c175fa0c
--- /dev/null
+++ b/lib/commit_ext.rb
@@ -0,0 +1,9 @@
+module CommitExt
+  # Cause of encoding rails truncate raise error
+  # this method is temporary decision
+  def truncated_message(size = 80)
+    message.length > size ? (message[0..(size - 1)] + "...") : message
+  rescue 
+    "-- invalid encoding for commit message"
+  end
+end