gravatarify 2.0.4 → 2.1.0

data/.gitignore

@@ -1,4 +1,3 @@
 doc/
 pkg/
 .yardoc
-*.gemspec

data/README.md

@@ -67,7 +67,7 @@ This then provides three helper methods: `gravatar_url`, `gravatar_attrs` and `g
 To just build a simple `<img/>` tag, pass in an object (if it responds to `email` or `mail`)
 or a string containing the e-mail address:
 
-    <%= gravatar_tag @user %> # => assumes @user has email or mail field!
+    <%= gravatar_tag @user %> # => assumes @user.respond_to?(:email) or @user.respond_to?(:mail)
 
 This builds a neat `<img/>`-tag. To display an "X" rated avatar which is 25x25 pixel in size
 and the `<img/>` tag should have a class attribute, do:
@@ -79,7 +79,7 @@ pass them in the `:html` option as hash. If more control is needed, or just the
 required, resort to `gravatar_url`, which returns a string with the (unescaped) url:
     
     <img src="<%= h(gravatar_url(@user.author_email, :size => 16)) %>" alt="Gravatar"/>
-    
+        
 Using styles
 ------------
 
@@ -94,7 +94,7 @@ these are reusable presets of options:
     <%= gravatar_tag @user, :mini %> # => <img alt="" class="gravatar gravatar-mini" height="16" src.... />
     
     # or in/another/view.html.haml:    
-    %img{gravatar_attrs(@user, :default)/ # => <img alt="" class="gravatar" height="45" ... />
+    %img{ gravatar_attrs(@user, :default) }/ # => <img alt="" class="gravatar" height="45" ... />
     
 Need to change to size of all `:mini` gravatars? Easy, just change the definition in `Gravatarify.styles`.
 Of course settings via `Gravatarify.options` are "mixed-in" as well, so:
@@ -208,9 +208,9 @@ to generate an image url, based on the request size:
     end
     
     # now each time a gravatar url is generated, the Proc is evaluated:
-    @user.gravatar_url
+    gravatar_url(@user)
     # => "http://0.gravatar.com/...jpg?d=http%3A%2F%2Fexample.com%2Fgravatar-80.jpg"
-    @user.gravatar_url(:size => 16)
+    gravatar_url(@user, :size => 16)
     # => "http://0.gravatar.com/...jpg?d=http%3A%2F%2Fexample.com%2Fgravatar-16.jpg&s=16"
     
 Into the block is passed the options hash and as second parameter the object itself, so it's possible to do stuff like
@@ -218,7 +218,7 @@ Into the block is passed the options hash and as second parameter the object its
     # doing stuff like showing default avatar based on gender...
     @user = User.new(:gender => :female, :email => 'bella@gmail.com') # => @user.female? = true
     
-    @user.gravatar_url :default => Proc.new { |opts, obj| "http://example.com/avatar#{obj.respond_to?(:female) && obj.female? ? '_female' : ''}.jpg" }
+    gravatar_url @user, :default => Proc.new { |opts, obj| "http://example.com/avatar#{obj.respond_to?(:female) && obj.female? ? '_female' : ''}.jpg" }
     # => http://0.gravatar.com/...jpg?d=http%3A%2F%2Fexample.com%2Fgravatar_female.jpg
 
 Not only the `:default` option accepts a Proc, but also `:secure`, can be useful to handle cases where
@@ -248,7 +248,7 @@ it's used, then...
 
  1. Remove all occurences of `gravatarify` in the models
  2. Change calls from `<%= image_tag @user.gravatar_url %>` to
-    saner `<%= gravatar_tag @user %>` calls or of course if just the url
+    saner `<%= gravatar_tag @user %>` calls, or if just the url
     is required to `gravatar_url(@user)`.
 
 If the model used `gravatarify :author_email`, then changes in the views must reflect that and use it

data/Rakefile

@@ -1,10 +1,7 @@
 require 'rake'
 require 'rake/testtask'
 require 'yard'
-
-def gravatarify_version
-  @gravatarify_version ||= (tmp = YAML.load(File.read('VERSION.yml'))) && [tmp[:major], tmp[:minor], tmp[:patch]] * '.'
-end
+require File.join(File.dirname(__FILE__), 'lib', 'gravatarify')
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -22,19 +19,21 @@ YARD::Rake::YardocTask.new(:doc) do |t|
   t.files = ['lib/**/*.rb']
   t.options = [
       "--readme", "README.md",
-      "--title", "gravatarify (v#{gravatarify_version}) API Documentation"
+      "--title", "gravatarify (v#{Gravatarify::VERSION}) API Documentation"
   ]
 end
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
+    gemspec.version = Gravatarify::VERSION
     gemspec.name = "gravatarify"
     gemspec.summary = "Awesome gravatar support for Ruby (and Rails)."
     description = <<-DESC
     Awesome gravatar support for Ruby (and Rails) -
-    with unique options like Proc's for default images, or
-    support for gravatar.com's multiple host names.
+    with unique options like Proc's for default images,
+    support for gravatar.com's multiple host names, ability to
+    define reusable styles and much more...
     DESC
     gemspec.description = description.strip
     gemspec.email = "lukas.westermann@gmail.com"
@@ -42,6 +41,10 @@ begin
     gemspec.authors = ["Lukas Westermann"]
     gemspec.licenses = %w{LICENSE}
     gemspec.extra_rdoc_files = %w{README.md}
+    
+    gemspec.add_development_dependency('shoulda', '>= 2.10.2')
+    gemspec.add_development_dependency('rr', '>= 0.10.5')
+    gemspec.add_development_dependency('activesupport', '>= 2.3.5')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/gravatarify.gemspec

@@ -0,0 +1,73 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{gravatarify}
+  s.version = "2.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Lukas Westermann"]
+  s.date = %q{2010-03-09}
+  s.description = %q{Awesome gravatar support for Ruby (and Rails) -
+    with unique options like Proc's for default images,
+    support for gravatar.com's multiple host names, ability to
+    define reusable styles and much more...}
+  s.email = %q{lukas.westermann@gmail.com}
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
+  s.files = [
+    ".gitignore",
+     "LICENSE",
+     "README.md",
+     "Rakefile",
+     "gravatarify.gemspec",
+     "lib/gravatarify.rb",
+     "lib/gravatarify/base.rb",
+     "lib/gravatarify/helper.rb",
+     "lib/gravatarify/utils.rb",
+     "rails/init.rb",
+     "test/benchmark/benchmark.rb",
+     "test/test_helper.rb",
+     "test/unit/gravatarify_base_test.rb",
+     "test/unit/gravatarify_helper_test.rb",
+     "test/unit/gravatarify_styles_test.rb",
+     "test/unit/gravatarify_subdomain_test.rb"
+  ]
+  s.homepage = %q{http://github.com/lwe/gravatarify}
+  s.licenses = ["LICENSE"]
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Awesome gravatar support for Ruby (and Rails).}
+  s.test_files = [
+    "test/benchmark/benchmark.rb",
+     "test/test_helper.rb",
+     "test/unit/gravatarify_base_test.rb",
+     "test/unit/gravatarify_helper_test.rb",
+     "test/unit/gravatarify_styles_test.rb",
+     "test/unit/gravatarify_subdomain_test.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
+      s.add_development_dependency(%q<rr>, [">= 0.10.5"])
+      s.add_development_dependency(%q<activesupport>, [">= 2.3.5"])
+    else
+      s.add_dependency(%q<shoulda>, [">= 2.10.2"])
+      s.add_dependency(%q<rr>, [">= 0.10.5"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.5"])
+    end
+  else
+    s.add_dependency(%q<shoulda>, [">= 2.10.2"])
+    s.add_dependency(%q<rr>, [">= 0.10.5"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.5"])
+  end
+end
+

data/lib/gravatarify.rb

@@ -1,10 +1,12 @@
 # Loads all required submodules
+module Gravatarify
+  # current API version, as defined by http://semver.org/
+  VERSION = "2.1.0".freeze
+  
+  autoload :Base,   'gravatarify/base'
+  autoload :Utils,  'gravatarify/utils'
+  autoload :Helper, 'gravatarify/helper'
+end
 
-# Base -> provides the basic gravatar_url method, can also be used for
-# custom implementations, just include Gravatarify::Base.
-require 'gravatarify/base'
-require 'gravatarify/utils'
-require 'gravatarify/helper'
-
-# and HAML support (if defined)
+# and add HAML support (if defined)
 Haml::Helpers.send(:include, Gravatarify::Helper) if defined?(Haml)

data/lib/gravatarify/base.rb

@@ -48,7 +48,7 @@ module Gravatarify
     # defined.
     def subdomain(str) #:nodoc:
       @subdomains ||= %w{ 0 1 2 www }
-      @subdomains[str.hash % @subdomains.size] || 'www'
+      (@subdomains.empty? ? nil : @subdomains[str.hash % @subdomains.size]) || 'www'
     end
   end
   
@@ -96,13 +96,14 @@ module Gravatarify
       url_options = Utils.merge_gravatar_options(*params)
       email_hash = Digest::MD5.hexdigest(Utils.smart_email(email))
       extension = (ext = url_options.delete(:filetype) and ext != '') ? ".#{ext || 'jpg'}" : '' # slightly adapted from gudleik's implementation
-      build_gravatar_host(email_hash, url_options.delete(:secure)) + "/avatar/#{email_hash}#{extension}#{build_gravatar_options(email, url_options)}"
+      host = Base.gravatar_host(self, email_hash, url_options.delete(:secure))
+      "#{host}/avatar/#{email_hash}#{extension}#{Base.gravatar_params(email, url_options)}"
     end
     
     # For backwards compatibility.
     alias_method :build_gravatar_url, :gravatar_url
-  
-    private
+    
+    protected
       # Builds gravatar host name from supplied e-mail hash.
       # Ensures that for the same +str_hash+ always the same subdomain is used.
       #
@@ -111,22 +112,22 @@ module Gravatarify
       #        else that subdomain magic. If it's passed in a +Proc+, it's evaluated and the result (+true+/+false+) is used
       #        for the same decicion.
       # @return [String] Protocol and hostname (like <tt>http://www.gravatar.com</tt>), without trailing slash.
-      def build_gravatar_host(str_hash, secure = false)
-        secure = secure.call(self) if secure.respond_to?(:call)
-        secure ? "https://secure.gravatar.com" : "http://#{Gravatarify.subdomain(str_hash)}.gravatar.com"        
+      def self.gravatar_host(context, str_hash, secure = false)        
+        use_ssl_host = secure.is_a?(Proc) ? secure.call(context) : secure
+        use_ssl_host ? "https://secure.gravatar.com" : "http://#{Gravatarify.subdomain(str_hash)}.gravatar.com"        
       end
-          
+        
       # Builds a query string from all passed in options.
-      def build_gravatar_options(source, url_options = {})
+      def self.gravatar_params(source, url_options = {})
         params = url_options.inject([]) do |params, (key, value)|
-          key = (GRAVATAR_ABBREV_OPTIONS[key] || key).to_sym # shorten key
+          key = (GRAVATAR_ABBREV_OPTIONS[key] || key).to_sym # shorten & symbolize key
           unless key == :html
-            value = value.call(url_options, source) if key == :d and value.respond_to?(:call)
+            value = value.call(url_options, source) if key == :d and value.is_a?(Proc)
             params << "#{key}=#{CGI.escape(value.to_s)}" if value
           end
           params
         end
         "?#{params.sort * '&'}" unless params.empty?
-      end      
-    end
+      end    
+  end
 end

data/lib/gravatarify/helper.rb

@@ -32,7 +32,6 @@ module Gravatarify::Helper
   # @return [String] a complete and hopefully valid +img+ tag.
   def gravatar_tag(email, *params)
     html_attrs = gravatar_attrs(email, *params).map { |key,value| "#{key}=\"#{CGI.escapeHTML(value.to_s)}\"" }.sort.join(" ")
-    html = "<img #{html_attrs} />"
-    Gravatarify::Utils.with_xss? ? html.html_safe! : html
+    Gravatarify::Utils.make_html_safe_if_available("<img #{html_attrs} />");
   end
 end

data/lib/gravatarify/utils.rb

@@ -1,6 +1,6 @@
 module Gravatarify  
   # Set of common utility methods to e.g. deep merge options etc.
-  module Utils #:nodoc:
+  module Utils #:nodoc:    
     # 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)
@@ -24,8 +24,13 @@ module Gravatarify
     def self.smart_email(obj)
       (obj.respond_to?(:email) ? obj.send(:email) : (obj.respond_to?(:mail) ? obj.send(:mail) : obj)).to_s.strip.downcase
     end
-    
-    # Returns +true+ when those XSS methods are available, else +false+ is returned.
-    def self.with_xss?; "".respond_to?(:html_safe!) end
+
+    # Kinda a workaround for Rails 3.x and it's newly introduced +html_safe+ method, which
+    # is used over old school +html_safe!+ method. Well, well.
+    def self.make_html_safe_if_available(str)
+      return str.html_safe if str.respond_to?(:html_safe)
+      return str.html_safe! if str.respond_to?(:html_safe!)
+      str
+    end
   end
 end

data/test/benchmark/benchmark.rb

@@ -4,7 +4,7 @@ require 'benchmark'
 include Gravatarify::Helper
   
 emails = ['foo@bar.com', 'foobar_didum_asdf@asdasd.com',
-          'ASDASDSA@aasd_ASDSAd.com', ' sad@asdASdssasd  .ch', 'Master <asdASD@asdasd.com >']
+          'ASDASDSA@aasd_ASDSAd.com', ' sad@asdASdssasd.ch', ' didum@asdasd.com  ']
 n = 10000
 Benchmark.bm(23) do |bm|
   bm.report("gravatar_url w/o args: ") { for i in 1..n do gravatar_url(emails[i % 5]) end }

data/test/test_helper.rb

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'test/unit'
 require 'shoulda'
 require 'rr'
-
 require 'gravatarify'
 
 Test::Unit::TestCase.send :include, RR::Adapters::TestUnit
@@ -15,6 +14,6 @@ def reset_gravatarify!
 end
 
 # some often used values...
-BELLA_AT_GMAIL = "http://0.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d"
+BELLA_AT_GMAIL = "http://www.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d"
 BELLA_AT_GMAIL_JPG = "#{BELLA_AT_GMAIL}.jpg"
-NIL_JPG = "http://1.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e.jpg"
+NIL_JPG = "http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e.jpg"

data/test/unit/gravatarify_base_test.rb

@@ -7,7 +7,7 @@ end
 class GravatarifyBaseTest < Test::Unit::TestCase
   include Gravatarify::Base
   
-  def setup; reset_gravatarify! end
+  def setup; reset_gravatarify!; Gravatarify.subdomains = %w{www} end
     
   context "#gravatar_url, but without any options yet" do
     should "generate correct url for hash without options" do
@@ -32,7 +32,7 @@ class GravatarifyBaseTest < Test::Unit::TestCase
   
   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", gravatar_url('bella@gmail.com', :size => 16)
+      assert_match "#{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
@@ -104,11 +104,11 @@ class GravatarifyBaseTest < Test::Unit::TestCase
   
   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", gravatar_url('bella@gmail.com')
+      assert_match %r{\Ahttp://(0|1|2|www).gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg\z}, 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')
+      assert_match %r{\Ahttp://(0|1|2|www).gravatar.com/avatar/41d86cad3dd465d6913d5a3232744441.jpg\z}, gravatar_url('bella@bella.com')
+      assert_match %r{\Ahttp://(0|1|2|www).gravatar.com/avatar/8f3af64e9c215d158b062a7b154e071e.jpg\z}, gravatar_url('bella@hotmail.com')
+      assert_match %r{\Ahttp://(0|1|2|www).gravatar.com/avatar/d2279c22a33da2cb57defd21c33c8ec5.jpg\z}, gravatar_url('bella@yahoo.de')
     end
     
     should "switch to https://secure.gravatar.com if :secure => true is supplied" do

data/test/unit/gravatarify_helper_test.rb

@@ -7,6 +7,7 @@ class GravatarifyHelpersTest < Test::Unit::TestCase
   def setup
     # just ensure that no global options are defined when starting next test
     reset_gravatarify!
+    Gravatarify.subdomains = %w{www}
   end
   
   context "#gravatar_attrs" do
@@ -32,23 +33,24 @@ class GravatarifyHelpersTest < Test::Unit::TestCase
   
   context "#gravatar_tag helper" do
     should "create <img/> tag with correct gravatar urls" do
-      assert_equal '<img alt="" height="80" src="http://0.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg" width="80" />', gravatar_tag('bella@gmail.com')
+      assert_equal '<img alt="" height="80" src="http://www.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg" width="80" />', gravatar_tag('bella@gmail.com')
     end
     
     should "create <img/> tags and handle all options correctly, other options should be passed to Rails' image_tag" do
-      assert_equal '<img alt="" height="16" src="http://0.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg?s=16" width="16" />',
+      assert_equal '<img alt="" height="16" src="http://www.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" />',
+      assert_equal '<img alt="" class="gravatar" height="16" src="http://www.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg?d=x&amp;s=16" width="16" />',
               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" />',
+      assert_equal '<img alt="" height="80" src="http://www.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg" title="&lt;&gt;" width="80" />',
               gravatar_tag('bella@gmail.com', :html => { :title => '<>' })
     end
     
-    should "be html_safe if rails 2.3.5" do
+    should "be html_safe if rails ~> 2.3.5" do
       require 'active_support'
+      require 'active_support/core_ext/string/output_safety' # for rails 3, be explicit...
       assert gravatar_tag('bella@gmail.com').html_safe?, "#html_safe? expected to return <true>"
     end
   end
@@ -58,7 +60,7 @@ class GravatarifyHelpersTest < Test::Unit::TestCase
       obj = Object.new
       mock(obj).email { "bella@gmail.com" }
       
-      assert_equal '<img alt="" height="80" src="http://0.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg" width="80" />',
+      assert_equal '<img alt="" height="80" src="http://www.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg" width="80" />',
                       gravatar_tag(obj)      
     end    
   end
@@ -67,11 +69,11 @@ class GravatarifyHelpersTest < Test::Unit::TestCase
     should "add be added to all tags/hashes created by gravatar_tag or gravatar_attrs" do
       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" />',
+      assert_equal '<img alt="" class="gravatar" height="80" src="http://www.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg" title="Gravatar" width="80" />',
                       gravatar_tag('bella@gmail.com')
       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",
+        :alt => "", :width => 20, :height => 20, :src => "http://www.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg?s=20",
         :title => "Gravatar for Bella", :id => "test", :class => "gravatar"
       }
       assert_equal expected, hash
@@ -80,16 +82,16 @@ class GravatarifyHelpersTest < Test::Unit::TestCase
     should "not allow :src, :height or :width to be set via global options and all local options should override!" do
       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" />',
+      assert_equal '<img alt="" height="25" src="http://www.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg?s=25" title="Gravatar" width="25" />',
                    gravatar_tag('bella@gmail.com', :size => 25, :html => { :title => 'Gravatar' })
     end
     
     should "allow :alt to be set globally" do
       Gravatarify.options[:html] = { :alt => "Gravatar" }
       
-      assert_equal '<img alt="Gravatar" height="80" src="http://0.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg" width="80" />',
+      assert_equal '<img alt="Gravatar" height="80" src="http://www.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" />',
+      assert_equal '<img alt="Avatar" height="80" src="http://www.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d" width="80" />',
                    gravatar_tag('bella@gmail.com', :filetype => false, :html => { :alt => 'Avatar' })
     end
   end

data/test/unit/gravatarify_styles_test.rb

@@ -5,6 +5,7 @@ class GravatarifyStylesTest < Test::Unit::TestCase
   
   def setup
     reset_gravatarify!
+    Gravatarify.subdomains = %w{www}
     Gravatarify.styles.clear
   end
   

data/test/unit/gravatarify_subdomain_test.rb

@@ -10,9 +10,9 @@ class GravatarifySubdomainTest < Test::Unit::TestCase
     
   context "changing hosts through Gravatarify#subdomains" do
     should "override default subdomains (useful to e.g. switch back to 'www' only)" do
-      Gravatarify.subdomains = ['0', '1']
-      assert_equal "http://0.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg", gravatar_url('info@initech.com')
-      assert_equal "http://1.gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", gravatar_url('support@initech.com')
+      Gravatarify.subdomains = ['a', 'b']
+      assert_match %r{\Ahttp://[ab].gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg\z}, gravatar_url('info@initech.com')
+      assert_match %r{\Ahttp://[ab].gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg\z}, gravatar_url('support@initech.com')
     end
     
     should "take in a string only argument, like www" do
@@ -45,8 +45,8 @@ class GravatarifySubdomainTest < Test::Unit::TestCase
       http = Net::HTTP.new('secure.gravatar.com', 443)
       http.use_ssl = true
       
-      # do not verify peer certificate (just get rid of that warning!)
-      http.instance_variable_get('@ssl_context').verify_mode = OpenSSL::SSL::VERIFY_NONE
+      # do not verify peer certificate (just get rid of that warning!)      
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       
       response = http.get '/avatar/4979dd9653e759c78a81d4997f56bae2.jpg'
       assert_equal 200, response.code.to_i

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: gravatarify
 version: !ruby/object:Gem::Version 
-  version: 2.0.4
+  prerelease: false
+  segments: 
+  - 2
+  - 1
+  - 0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Lukas Westermann
@@ -9,14 +14,56 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 +01:00
+date: 2010-03-09 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 10
+        - 2
+        version: 2.10.2
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rr
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 5
+        version: 0.10.5
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
+  type: :development
+  version_requirements: *id003
 description: |-
   Awesome gravatar support for Ruby (and Rails) -
-      with unique options like Proc's for default images, or
-      support for gravatar.com's multiple host names.
+      with unique options like Proc's for default images,
+      support for gravatar.com's multiple host names, ability to
+      define reusable styles and much more...
 email: lukas.westermann@gmail.com
 executables: []
 
@@ -29,8 +76,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- VERSION.yml
-- init.rb
+- gravatarify.gemspec
 - lib/gravatarify.rb
 - lib/gravatarify/base.rb
 - lib/gravatarify/helper.rb
@@ -55,18 +101,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Awesome gravatar support for Ruby (and Rails).

data/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:major: 2
-:minor: 0
-:build: 
-:patch: 4

data/init.rb

@@ -1 +0,0 @@
-require File.join(File.dirname(__FILE__), 'rails', 'init')