Cache the value of safe_message

Also, just for extra paranoia, only call safe_message once in the decorator methods Adds specs to make sure it still works

Cache the value of safe_message
Also, just for extra paranoia, only call safe_message once in the decorator methods Adds specs to make sure it still works
Robert Speicher
1 parent 38ca52f3
Showing 3 changed files with 51 additions and 10 deletions Show diff stats
app/decorators/commit_decorator.rb
app/models/commit.rb
spec/models/commit_spec.rb
@@ -16,13 +16,15 @@ class CommitDecorator &lt; ApplicationDecorator
   # In case this first line is longer than 80 characters, it is cut off
   # after 70 characters and ellipses (`&hellp;`) are appended.
   def title
-    return no_commit_message if safe_message.blank?
+    title = safe_message
-    title_end = safe_message.index(/\n/)
-    if (!title_end && safe_message.length > 80) || (title_end && title_end > 80)
-      safe_message[0..69] << "&hellip;".html_safe
+    return no_commit_message if title.blank?
+
+    title_end = title.index(/\n/)
+    if (!title_end && title.length > 80) || (title_end && title_end > 80)
+      title[0..69] << "&hellip;".html_safe
     else
-      safe_message.split(/\n/, 2).first
+      title.split(/\n/, 2).first
     end
   end
@@ -30,11 +32,13 @@ class CommitDecorator &lt; ApplicationDecorator
   #
   # cut off, ellipses (`&hellp;`) are prepended to the commit message.
   def description
-    title_end = safe_message.index(/\n/)
-    if (!title_end && safe_message.length > 80) || (title_end && title_end > 80)
-      "&hellip;".html_safe << safe_message[70..-1]
+    description = safe_message
+
+    title_end = description.index(/\n/)
+    if (!title_end && description.length > 80) || (title_end && title_end > 80)
+      "&hellip;".html_safe << description[70..-1]
     else
-      safe_message.split(/\n/, 2)[1].try(:chomp)
+      description.split(/\n/, 2)[1].try(:chomp)
     end
   end
@@ -107,7 +107,7 @@ class Commit
   end
   def safe_message
-    utf8 message
+    @safe_message ||= utf8 message
   end
   def created_at
@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Commit do
+  let(:commit) { create(:project).commit }
+
+  describe CommitDecorator do
+    let(:decorator) { CommitDecorator.new(commit) }
+
+    describe '#title' do
+      it "returns no_commit_message when safe_message is blank" do
+        decorator.stub(:safe_message).and_return('')
+        decorator.title.should == "--no commit message"
+      end
+
+      it "truncates a message without a newline at 70 characters" do
+        message = commit.safe_message * 10
+
+        decorator.stub(:safe_message).and_return(message)
+        decorator.title.should == "#{message[0..69]}&hellip;"
+      end
+
+      it "truncates a message with a newline before 80 characters at the newline" do
+        message = commit.safe_message.split(" ").first
+
+        decorator.stub(:safe_message).and_return(message + "\n" + message)
+        decorator.title.should == message
+      end
+
+      it "truncates a message with a newline after 80 characters at 70 characters" do
+        message = (commit.safe_message * 10) + "\n"
+
+        decorator.stub(:safe_message).and_return(message)
+        decorator.title.should == "#{message[0..69]}&hellip;"
+      end
+    end
+  end
+end
	@@ -107,7 +107,7 @@ class Commit		@@ -107,7 +107,7 @@ class Commit
107	end	107	end
108		108
109	def safe_message	109	def safe_message
110	- utf8 message	110	+ @safe_message \|\|= utf8 message
111	end	111	end
112		112
113	def created_at	113	def created_at
@@ -0,0 +1,37 @@		@@ -0,0 +1,37 @@
	1	+require 'spec_helper'
	2	+
	3	+describe Commit do
	4	+ let(:commit) { create(:project).commit }
	5	+
	6	+ describe CommitDecorator do
	7	+ let(:decorator) { CommitDecorator.new(commit) }
	8	+
	9	+ describe '#title' do
	10	+ it "returns no_commit_message when safe_message is blank" do
	11	+ decorator.stub(:safe_message).and_return('')
	12	+ decorator.title.should == "--no commit message"
	13	+ end
	14	+
	15	+ it "truncates a message without a newline at 70 characters" do
	16	+ message = commit.safe_message * 10
	17	+
	18	+ decorator.stub(:safe_message).and_return(message)
	19	+ decorator.title.should == "#{message[0..69]}…"
	20	+ end
	21	+
	22	+ it "truncates a message with a newline before 80 characters at the newline" do
	23	+ message = commit.safe_message.split(" ").first
	24	+
	25	+ decorator.stub(:safe_message).and_return(message + "\n" + message)
	26	+ decorator.title.should == message
	27	+ end
	28	+
	29	+ it "truncates a message with a newline after 80 characters at 70 characters" do
	30	+ message = (commit.safe_message * 10) + "\n"
	31	+
	32	+ decorator.stub(:safe_message).and_return(message)
	33	+ decorator.title.should == "#{message[0..69]}…"
	34	+ end
	35	+ end
	36	+ end
	37	+end