Updated configuration fill_color to return default value if not set

kbackowski
1 parent c3b809e4
Showing 2 changed files with 2 additions and 2 deletions Show diff stats
lib/letter_avatar/avatar.rb
lib/letter_avatar/configuration.rb
@@ -68,7 +68,7 @@ module LetterAvatar
             -pointsize 140
             -font #{FONT_FILENAME}
             -weight #{LetterAvatar.weight}
-            -fill '#{LetterAvatar.fill_color || FILL_COLOR}'
+            -fill '#{LetterAvatar.fill_color}'
             -gravity Center
             -annotate #{LetterAvatar.annotate_position} '#{identity.letter}'
             '#{filename}'
@@ -9,7 +9,7 @@ module LetterAvatar
     end
  
     def fill_color
-      @fill_color
+      @fill_color || Avatar::FILL_COLOR
     end
  
     def fill_color=(v)
...	...	@@ -68,7 +68,7 @@ module LetterAvatar
68	68	-pointsize 140
69	69	-font #{FONT_FILENAME}
70	70	-weight #{LetterAvatar.weight}
71		- -fill '#{LetterAvatar.fill_color \|\| FILL_COLOR}'
	71	+ -fill '#{LetterAvatar.fill_color}'
72	72	-gravity Center
73	73	-annotate #{LetterAvatar.annotate_position} '#{identity.letter}'
74	74	'#{filename}'
...	...
...	...	@@ -9,7 +9,7 @@ module LetterAvatar
9	9	end
10	10
11	11	def fill_color
12		- @fill_color
	12	+ @fill_color \|\| Avatar::FILL_COLOR
13	13	end
14	14
15	15	def fill_color=(v)
...	...