libravatar 1.0.0 → 1.0.1

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/libravatar.rb

@@ -9,11 +9,12 @@
 # License:: MIT
 #
 
+require 'digest/md5'
 require 'digest/sha2'
 require 'uri'
 
 class Libravatar
-  attr_accessor :email, :openid, :size, :default
+  attr_accessor :email, :openid, :size, :default, :https
 
   # The options should contain :email or :openid values.  If both are
   # given, email will be used. The value of openid and email will be
@@ -24,24 +25,32 @@ class Libravatar
   # - :email
   # - :openid
   # - :size An integer ranged 1 - 512, default is 80.
+  # - :https Set to true to serve avatars over SSL
+  # - :default URL to redirect missing avatars to, or one of these specials: "404", "mm", "identicon", "monsterid", "wavatar", "retro"
   #
   def initialize(options = {})
     @email   = options[:email]
     @openid  = options[:openid]
     @size    = options[:size]
     @default = options[:default]
+    @https   = options[:https]
   end
 
   # Generate the libravatar URL
   def to_s
-    @email.downcase! if @email
-    id = Digest::SHA2.hexdigest(@email || normalize_openid(@openid))
+    if @email
+      @email.downcase!
+      id = Digest::MD5.hexdigest(@email)
+    else
+      id = Digest::SHA2.hexdigest(normalize_openid(@openid))
+    end
     s  = @size ? "s=#{@size}" : nil
     d  = @default ? "d=#{@default}" : nil
 
     query = [s,d].reject{|x|!x}.join("&")
     query = "?#{query}" unless query == ""
-    return "http://cdn.libravatar.org/avatar/" + id + query
+    baseurl = @https ? "https://seccdn.libravatar.org/avatar/" : "http://cdn.libravatar.org/avatar/"
+    return baseurl + id + query
   end
 
   private

data/libravatar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{libravatar}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kang-min Liu"]
-  s.date = %q{2011-04-15}
+  s.date = %q{2011-04-19}
   s.description = %q{libravatar.org provides avatar image hosting (like gravatar.com). Their users may associate avatar images with email or openid. This rubygem can be used to generate libravatar avatar image URL}
   s.email = %q{gugod@gugod.org}
   s.extra_rdoc_files = [

data/test/test_libravatar.rb

@@ -2,19 +2,25 @@ require 'helper'
 
 class TestLibravatar < Test::Unit::TestCase
   should "Generate url from email" do
-    # echo -n "user@example.com"|shasum -a 256
-    # => b4c9a289323b21a01c3e940f150eb9b8c542587f1abfd8f0e1cc1ffc5e475514
+    # echo -n "user@example.com"|md5sum
+    # => b58996c504c5638798eb6b511e6f49af
     avatar = Libravatar.new(:email => "user@example.com")
-    assert_equal avatar.to_s, "http://cdn.libravatar.org/avatar/b4c9a289323b21a01c3e940f150eb9b8c542587f1abfd8f0e1cc1ffc5e475514"
+    assert_equal avatar.to_s, "http://cdn.libravatar.org/avatar/b58996c504c5638798eb6b511e6f49af"
 
-    assert_equal Libravatar.new(:email => "USER@ExAmPlE.CoM").to_s, "http://cdn.libravatar.org/avatar/b4c9a289323b21a01c3e940f150eb9b8c542587f1abfd8f0e1cc1ffc5e475514"
+    assert_equal Libravatar.new(:email => "USER@ExAmPlE.CoM").to_s, "http://cdn.libravatar.org/avatar/b58996c504c5638798eb6b511e6f49af"
 
-    assert_equal Libravatar.new(:email => "USER@ExAmPlE.CoM", :default => "http://example.com/avatar.png").to_s, "http://cdn.libravatar.org/avatar/b4c9a289323b21a01c3e940f150eb9b8c542587f1abfd8f0e1cc1ffc5e475514?d=http://example.com/avatar.png"
+    assert_equal Libravatar.new(:email => "user@example.com", :https => true).to_s, "https://seccdn.libravatar.org/avatar/b58996c504c5638798eb6b511e6f49af"
 
-    assert_equal Libravatar.new(:email => "USER@ExAmPlE.CoM", :size => 512, :default => "mm").to_s, "http://cdn.libravatar.org/avatar/b4c9a289323b21a01c3e940f150eb9b8c542587f1abfd8f0e1cc1ffc5e475514?s=512&d=mm"
+    assert_equal Libravatar.new(:email => "user@example.com", :https => false).to_s, "http://cdn.libravatar.org/avatar/b58996c504c5638798eb6b511e6f49af"
+
+    assert_equal Libravatar.new(:email => "USER@ExAmPlE.CoM", :default => "http://example.com/avatar.png").to_s, "http://cdn.libravatar.org/avatar/b58996c504c5638798eb6b511e6f49af?d=http://example.com/avatar.png"
+
+    assert_equal Libravatar.new(:email => "USER@ExAmPlE.CoM", :size => 512, :default => "mm").to_s, "http://cdn.libravatar.org/avatar/b58996c504c5638798eb6b511e6f49af?s=512&d=mm"
   end
 
   should "Generate url from openid" do
+    # echo -n "http://example.com/id/Bob"|shasum -a 256
+    # => 80cd0679bb52beac4d5d388c163016dbc5d3f30c262a4f539564236ca9d49ccd
     avatar = Libravatar.new(:openid => "http://example.com/id/Bob")
     assert_equal avatar.to_s, "http://cdn.libravatar.org/avatar/80cd0679bb52beac4d5d388c163016dbc5d3f30c262a4f539564236ca9d49ccd"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libravatar
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Kang-min Liu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 +08:00
+date: 2011-04-19 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency