Merge pull request #2 from huacnlee/remove-image-optim

Remove image_optim dependency;

Merge pull request #2 from huacnlee/remove-image-optim
Remove image_optim dependency;
Krzysiek Szczuka
2 parents 9acd93e7 5868d7bf
Showing 5 changed files with 16 additions and 18 deletions Show diff stats
README.md
letter_avatar.gemspec
lib/letter_avatar.rb
lib/letter_avatar/avatar.rb
lib/letter_avatar/avatar_helper.rb
@@ -10,7 +10,7 @@ Code extracted from discourse source (thanks guys!) - I needed this functionalit
  
 System requirements
  
-    sudo apt-get install -y advancecomp gifsicle jhead jpegoptim libjpeg-progs optipng pngcrush pngquant
+    sudo apt-get install -y imagemagick
  
 Add this line to your application's Gemfile:
  
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Create nice initals avatars from your users usernames}
   spec.homepage      = "https://github.com/ksz2k/letter_avatar"
   spec.license       = "GPL"
-  
+
   spec.rubyforge_project = "letter_avatar"
  
   spec.files         = `git ls-files`.split($/)
@@ -22,5 +22,4 @@ Gem::Specification.new do |spec|
  
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "image_optim"
 end
 require "letter_avatar/version"
 require "letter_avatar/avatar"
+require "letter_avatar/avatar_helper"
  
 module LetterAvatar
  
@@ -27,7 +28,6 @@ module LetterAvatar
     `convert #{instructions}`
  
     if $?.exitstatus == 0
-      ImageOptim.new.optimize_image(to) rescue nil
       true
     else
       false
@@ -71,17 +71,14 @@ module LetterAvatar
           -pointsize 200
           -fill white
           -gravity Center
-          -font 'Helvetica'
           -stroke #{to_rgb(stroke)}
           -strokewidth 2
-          -annotate -5+25 '#{letter}'
+          -annotate -5+20 '#{letter}'
           '#{filename}'
         }
  
         `convert #{instructions.join(" ")}`
  
-        ImageOptim.new.optimize_image(filename) rescue nil
-
         filename
       end
  
 # encoding: UTF-8
-module LetterAvatar::AvatarHelper
+module LetterAvatar
+  module AvatarHelper
  
-  def letter_avatar_for(name, size = 64)
-    LetterAvatar.generate(name, size)
-  end
+    def letter_avatar_for(name, size = 64)
+      LetterAvatar.generate(name, size)
+    end
  
-  def letter_avatar_url_for(avatar_path)
-    avatar_path.to_s.gsub(/public/,'')
-  end
+    def letter_avatar_url_for(avatar_path)
+      avatar_path.to_s.sub('public/','/')
+    end
  
-  def letter_avatar_tag(name, size = 64, options = {})
-    image_tag(letter_avatar_url_for(letter_avatar_for(name, size)), options)
-  end
+    def letter_avatar_tag(name, size = 64, options = {})
+      image_tag(letter_avatar_url_for(letter_avatar_for(name, size)), options)
+    end
  
+  end
 end
...	...	@@ -10,7 +10,7 @@ Code extracted from discourse source (thanks guys!) - I needed this functionalit
10	10
11	11	System requirements
12	12
13		- sudo apt-get install -y advancecomp gifsicle jhead jpegoptim libjpeg-progs optipng pngcrush pngquant
	13	+ sudo apt-get install -y imagemagick
14	14
15	15	Add this line to your application's Gemfile:
16	16
...	...
...	...	@@ -12,7 +12,7 @@ Gem::Specification.new do \|spec\|
12	12	spec.summary = %q{Create nice initals avatars from your users usernames}
13	13	spec.homepage = "https://github.com/ksz2k/letter_avatar"
14	14	spec.license = "GPL"
15		-
	15	+
16	16	spec.rubyforge_project = "letter_avatar"
17	17
18	18	spec.files = `git ls-files`.split($/)
...	...	@@ -22,5 +22,4 @@ Gem::Specification.new do \|spec\|
22	22
23	23	spec.add_development_dependency "bundler", "~> 1.3"
24	24	spec.add_development_dependency "rake"
25		- spec.add_development_dependency "image_optim"
26	25	end
...	...
1	1	require "letter_avatar/version"
2	2	require "letter_avatar/avatar"
	3	+require "letter_avatar/avatar_helper"
3	4
4	5	module LetterAvatar
5	6
...	...	@@ -27,7 +28,6 @@ module LetterAvatar
27	28	`convert #{instructions}`
28	29
29	30	if $?.exitstatus == 0
30		- ImageOptim.new.optimize_image(to) rescue nil
31	31	true
32	32	else
33	33	false
...	...
...	...	@@ -71,17 +71,14 @@ module LetterAvatar
71	71	-pointsize 200
72	72	-fill white
73	73	-gravity Center
74		- -font 'Helvetica'
75	74	-stroke #{to_rgb(stroke)}
76	75	-strokewidth 2
77		- -annotate -5+25 '#{letter}'
	76	+ -annotate -5+20 '#{letter}'
78	77	'#{filename}'
79	78	}
80	79
81	80	`convert #{instructions.join(" ")}`
82	81
83		- ImageOptim.new.optimize_image(filename) rescue nil
84		-
85	82	filename
86	83	end
87	84
...	...
1	1	# encoding: UTF-8
2		-module LetterAvatar::AvatarHelper
	2	+module LetterAvatar
	3	+ module AvatarHelper
3	4
4		- def letter_avatar_for(name, size = 64)
5		- LetterAvatar.generate(name, size)
6		- end
	5	+ def letter_avatar_for(name, size = 64)
	6	+ LetterAvatar.generate(name, size)
	7	+ end
7	8
8		- def letter_avatar_url_for(avatar_path)
9		- avatar_path.to_s.gsub(/public/,'')
10		- end
	9	+ def letter_avatar_url_for(avatar_path)
	10	+ avatar_path.to_s.sub('public/','/')
	11	+ end
11	12
12		- def letter_avatar_tag(name, size = 64, options = {})
13		- image_tag(letter_avatar_url_for(letter_avatar_for(name, size)), options)
14		- end
	13	+ def letter_avatar_tag(name, size = 64, options = {})
	14	+ image_tag(letter_avatar_url_for(letter_avatar_for(name, size)), options)
	15	+ end
15	16
	17	+ end
16	18	end
...	...