tsalzer-img_gravatar 0.0.0 → 0.0.1

data/Rakefile

@@ -3,12 +3,12 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('img_gravatar', '0.0.0') do |p|
+Echoe.new('img_gravatar', '0.0.1') do |p|
   p.description = "Add a img_gravatar helper to ActiveView."
   p.url = "http://github.com/tsalzer/img_gravatar"
   p.author = "Till Salzer"
   p.email = "till.salzer@googlemail.com"
-  p.ignore_pattern = ["tmp/*", "script/*", "rdoc/*"]
+  p.ignore_pattern = ["tmp/*", "script/*", "rdoc/*", "pkg/*", "gravatar.tmproj"]
   p.development_dependencies = []
 end
 

data/img_gravatar.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{img_gravatar}
-  s.version = "0.0.0"
+  s.version = "0.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Till Salzer"]
-  s.date = %q{2009-01-17}
+  s.date = %q{2009-01-20}
   s.description = %q{Add a img_gravatar helper to ActiveView.}
   s.email = %q{till.salzer@googlemail.com}
   s.extra_rdoc_files = ["lib/img_gravatar.rb", "README.rdoc", "tasks/img_gravatar_tasks.rake"]

data/init.rb

@@ -1,4 +1,3 @@
 # Include hook code here
-# $Id$
 
 require 'gravatar'

data/install.rb

@@ -1,2 +1 @@
 # Install hook code here
-# $Id$

data/lib/img_gravatar.rb

@@ -1,5 +1,6 @@
 require 'md5'
 require 'uri'
+require 'action_view'
 
 # = Gravatar
 # 
@@ -7,23 +8,30 @@ require 'uri'
 #
 # $Id$
 module ImgGravatar #:nodoc:
+  mattr_reader :gravatar_host
+  @@gravatar_host = 'www.gravatar.com'
   # gravatar.com base URL.
-  # This is +http://www.gravatar.com/avatar.php+.
+  # This is +http://www.gravatar.com/avatar/+.
   mattr_reader :gravatar_base_url
-  @@gravatar_base_url = 'http://www.gravatar.com/avatar.php'
+  @@gravatar_base_url = "http://#{@@gravatar_host}/avatar"
   
   # default image URL. Default is +/img/no_gravatar.png+.
   mattr_accessor :default_img_url
   @@default_img_url = '/img/no_gravatar.png'
   
-  # Default size of the image in pixel. Default is +40+.
+  mattr_reader :minimum_size
+  @@minimum_size = 1
+  mattr_reader :maximum_size
+  @@maximum_size = 512
+  
+  # Default size of the image in pixel. Default is +80+.
   mattr_accessor :default_size
-  @@default_size = 40
+  @@default_size = 80
   
   # default rating.
-  # Valid values are +G+, default is +G+.
+  # Valid values are +g+, +r+, +x+, default is +g+.
   mattr_accessor :default_rating
-  @@default_rating = 'G'
+  @@default_rating = 'g'
   
   # Methods injected in all ActionView classes.
   module Base #:nodoc:
@@ -52,30 +60,54 @@ module ImgGravatar #:nodoc:
     def img_gravatar(email, opts={})
       # the defaults
       alt = nil
-      default_img_url = ImgGravatar.default_img_url
-      size = ImgGravatar.default_size
-      rating = ImgGravatar.default_rating
+      appender = '?'
       
       # now, load infos from options
       alt = opts[:alt] if opts[:alt]
-      default_img_url = opts[:default_url] if opts[:default_url]
-      size = opts[:size] if opts[:size]
-      rating = opts[:rating] if opts[:rating]
+      default_img_url = check_default_opt(opts[:default_url])
+      size = check_size_opt(opts[:size] )
+      rating = check_rating_opt(opts[:rating])
       
-      #uri = URI::HTTP.new(Gravatar.gravatar_base_url)
-      uri = "%s?gravatar_id=%s&rating=%s&size=%s" % [ImgGravatar.gravatar_base_url,
-        MD5.md5(email.strip),
-        rating,
-        size
-        ]
+      query = nil
+      query = "s=%s" % size if size
+      query = query ? "%s&r=%s" % [query, rating] : "r=%s" % rating if rating
+      query = query ? "%s&d=%s" % [query, default_img_url] : "d=%s" % default_img_url if default_img_url
       
+      query = URI.escape(query) if query
+      
+      #uri = URI::HTTP.new(Gravatar.gravatar_base_url)
+      uri = URI::HTTP.build(:host => ImgGravatar.gravatar_host,
+        :path => "/avatar/%s" % MD5.md5(email.downcase.strip),
+        :query => query)
+
       if alt then
         "<img src=\"%s\" alt=\"%s\" />" % [uri, alt]
       else
         "<img src=\"%s\" />" % uri
       end
+      
+    end
+
+    
+    private
+    
+    def check_size_opt(size)
+      if size and size >= ImgGravatar.minimum_size and size <= ImgGravatar.maximum_size
+        return size
+      end
+    end
+    
+    def check_rating_opt(rating)
+      if rating and ['g', 'r', 'x'].include?(rating)
+        return rating
+      end
     end
     
+    def check_default_opt(dflt)
+      if dflt
+        return dflt
+      end
+    end
   end
 end
 

data/test/img_gravatar_test.rb

@@ -1,9 +1,88 @@
 # Unit tests for ImgGravatar
 require 'test/unit'
+require 'img_gravatar'
+
+class TestView < ActionView::Base
+end
 
 class ImgGravatarTest < Test::Unit::TestCase
-  # TODO: Replace this with your real tests.
-  def test_this_plugin
-    flunk
+  @@gravatar_host = "www.gravatar.com"
+  @@base_url = "http://#{@@gravatar_host}/avatar"
+  @@ref_mail = "iHaveAn@email.com"
+  @@ref_hash = "3b3be63a4c2a439b013787725dfce802"
+  
+    
+  def test_actionview_integration
+    myview = TestView.new
+    assert myview.respond_to?('img_gravatar'), "integration into ActionView failed"
+  end
+  
+  def test_reference_data
+    myview = TestView.new
+    # the reference data from http://en.gravatar.com/site/implement/url
+    link_url = myview.img_gravatar(@@ref_mail)
+    assert_match(/^<img src="#{@@base_url}\/#{@@ref_hash}\" \/>/, link_url)
+    #assert_match(/^<img src="http:\/\/www\.gravatar\.com\/avatar\/#{ref_hash}\" \/>/, link_url)
+  end
+  
+  def test_actionview_url
+    myview = TestView.new
+    link_url = myview.img_gravatar(@@ref_mail)
+    assert_match(/^<img src="#{@@base_url}\/[a-z0-9]{32}\" \/>/, link_url)
+  end
+  
+  def test_defaults
+    myview = TestView.new
+    link_url = myview.img_gravatar(@@ref_mail)
+    assert_match(/^<img src="#{@@base_url}\/[a-z0-9]{32}\" \/>/, link_url)
+  end
+  
+  def test_actionview_ratings
+    myview = TestView.new
+    ['g', 'r', 'x'].each do |rating|
+      link_url = myview.img_gravatar(@@ref_mail, {:rating => rating})
+      assert_match(/^<img src="#{@@base_url}\/[a-z0-9]{32}\?r=#{rating}\" \/>/, link_url)
+    end
+  end
+  
+  def test_actionview_size
+    myview = TestView.new
+    (1..512).each do |size|
+      link_url = myview.img_gravatar(@@ref_mail, {:size => size})
+      assert_match(/^<img src="#{@@base_url}\/[a-z0-9]{32}\?s=#{size}\" \/>/, link_url)
+    end
+  end
+  
+  def test_illegal_small_sizes
+    myview = TestView.new
+    (-10..0).each do |size|
+      link_url = myview.img_gravatar(@@ref_mail, {:size => size})
+      assert_match(/^<img src="#{@@base_url}\/[a-z0-9]{32}\" \/>/, link_url)
+    end
+  end
+  
+  def test_illegal_large_sizes
+    myview = TestView.new
+    (513..10000).each do |size|
+      link_url = myview.img_gravatar(@@ref_mail, {:size => size})
+      assert_match(/^<img src="#{@@base_url}\/[a-z0-9]{32}\" \/>/, link_url)
+    end
+  end
+  
+  def test_default_image_encoding
+    myview = TestView.new
+    unencoded = "http://example.com/images/example.jpg"
+    encoded = 'http%3A%2F%2Fexample.com%2Fimages%2Fexample.jpg'
+    link_url = myview.img_gravatar(@@ref_mail, {:default_url => unencoded})
+    assert_match(/^<img src="#{@@base_url}\/[a-z0-9]{32}\?d=#{encoded}\" \/>/, link_url)
+  end
+  
+  def test_default_image_specials
+    myview = TestView.new
+    ['identicon', 'monsterid', 'wavatar'].each do |dflt|
+      link_url = myview.img_gravatar(@@ref_mail, {:default_url => dflt})
+      assert_match(/^<img src="#{@@base_url}\/[a-z0-9]{32}\?d=#{dflt}\" \/>/, link_url)
+    end
   end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tsalzer-img_gravatar
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - Till Salzer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-17 00:00:00 -08:00
+date: 2009-01-20 00:00:00 -08:00
 default_executable: 
 dependencies: []