vishnu 1.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3c3ac27d6595188485f30fd8e19b94f4366efa9
-  data.tar.gz: 6a8e3d5cc7217a1f6e7fbea35941af2ae925f99e
+  metadata.gz: 092e4ac774903584fdaa83c58aaa49fdecbb56b6
+  data.tar.gz: b5e5768c1a1ff5e604503d01ab969853993593c2
 SHA512:
-  metadata.gz: 90d6bcf8cae62e3037b0920826ec39184b6cdbaa64bfb5b5e1bb7f8ae24a2a55356170ba45d1060757d50d050706902e5defc57fb2e7df218f7427e539266c12
-  data.tar.gz: 9fa0491431764f3fe25aadb020c9d66b0b9a0229b319f33a8f6e09670869c43c40cb16875dd5d9a1044e06810ab8ef8c4fd023abc98420c6bebb3d83b42db49a
+  metadata.gz: 364464d050b89d3f61d7d871a6ba991595e373e53c57c4849f5dc69e93d6f1183b009536fdfd395679dfa2c821f876ccbed2b9753939e22cd7ff184cf146a69d
+  data.tar.gz: 3e729cb99404c40976dc56b93c1b8af2e891b6fd9a71e072bb0e5bc7f13df2c5c8a54021986a45dd1b1fa42f20516d3e5d31ec31f9cffcb12301a16dfc415f26

data/.gitignore

@@ -0,0 +1,43 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+Gemfile.lock
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+#
+# For TextMate
+#*.tmproj
+#tmtags
+#
+# For emacs:
+#*~
+#\#*
+#.\#*
+#
+# For vim:
+#*.swp

data/.travis.yml

@@ -1,5 +1,8 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.2.0
+  - '2.0.0'
+  - '2.1.8'
+  - '2.2.4'
+  - '2.3.0'
+  - rbx
+script: bundle exec rspec

data/Gemfile

@@ -1,9 +1,4 @@
 source 'https://rubygems.org'
 
-group :development do
-  gem 'jeweler'
-  gem 'shoulda', '> 1.2.3'
-  gem 'minitest', '4.7.5'
-  gem 'test-unit'
-end
-
+# Specify your gem's dependencies in vishnu.gemspec
+gemspec

data/LICENSE.txt

@@ -1,6 +1,7 @@
 The MIT License
 
 Copyright (c) 2011 Kang-min Liu
+Copyright (c) 2016 Anton Smirnov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +20,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-

data/README.md

@@ -0,0 +1,71 @@
+# Vishnu
+
+[![Gem Version](https://badge.fury.io/rb/vishnu.svg)](http://badge.fury.io/rb/vishnu)
+[![Reference Status](https://www.versioneye.com/ruby/vishnu/reference_badge.svg)](https://www.versioneye.com/ruby/vishnu/references)
+[![Build Status](https://travis-ci.org/sandfoxme/vishnu.svg?branch=master)](https://travis-ci.org/sandfoxme/vishnu)
+
+Vishnu is a simple library to use Libravatar avatars in your ruby app. 
+
+[Libravatar](https://libravatar.org/) is an avatar service to let their 
+users associate avatar images with their emails or openids. This rubygem 
+generates their avatar URL.
+
+## Installation
+
+Add the following line to your ```Gemfile```:
+    
+```ruby
+gem 'vishnu'
+```
+
+Or if you want to register ```Libravatar``` alias, then:
+
+```ruby
+gem 'vishnu', require: 'libravatar'
+```
+
+## Usage
+
+```ruby
+Vishnu.new(email:  'someone@example.com').url   # get avatar for email
+Vishnu.new(openid: 'https://example.com').url   # get avatar for OpenID URL
+Vishnu.new(email:  'someone@example.com').to_s  # use to_s alias
+
+# use all options
+avatar = Vishnu.new(
+    email:      'someone@example.com',  # email
+    openid:     'https://example.com/', # OpenID URL. If both email and url are set,
+                                        # you will get avatar for the email
+    size:       150,                    # avatar size, 1-512; default is 80
+    default:    'identicon',            # '404', 'mm', 'identicon', 'monsterid', 'wavatar', 'retro'
+                                        # or url to your default
+    https:      true,                   # use secure url or not; default is false
+)
+
+avatar.size = 40    # all params are also available as attributes
+
+avatar.url          # get avatar url new style
+avatar.to_s         # and old style
+# => "https://seccdn.libravatar.org/avatar/16d113840f999444259f73bac9ab8b10?s=40&d=identicon"
+
+require 'libravatar' # register an alias if you didn't add require: 'libravatar' to your Gemfile
+Libravatar.new(email: 'someone@example.com').to_s   # libravatar gem style 
+```
+
+## libravatar gem compatibility
+
+As a fork, vishnu is mostly compatible to the [libravatar](https://rubygems.org/gems/libravatar) v1.2.0 gem.
+
+Major differences in 2.0 are:
+ 
+*   ruby < 2.0.0 is no longer supported
+*   methods ```get_target_domain```, ```srv_lookup```, ```get_base_url```
+(basically everything except `to_s` and attribute setters / getters) 
+are now private
+    
+If you for some reason depend on these features, use ```vishnu 1.2.1``` 
+which is basically rebranded bugfix for ```libravatar 1.2.0```.
+
+## License
+
+Licensed under the MIT License. See ```LICENSE.txt``` for further details.

data/Rakefile

@@ -1,39 +1 @@
-require 'rubygems'
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "vishnu"
-  gem.homepage = "http://github.com/sandfoxme/vishnu"
-  gem.license = "MIT"
-  gem.summary = %Q{Avatar URL Generation wih libravatar.org}
-  gem.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}
-  gem.email = "sandfox@sandfox.me"
-  gem.authors = ['Anton Smirnov', "Kang-min Liu"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  # gem.add_runtime_dependency 'digest/sha2', '> 0.1'
-  # gem.add_runtime_dependency 'uri', '> 0.1'
-  # gem.add_development_dependency 'shoulda', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-task :default => :test
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "vishnu #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'bundler/gem_tasks'

data/lib/libravatar.rb

@@ -1,3 +1,5 @@
-require 'vishnu'
+# enable compatibility between Vishnu and Libravatar and allow require 'libravatar' to work
+
+require_relative 'vishnu'
 
 class Libravatar < Vishnu; end

data/lib/vishnu.rb

@@ -1,15 +1,18 @@
 #
-# The Libravatar class generates the avatar URL provided by the libravatar
-# web service at http://www.libravatar.org
+# The Vishnu class generates the avatar URL provided by the libravatar
+# web service at https://www.libravatar.org
 #
 # Users may associate their avatar images with multiple OpenIDs and Emails.
 #  
-# Author:: Kang-min Liu (http://gugod.org)
+# Original Author:: Kang-min Liu (http://gugod.org/)
+# Fork Author:: Anton Smirnov (https://sandfox.me/)
 # Copyright:: Copyright (c) 2011 Kang-min Liu
 # License:: MIT
-# Contributors:: https://github.com/gugod/libravatar/contributors
+# Contributors:: https://github.com/sandfoxme/vishnu/graphs/contributors
 #
 
+require_relative 'vishnu/version'
+
 require 'digest/md5'
 require 'digest/sha2'
 require 'uri'
@@ -20,7 +23,7 @@ class Vishnu
 
   # The options should contain :email or :openid values.  If both are
   # given, email will be used. The value of openid and email will be
-  # normalized by the rule described in http://www.libravatar.org/api
+  # normalized by the rule described in https://wiki.libravatar.org/api/
   #
   # List of option keys:
   #
@@ -30,99 +33,116 @@ class Vishnu
   # - :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
-
-  def get_target_domain
-    return @email.split('@')[1] if @email
-    return URI.parse(@openid).host
+  def initialize(email: nil, openid: nil, size: nil, default: nil, https: nil)
+    @email   = email
+    @openid  = openid
+    @size    = size
+    @default = default
+    @https   = https
   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 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 [nil, nil] unless rrs.any?
-
-
-      min_priority = rrs.map{ |r| r.priority }.min
-      rrs.delete_if{ |r| r.priority != min_priority }
-
-      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
-
-  def get_base_url
-    profile = @@profiles[ @https ? 1 : 0 ]
-    target, port = srv_lookup
-
-    if (target && port) 
-      port_fragment = port != profile[:port] ? ':' + port.to_s : ''
-      return profile[:scheme] + target.to_s + port_fragment
-    else
-      return profile[:scheme] + profile[:host]
-    end
-  end
+  PROFILES = [
+      {
+          scheme: 'http://',
+          host:   'cdn.libravatar.org',
+          srv:    '_avatars._tcp.',
+          port:   80,
+      },
+      {
+          scheme: 'https://',
+          host:   'seccdn.libravatar.org',
+          srv:    '_avatars-sec._tcp.',
+          port:   443,
+      }
+  ]
 
   # Generate the libravatar URL
-  def to_s
+  def url
     if @email
-      @email.downcase!
-      id = Digest::MD5.hexdigest(@email)
+      id = Digest::MD5.hexdigest(normalize_email(@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 == ""
-    baseurl = get_base_url() + '/avatar/'
-    return baseurl + id + query
+    size    = @size ?     "s=#{@size}" : nil
+    default = @default ?  "d=#{@default}" : nil
+
+    query = [ size, default ].reject{ |x| !x }.join('&')
+    query = "?#{query}" unless query == ''
+
+    baseurl = get_base_url + '/avatar/'
+
+    baseurl + id + query
   end
 
+  alias_method :to_s, :url
+
   private
 
-  def sanitize_srv_lookup(hostname, port)
-    unless hostname.match(/^[0-9a-zA-Z\-.]+$/) && 1 <= port && port <= 65535
-      return [nil, nil]
+    def get_target_domain
+      if @email
+        @email.split('@')[1]
+      else
+        URI.parse(@openid).host
+      end
     end
 
-    return [hostname, port]
-  end
+    # Grab the DNS SRV records associated with the target domain,
+    # and choose one according to RFC2782.
+    def srv_lookup
+      profile = PROFILES[ @https ? 1 : 0 ]
+      Resolv::DNS::open do |dns|
+        resources = dns.getresources(profile[:srv] + get_target_domain,
+                               Resolv::DNS::Resource::IN::SRV).to_a
+        return [nil, nil] unless resources.any?
+
 
-  # Normalize an openid URL following the description on libravatar.org
-  def normalize_openid(s)
-    x = URI.parse(s)
-    x.host.downcase!
-    x.scheme = x.scheme.downcase
-    if (x.path == "" && x.fragment == nil)
-      x.path = "/"
+        min_priority = resources.map{ |r| r.priority }.min
+        resources.delete_if{ |r| r.priority != min_priority }
+
+        weight_sum = resources.inject(0) { |sum, r| sum + r.weight }.to_f
+
+        r = resources.max_by { |r| r.weight == 0 ? 0 : rand ** (weight_sum / r.weight) }
+
+        return sanitize_srv_lookup(r.target.to_s, r.port)
+      end
     end
-    return x.to_s
-  end
+
+    def get_base_url
+      profile = PROFILES[ @https ? 1 : 0 ]
+      target, port = srv_lookup
+
+      if target && port
+        port_fragment = port != profile[:port] ? ':' + port.to_s : ''
+        profile[:scheme] + target.to_s + port_fragment
+      else
+        profile[:scheme] + profile[:host]
+      end
+    end
+
+    def sanitize_srv_lookup(hostname, port)
+      unless hostname.match(/^[0-9a-zA-Z\-.]+$/) && 1 <= port && port <= 65535
+        return [nil, nil]
+      end
+
+      [hostname, port]
+    end
+
+    def normalize_email(email)
+      email.downcase
+    end
+
+    # Normalize an openid URL following the description on libravatar.org
+    def normalize_openid(url)
+      parsed_url = URI.parse(url)
+      parsed_url.host   = parsed_url.host.downcase
+      parsed_url.scheme = parsed_url.scheme.downcase
+      if parsed_url.path == '' && parsed_url.fragment == nil
+        parsed_url.path = '/'
+      end
+
+      parsed_url.to_s
+    end
+
 end

data/lib/vishnu/version.rb

@@ -0,0 +1,3 @@
+class Vishnu
+  VERSION = '2.0.0'
+end

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+require 'simplecov'
+SimpleCov.start
+
+require_relative '../lib/vishnu'

data/spec/vishnu_spec.rb

@@ -0,0 +1,97 @@
+require 'spec_helper'
+
+RSpec.describe Vishnu do
+  describe 'Gets urls' do
+    before(:each) do
+      dns = double('Resolv::DNS')
+      allow(Resolv::DNS).to receive(:open).and_yield(dns)
+      allow(dns).to receive(:getresources) do |host, type|
+        expect(type).to eq(Resolv::DNS::Resource::IN::SRV)
+
+        case host.downcase
+          when '_avatars._tcp.federated.com'
+            [
+                Resolv::DNS::Resource::IN::SRV.new(0, 5, 80, 'avatars.federated.com'),
+                Resolv::DNS::Resource::IN::SRV.new(5, 5, 80, 'not-in-priority.federated.com'),
+            ]
+          when '_avatars-sec._tcp.federated.com'
+            [
+                Resolv::DNS::Resource::IN::SRV.new(5, 5, 443, 'not-in-priority.federated.com'),
+                Resolv::DNS::Resource::IN::SRV.new(0, 5, 443, 'avatars.federated.com'),
+            ]
+          when '_avatars._tcp.custom-federated.com'
+            [Resolv::DNS::Resource::IN::SRV.new(0, 5, 8080, 'avatars.custom-federated.com')]
+          when '_avatars-sec._tcp.custom-federated.com'
+            [Resolv::DNS::Resource::IN::SRV.new(0, 5, 8043, 'avatars.custom-federated.com')]
+          else
+            []
+        end
+      end
+    end
+
+    it 'gets url for email' do
+      # non-federated
+      expect(Vishnu.new(email: 'user@example.com').url).to eq('http://cdn.libravatar.org/avatar/b58996c504c5638798eb6b511e6f49af')
+      expect(Vishnu.new(email: 'user@example.com').to_s).to eq('http://cdn.libravatar.org/avatar/b58996c504c5638798eb6b511e6f49af')
+      expect(Vishnu.new(email: 'USER@ExAmPlE.CoM').url).to eq('http://cdn.libravatar.org/avatar/b58996c504c5638798eb6b511e6f49af')
+      expect(Vishnu.new(email: 'user@example.com', https: true).url).to eq('https://seccdn.libravatar.org/avatar/b58996c504c5638798eb6b511e6f49af')
+      expect(Vishnu.new(email: 'user@example.com', https: false).url).to eq('http://cdn.libravatar.org/avatar/b58996c504c5638798eb6b511e6f49af')
+      expect(Vishnu.new(email: 'USER@ExAmPlE.CoM', default: 'http://example.com/avatar.png').url).to eq('http://cdn.libravatar.org/avatar/b58996c504c5638798eb6b511e6f49af?d=http://example.com/avatar.png')
+      expect(Vishnu.new(email: 'USER@ExAmPlE.CoM', size: 512, default: 'mm').url).to eq('http://cdn.libravatar.org/avatar/b58996c504c5638798eb6b511e6f49af?s=512&d=mm')
+
+      # federated
+      expect(Vishnu.new(email: 'user@federated.com').url).to eq('http://avatars.federated.com/avatar/d69b469ded547b3ddef720a70c186322')
+      expect(Vishnu.new(email: 'user@feDeRaTed.cOm', https: true).url).to eq('https://avatars.federated.com/avatar/d69b469ded547b3ddef720a70c186322')
+      expect(Vishnu.new(email: 'USER@cuStOm-feDerated.COM').url).to eq('http://avatars.custom-federated.com:8080/avatar/8df8704e4b556e0684f7c38accdaf517')
+      expect(Vishnu.new(email: 'user@custom-federated.com', https: true).url).to eq('https://avatars.custom-federated.com:8043/avatar/8df8704e4b556e0684f7c38accdaf517')
+    end
+
+    it 'gets url for openid' do
+      avatar = Vishnu.new(openid: 'http://example.com/id/Bob')
+      expect(avatar.url).to eq('http://cdn.libravatar.org/avatar/80cd0679bb52beac4d5d388c163016dbc5d3f30c262a4f539564236ca9d49ccd')
+
+      avatar = Vishnu.new(openid: 'https://example.com/id/Bob')
+      expect(avatar.url).to eq('http://cdn.libravatar.org/avatar/82be86d8b10f6492d0eb3d6475c388044529b9d4ddf7269dec2483601b22d2e1')
+
+      avatar = Vishnu.new(openid: 'hTTp://EXAMPLE.COM/id/Bob')
+      expect(avatar.url).to eq('http://cdn.libravatar.org/avatar/80cd0679bb52beac4d5d388c163016dbc5d3f30c262a4f539564236ca9d49ccd')
+
+      avatar = Vishnu.new(openid: 'hTTp://EXAMPLE.COM/id/Bob', size: 512)
+      expect(avatar.url).to eq('http://cdn.libravatar.org/avatar/80cd0679bb52beac4d5d388c163016dbc5d3f30c262a4f539564236ca9d49ccd?s=512')
+
+      avatar = Vishnu.new(openid: 'http://example.com/id/bob')
+      expect(avatar.url).to eq('http://cdn.libravatar.org/avatar/84106b275be9a7c69f3b0f77d1d504a794e6d0e4e0a068fa529d869b721f4261')
+
+      avatar = Vishnu.new(openid: 'hTTp://EXAMPLE.COM/ID/BOB')
+      expect(avatar.url).to eq('http://cdn.libravatar.org/avatar/10e678f0db6ead293f21fae8adb1407ab039cffc46f39783152770e4628d9c6c')
+
+      avatar = Vishnu.new(openid: 'http://example.com')
+      expect(avatar.url).to eq('http://cdn.libravatar.org/avatar/2a1b402420ef46577471cdc7409b0fa2c6a204db316e59ade2d805435489a067')
+
+      avatar = Vishnu.new(openid: 'http://federated.com/id/user')
+      expect(avatar.url).to eq('http://avatars.federated.com/avatar/50ef67971fecacf62abe7f9a002aaf6a26ff5882229a51899439dd4c7ccb9ddd')
+
+      avatar = Vishnu.new(openid: 'http://custom-federated.com/id/user')
+      expect(avatar.url).to eq('http://avatars.custom-federated.com:8080/avatar/e2014cf33d71fbf29f6976eab7f9569e7c9eae358cca0ac5b4aa536400a1c9fe')
+    end
+  end
+
+  describe 'Works correctly inside' do
+    it 'sanitizes openid' do
+      avatar = Vishnu.new
+
+      expect(avatar.send(:normalize_openid, 'HTTP://EXAMPLE.COM/id/Bob')).to   eq('http://example.com/id/Bob')
+      expect(avatar.send(:normalize_openid, 'HTTP://EXAMPLE.COM')).to          eq('http://example.com/')
+      expect(avatar.send(:normalize_openid, 'https://example.com/id/bob')).to  eq('https://example.com/id/bob')
+      expect(avatar.send(:normalize_openid, 'https://eXamPlE.cOm/ID/BOB/')).to eq('https://example.com/ID/BOB/')
+    end
+
+    it 'sanitizes SRV lookup result' do
+      avatar = Vishnu.new
+      expect(avatar.send(:sanitize_srv_lookup, 'hosntame.abcde.fghi.com', 12345)).to    eq(['hosntame.abcde.fghi.com', 12345])
+      expect(avatar.send(:sanitize_srv_lookup, 'hosntame.abcde.fghi.com', 65348283)).to eq([nil, nil])
+      expect(avatar.send(:sanitize_srv_lookup, 'FNORD IMPUNTK *#(*$#&',   12345)).to    eq([nil, nil])
+      expect(avatar.send(:sanitize_srv_lookup, 'FNORD IMPUNTK *#(*$#&',   65348283)).to eq([nil, nil])
+    end
+  end
+end

data/vishnu.gemspec

@@ -1,61 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: vishnu 1.2.2 ruby lib
+require_relative 'lib/vishnu/version'
 
-Gem::Specification.new do |s|
-  s.name = "vishnu"
-  s.version = "1.2.2"
+Gem::Specification.new do |spec|
+  spec.name             = 'vishnu'
+  spec.version          = Vishnu::VERSION
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Anton Smirnov", "Kang-min Liu"]
-  s.date = "2016-06-20"
-  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 = "sandfox@sandfox.me"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".travis.yml",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/libravatar.rb",
-    "lib/vishnu.rb",
-    "test/helper.rb",
-    "test/test_libravatar.rb",
-    "vishnu.gemspec"
-  ]
-  s.homepage = "http://github.com/sandfoxme/vishnu"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.5.1"
-  s.summary = "Avatar URL Generation wih libravatar.org"
+  spec.authors          = ['Anton Smirnov', 'Kang-min Liu']
+  spec.email            = 'sandfox@sandfox.me'
+  spec.summary          = 'Avatar URL Generation with libravatar.org'
+  spec.description      = 'Libravatar 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 image URL'
+  spec.homepage         = 'https://github.com/sandfoxme/vishnu'
+  spec.license          = 'MIT'
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  spec.files            = `git ls-files -z`.split("\x0")
+  spec.test_files       = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths    = ['lib']
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, ["> 1.2.3"])
-      s.add_development_dependency(%q<minitest>, ["= 4.7.5"])
-      s.add_development_dependency(%q<test-unit>, [">= 0"])
-    else
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<shoulda>, ["> 1.2.3"])
-      s.add_dependency(%q<minitest>, ["= 4.7.5"])
-      s.add_dependency(%q<test-unit>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<shoulda>, ["> 1.2.3"])
-    s.add_dependency(%q<minitest>, ["= 4.7.5"])
-    s.add_dependency(%q<test-unit>, [">= 0"])
-  end
+  spec.required_ruby_version = '>= 2.0.0'
+
+  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec',   '~> 3.4'
+  spec.add_development_dependency 'simplecov'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vishnu
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Anton Smirnov
@@ -9,52 +9,52 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.5
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.5
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,29 +67,27 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-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
+description: Libravatar 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 image URL
 email: sandfox@sandfox.me
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
 files:
-- ".document"
+- ".gitignore"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
-- VERSION
 - lib/libravatar.rb
 - lib/vishnu.rb
-- test/helper.rb
-- test/test_libravatar.rb
+- lib/vishnu/version.rb
+- spec/spec_helper.rb
+- spec/vishnu_spec.rb
 - vishnu.gemspec
-homepage: http://github.com/sandfoxme/vishnu
+homepage: https://github.com/sandfoxme/vishnu
 licenses:
 - MIT
 metadata: {}
@@ -101,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -109,8 +107,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Avatar URL Generation wih libravatar.org
-test_files: []
+summary: Avatar URL Generation with libravatar.org
+test_files:
+- spec/spec_helper.rb
+- spec/vishnu_spec.rb

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/README.rdoc

@@ -1,20 +0,0 @@
-= libravatar
-
-http://libravatar.org is an avatar service to let their users associate avatar images
-with their emails or openids. This rubygem generates their avatar URL.
-
-== Contributing to libravatar
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2011 Kang-min Liu. See LICENSE.txt for
-further details.
-

data/VERSION

@@ -1 +0,0 @@
-1.2.2

data/test/helper.rb

@@ -1,11 +0,0 @@
-require 'rubygems'
-require 'minitest/autorun'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'libravatar'
-
-class Test::Unit::TestCase
-end

data/test/test_libravatar.rb

@@ -1,50 +0,0 @@
-require 'helper'
-
-class TestLibravatar < Test::Unit::TestCase
-  should "Generate url from email" do
-    # echo -n "user@example.com"|md5sum
-    # => b58996c504c5638798eb6b511e6f49af
-    avatar = Libravatar.new(:email => "user@example.com")
-
-    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[0,8], "https://"
-    assert_equal Libravatar.new(:email => "user@example.com", :https => false).to_s[0,7], "http://"
-
-    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", :size => 512, :default => "mm").to_s[-43,43], "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"
-
-    avatar = Libravatar.new(:openid => "hTTp://EXAMPLE.COM/id/Bob")
-    assert_equal avatar.to_s, "http://cdn.libravatar.org/avatar/80cd0679bb52beac4d5d388c163016dbc5d3f30c262a4f539564236ca9d49ccd"
-
-    avatar = Libravatar.new(:openid => "hTTp://EXAMPLE.COM/id/Bob", :size => 512)
-    assert_equal avatar.to_s, "http://cdn.libravatar.org/avatar/80cd0679bb52beac4d5d388c163016dbc5d3f30c262a4f539564236ca9d49ccd?s=512"
-  end
-
-  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 avatar.to_s.match(/http:\/\/.+\/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