libravatar 1.0.1 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/lib/libravatar.rb

@@ -7,11 +7,13 @@
 # Author:: Kang-min Liu (http://gugod.org)
 # Copyright:: Copyright (c) 2011 Kang-min Liu
 # License:: MIT
+# Contributors:: https://github.com/gugod/libravatar/contributors
 #
 
 require 'digest/md5'
 require 'digest/sha2'
 require 'uri'
+require 'resolv'
 
 class Libravatar
   attr_accessor :email, :openid, :size, :default, :https
@@ -36,6 +38,47 @@ class Libravatar
     @https   = options[:https]
   end
 
+  def get_target_domain
+    return @email.split('@')[1] if @email
+    return URI.parse(@openid).host
+  end
+
+  # All the values which are different between HTTP and HTTPS methods.
+  @@profiles = [
+    { :scheme => 'http://',
+      :host => 'cdn.libravatar.org',
+      :srv => '_avatars._tcp.',
+      :port => 80 },
+    { :scheme => 'https://',
+      :host => 'seccdn.libravatar.org',
+      :srv => '_avatars-sec._tcp.',
+      :port => 443 }
+    ]
+
+  # Grab the DNS SRV records associated with the target domain,
+  # and choose one according to RFC2782.
+  def get_base_url
+    profile = @@profiles[ @https ? 1 : 0 ]
+    Resolv::DNS::open do |dns|
+      rrs = dns.getresources(profile[:srv] + get_target_domain(),
+        Resolv::DNS::Resource::IN::SRV).to_a
+      return profile[:scheme] + profile[:host] unless rrs.any?
+
+      min_priority = rrs.map{ |r| r.priority }.min
+      rrs.delete_if{ |r| r.priority != min_priority }
+      rrs = rrs.select{ |r| r.weight == 0 } +
+            rrs.select{ |r| r.weight > 0 }.shuffle
+
+      weight_sum = rrs.inject(0) { |a,r| a+r.weight }
+      value = rand( weight_sum + 1 )
+      rrs.each do |r|
+        port_fragment = r.port != profile[:port] ? ':' + r.port : ''
+        return profile[:scheme] + r.target.to_s + port_fragment if r.weight <= value
+        value -= r.weight
+      end
+    end
+  end
+
   # Generate the libravatar URL
   def to_s
     if @email
@@ -49,7 +92,7 @@ class Libravatar
 
     query = [s,d].reject{|x|!x}.join("&")
     query = "?#{query}" unless query == ""
-    baseurl = @https ? "https://seccdn.libravatar.org/avatar/" : "http://cdn.libravatar.org/avatar/"
+    baseurl = get_base_url() + '/avatar/'
     return baseurl + id + query
   end
 

data/libravatar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{libravatar}
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   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-19}
+  s.date = %q{2011-06-26}
   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 = [
@@ -32,10 +32,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.6.1}
   s.summary = %q{Avatar URL Generation wih libravatar.org}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_libravatar.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/test_libravatar.rb

@@ -37,4 +37,9 @@ class TestLibravatar < Test::Unit::TestCase
 
     assert_equal x.send(:normalize_openid, "HTTP://EXAMPLE.COM"), "http://example.com/"
   end
+
+  should "Retured the federated URI" do
+    avatar = Libravatar.new(:email => 'invalid@catalyst.net.nz')
+    assert_equal avatar.to_s, 'http://static.avatars.catalyst.net.nz/avatar/f924d1e9f2c10ee9efa7acdd16484c2f'
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libravatar
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Kang-min Liu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 +08:00
+date: 2011-06-26 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,6 +87,5 @@ rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Avatar URL Generation wih libravatar.org
-test_files: 
-- test/helper.rb
-- test/test_libravatar.rb
+test_files: []
+