enhanced HasAvatar to use helpers from AvatarHelper

Krzysiek Szczuka
1 parent eb30446a
Showing 1 changed file with 11 additions and 4 deletions Show diff stats
lib/letter_avatar/has_avatar.rb
@@ -3,6 +3,9 @@ module LetterAvatar
     def self.included(base)
       base.send :include, InstanceMethods
       base.extend ClassMethods
+      base.class_eval do
+        include LetterAvatar::AvatarHelper
+      end
     end
  
     module ClassMethods
@@ -13,14 +16,18 @@ module LetterAvatar
         base.extend ClassMethods
       end
  
-      def avatar_path(size = 200)
-        LetterAvatar.generate(name, size)
+      def avatar_path(size = 64)
+        letter_avatar_for(name, size)
       end
  
-      def avatar_url(size = 200)
-        avatar_path(size).gsub(/public/, '')
+      def avatar_url(size = 64)
+        letter_avatar_url(name, size)
       end
  
+      def avatar_tag(size = 64, options = {})
+        letter_avatar_tag(name, size, options)
+      end
+      
     end
   end
 end
...	...	@@ -3,6 +3,9 @@ module LetterAvatar
3	3	def self.included(base)
4	4	base.send :include, InstanceMethods
5	5	base.extend ClassMethods
	6	+ base.class_eval do
	7	+ include LetterAvatar::AvatarHelper
	8	+ end
6	9	end
7	10
8	11	module ClassMethods
...	...	@@ -13,14 +16,18 @@ module LetterAvatar
13	16	base.extend ClassMethods
14	17	end
15	18
16		- def avatar_path(size = 200)
17		- LetterAvatar.generate(name, size)
	19	+ def avatar_path(size = 64)
	20	+ letter_avatar_for(name, size)
18	21	end
19	22
20		- def avatar_url(size = 200)
21		- avatar_path(size).gsub(/public/, '')
	23	+ def avatar_url(size = 64)
	24	+ letter_avatar_url(name, size)
22	25	end
23	26
	27	+ def avatar_tag(size = 64, options = {})
	28	+ letter_avatar_tag(name, size, options)
	29	+ end
	30	+
24	31	end
25	32	end
26	33	end
...	...