Colors simplified, .all removed

Krzysiek Szczuka
1 parent 9f604744
Showing 1 changed file with 7 additions and 13 deletions Show diff stats
lib/letter_avatar/colors.rb
@@ -33,23 +33,17 @@ module LetterAvatar
     ]
  
     def self.for(username)
-      char = username[0]
-      char.upcase!
+      char = username[0].upcase
+
       if /[A-Z]/.match(char)
         # 65 is 'A' ord
         idx = char.ord - 65
-        return all[idx]
-      end
-
-      if /[\d]/.match(char)
-        return all[char.to_i]
+        COLORS[idx]
+      elsif /[\d]/.match(char)
+        COLORS[char.to_i]
+      else
+        COLORS[Digest::MD5.hexdigest(username)[0...15].to_i(16) % all.length]
       end
-
-      all[Digest::MD5.hexdigest(username)[0...15].to_i(16) % all.length]
-    end
-
-    def self.all
-      COLORS
     end
  
   end
...	...	@@ -33,23 +33,17 @@ module LetterAvatar
33	33	]
34	34
35	35	def self.for(username)
36		- char = username[0]
37		- char.upcase!
	36	+ char = username[0].upcase
	37	+
38	38	if /[A-Z]/.match(char)
39	39	# 65 is 'A' ord
40	40	idx = char.ord - 65
41		- return all[idx]
42		- end
43		-
44		- if /[\d]/.match(char)
45		- return all[char.to_i]
	41	+ COLORS[idx]
	42	+ elsif /[\d]/.match(char)
	43	+ COLORS[char.to_i]
	44	+ else
	45	+ COLORS[Digest::MD5.hexdigest(username)[0...15].to_i(16) % all.length]
46	46	end
47		-
48		- all[Digest::MD5.hexdigest(username)[0...15].to_i(16) % all.length]
49		- end
50		-
51		- def self.all
52		- COLORS
53	47	end
54	48
55	49	end
...	...