libravatar 1.2.0 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7341a3c99b8e83267d944cc3be27a8d01b6e2511
+  data.tar.gz: c32bfa4a5975accb25f07da5e5afaeef2df7e6a9
+SHA512:
+  metadata.gz: b04fec26d5ef9f430210d23bad07ca7a7b28c2dedae8bb0f5275038101dd22ea39c16170d022878dfda333d08121d9e35bb50a24b281082bb2c33c6ba93f35e6
+  data.tar.gz: 5482a092d0ebb22201ea3163d290029a1f8dcb1fffb89d6f078180559bdc5f9161830481ea38fa8205c02c2c8179a3e20791a94aca23f75231c94c194551501f

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.2.0

data/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+gem 'jeweler'
+gem 'shoulda'
+gem 'minitest', '4.7.5'
+

data/Gemfile.lock

@@ -0,0 +1,73 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.0.13)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    addressable (2.4.0)
+    builder (3.2.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.3.0)
+    github_api (0.13.1)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      multi_json (>= 1.7.5, < 2.0)
+      oauth2
+    hashie (3.4.3)
+    highline (1.7.8)
+    i18n (0.7.0)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
+      git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      rake
+      rdoc
+    json (1.8.3)
+    jwt (1.5.1)
+    mini_portile2 (2.0.0)
+    minitest (4.7.5)
+    multi_json (1.11.2)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    oauth2 (1.1.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0, < 1.5.2)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    rack (1.6.4)
+    rake (11.1.1)
+    rdoc (4.2.2)
+      json (~> 1.4)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.2.1)
+    shoulda-matchers (2.8.0)
+      activesupport (>= 3.0.0)
+    thread_safe (0.3.5)
+    tzinfo (0.3.48)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler
+  minitest (= 4.7.5)
+  shoulda
+
+BUNDLED WITH
+   1.11.2

data/Rakefile

@@ -26,16 +26,9 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/lib/libravatar.rb

@@ -67,15 +67,12 @@ class Libravatar
 
       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|
-        return [r.target, r.port] if r.weight <= value
-        value -= r.weight
-      end
+
+      weight_sum = rrs.inject(0) { |a,r| a+r.weight }.to_f
+
+      r = rrs.max_by { |r| r.weight == 0 ? 0 : rand ** (weight_sum / r.weight) }
+
+      return [r.target, r.port]
     end
   end
 
@@ -84,7 +81,7 @@ class Libravatar
     target, port = srv_lookup
 
     if (target && port) 
-      port_fragment = port != profile[:port] ? ':' + port : ''
+      port_fragment = port != profile[:port] ? ':' + port.to_s : ''
       return profile[:scheme] + target.to_s + port_fragment
     else
       return profile[:scheme] + profile[:host]

data/libravatar.gemspec

@@ -4,20 +4,23 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{libravatar}
-  s.version = "1.2.0"
+  s.name = "libravatar"
+  s.version = "1.3.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-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.date = "2016-03-27"
+  s.description = "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 = "gugod@gugod.org"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
   ]
   s.files = [
     ".document",
+    ".travis.yml",
+    "Gemfile",
+    "Gemfile.lock",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
@@ -27,21 +30,30 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_libravatar.rb"
   ]
-  s.homepage = %q{http://github.com/gugod/libravatar}
+  s.homepage = "http://github.com/gugod/libravatar"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
-  s.summary = %q{Avatar URL Generation wih libravatar.org}
+  s.rubygems_version = "2.0.14.1"
+  s.summary = "Avatar URL Generation wih libravatar.org"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<minitest>, ["= 4.7.5"])
       s.add_development_dependency(%q<shoulda>, ["> 1.2.3"])
     else
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<minitest>, ["= 4.7.5"])
       s.add_dependency(%q<shoulda>, ["> 1.2.3"])
     end
   else
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<minitest>, ["= 4.7.5"])
     s.add_dependency(%q<shoulda>, ["> 1.2.3"])
   end
 end

data/test/helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'minitest/autorun'
 require 'test/unit'
 require 'shoulda'
 

data/test/test_libravatar.rb

@@ -5,17 +5,17 @@ class TestLibravatar < Test::Unit::TestCase
     # echo -n "user@example.com"|md5sum
     # => b58996c504c5638798eb6b511e6f49af
     avatar = Libravatar.new(:email => "user@example.com")
-    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/b58996c504c5638798eb6b511e6f49af"
+    re = /http:\/\/.+\/avatar\/b58996c504c5638798eb6b511e6f49af$/
+    assert avatar.to_s.match(re)
+    assert Libravatar.new(:email => "USER@ExAmPlE.CoM").to_s.match(re)
 
-    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", :https => true).to_s[0,8], "https://"
+    assert_equal Libravatar.new(:email => "user@example.com", :https => false).to_s[0,7], "http://"
 
-    assert_equal Libravatar.new(:email => "user@example.com", :https => false).to_s, "http://cdn.libravatar.org/avatar/b58996c504c5638798eb6b511e6f49af"
+    assert Libravatar.new(:email => "USER@ExAmPlE.CoM", :default => "http://example.com/avatar.png").to_s.match(/http:\/\/.+\/avatar\/b58996c504c5638798eb6b511e6f49af\?d=http:\/\/example\.com\/avatar\.png/)
 
-    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"
+    assert_equal Libravatar.new(:email => "USER@ExAmPlE.CoM", :size => 512, :default => "mm").to_s[-43,43], "b58996c504c5638798eb6b511e6f49af?s=512&d=mm"
   end
 
   should "Generate url from openid" do
@@ -34,13 +34,12 @@ class TestLibravatar < Test::Unit::TestCase
   should "Normalize OpenID" do
     x = Libravatar.new
     assert_equal x.send(:normalize_openid, "HTTP://EXAMPLE.COM/id/Bob"), "http://example.com/id/Bob"
-
     assert_equal x.send(:normalize_openid, "HTTP://EXAMPLE.COM"), "http://example.com/"
   end
 
   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'
+    assert avatar.to_s.match(/http:\/\/.+\/avatar\/f924d1e9f2c10ee9efa7acdd16484c2f$/)
   end
 
   should "Sanitize the SRV lookup result" do

metadata

@@ -1,50 +1,85 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: libravatar
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
+version: !ruby/object:Gem::Version
+  version: 1.3.0
 platform: ruby
-authors: 
+authors:
 - Kang-min Liu
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-24 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-03-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.7.5
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 2
-        - 3
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.7.5
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>'
+      - !ruby/object:Gem::Version
         version: 1.2.3
   type: :development
-  version_requirements: *id001
-description: 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
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>'
+      - !ruby/object:Gem::Version
+        version: 1.2.3
+description: 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
 email: gugod@gugod.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
+- .travis.yml
+- Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -53,39 +88,28 @@ files:
 - libravatar.gemspec
 - test/helper.rb
 - test/test_libravatar.rb
-has_rdoc: true
 homepage: http://github.com/gugod/libravatar
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 2.0.14.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Avatar URL Generation wih libravatar.org
 test_files: []
-