libravatar 1.1.0 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/libravatar.rb

@@ -57,12 +57,13 @@ class Libravatar
 
   # Grab the DNS SRV records associated with the target domain,
   # and choose one according to RFC2782.
-  def get_base_url
+  def srv_lookup
     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?
+      return [nil, nil] unless rrs.any?
+
 
       min_priority = rrs.map{ |r| r.priority }.min
       rrs.delete_if{ |r| r.priority != min_priority }
@@ -72,13 +73,24 @@ class Libravatar
       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
+        return [r.target, r.port] if r.weight <= value
         value -= r.weight
       end
     end
   end
 
+  def get_base_url
+    profile = @@profiles[ @https ? 1 : 0 ]
+    target, port = srv_lookup
+
+    if (target && port) 
+      port_fragment = port != profile[:port] ? ':' + port : ''
+      return profile[:scheme] + target.to_s + port_fragment
+    else
+      return profile[:scheme] + profile[:host]
+    end
+  end
+
   # Generate the libravatar URL
   def to_s
     if @email
@@ -98,6 +110,14 @@ class Libravatar
 
   private
 
+  def sanitize_srv_lookup(hostname, port)
+    unless hostname.match(/^[0-9a-zA-Z\-.]+$/) && 1 <= port && port <= 65535
+      return [nil, nil]
+    end
+
+    return [hostname, port]
+  end
+
   # Normalize an openid URL following the description on libravatar.org
   def normalize_openid(s)
     x = URI.parse(s)

data/libravatar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{libravatar}
-  s.version = "1.1.0"
+  s.version = "1.2.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-06-26}
+  s.date = %q{2011-07-24}
   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

@@ -38,8 +38,14 @@ class TestLibravatar < Test::Unit::TestCase
     assert_equal x.send(:normalize_openid, "HTTP://EXAMPLE.COM"), "http://example.com/"
   end
 
-  should "Retured the federated URI" do
+  should "Return 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
+
+  should "Sanitize the SRV lookup result" do
+    avatar = Libravatar.new
+    assert_equal ["hosntame.abcde.fghi.com", 12345], avatar.send(:sanitize_srv_lookup, "hosntame.abcde.fghi.com", 12345)
+    assert_equal [nil, nil], avatar.send(:sanitize_srv_lookup, "FNORD IMPUNTK *#(*$#&", 65348283)
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libravatar
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Kang-min Liu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-26 00:00:00 +08:00
+date: 2011-07-24 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency