gravatarify 1.2.1 → 2.0.3

data/lib/gravatarify/helper.rb

@@ -1,18 +1,6 @@
 module Gravatarify::Helper
-  # so that it's possible to access that build_gravatar_url method
   include Gravatarify::Base
-  
-  # Allow HTML options to be overriden globally as well, useful
-  # to e.g. define a common alt attribute, or class.
-  #
-  #    Gravatarify::Helper.html_options[:title] = "Gravatar"
-  #
-  # @return [Hash] globally defined html attributes  
-  def self.html_options; @html_options ||= { :alt => '' } end
-  
-  # To simplify things a bit and have a neat-o naming
-  alias_method :gravatar_url, :build_gravatar_url
-  
+    
   # Helper method for HAML to return a neat hash to be used as attributes in an image tag.
   #
   # Now it's as simple as doing something like:
@@ -23,14 +11,15 @@ module Gravatarify::Helper
   #
   # @param [String, #email, #mail, #gravatar_url] email a string or an object used
   #        to generate to gravatar url for.
-  # @param [Hash] options other gravatar or html options for building the resulting
+  # @param [Symbol, Hash] *params other gravatar or html options for building the resulting
   #        hash.
   # @return [Hash] all html attributes required to build an +img+ tag.
-  def gravatar_attrs(email, options = {})
-    url_options = options.inject({}) { |hsh, (key, value)| hsh[key] = options.delete(key) if Gravatarify::GRAVATAR_OPTIONS.include?(key.to_sym); hsh }
-    options[:width] = options[:height] = (url_options[:size] || 80) # customize size
-    options[:src] = email.respond_to?(:gravatar_url) ? email.gravatar_url(url_options) : build_gravatar_url(email, url_options)
-    Gravatarify::Helper.html_options.merge(options)
+  def gravatar_attrs(email, *params)
+    url_options = Gravatarify::Utils.merge_gravatar_options(*params)
+    options = url_options[:html] || {}
+    options[:src] = gravatar_url(email, false, url_options)
+    options[:width] = options[:height] = (url_options[:size] || 80) # customize size    
+    { :alt => '' }.merge!(options) # to ensure validity merge with :alt => ''!
   end
   
   # Takes care of creating an <tt><img/></tt>-tag based on a gravatar url, it no longer
@@ -38,14 +27,11 @@ module Gravatarify::Helper
   #
   # @param [String, #email, #mail, #gravatar_url] email a string or an object used
   #        to generate the gravatar url from
-  # @param [Hash] options other gravatar or html options for building the resulting
+  # @param [Symbol, Hash] *params other gravatar or html options for building the resulting
   #        image tag.
   # @return [String] a complete and hopefully valid +img+ tag.
-  def gravatar_tag(email, options = {})
-    html_attrs = gravatar_attrs(email, options).map do |key,value|
-      escaped = defined?(Rack::Utils) ? Rack::Utils.escape_html(value) : CGI.escapeHTML(value)
-      "#{key}=\"#{escaped}\""
-    end.sort.join(" ")
+  def gravatar_tag(email, *params)
+    html_attrs = gravatar_attrs(email, *params).map { |key,value| "#{key}=\"#{Gravatarify::Utils.escape_html(value)}\"" }.sort.join(" ")
     "<img #{html_attrs} />"
   end
 end

data/lib/gravatarify/utils.rb

@@ -0,0 +1,44 @@
+begin; require 'rack/utils'; rescue LoadError; require 'cgi' end
+
+module Gravatarify
+  module Utils #:nodoc:          
+    # Helper method to URI escape a string using either <tt>Rack::Utils#escape</tt> if available or else
+    # fallback to <tt>CGI#escape</tt>.
+    def self.escape(str)
+      str = str.to_s
+      defined?(Rack::Utils) ? Rack::Utils.escape(str) : CGI.escape(str)
+    end
+    
+    # Escape HTML entities in string, basically falls back to either <tt>RackUtils#escape_html</tt>
+    # or <tt>CGI#escapeHTML</tt>.
+    def self.escape_html(str)
+      str = str.to_s
+      defined?(Rack::Utils) ? Rack::Utils.escape_html(str) : CGI.escapeHTML(str)
+    end
+    
+    # Merge supplied list of +params+ with the globally defined default options and
+    # any params. Then merge remaining params as hash.
+    # 
+    def self.merge_gravatar_options(*params)
+      return (params[1] || {}) if params.first == false
+      options = Gravatarify.options.dup
+      deep_merge_html!(options, Gravatarify.styles[params.shift] || {}) unless params.first.is_a?(Hash)
+      deep_merge_html!(options, params.first) unless params.empty?
+      options
+    end
+    
+    def self.deep_merge_html!(hash, to_merge)
+      html = (hash[:html] || {}).merge(to_merge[:html] || {})
+      hash.merge!(to_merge)
+      hash[:html] = html unless html.empty?
+    end
+  
+    # Tries first to call +email+, then +mail+ then +to_s+ on supplied
+    # object.
+    def self.smart_email(obj)
+      str = (obj.respond_to?(:email) ? obj.send(:email) : (obj.respond_to?(:mail) ? obj.send(:mail) : obj)).to_s
+      str = str.sub(/\A.*?<(.+?)>.*\z/, '\1') if str =~ /<.+>/
+      str.strip.downcase
+    end
+  end
+end

data/test/test_helper.rb

@@ -3,9 +3,6 @@ require 'test/unit'
 require 'shoulda'
 require 'rr'
 
-require 'active_support'
-begin; require 'activerecord'; rescue LoadError; end
-begin; require 'dm-core'; rescue LoadError; end
 require 'gravatarify'
 
 Test::Unit::TestCase.send :include, RR::Adapters::TestUnit
@@ -14,12 +11,7 @@ Test::Unit::TestCase.send :include, RR::Adapters::TestUnit
 def reset_gravatarify!
   Gravatarify.options.clear
   Gravatarify.options[:filetype] = :jpg
-  Gravatarify.subdomains = %w{ 0 1 2 www }
-  
-  if defined?(Gravatarify::Helper)
-    Gravatarify::Helper.html_options.clear
-    Gravatarify::Helper.html_options[:alt] = ''
-  end
+  Gravatarify.subdomains = %w{ 0 1 2 www }  
 end
 
 # some often used values...

data/test/unit/gravatarify_base_test.rb

@@ -9,79 +9,83 @@ class GravatarifyBaseTest < Test::Unit::TestCase
   
   def setup; reset_gravatarify! end
     
-  context "#build_gravatar_url, but without any options yet" do
+  context "#gravatar_url, but without any options yet" do
     should "generate correct url for hash without options" do
-      assert_equal BELLA_AT_GMAIL_JPG, build_gravatar_url('bella@gmail.com')
+      assert_equal BELLA_AT_GMAIL_JPG, gravatar_url('bella@gmail.com')
     end
 
     should "trim and lowercase email address (as according to gravatar docs)" do
-      assert_equal BELLA_AT_GMAIL_JPG, build_gravatar_url("\tbella@gmail.com \n\t")
-      assert_equal BELLA_AT_GMAIL_JPG, build_gravatar_url("BELLA@gmail.COM")
-      assert_equal BELLA_AT_GMAIL_JPG, build_gravatar_url(" BELLA@GMAIL.com")
+      assert_equal BELLA_AT_GMAIL_JPG, gravatar_url("\tbella@gmail.com \n\t")
+      assert_equal BELLA_AT_GMAIL_JPG, gravatar_url("BELLA@gmail.COM")
+      assert_equal BELLA_AT_GMAIL_JPG, gravatar_url(" BELLA@GMAIL.com")
     end
 
     should "handle a nil email as if it were an empty string" do
-      assert_equal NIL_JPG, build_gravatar_url(nil)
-      assert_equal NIL_JPG, build_gravatar_url('')
+      assert_equal NIL_JPG, gravatar_url(nil)
+      assert_equal NIL_JPG, gravatar_url('')
+    end
+    
+    should "be aliased to #build_gravatar_url, for backwards compatibility" do
+      assert_equal BELLA_AT_GMAIL_JPG, build_gravatar_url('bella@gmail.com')
     end
   end
   
-  context "#build_gravatar_url, with options" do
+  context "#gravatar_url, with options" do
     should "add well known options like size, rating or default and always in alphabetical order" do
-      assert_equal "#{BELLA_AT_GMAIL_JPG}?s=16", build_gravatar_url('bella@gmail.com', :size => 16)
-      assert_equal "#{BELLA_AT_GMAIL_JPG}?d=http%3A%2F%2Fexample.com%2Ftest.jpg&s=20", build_gravatar_url('bella@gmail.com', :size => 20, :default => 'http://example.com/test.jpg')
-      assert_equal "#{BELLA_AT_GMAIL_JPG}?other=escaped%26yes%3F&r=x&s=30", build_gravatar_url('bella@gmail.com', :size => 30, :rating => :x, :other => "escaped&yes?")
+      assert_equal "#{BELLA_AT_GMAIL_JPG}?s=16", gravatar_url('bella@gmail.com', :size => 16)
+      assert_equal "#{BELLA_AT_GMAIL_JPG}?d=http%3A%2F%2Fexample.com%2Ftest.jpg&s=20", gravatar_url('bella@gmail.com', :size => 20, :default => 'http://example.com/test.jpg')
+      assert_equal "#{BELLA_AT_GMAIL_JPG}?other=escaped%26yes%3F&r=x&s=30", gravatar_url('bella@gmail.com', :size => 30, :rating => :x, :other => "escaped&yes?")
     end
     
     should "ensure that all options as well as keys are escaped correctly" do
-      assert_equal "#{BELLA_AT_GMAIL_JPG}?escaped%2Fme=escaped%2Fme", build_gravatar_url('bella@gmail.com', 'escaped/me' => 'escaped/me')
+      assert_equal "#{BELLA_AT_GMAIL_JPG}?escaped%2Fme=escaped%2Fme", gravatar_url('bella@gmail.com', 'escaped/me' => 'escaped/me')
     end
     
     should "ignore false or nil options" do
-      assert_equal "#{BELLA_AT_GMAIL_JPG}?s=24", build_gravatar_url('bella@gmail.com', :s => 24, :invalid => false, :other => nil)
+      assert_equal "#{BELLA_AT_GMAIL_JPG}?s=24", gravatar_url('bella@gmail.com', :s => 24, :invalid => false, :other => nil)
     end
     
     should "allow different :filetype to be set, like 'gif' or 'png'" do
-      assert_equal "#{BELLA_AT_GMAIL}.gif", build_gravatar_url('bella@gmail.com', :filetype => :gif)
-      assert_equal "#{BELLA_AT_GMAIL}.png", build_gravatar_url('bella@gmail.com', :filetype => :png)
+      assert_equal "#{BELLA_AT_GMAIL}.gif", gravatar_url('bella@gmail.com', :filetype => :gif)
+      assert_equal "#{BELLA_AT_GMAIL}.png", gravatar_url('bella@gmail.com', :filetype => :png)
     end
   
     should "skip :filetype if set to false, nil or ''" do
-      assert_equal "#{BELLA_AT_GMAIL}", build_gravatar_url('bella@gmail.com', :filetype => false)
-      assert_equal "#{BELLA_AT_GMAIL}", build_gravatar_url('bella@gmail.com', :filetype => nil)
-      assert_equal "#{BELLA_AT_GMAIL}", build_gravatar_url('bella@gmail.com', :filetype => '')
-      assert_equal "#{BELLA_AT_GMAIL}.foobar", build_gravatar_url('bella@gmail.com', :filetype => 'foobar')
-      assert_equal "#{BELLA_AT_GMAIL}.gif", build_gravatar_url('bella@gmail.com', :filetype => :gif)
+      assert_equal "#{BELLA_AT_GMAIL}", gravatar_url('bella@gmail.com', :filetype => false)
+      assert_equal "#{BELLA_AT_GMAIL}", gravatar_url('bella@gmail.com', :filetype => nil)
+      assert_equal "#{BELLA_AT_GMAIL}", gravatar_url('bella@gmail.com', :filetype => '')
+      assert_equal "#{BELLA_AT_GMAIL}.foobar", gravatar_url('bella@gmail.com', :filetype => 'foobar')
+      assert_equal "#{BELLA_AT_GMAIL}.gif", gravatar_url('bella@gmail.com', :filetype => :gif)
     end
     
     should "handle Procs as :default, to easily generate default urls based on supplied :size" do
       default = Proc.new { |*args| "http://example.com/gravatar#{args.first[:size] ? '-' + args.first[:size].to_s : ''}.jpg" }
-      assert_equal "#{BELLA_AT_GMAIL_JPG}?d=http%3A%2F%2Fexample.com%2Fgravatar.jpg", build_gravatar_url('bella@gmail.com', :default => default)        
-      assert_equal "#{BELLA_AT_GMAIL_JPG}?d=http%3A%2F%2Fexample.com%2Fgravatar-25.jpg&s=25", build_gravatar_url('bella@gmail.com', :size => 25, :d => default)
-      assert_equal "#{BELLA_AT_GMAIL_JPG}?d=http%3A%2F%2Fexample.com%2Fgravatar-20.jpg&s=20", build_gravatar_url('bella@gmail.com', :size => 20, 'd' => default)
+      assert_equal "#{BELLA_AT_GMAIL_JPG}?d=http%3A%2F%2Fexample.com%2Fgravatar.jpg", gravatar_url('bella@gmail.com', :default => default)        
+      assert_equal "#{BELLA_AT_GMAIL_JPG}?d=http%3A%2F%2Fexample.com%2Fgravatar-25.jpg&s=25", gravatar_url('bella@gmail.com', :size => 25, :d => default)
+      assert_equal "#{BELLA_AT_GMAIL_JPG}?d=http%3A%2F%2Fexample.com%2Fgravatar-20.jpg&s=20", gravatar_url('bella@gmail.com', :size => 20, 'd' => default)
     end    
   end
   
-  context "#build_gravatar_url when passed in an object" do
-    should "look for :email method and use it to generate build_gravatar_url from" do
+  context "#gravatar_url when passed in an object" do
+    should "look for :email method and use it to generate gravatar_url from" do
       obj = Object.new
       mock(obj).email { "bella@gmail.com" }
       
-      assert_equal BELLA_AT_GMAIL_JPG, build_gravatar_url(obj)
+      assert_equal BELLA_AT_GMAIL_JPG, gravatar_url(obj)
     end
     
     should "look for :mail of field :email does not exist" do
       obj = Object.new
       mock(obj).mail { "bella@gmail.com" }
       
-      assert_equal BELLA_AT_GMAIL_JPG, build_gravatar_url(obj)      
+      assert_equal BELLA_AT_GMAIL_JPG, gravatar_url(obj)      
     end
     
     should "finally just use to_s... if neither :email nor :mail exists" do
       obj = Object.new
       mock(obj).to_s { "bella@gmail.com" }
       
-      assert_equal BELLA_AT_GMAIL_JPG, build_gravatar_url(obj)      
+      assert_equal BELLA_AT_GMAIL_JPG, gravatar_url(obj)      
     end
     
     should "handle Procs as :default and pass in the 'object' as second parameter" do
@@ -89,28 +93,32 @@ class GravatarifyBaseTest < Test::Unit::TestCase
       girl = Object.new
       mock(girl).email { "bella@gmail.com" }
       mock(girl).female? { true }      
-      assert_equal "#{BELLA_AT_GMAIL_JPG}?d=http%3A%2F%2Fexample.com%2Fgravatar_girl.jpg", build_gravatar_url(girl, :default => default)
+      assert_equal "#{BELLA_AT_GMAIL_JPG}?d=http%3A%2F%2Fexample.com%2Fgravatar_girl.jpg", gravatar_url(girl, :default => default)
       
       boy = Object.new
       mock(boy).email { "hans@gmail.com" }
       mock(boy).female? { false }
-      assert_equal "http://www.gravatar.com/avatar/b6987c8f1d734e684cf9721970b906e5.jpg?d=http%3A%2F%2Fexample.com%2Fgravatar.jpg", build_gravatar_url(boy, :default => default)      
-    end    
+      assert_equal "http://www.gravatar.com/avatar/b6987c8f1d734e684cf9721970b906e5.jpg?d=http%3A%2F%2Fexample.com%2Fgravatar.jpg", gravatar_url(boy, :default => default)      
+    end
+    
+    should "work easily work with RFC emails encapsulated in < and >" do
+      assert_equal BELLA_AT_GMAIL_JPG, gravatar_url('Bella <bella@gmail.com>')
+    end
   end
   
   context "Gravatar hosts support" do
     should "switch to different hosts based on generated email hash, yet always the same for consecutive calls with the same email!" do
-      assert_equal "http://0.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg", build_gravatar_url('bella@gmail.com')
-      assert_equal build_gravatar_url('bella@gmail.com'), build_gravatar_url('bella@gmail.com')
-      assert_equal "http://1.gravatar.com/avatar/41d86cad3dd465d6913d5a3232744441.jpg", build_gravatar_url('bella@bella.com')
-      assert_equal "http://2.gravatar.com/avatar/8f3af64e9c215d158b062a7b154e071e.jpg", build_gravatar_url('bella@hotmail.com')
-      assert_equal "http://www.gravatar.com/avatar/d2279c22a33da2cb57defd21c33c8ec5.jpg", build_gravatar_url('bella@yahoo.de')
+      assert_equal "http://0.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg", gravatar_url('bella@gmail.com')
+      assert_equal gravatar_url('bella@gmail.com'), gravatar_url('bella@gmail.com')
+      assert_equal "http://1.gravatar.com/avatar/41d86cad3dd465d6913d5a3232744441.jpg", gravatar_url('bella@bella.com')
+      assert_equal "http://2.gravatar.com/avatar/8f3af64e9c215d158b062a7b154e071e.jpg", gravatar_url('bella@hotmail.com')
+      assert_equal "http://www.gravatar.com/avatar/d2279c22a33da2cb57defd21c33c8ec5.jpg", gravatar_url('bella@yahoo.de')
     end
     
     should "switch to https://secure.gravatar.com if :secure => true is supplied" do
-      assert_equal "https://secure.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg", build_gravatar_url('bella@gmail.com', :secure => true)
-      assert_equal "https://secure.gravatar.com/avatar/41d86cad3dd465d6913d5a3232744441.jpg", build_gravatar_url('bella@bella.com', :secure => true)
-      assert_equal "https://secure.gravatar.com/avatar/d2279c22a33da2cb57defd21c33c8ec5.jpg", build_gravatar_url('bella@yahoo.de', :secure => true)
+      assert_equal "https://secure.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg", gravatar_url('bella@gmail.com', :secure => true)
+      assert_equal "https://secure.gravatar.com/avatar/41d86cad3dd465d6913d5a3232744441.jpg", gravatar_url('bella@bella.com', :secure => true)
+      assert_equal "https://secure.gravatar.com/avatar/d2279c22a33da2cb57defd21c33c8ec5.jpg", gravatar_url('bella@yahoo.de', :secure => true)
     end
     
     should "allow Procs for :secure option, enables pretty cool stuff for stuff like request.ssl?" do
@@ -118,11 +126,11 @@ class GravatarifyBaseTest < Test::Unit::TestCase
       
       mock_ssl = MockView.new
       mock(mock_ssl).request.stub!.ssl? { true }      
-      assert_equal "https://secure.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg", mock_ssl.build_gravatar_url('bella@gmail.com')
+      assert_equal "https://secure.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg", mock_ssl.gravatar_url('bella@gmail.com')
       
       mock_no_ssl = MockView.new
       mock(mock_no_ssl).request.stub!.ssl? { false }
-      assert_equal BELLA_AT_GMAIL_JPG, mock_no_ssl.build_gravatar_url('bella@gmail.com')
+      assert_equal BELLA_AT_GMAIL_JPG, mock_no_ssl.gravatar_url('bella@gmail.com')
     end
   end
     
@@ -134,17 +142,17 @@ class GravatarifyBaseTest < Test::Unit::TestCase
     end
     
     should "ensure that default options are always added" do
-      assert_equal "#{BELLA_AT_GMAIL}.png?anything=test&d=http%3A%2F%2Fexample.com%2Fgravatar.jpg", build_gravatar_url('bella@gmail.com')
+      assert_equal "#{BELLA_AT_GMAIL}.png?anything=test&d=http%3A%2F%2Fexample.com%2Fgravatar.jpg", gravatar_url('bella@gmail.com')
     end
     
-    should "ensure that default options can be overriden by passing options into build_gravatar_url call" do
-      assert_equal "#{BELLA_AT_GMAIL}.gif?anything=else&d=http%3A%2F%2Fexample.com%2Fgravatar.jpg", build_gravatar_url('bella@gmail.com', :anything => "else", :filetype => :gif)
+    should "ensure that default options can be overriden by passing options into gravatar_url call" do
+      assert_equal "#{BELLA_AT_GMAIL}.gif?anything=else&d=http%3A%2F%2Fexample.com%2Fgravatar.jpg", gravatar_url('bella@gmail.com', :anything => "else", :filetype => :gif)
     end
     
     should "ensure that no filetypes are added when :filetype set to false, unless locally specified" do
       Gravatarify.options[:filetype] = false
-      assert_equal "#{BELLA_AT_GMAIL}?anything=test&d=http%3A%2F%2Fexample.com%2Fgravatar.jpg", build_gravatar_url('bella@gmail.com')
-      assert_equal "#{BELLA_AT_GMAIL}.png?anything=test&d=http%3A%2F%2Fexample.com%2Fgravatar.jpg", build_gravatar_url('bella@gmail.com', :filetype => 'png')
+      assert_equal "#{BELLA_AT_GMAIL}?anything=test&d=http%3A%2F%2Fexample.com%2Fgravatar.jpg", gravatar_url('bella@gmail.com')
+      assert_equal "#{BELLA_AT_GMAIL}.png?anything=test&d=http%3A%2F%2Fexample.com%2Fgravatar.jpg", gravatar_url('bella@gmail.com', :filetype => 'png')
     end
   end
 end

data/test/unit/gravatarify_helper_test.rb

@@ -8,13 +8,6 @@ class GravatarifyHelpersTest < Test::Unit::TestCase
     # just ensure that no global options are defined when starting next test
     reset_gravatarify!
   end
-
-  context "#gravatar_url" do
-    should "return same urls as build_gravatar_url" do
-      assert_equal BELLA_AT_GMAIL_JPG, gravatar_url('bella@gmail.com')
-      assert_equal "#{BELLA_AT_GMAIL_JPG}?d=x&s=16", gravatar_url('bella@gmail.com', :d => 'x', :s => 16)      
-    end
-  end
   
   context "#gravatar_attrs" do
     should "return hash with :height, :width, :alt and :src defined" do
@@ -25,9 +18,10 @@ class GravatarifyHelpersTest < Test::Unit::TestCase
     end
     
     should "allow any param to be defined/overridden, except src, width and heigth" do
-      hash = gravatar_attrs('bella@gmail.com', :size => 20, :r => :x, :height => 40, :alt => 'bella', :id => 'test', :title => 'something', :class => 'gravatar')
+      hash = gravatar_attrs('bella@gmail.com', :size => 20, :r => :x, :foo => 40,
+                  :html => { :alt => 'bella', :id => 'test', :title => 'something', :class => 'gravatar'})
       expected = {
-        :alt => 'bella', :src => "#{BELLA_AT_GMAIL_JPG}?r=x&s=20", :width => 20, :height => 20,
+        :alt => 'bella', :src => "#{BELLA_AT_GMAIL_JPG}?foo=40&r=x&s=20", :width => 20, :height => 20,
         :id => 'test', :title => 'something', :class => 'gravatar'
       }
       assert_equal expected, hash
@@ -45,12 +39,12 @@ class GravatarifyHelpersTest < Test::Unit::TestCase
       assert_equal '<img alt="" height="16" src="http://0.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg?s=16" width="16" />',
               gravatar_tag('bella@gmail.com', :size => 16)
       assert_equal '<img alt="" class="gravatar" height="16" src="http://0.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg?d=x&amp;s=16" width="16" />',
-              gravatar_tag('bella@gmail.com', :class => "gravatar", :size => 16, :d => "x")
+              gravatar_tag('bella@gmail.com', :html => { :class => "gravatar" }, :size => 16, :d => "x")
     end
     
     should "ensure that all values are correctly html-esacped!" do
       assert_equal '<img alt="" height="80" src="http://0.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg" title="&lt;&gt;" width="80" />',
-              gravatar_tag('bella@gmail.com', :title => '<>')
+              gravatar_tag('bella@gmail.com', :html => { :title => '<>' })
     end
   end
   
@@ -61,26 +55,16 @@ class GravatarifyHelpersTest < Test::Unit::TestCase
       
       assert_equal '<img alt="" height="80" src="http://0.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg" width="80" />',
                       gravatar_tag(obj)      
-    end
-    
-    should "create <img/>-tag based on gravatar_url from object if object responds to gravatar_url" do
-      obj = Object.new
-      mock(obj).name { "Mr. X" }
-      mock(obj).gravatar_url({ :size => 16 }) { "http://0.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg?s=16" }
-      
-      assert_equal '<img alt="Gravatar for Mr. X" height="16" src="http://0.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg?s=16" width="16" />',
-                      gravatar_tag(obj, :size => 16, :alt => "Gravatar for #{obj.name}")
-    end
+    end    
   end
   
   context "Gravatarify::Helper#html_options" do
     should "add be added to all tags/hashes created by gravatar_tag or gravatar_attrs" do
-      Gravatarify::Helper.html_options[:title] = "Gravatar" # add a title attribute, yeah neat-o!
-      Gravatarify::Helper.html_options[:class] = "gravatar"
+      Gravatarify.options[:html] = { :title => "Gravatar", :class => "gravatar" } # add a title attribute, yeah neat-o!
       
       assert_equal '<img alt="" class="gravatar" height="80" src="http://0.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg" title="Gravatar" width="80" />',
                       gravatar_tag('bella@gmail.com')
-      hash = gravatar_attrs('bella@gmail.com', :size => 20, :title => "Gravatar for Bella", :id => "test")
+      hash = gravatar_attrs('bella@gmail.com', :size => 20, :html => { :title => "Gravatar for Bella", :id => "test" })
       expected = {
         :alt => "", :width => 20, :height => 20, :src => "http://0.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg?s=20",
         :title => "Gravatar for Bella", :id => "test", :class => "gravatar"
@@ -89,21 +73,19 @@ class GravatarifyHelpersTest < Test::Unit::TestCase
     end
     
     should "not allow :src, :height or :width to be set via global options and all local options should override!" do
-      Gravatarify::Helper.html_options[:src] = "avatar-30.jpg"
-      Gravatarify::Helper.html_options[:width] = 30
-      Gravatarify::Helper.html_options[:title] = "Avatar"
+      Gravatarify.options[:html] = { :src => "avatar-30.jpg", :width => 30, :title => "Avatar" }
       
       assert_equal '<img alt="" height="25" src="http://0.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg?s=25" title="Gravatar" width="25" />',
-                   gravatar_tag('bella@gmail.com', :size => 25, :title => 'Gravatar')
+                   gravatar_tag('bella@gmail.com', :size => 25, :html => { :title => 'Gravatar' })
     end
     
     should "allow :alt to be set globally" do
-      Gravatarify::Helper.html_options[:alt] = "Gravatar"
+      Gravatarify.options[:html] = { :alt => "Gravatar" }
       
       assert_equal '<img alt="Gravatar" height="80" src="http://0.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg" width="80" />',
                    gravatar_tag('bella@gmail.com')
       assert_equal '<img alt="Avatar" height="80" src="http://0.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d" width="80" />',
-                   gravatar_tag('bella@gmail.com', :filetype => false, :alt => 'Avatar')
+                   gravatar_tag('bella@gmail.com', :filetype => false, :html => { :alt => 'Avatar' })
     end
   end
 end

data/test/unit/gravatarify_rack_vs_cgi_test.rb

@@ -4,21 +4,21 @@ require 'cgi'
 class GravatarifyRackVsCgiTest < Test::Unit::TestCase
   include Gravatarify::Base
 
+  # Remove Rack if defined
+  def setup
+    Object.send(:remove_const, :Rack) if defined?(Rack)    
+  end
+
   # Reload Rack::Utils
   def teardown
     begin; require('rack/utils'); rescue LoadError; end
   end
 
-  context "if Rack::Utils is not available, #gravatarify" do
-    setup do
-      # Remove Rack if defined
-      Object.send(:remove_const, :Rack) if defined?(Rack)
-    end
-    
+  context "if Rack::Utils is not available, #gravatar_url" do
     should "fallback to CGI#escape" do
       assert !defined?(Rack::Utils), 'Rack::Utils should no longer be defined'
       assert defined?(CGI), "CGI should be defined"
-      assert_equal "#{BELLA_AT_GMAIL_JPG}?escaped%2Fme=escaped%2Fme", build_gravatar_url('bella@gmail.com', 'escaped/me' => 'escaped/me')
+      assert_equal "#{BELLA_AT_GMAIL_JPG}?escaped%2Fme=escaped%2Fme", gravatar_url('bella@gmail.com', 'escaped/me' => 'escaped/me')
     end
   end
 end

data/test/unit/gravatarify_styles_test.rb

@@ -0,0 +1,92 @@
+require 'test_helper'
+
+class GravatarifyStylesTest < Test::Unit::TestCase
+  include Gravatarify::Helper
+  
+  def setup
+    reset_gravatarify!
+    Gravatarify.styles.clear
+  end
+  
+  context "Gravatarify#styles" do
+    should "store and retrieve styles" do
+      Gravatarify.styles[:mini] = { :size => 16 }
+      exp = { :size => 16 }
+      assert_equal exp, Gravatarify.styles[:mini]
+    end
+  end
+  
+  context "Gravatarify::Base#gravatar_url" do
+    setup { Gravatarify.styles[:mini] = { :size => 16, :default => :wavatar } }
+    
+    should "still work without any argument" do
+      assert_equal BELLA_AT_GMAIL_JPG, gravatar_url('bella@gmail.com')      
+    end
+    
+    should "respect styles" do
+      assert_equal "#{BELLA_AT_GMAIL_JPG}?d=wavatar&s=16", gravatar_url('bella@gmail.com', :mini)
+    end
+    
+    should "allow to override styles" do
+      assert_equal "#{BELLA_AT_GMAIL}?d=404&s=16", gravatar_url('bella@gmail.com', :mini, :filetype => false, :default => 404)
+    end
+    
+    should "override default options" do
+      Gravatarify.options[:size] = 45
+      assert_equal "#{BELLA_AT_GMAIL_JPG}?d=wavatar&s=16", gravatar_url('bella@gmail.com', :mini)
+    end
+    
+    should "inherit default options" do
+      Gravatarify.options[:size] = 45
+      Gravatarify.options[:filetype] = 'png'
+      assert_equal "#{BELLA_AT_GMAIL}.png?d=wavatar&s=16", gravatar_url('bella@gmail.com', :mini)
+    end
+    
+    should "work with unknown style" do
+      assert_equal "#{BELLA_AT_GMAIL_JPG}", gravatar_url('bella@gmail.com', :some_style)
+    end
+    
+    should "work with unknown style and custom options" do
+      assert_equal "#{BELLA_AT_GMAIL_JPG}?s=20", gravatar_url('bella@gmail.com', :some_style, :size => 20)
+    end    
+  end
+  
+  context "Gravatarify::Helper#gravatar_attrs" do
+    setup { Gravatarify.styles[:mini] = { :size => 16 } }
+    
+    should "still work as-is without options" do
+      expected = { :src => BELLA_AT_GMAIL_JPG, :alt => '', :width => 80, :height => 80 }
+      assert_equal expected, gravatar_attrs('bella@gmail.com')
+    end
+    
+    should "work with style :mini" do
+      expected = { :src => "#{BELLA_AT_GMAIL_JPG}?s=16", :alt => '', :width => 16, :height => 16 }
+      assert_equal expected, gravatar_attrs('bella@gmail.com', :mini)
+    end    
+  end
+  
+  context "Gravatarify::Helper#gravatar_tag" do
+    setup { Gravatarify.styles[:mini] = { :size => 16, :html => { :alt => "x" } } }
+    
+    should "work with styles and be able to override options locally" do
+      assert_equal "<img alt=\"x\" height=\"16\" src=\"#{BELLA_AT_GMAIL_JPG}?r=x&amp;s=16\" width=\"16\" />", gravatar_tag('bella@gmail.com', :mini, :rating => :x)
+    end
+  end
+  
+  context "Gravatarify#options and Gravatarify#styles" do
+    should "deep merge the :html attribute and inherit correctly" do
+      Gravatarify.options[:a] = "global"
+      Gravatarify.options[:b] = "global"
+      Gravatarify.options[:c] = "global"
+      Gravatarify.options[:html] = { :a => "global", :b => "global", :c => "global" }
+      Gravatarify.styles[:test] = { :b => "style", :c => "style", :html => { :b => "style", :c => "style" } }
+      
+      expected = {
+        :alt => '', :width => 80, :height => 80,
+        :src => "#{BELLA_AT_GMAIL_JPG}?a=global&b=style&c=local",
+        :a => "global", :b => "style", :c => "local"
+      }
+      assert_equal expected, gravatar_attrs('bella@gmail.com', :test, :c => "local", :html => { :c => "local" })
+    end
+  end
+end