gravatarify 3.1.0 → 3.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: da6497d2bbb29f19c0754cd5d1e0d86b5595608f
+  data.tar.gz: 9738f5fca4d8df44288035b9cf010404999eb9d8
+SHA512:
+  metadata.gz: 90a79743136c3cec9eea5ee408ba7b2a3fcf00eec2c25bea8920b1359a67b9bfd938201e407966466701abe616c634180f4a485561121aad943aff9797d3b2ab
+  data.tar.gz: f1d88652037de585855d7f968ebc8bd34e95a593f23d6c1cf2a2c5076a7f3044425f823301d842543f3b7cd857792117cf0214261a76ab5e8aabbcf67c7515a1

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.3
-  - jruby-18mode
+  - 2.0.0
+  - 2.1.0
   - jruby-19mode

data/README.md

@@ -21,7 +21,7 @@ Ready, Set, Go!
 **READY** Add gravatarify to your `Gemfile`
 
     gem 'gravatarify', '~> 3.0.0'
-    
+
 **SET** Guess, you are all set :) when using HAML or Sinatra you might to add:
 
     # e.g. for Sinatra
@@ -37,11 +37,11 @@ Ready, Set, Go!
 
     # creates an 20x20 pixel <img/> tag in your Rails ERB views:
     <%= gravatar_tag @user.email, :size => 20 %>
-    
+
     # or in HAML views
     # (Note: how it's possible to skip the email attribute, btw - that's a feature)
     %img{ gravatar_attrs(@user, :size => 20) }/
-    
+
 **More!?** Allright, that was just the quickstart, to get up and running with ease. However, this library provides
 quite a bit more, like:
 
@@ -78,31 +78,31 @@ and the `<img/>` tag should have a class attribute, do:
 If any additional HTML attributes are needed on the tag, or in the `gravatar_attrs`, just
 pass them in the `:html` option as hash. If more control is needed, or just the plain URL is
 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
 ------------
 
 With styles it's possible to easily change e.g. the size of all gravatars based on a name,
 these are reusable presets of options:
-  
+
     # in config/initializers/gravatarify.rb or similar:
     Gravatarify.styles[:mini] = { :size => 16, :html => { :class => 'gravatar gravatar-mini' } }
     Gravatarify.styles[:default] = { :size => 45, :html => { :class => 'gravatar' } }
- 
+
     # then in/some/view.html.erb:
     <%= gravatar_tag @user, :mini %> # => <img alt="" class="gravatar gravatar-mini" height="16" src.... />
-    
-    # or in/another/view.html.haml:    
+
+    # or in/another/view.html.haml:
     %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:
 
     Gravatarify.options[:default] = Proc.new { |*params| "http://example.com/avatar-#{params.first[:size] || 80}.jpg" }
     Gravatarify.styles[:mini] => { :size => 16 }
-    
+
     <%= gravatar_tag @user, :mini %> # => <img alt="" height="16" src=".....?d=http://example.com/avatar-16.jpg" width="16" />
 
 All methods accept a style, i.e. a style parameter can be passed in to `gravatar_attrs`, `gravatar_tag` and
@@ -117,7 +117,7 @@ Back to the roots?
 
 No need for sophisticated stuff like view helpers, want to go back to the roots?
 Then feel free to use `Gravatarify::Base#gravatar_url` directly.
-    
+
 When the ability to display image tags is required in different view frameworks (like liquid!?),
 then just ensure that `Gravatarify::Helper` is included in the framework in question.
 See {Gravatarify::Base#gravatar_url} and of course {Gravatarify::Helper} for more informations
@@ -170,7 +170,7 @@ Need more control?
   <tr>
     <td><tt>:filetype</tt></td>
     <td>String, Symbol</td>
-    <td>Change image type, gravatar.com supports <tt>:gif</tt>, <tt>:png</tt> and <tt>:jpg</tt>. If set to <tt>false</tt> 
+    <td>Change image type, gravatar.com supports <tt>:gif</tt>, <tt>:png</tt> and <tt>:jpg</tt>. If set to <tt>false</tt>
       then a URL without an extension will be built (and gravatar.com then returns a JPG image).</td>
     <td><tt>:jpg</tt></td>
   </tr>
@@ -189,15 +189,15 @@ gravatar urls there. Of course all settings can be overridden locally:
     # disable suffix and set default size to 16x16px
     Gravatarify.options[:filetype] = false
     Gravatarify.options[:size] = 16
-    
+
     gravatar_url(@user.email) # => http://0.gravatar.com/avatar/..f93ff1e?s=16
     gravatar_url(@user.email, :filetype => :png) # => http://0.gravatar.com/avatar/..f93ff1e.png?s=16
-    
+
 To define global HTML attributes go ahead and do something like:
 
     # add title attribute
     Gravatarify.options[:html] = { :title => "Gravatar" }
-    
+
 ## Not yet enough?
 
 The `:default` option can be passed in a `Proc`, so this is certainly useful to for example
@@ -207,18 +207,18 @@ to generate an image url, based on the request size:
     Gravatarify.options[:default] = Proc.new do |options, object|
       "http://example.com/avatar-#{options[:size] || 80}.jpg"
     end
-    
+
     # now each time a gravatar url is generated, the Proc is evaluated:
     gravatar_url(@user)
     # => "http://0.gravatar.com/...jpg?d=http%3A%2F%2Fexample.com%2Fgravatar-80.jpg"
     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
 
     # doing stuff like showing default avatar based on gender...
     @user = User.new(:gender => :female, :email => 'bella@gmail.com') # => @user.female? = true
-    
+
     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
 
@@ -232,16 +232,16 @@ all methods and no magic involved! So instead of doing:
 
     gravatar_tag(@user, :size => 30, :class => "gravatar", :title => "Gravatar")
     # Note: in Version 2.0 this would build an image src like http://..gravatar.com/...../?class=gravatar&s=30&title=Gravatar
-    
+
 do:
 
     gravatar_tag(@user, :size => 30, :html => { :class => "Gravatar", :title => "Gravatar" })
-    
+
 An important thing to know is that the `:html` is deep merged, with defaults, so stuff like:
 
     Gravatarify.options[:html] = { :title => "Gravatar" }
     gravatar_tag(@user, :html => { :class => "gravatar" }) # => <img alt="" class="gravatar" ... title="Gravatar" .../>
-    
+
 Furthermore the option `:html` is ignored when building the url parameters.
 
 If the `gravatarify` method was not used, there's no need to change anything at all :) Though if
@@ -260,7 +260,7 @@ directly: `<%= gravatar_tag @user.author_email %>`. If the model defines `author
     class Author < ActiveRecord::Base
       alias_attribute :email, :author_email
     end
-    
+
     # and in the views:
     <%= gravatar_tag @author %>
 
@@ -270,7 +270,7 @@ methods! The `gravatarify` method was introduced to provide compatibility with
 then feel free to fallback and use an older version (i.e. 1.2.1):
 
     [sudo] gem install gravatarify -v 1.2.1
-    
+
 
 About the code
 ==============
@@ -281,30 +281,31 @@ of an overkill, though I like neat and tidy classes :)
     lib/gravatarify.rb                      # loads the other files from lib/gravatarify
                                             # and hooks the necessary modules into
                                             # HAML or ActionView.
-                                            
+
     lib/gravatarify/base.rb                 # Provides all logic required to generate
                                             # gravatar.com urls from an email address.
                                             # Check out Gravatarify::Base.gravatar_url,
                                             # this is the absolute core method.
-                                                                                        
+
     lib/gravatarify/helper.rb               # Defines the view helpers: gravatar_attrs
                                             # and gravatar_tag
-                                            
+
     lib/gravatarify/utils.rb                # Provides commonly used methods, like helpers to
                                             # uri and html escape strings or deep mergeing
                                             # hashes. Though these utils are only for internal
                                             # uses :)
-                                            
+
 ### Contribute
 
  1. Fork the project and hack away
  2. Ensure that the changes are well tested
  3. Send me a pull request
- 
+
 ### Thanks
 
  - [gudleik](https://github.com/gudleik) for his work on allowing an empty `:filetype`
  - [thegcat](https://github.com/thegcat) travis, jruby and ruby 1.9 support
+ - [technoweenie](https://github.com/technoweenie) fix to use consistent hashing: `Zlib.crc32`
 
 Licence
 =======

data/gravatarify.gemspec

@@ -1,30 +1,27 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "gravatarify/version"
+require File.expand_path('../lib/gravatarify/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name        = "gravatarify"
-  s.version     = Gravatarify::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.summary     = "Awesome gravatar support for Ruby (and Rails)."
-  s.description = "Ruby (and Rails) Gravatar helpers 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..."
+Gem::Specification.new do |gem|
+  gem.name        = "gravatarify"
+  gem.version     = Gravatarify::VERSION
+  gem.summary     = "Awesome gravatar support for Ruby (and Rails)."
+  gem.description = "Ruby (and Rails) Gravatar helpers 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.required_ruby_version     = ">= 1.8.7"
-  s.required_rubygems_version = ">= 1.3.6"
+  gem.required_ruby_version     = ">= 1.8.7"
+  gem.required_rubygems_version = ">= 1.3.6"
 
-  s.authors  = ["Lukas Westermann"]
-  s.email    = ["lukas.westermann@gmail.com"]
-  s.homepage = "http://github.com/lwe/gravatarify"
+  gem.authors  = ["Lukas Westermann"]
+  gem.email    = ["lukas.westermann@gmail.com"]
+  gem.homepage = "https://github.com/lwe/gravatarify"
 
-  s.files            = `git ls-files`.split("\n")
-  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.require_path     = 'lib'
-  
-  s.license          = 'MIT'
-    
-  s.add_development_dependency 'shoulda',       '>= 2.10.2'
-  s.add_development_dependency 'rr',            '>= 0.10.5'
-  s.add_development_dependency 'activesupport', '>= 3.0.0'
-  s.add_development_dependency 'rake'
-end
+  gem.files            = %w{.travis.yml .gitignore Gemfile Rakefile LICENSE README.md gravatarify.gemspec} + Dir['{lib,test}/**/*.rb']
+  gem.test_files       = gem.files.grep(%r{^test/})
+  gem.require_paths    = ['lib']
+
+  gem.license          = 'MIT'
 
+  gem.add_development_dependency 'shoulda',       '>= 2.10.2'
+  gem.add_development_dependency 'rr',            '>= 0.10.5'
+  gem.add_development_dependency 'activesupport', '>= 3.0.0'
+  gem.add_development_dependency 'rake'
+end

data/lib/gravatarify.rb

@@ -1,4 +1,5 @@
 require 'gravatarify/version'
+require 'zlib'
 
 # Provides support for adding gravatar images in ruby (and rails)
 # applications.
@@ -6,9 +7,9 @@ module Gravatarify
   autoload :Base,   'gravatarify/base'
   autoload :Helper, 'gravatarify/helper'
   autoload :Utils,  'gravatarify/utils'
-  
+
   class << self
-    
+
     # Global options which are merged on every call to
     # +gravatar_url+, this is useful to e.g. define a default image.
     #
@@ -27,46 +28,46 @@ module Gravatarify
     #     Gravatarify.options[:filetype] = false
     #
     def options; @options ||= { :filetype => :jpg } end
-  
+
     # Allows to define some styles, makes it simpler to call by name, instead of always giving a size etc.
-    # 
+    #
     #   Gravatarify.styles[:mini] => { :size => 30, :default => "http://example.com/gravatar-mini.jpg" }
-    # 
+    #
     #   # in the views, it will then use the stuff defined by styles[:mini]:
     #   <%= gravatar_tag @user, :mini %>
     #
     def styles; @styles ||= {} end
-    
+
     # Globally overide subdomains used to build gravatar urls, normally
     # +gravatarify+ picks from either +0.gravatar.com+, +1.gravatar.com+,
-    # +2.gravatar.com+ or +www.gravatar.com+ when building hosts, to use a custom
+    # +2.gravatar.com+, +3.gravater.com+ or +www.gravatar.com+ when building hosts, to use a custom
     # set of subdomains (or none!) do something like:
     #
     #     Gravatarify.subdomains = %w{ 0 www } # only use 0.gravatar.com and www.gravatar.com
     #
     def subdomains=(subdomains) @subdomains = [*subdomains] end
-    
+
     # Get subdomain for supplied string or returns +www+ if none is
     # defined.
     def subdomain(str) #:nodoc:
       @subdomains ||= []
       unless @subdomains.empty?
-        subdomain = @subdomains[str.hash % @subdomains.size]
+        subdomain = @subdomains[Zlib.crc32(str) % @subdomains.size]
         subdomain + "." if subdomain
       end
     end
-    
+
     # Is running rails and at least rails 3.x
     def rails?
       defined?(::Rails) && ::Rails.version.to_i >= 3
     end
-    
+
     # Loads `Gravatarify::Helper` as view helper via `ActionController::Base.helper`
     def setup_rails!
       ActiveSupport.on_load(:action_controller) { ActionController::Base.helper(Gravatarify::Helper) }
     end
-  end  
+  end
 end
 
-# Try to init rails3
+# Try to init rails
 Gravatarify.setup_rails! if Gravatarify.rails?

data/lib/gravatarify/base.rb

@@ -4,10 +4,10 @@ require 'cgi'
 module Gravatarify
   # Hash of :ultra_long_option_name => :abbr_opt
   GRAVATAR_ABBREV_OPTIONS = { 'default' => :d, :default => :d, 'rating' => :r, :rating => :r, 'size' => :s, :size => :s }
-    
+
   # Provides core support to build gravatar urls based on supplied e-mail strings.
   module Base
-    
+
     # Method which builds a gravatar url based on a supplied email and options as
     # defined by gravatar.com (http://en.gravatar.com/site/implement/url).
     #
@@ -19,11 +19,11 @@ module Gravatarify
     #
     # If supplied +email+ responds to either a method named +email+ or +mail+, the value of that method
     # is used instead to build the gravatar hash. Very useful to just pass in ActiveRecord object for instance:
-    #    
+    #
     #    @user = User.find_by_email("samir@initech.com")
     #    gravatar_url(@user) # => "http://2.gravatar.com/avatar/58cf31c817d76605d5180ce1a550d0d0.jpg"
     #    gravatar_url(@user.email) # same as above!
-    # 
+    #
     # Among all options as defined by gravatar.com's specification, there also exist some special options:
     #
     #    gravatar_url(@user, :secure => true) # => https://secure.gravatar.com/ava....
@@ -52,10 +52,10 @@ module Gravatarify
       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
-    
+
     protected
       # Builds gravatar host name from supplied e-mail hash.
       # Ensures that for the same +str_hash+ always the same subdomain is used.
@@ -65,22 +65,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 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"        
+      def self.gravatar_host(context, str_hash, secure = false)
+        use_https = secure.respond_to?(:call) ? secure.call(context) : secure
+        "#{use_https ? 'https' : 'http'}://#{Gravatarify.subdomain(str_hash)}gravatar.com"
       end
-        
+
       # Builds a query string from all passed in 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 & symbolize key
           unless key == :html
-            value = value.call(url_options, source) if key == :d and value.is_a?(Proc)
+            value = value.call(url_options, source) if key == :d && value.respond_to?(:call)
             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/version.rb

@@ -1,4 +1,4 @@
 module Gravatarify
   # current API version, as defined by http://semver.org/
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

data/test/unit/gravatarify_base_test.rb

@@ -6,9 +6,9 @@ end
 
 class GravatarifyBaseTest < Test::Unit::TestCase
   include Gravatarify::Base
-  
+
   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
       assert_equal BELLA_AT_GMAIL_JPG, gravatar_url('bella@gmail.com')
@@ -24,32 +24,32 @@ class GravatarifyBaseTest < Test::Unit::TestCase
       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 "#gravatar_url, with options" do
     should "add well known options like size, rating or default and always in alphabetical order" do
       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
-    
+
     should "ensure that all options are escaped correctly" do
       assert_equal "#{BELLA_AT_GMAIL_JPG}?unescaped=escaped%2Fme", gravatar_url('bella@gmail.com', 'unescaped' => 'escaped/me')
     end
-    
+
     should "ignore false or nil options" do
       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", 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}", gravatar_url('bella@gmail.com', :filetype => false)
       assert_equal "#{BELLA_AT_GMAIL}", gravatar_url('bella@gmail.com', :filetype => nil)
@@ -57,51 +57,51 @@ class GravatarifyBaseTest < Test::Unit::TestCase
       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", gravatar_url('bella@gmail.com', :default => 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
   end
-  
+
   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, 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, 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, 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
       default = Proc.new { |options, object| "http://example.com/gravatar#{object.respond_to?(:female?) && object.female? ? '_girl' : ''}.jpg" }
       girl = Object.new
       mock(girl).email { "bella@gmail.com" }
-      mock(girl).female? { true }      
+      mock(girl).female? { true }
       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", 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
   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_match %r{\Ahttp://(0|1|2|www).gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg\z}, gravatar_url('bella@gmail.com')
@@ -110,41 +110,41 @@ class GravatarifyBaseTest < Test::Unit::TestCase
       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
-      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)
+
+    should "switch to https://www.gravatar.com if :secure => true is supplied" do
+      assert_equal "https://www.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg", gravatar_url('bella@gmail.com', :secure => true)
+      assert_equal "https://www.gravatar.com/avatar/41d86cad3dd465d6913d5a3232744441.jpg", gravatar_url('bella@bella.com', :secure => true)
+      assert_equal "https://www.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
       Gravatarify.options[:secure] = Proc.new { |obj| obj.request.ssl? }
-      
+
       mock_ssl = MockView.new
-      mock(mock_ssl).request.stub!.ssl? { true }      
-      assert_equal "https://secure.gravatar.com/avatar/1cacf1bc403efca2e7a58bcfa9574e4d.jpg", mock_ssl.gravatar_url('bella@gmail.com')
-      
+      mock(mock_ssl).request.stub!.ssl? { true }
+      assert_equal "https://www.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.gravatar_url('bella@gmail.com')
     end
   end
-    
+
   context "Gravatarify#options" do
     setup do
       Gravatarify.options[:anything] = "test"
       Gravatarify.options[:filetype] = "png"
       Gravatarify.options[:default] = "http://example.com/gravatar.jpg"
     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", gravatar_url('bella@gmail.com')
     end
-    
+
     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", gravatar_url('bella@gmail.com')

data/test/unit/gravatarify_subdomain_test.rb

@@ -5,52 +5,50 @@ require 'uri'
 
 class GravatarifySubdomainTest < Test::Unit::TestCase
   include Gravatarify::Base
-  
+
   def setup; reset_gravatarify! end
-    
+
   context "changing hosts through Gravatarify#subdomains" do
     should "override default subdomains (useful to e.g. switch back to 'www' only)" do
       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
       Gravatarify.subdomains = 'www'
       assert_equal "http://www.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg", gravatar_url('info@initech.com')
-      assert_equal "http://www.gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", gravatar_url('support@initech.com')      
+      assert_equal "http://www.gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", gravatar_url('support@initech.com')
     end
-    
+
     should "still work as expected if passed in `nil` and return urls without subdomain (default)" do
       Gravatarify.subdomains = []
       assert_equal "http://gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg", gravatar_url('info@initech.com')
-      assert_equal "http://gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", gravatar_url('support@initech.com')            
+      assert_equal "http://gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", gravatar_url('support@initech.com')
     end
   end
-    
+
   context "with Net::HTTP the gravatar.com subdomains" do
-    should "return an image of type image/jpeg" do
-      %w{ 0 1 2 www }.each do |subdomain|
+    %w{ 0 1 2 3 www secure }.each do |subdomain|
+      should "respond to http://#{subdomain}.gravatar.com/" do
         response = Net::HTTP.get_response URI.parse("http://#{subdomain}.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg")
         assert_equal 200, response.code.to_i
         assert_equal "image/jpeg", response.content_type
       end
+
+      should "respond to https://#{subdomain}.gravatar.com/ urls as well" do
+        http = Net::HTTP.new("#{subdomain}.gravatar.com", 443)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+        response = http.get '/avatar/4979dd9653e759c78a81d4997f56bae2.jpg'
+        assert_equal 200, response.code.to_i
+        assert_equal "image/jpeg", response.content_type
+      end
     end
-    
-    should "not respond to 3.gravatar.com, if so add to subdomains dude!!!" do
-      assert_raises(SocketError) { Net::HTTP.get_response URI.parse('http://3.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg') }
-    end
-    
-    should "respond to https://secure.gravatar.com/ urls as well" do
-      http = Net::HTTP.new('secure.gravatar.com', 443)
-      http.use_ssl = true
-      
-      # 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
-      assert_equal "image/jpeg", response.content_type
+
+    should "not respond to 4.gravatar.com, if so add to subdomains dude!!!" do
+      assert_raises(SocketError) { Net::HTTP.get_response URI.parse('http://4.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg') }
     end
   end
-end
+end

metadata

@@ -1,98 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gravatarify
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
-  segments: 
-  - 3
-  - 1
-  - 0
-  version: 3.1.0
+version: !ruby/object:Gem::Version
+  version: 3.1.1
 platform: ruby
-authors: 
+authors:
 - Lukas Westermann
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+date: 2014-03-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 2
-        - 10
-        - 2
+      - !ruby/object:Gem::Version
         version: 2.10.2
-  requirement: *id001
   type: :development
-  name: shoulda
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 10
-        - 5
+      - !ruby/object:Gem::Version
+        version: 2.10.2
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
         version: 0.10.5
-  requirement: *id002
   type: :development
-  name: rr
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
+        version: 0.10.5
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
         version: 3.0.0
-  requirement: *id003
   type: :development
-  name: activesupport
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
-  type: :development
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
   name: rake
-description: Ruby (and Rails) Gravatar helpers 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: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Ruby (and Rails) Gravatar helpers 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: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .travis.yml
+files:
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -108,44 +93,31 @@ files:
 - test/unit/gravatarify_helper_test.rb
 - test/unit/gravatarify_styles_test.rb
 - test/unit/gravatarify_subdomain_test.rb
-homepage: http://github.com/lwe/gravatarify
-licenses: 
+homepage: https://github.com/lwe/gravatarify
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Awesome gravatar support for Ruby (and Rails).
-test_files: 
+test_files:
 - test/benchmark/benchmark.rb
 - test/test_helper.rb
 - test/unit/gravatarify_base_test.rb

data/Gemfile.lock

@@ -1,31 +0,0 @@
-PATH
-  remote: .
-  specs:
-    gravatarify (3.1.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.2.5)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    i18n (0.6.0)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    rr (1.0.4)
-    shoulda (3.0.1)
-      shoulda-context (~> 1.0.0)
-      shoulda-matchers (~> 1.0.0)
-    shoulda-context (1.0.0)
-    shoulda-matchers (1.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (>= 3.0.0)
-  gravatarify!
-  jruby-openssl
-  rake
-  rr (>= 0.10.5)
-  shoulda (>= 2.10.2)