Hello community,

here is the log from the commit of package rubygem-ruby-openid for 
openSUSE:Factory checked in at 2020-03-07 21:39:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-ruby-openid (Old)
 and      /work/SRC/openSUSE:Factory/.rubygem-ruby-openid.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "rubygem-ruby-openid"

Sat Mar  7 21:39:48 2020 rev:2 rq:773846 version:2.9.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-ruby-openid/rubygem-ruby-openid.changes  
2018-02-15 13:25:02.580985668 +0100
+++ 
/work/SRC/openSUSE:Factory/.rubygem-ruby-openid.new.26092/rubygem-ruby-openid.changes
       2020-03-07 21:39:51.452337739 +0100
@@ -1,0 +2,54 @@
+Mon Feb 10 15:41:56 UTC 2020 - Stephan Kulow <co...@suse.com>
+
+- updated to version 2.9.2
+ see installed CHANGELOG.md
+
+  ## 2.9.2
+  
+  * Perform all checks before verifying endpoints.
+    [#126](https://github.com/openid/ruby-openid/pull/126)
+  
+  ## 2.9.1
+  
+  * Updated CHANGELOG.md
+  
+  ## 2.9.0
+  
+  * Remove deprecated `autorequire` from gemspec.
+    [#123](https://github.com/openid/ruby-openid/pull/123)
+  * Rescue from `Yadis::XRI::XRIHTTPError` on discovery.
+    [#106](https://github.com/openid/ruby-openid/pull/106)
+  * Avoid SSRF for claimed_id request.
+    [#121](https://github.com/openid/ruby-openid/pull/121)
+  * Updated documentation.
+    [#115](https://github.com/openid/ruby-openid/pull/115), 
[#116](https://github.com/openid/ruby-openid/pull/116), 
[#117](https://github.com/openid/ruby-openid/pull/117), 
[#118](https://github.com/openid/ruby-openid/pull/118)
+  * Reduce warnings output in test runs.
+    [#119](https://github.com/openid/ruby-openid/pull/119)
+  * Drop deprecated option from gemspec.
+    [#120](https://github.com/openid/ruby-openid/pull/120)
+  * Remove circular require.
+    [#113](https://github.com/openid/ruby-openid/pull/113)
+  * Updated Travis CI config with Ruby 2.6
+    [#114](https://github.com/openid/ruby-openid/pull/114)
+  * Simplify Bundler require; remove need for extra `:require`.
+    [#112](https://github.com/openid/ruby-openid/pull/112)
+  
+  ## 2.8.0
+  
+  * Fix `admin/mkassoc` script.
+    See https://github.com/openid/ruby-openid/pull/103
+  * Allow specifying timeout for `OpenID::StandardFetcher` in environment 
variables.
+    See https://github.com/openid/ruby-openid/pull/109
+  * Fixed some documentation.
+    See https://github.com/openid/ruby-openid/pull/111
+  * Fixed example server.
+    See https://github.com/openid/ruby-openid/pull/91
+  * Fixed tests.
+    See https://github.com/openid/ruby-openid/pull/86
+  * Misc. changes to the CI setup.
+    See
+    - https://github.com/openid/ruby-openid/pull/110
+    - https://github.com/openid/ruby-openid/pull/108
+    - https://github.com/openid/ruby-openid/pull/107
+
+-------------------------------------------------------------------

Old:
----
  ruby-openid-2.7.0.gem

New:
----
  ruby-openid-2.9.2.gem

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ rubygem-ruby-openid.spec ++++++
--- /var/tmp/diff_new_pack.tQqcqK/_old  2020-03-07 21:39:53.488339114 +0100
+++ /var/tmp/diff_new_pack.tQqcqK/_new  2020-03-07 21:39:53.492339117 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package rubygem-ruby-openid
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -24,20 +24,20 @@
 #
 
 Name:           rubygem-ruby-openid
-Version:        2.7.0
+Version:        2.9.2
 Release:        0
 %define mod_name ruby-openid
 %define mod_full_name %{mod_name}-%{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  ruby-macros >= 5
-BuildRequires:  %{ruby}
 BuildRequires:  %{rubygem gem2rpm}
 BuildRequires:  %{rubygem rdoc > 3.10}
-Url:            https://github.com/openid/ruby-openid
-Source:         http://rubygems.org/gems/%{mod_full_name}.gem
+BuildRequires:  %{ruby}
+BuildRequires:  ruby-macros >= 5
+URL:            https://github.com/openid/ruby-openid
+Source:         https://rubygems.org/gems/%{mod_full_name}.gem
 Source1:        gem2rpm.yml
 Summary:        A library for consuming and serving OpenID identities
-License:        Ruby and Apache-2.0
+License:        Ruby AND Apache-2.0
 Group:          Development/Languages/Ruby
 
 %description

++++++ ruby-openid-2.7.0.gem -> ruby-openid-2.9.2.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md
--- old/CHANGELOG.md    2015-03-05 13:51:44.000000000 +0100
+++ new/CHANGELOG.md    2019-10-16 14:21:19.000000000 +0200
@@ -1,5 +1,53 @@
 # Changelog
 
+## 2.9.2
+
+* Perform all checks before verifying endpoints.
+  [#126](https://github.com/openid/ruby-openid/pull/126)
+
+## 2.9.1
+
+* Updated CHANGELOG.md
+
+## 2.9.0
+
+* Remove deprecated `autorequire` from gemspec.
+  [#123](https://github.com/openid/ruby-openid/pull/123)
+* Rescue from `Yadis::XRI::XRIHTTPError` on discovery.
+  [#106](https://github.com/openid/ruby-openid/pull/106)
+* Avoid SSRF for claimed_id request.
+  [#121](https://github.com/openid/ruby-openid/pull/121)
+* Updated documentation.
+  [#115](https://github.com/openid/ruby-openid/pull/115), 
[#116](https://github.com/openid/ruby-openid/pull/116), 
[#117](https://github.com/openid/ruby-openid/pull/117), 
[#118](https://github.com/openid/ruby-openid/pull/118)
+* Reduce warnings output in test runs.
+  [#119](https://github.com/openid/ruby-openid/pull/119)
+* Drop deprecated option from gemspec.
+  [#120](https://github.com/openid/ruby-openid/pull/120)
+* Remove circular require.
+  [#113](https://github.com/openid/ruby-openid/pull/113)
+* Updated Travis CI config with Ruby 2.6
+  [#114](https://github.com/openid/ruby-openid/pull/114)
+* Simplify Bundler require; remove need for extra `:require`.
+  [#112](https://github.com/openid/ruby-openid/pull/112)
+
+## 2.8.0
+
+* Fix `admin/mkassoc` script.
+  See https://github.com/openid/ruby-openid/pull/103
+* Allow specifying timeout for `OpenID::StandardFetcher` in environment 
variables.
+  See https://github.com/openid/ruby-openid/pull/109
+* Fixed some documentation.
+  See https://github.com/openid/ruby-openid/pull/111
+* Fixed example server.
+  See https://github.com/openid/ruby-openid/pull/91
+* Fixed tests.
+  See https://github.com/openid/ruby-openid/pull/86
+* Misc. changes to the CI setup.
+  See
+  - https://github.com/openid/ruby-openid/pull/110
+  - https://github.com/openid/ruby-openid/pull/108
+  - https://github.com/openid/ruby-openid/pull/107
+
 ## 2.7.0
 
 * Use RFC 2396 compatible URI parser for trustroot - 
7c84ec9ced3ccbdad575e02dbfa81e53b52f909e
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/INSTALL.md new/INSTALL.md
--- old/INSTALL.md      2015-03-05 13:51:44.000000000 +0100
+++ new/INSTALL.md      2019-10-16 14:21:19.000000000 +0200
@@ -1,21 +1,23 @@
 # Ruby OpenID Library Installation
 
-## Rubygems Installation
+## Install as a gem
 
-Rubygems is a tool for installing ruby libraries and their
-dependancies. If you have rubygems installed, simply:
+`ruby-openid` is distributed on [RubyGems](https://rubygems.org/).
+Install it:
 
     gem install ruby-openid
 
+This is probably what you need.
+
 ## Manual Installation
 
-Unpack the archive and run setup.rb to install:
+Unpack the archive and run `setup.rb` to install:
 
     ruby setup.rb
 
-setup.rb installs the library into your system ruby. If don't want to
+`setup.rb` installs the library into your system ruby. If don't want to
 add openid to you system ruby, you may instead add the `lib` directory of
-the extracted tarball to your RUBYLIB environment variable:
+the extracted tarball to your `RUBYLIB` environment variable:
 
     $ export RUBYLIB=${RUBYLIB}:/path/to/ruby-openid/lib
 
@@ -27,21 +29,13 @@
     irb$> require "openid"
     => true
 
-Or, if you installed via rubygems:
-
-    $> irb
-    irb$> require "rubygems"
-    => true
-    irb$> require_gem "ruby-openid"
-    => true
-
 ## Run the test suite
 
 Go into the test directory and execute the `runtests.rb` script.
 
 ## Next steps
 
-* Run `consumer.rb` in the examples directory.
-* Get started writing your own consumer using OpenID::Consumer
+* Run `consumer.rb` in the `examples/` directory.
+* Get started writing your own consumer using `OpenID::Consumer`
 * Write your own server with `OpenID::Server`
-* Use the `OpenIDLoginGenerator`! Read `example/README` for more info.
+* Use the `OpenIDLoginGenerator`! Read `examples/README.md` for more info.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/README.md new/README.md
--- old/README.md       2015-03-05 13:51:44.000000000 +0100
+++ new/README.md       2019-10-16 14:21:19.000000000 +0200
@@ -2,7 +2,7 @@
 
 A Ruby library for verifying and serving OpenID identities.
 
-[![Build 
Status](https://secure.travis-ci.org/openid/ruby-openid.png)](http://travis-ci.org/openid/ruby-openid)
+[![Build 
Status](https://secure.travis-ci.org/openid/ruby-openid.svg)](http://travis-ci.org/openid/ruby-openid)
 
 ## Features
 
@@ -55,8 +55,8 @@
 
 ## Homepage
 
-  * [GitHub](http://github.com/openid/ruby-openid)
-  * [Website](http://openid.net/)
+  * GitHub repository: 
[openid/ruby-openid](http://github.com/openid/ruby-openid)
+  * Homepage: [OpenID.net](http://openid.net/)
 
 ## Community
 
@@ -74,7 +74,7 @@
 
 Copyright 2006-2012, JanRain, Inc.
 
-Contact ope...@janrain.com or visit the [OpenID channel on 
pibb.com](http://pibb.com/go/openid).
+Contact ope...@janrain.com.
 
 ## License
 
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/examples/README new/examples/README
--- old/examples/README 2015-03-05 13:51:44.000000000 +0100
+++ new/examples/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-This directory contains several examples that demonstrate use of the
-OpenID library.  Make sure you have properly installed the library
-before running the examples.  These examples are a great place to
-start in integrating OpenID into your application.
-
-==Rails example
-
-The rails_openid contains a fully functional OpenID server and relying
-party, and acts as a starting point for implementing your own
-production rails server.  You'll need the latest version of Ruby on
-Rails installed, and then:
-
- cd rails_openid
- ./script/server
-
-Open a web browser to http://localhost:3000/ and follow the instructions.
-
-The relevant code to work from when writing your Rails OpenID Relying
-Party is: 
-  rails_openid/app/controllers/consumer_controller.rb
-If you are working on an OpenID provider, check out
-  rails_openid/app/controllers/server_controller.rb
-
-Since the library and examples are Apache-licensed, don't be shy about 
-copy-and-paste.
-
-==Rails ActiveRecord OpenIDStore plugin
-
-For various reasons you may want or need to deploy your ruby openid
-consumer/server using an SQL based store.  The active_record_openid_store 
-is a plugin that makes using an SQL based store simple.  Follow the
-README inside the plugin's dir for usage.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/examples/README.md new/examples/README.md
--- old/examples/README.md      1970-01-01 01:00:00.000000000 +0100
+++ new/examples/README.md      2019-10-16 14:21:19.000000000 +0200
@@ -0,0 +1,37 @@
+This directory contains several examples that demonstrate use of the
+OpenID library.  Make sure you have properly installed the library
+before running the examples.  These examples are a great place to
+start in integrating OpenID into your application.
+
+## Rails example
+
+The `rails_openid` directory contains a fully functional OpenID server and 
relying
+party, and acts as a starting point for implementing your own
+production rails server.  You'll need the latest version of Ruby on
+Rails installed, and then:
+
+```shell
+cd rails_openid
+./script/server
+```
+
+Open a web browser to http://localhost:3000/ and follow the instructions.
+
+The relevant code to work from when writing your Rails OpenID Relying
+Party is: 
+
+  rails_openid/app/controllers/consumer_controller.rb
+
+If you are working on an OpenID provider, check out
+
+  rails_openid/app/controllers/server_controller.rb
+
+Since the library and examples are Apache-licensed, don't be shy about 
+copy-and-paste.
+
+## Rails ActiveRecord OpenIDStore plugin
+
+For various reasons you may want or need to deploy your ruby openid
+consumer/server using an SQL based store.  The `active_record_openid_store` 
+is a plugin that makes using an SQL based store simple.  Follow the
+README inside the plugin's dir for usage.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/examples/rails5_openid/Gemfile.lock 
new/examples/rails5_openid/Gemfile.lock
--- old/examples/rails5_openid/Gemfile.lock     1970-01-01 01:00:00.000000000 
+0100
+++ new/examples/rails5_openid/Gemfile.lock     2019-10-16 14:21:19.000000000 
+0200
@@ -0,0 +1,137 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.2.3)
+      actionpack (= 5.2.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.3)
+      activesupport (= 5.2.3)
+      globalid (>= 0.3.6)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
+      arel (>= 9.0)
+    activestorage (5.2.3)
+      actionpack (= 5.2.3)
+      activerecord (= 5.2.3)
+      marcel (~> 0.3.1)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (9.0.0)
+    bindex (0.7.0)
+    builder (3.2.3)
+    byebug (11.0.1)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    erubi (1.8.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    jbuilder (2.9.1)
+      activesupport (>= 4.2.0)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    puma (3.12.1)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.3)
+      actioncable (= 5.2.3)
+      actionmailer (= 5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      activemodel (= 5.2.3)
+      activerecord (= 5.2.3)
+      activestorage (= 5.2.3)
+      activesupport (= 5.2.3)
+      bundler (>= 1.3.0)
+      railties (= 5.2.3)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.2)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    web-console (3.7.0)
+      actionview (>= 5.0)
+      activemodel (>= 5.0)
+      bindex (>= 0.4.0)
+      railties (>= 5.0)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  byebug
+  jbuilder (~> 2.5)
+  puma (~> 3.11)
+  rails (~> 5.2.3)
+  tzinfo-data
+  web-console (>= 3.3.0)
+
+RUBY VERSION
+   ruby 2.6.3p62
+
+BUNDLED WITH
+   1.17.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/examples/rails5_openid/config/master.key 
new/examples/rails5_openid/config/master.key
--- old/examples/rails5_openid/config/master.key        1970-01-01 
01:00:00.000000000 +0100
+++ new/examples/rails5_openid/config/master.key        2019-10-16 
14:21:19.000000000 +0200
@@ -0,0 +1 @@
+ce81c1fc524a700075e423e493bbcdf7
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/examples/rails_openid/Gemfile 
new/examples/rails_openid/Gemfile
--- old/examples/rails_openid/Gemfile   2015-03-05 13:51:44.000000000 +0100
+++ new/examples/rails_openid/Gemfile   2019-10-16 14:21:19.000000000 +0200
@@ -38,4 +38,4 @@
 # To use debugger
 # gem 'ruby-debug'
 
-gem 'ruby-openid'
+gem 'ruby-openid', :require => 'openid'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lib/openid/consumer/discovery.rb 
new/lib/openid/consumer/discovery.rb
--- old/lib/openid/consumer/discovery.rb        2015-03-05 13:51:44.000000000 
+0100
+++ new/lib/openid/consumer/discovery.rb        2019-10-16 14:21:19.000000000 
+0200
@@ -450,7 +450,7 @@
       services.each { |service_element|
         endpoints += flt.get_service_endpoints(iname, service_element)
       }
-    rescue Yadis::XRDSError => why
+    rescue Yadis::XRDSError, Yadis::XRI::XRIHTTPError => why
       Util.log('xrds error on ' + iname + ': ' + why.to_s)
     end
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lib/openid/consumer/idres.rb 
new/lib/openid/consumer/idres.rb
--- old/lib/openid/consumer/idres.rb    2015-03-05 13:51:44.000000000 +0100
+++ new/lib/openid/consumer/idres.rb    2019-10-16 14:21:19.000000000 +0200
@@ -71,10 +71,10 @@
       # verified information.
       def id_res
         check_for_fields
-        verify_return_to
-        verify_discovery_results
         check_signature
         check_nonce
+        verify_return_to
+        verify_discovery_results
       end
 
       def server_url
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lib/openid/consumer.rb new/lib/openid/consumer.rb
--- old/lib/openid/consumer.rb  2015-03-05 13:51:44.000000000 +0100
+++ new/lib/openid/consumer.rb  2019-10-16 14:21:19.000000000 +0200
@@ -139,7 +139,7 @@
   #
   # Add an OpenID login field somewhere on your site.  When an OpenID
   # is entered in that field and the form is submitted, it should make
-  # a request to the your site which includes that OpenID URL.
+  # a request to the site that includes that OpenID URL.
   #
   # First, the application should instantiate a Consumer with a
   # session for per-user state and store for shared state using the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lib/openid/extensions/ax.rb 
new/lib/openid/extensions/ax.rb
--- old/lib/openid/extensions/ax.rb     2015-03-05 13:51:44.000000000 +0100
+++ new/lib/openid/extensions/ax.rb     2019-10-16 14:21:19.000000000 +0200
@@ -539,9 +539,8 @@
       end
 
       def self.from_success_response(success_response)
-        resp = nil
         ax_args = success_response.message.get_args(NS_URI)
-        resp = ax_args.key?('error') ? new(false, ax_args['error']) : new
+        ax_args.key?('error') ? new(false, ax_args['error']) : new
       end
 
       def succeeded?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lib/openid/fetchers.rb new/lib/openid/fetchers.rb
--- old/lib/openid/fetchers.rb  2015-03-05 13:51:44.000000000 +0100
+++ new/lib/openid/fetchers.rb  2019-10-16 14:21:19.000000000 +0200
@@ -1,6 +1,6 @@
 require 'net/http'
-require 'openid'
 require 'openid/util'
+require 'openid/version'
 
 begin
   require 'net/https'
@@ -117,7 +117,7 @@
     USER_AGENT = "ruby-openid/#{OpenID::VERSION} (#{RUBY_PLATFORM})"
 
     REDIRECT_LIMIT = 5
-    TIMEOUT = 60
+    TIMEOUT = ENV['RUBY_OPENID_FETCHER_TIMEOUT'] || 60
 
     attr_accessor :ca_file
     attr_accessor :timeout
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lib/openid/store/filesystem.rb 
new/lib/openid/store/filesystem.rb
--- old/lib/openid/store/filesystem.rb  2015-03-05 13:51:44.000000000 +0100
+++ new/lib/openid/store/filesystem.rb  2019-10-16 14:21:19.000000000 +0200
@@ -230,7 +230,7 @@
       # create a safe filename from a url
       def filename_escape(s)
         s = '' if s.nil?
-        filename_chunks = s.each_char.flat_map {|c|
+        s.each_char.flat_map {|c|
           @@FILENAME_ALLOWED.include?(c) ? c : c.bytes.map {|b|
             "_%02X" % b
           }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lib/openid/version.rb new/lib/openid/version.rb
--- old/lib/openid/version.rb   2015-03-05 13:51:44.000000000 +0100
+++ new/lib/openid/version.rb   2019-10-16 14:21:19.000000000 +0200
@@ -1,3 +1,3 @@
 module OpenID
-  VERSION = "2.7.0"
+  VERSION = "2.9.2"
 end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lib/openid/yadis/xri.rb new/lib/openid/yadis/xri.rb
--- old/lib/openid/yadis/xri.rb 2015-03-05 13:51:44.000000000 +0100
+++ new/lib/openid/yadis/xri.rb 2019-10-16 14:21:19.000000000 +0200
@@ -1,4 +1,3 @@
-require 'openid/yadis/xrds'
 require 'openid/fetchers'
 
 module OpenID
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lib/ruby-openid.rb new/lib/ruby-openid.rb
--- old/lib/ruby-openid.rb      1970-01-01 01:00:00.000000000 +0100
+++ new/lib/ruby-openid.rb      2019-10-16 14:21:19.000000000 +0200
@@ -0,0 +1 @@
+require 'openid'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata        2015-03-05 13:51:44.000000000 +0100
+++ new/metadata        2019-10-16 14:21:19.000000000 +0200
@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-openid
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.9.2
 platform: ruby
 authors:
 - JanRain, Inc
-autorequire: openid
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -40,7 +40,7 @@
 - NOTICE
 - README.md
 - UPGRADE.md
-- examples/README
+- examples/README.md
 - examples/active_record_openid_store/README
 - examples/active_record_openid_store/XXX_add_open_id_store_to_db.rb
 - examples/active_record_openid_store/XXX_upgrade_open_id_store.rb
@@ -51,6 +51,8 @@
 - examples/active_record_openid_store/lib/openid_ar_store.rb
 - examples/active_record_openid_store/test/store_test.rb
 - examples/discover
+- examples/rails5_openid/Gemfile.lock
+- examples/rails5_openid/config/master.key
 - examples/rails_openid/Gemfile
 - examples/rails_openid/README
 - examples/rails_openid/README.rdoc
@@ -156,6 +158,7 @@
 - lib/openid/yadis/xrds.rb
 - lib/openid/yadis/xri.rb
 - lib/openid/yadis/xrires.rb
+- lib/ruby-openid.rb
 - test/data/accept.txt
 - test/data/dh.txt
 - test/data/example-xrds.xml
@@ -260,8 +263,7 @@
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A library for consuming and serving OpenID identities.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/test/test_associationmanager.rb 
new/test/test_associationmanager.rb
--- old/test/test_associationmanager.rb 2015-03-05 13:51:44.000000000 +0100
+++ new/test/test_associationmanager.rb 2019-10-16 14:21:19.000000000 +0200
@@ -304,7 +304,7 @@
     # server error or is otherwise undecipherable.
     def test_bad_response
       assert_log_matches('Server error when requesting an association') {
-        assert_equal(call_negotiate([mk_message({})]), nil)
+        assert_nil(call_negotiate([mk_message({})]))
       }
     end
 
@@ -320,7 +320,7 @@
                          "Server #{@server_url} responded with unsupported "\
                          "association session but did not supply a fallback."
                          ) {
-        assert_equal(call_negotiate([msg]), nil)
+        assert_nil(call_negotiate([msg]))
       }
 
     end
@@ -337,7 +337,7 @@
                          "Server #{@server_url} responded with unsupported "\
                          "association session but did not supply a fallback."
                          ) {
-        assert_equal(call_negotiate([msg]), nil)
+        assert_nil(call_negotiate([msg]))
       }
     end
 
@@ -357,7 +357,7 @@
 
       assert_log_matches('Unsupported association type',
                          'Server sent unsupported session/association type:') {
-        assert_equal(call_negotiate([msg], negotiator), nil)
+        assert_nil(call_negotiate([msg], negotiator))
       }
     end
 
@@ -388,7 +388,7 @@
 
       assert_log_matches('Unsupported association type',
                          "Server #{@server_url} refused") {
-        assert_equal(call_negotiate([msg, msg]), nil)
+        assert_nil(call_negotiate([msg, msg]))
       }
     end
 
@@ -424,7 +424,7 @@
     def test_bad_response
       assert_log_matches('Server error when requesting an association') {
         response = call_negotiate([mk_message({})])
-        assert_equal(nil, response)
+        assert_nil(response)
       }
     end
 
@@ -436,7 +436,7 @@
 
       assert_log_matches('Server error when requesting an association') {
         response = call_negotiate([msg])
-        assert_equal(nil, response)
+        assert_nil(response)
       }
     end
 
@@ -448,7 +448,7 @@
 
       assert_log_matches('Server error when requesting an association') {
         response = call_negotiate([msg])
-        assert_equal(nil, response)
+        assert_nil(response)
       }
     end
 
@@ -466,7 +466,7 @@
 
       assert_log_matches('Server error when requesting an association') {
         response = call_negotiate([msg])
-        assert_equal(nil, response)
+        assert_nil(response)
       }
     end
 
@@ -482,7 +482,7 @@
 
       assert_log_matches('Server error when requesting an association') {
         response = call_negotiate([msg, assoc])
-        assert_equal(nil, response)
+        assert_nil(response)
       }
     end
 
@@ -818,13 +818,13 @@
 
     def test_not_in_store_no_response
       set_negotiate_response(nil)
-      assert_equal(nil, @assoc_manager.get_association)
+      assert_nil(@assoc_manager.get_association)
     end
 
     def test_not_in_store_negotiate_assoc
       # Not stored beforehand:
       stored_assoc = @store.get_association(@server_url, @assoc.handle)
-      assert_equal(nil, stored_assoc)
+      assert_nil(stored_assoc)
 
       # Returned from associate call:
       set_negotiate_response(@assoc)
@@ -898,7 +898,7 @@
     def test_missing_fields
       @message.del_arg(OPENID_NS, 'assoc_type')
       assert_log_matches('Missing required par') {
-        assert_equal(nil, make_request)
+        assert_nil(make_request)
       }
     end
 
@@ -907,7 +907,7 @@
     def test_protocol_error
       @message.set_arg(OPENID_NS, 'expires_in', 'goats')
       assert_log_matches('Protocol error processing') {
-        assert_equal(nil, make_request)
+        assert_nil(make_request)
       }
     end
   end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/test/test_ax.rb new/test/test_ax.rb
--- old/test/test_ax.rb 2015-03-05 13:51:44.000000000 +0100
+++ new/test/test_ax.rb 2019-10-16 14:21:19.000000000 +0200
@@ -47,7 +47,7 @@
         assert_equal(type_uri, ainfo.type_uri)
         assert_equal(1, ainfo.count)
         assert_equal(false, ainfo.required)
-        assert_equal(nil, ainfo.ns_alias)
+        assert_nil(ainfo.ns_alias)
       end
     end
 
@@ -234,7 +234,7 @@
 
       def test_construct
         assert_equal({}, @msg.requested_attributes)
-        assert_equal(nil, @msg.update_url)
+        assert_nil(@msg.update_url)
 
         msg = FetchRequest.new('hailstorm')
         assert_equal({}, msg.requested_attributes)
@@ -494,7 +494,7 @@
       end
 
       def test_construct
-        assert_equal(nil, @msg.update_url)
+        assert_nil(@msg.update_url)
         assert_equal({}, @msg.data)
       end
 
@@ -541,7 +541,7 @@
       end
 
       def test_get_extension_args_single_value_response
-        # Single values do NOT have a count, and 
+        # Single values do NOT have a count, and
         # do not use the array extension
         eargs = {
           'mode' => 'fetch_response',
@@ -585,7 +585,7 @@
       end
 
       def test_get_single_none
-        assert_equal(nil, @msg.get_single(@type_a))
+        assert_nil(@msg.get_single(@type_a))
       end
 
       def test_get_single_extra
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/test/test_consumer.rb new/test/test_consumer.rb
--- old/test/test_consumer.rb   2015-03-05 13:51:44.000000000 +0100
+++ new/test/test_consumer.rb   2019-10-16 14:21:19.000000000 +0200
@@ -16,7 +16,7 @@
           assert_equal(:endpoint, ep)
           consumer.send(:cleanup_last_requested_endpoint)
           ep = consumer.send(:last_requested_endpoint)
-          assert_equal(nil, ep)
+          assert_nil(ep)
         end
       end
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/test/test_discover.rb new/test/test_discover.rb
--- old/test/test_discover.rb   2015-03-05 13:51:44.000000000 +0100
+++ new/test/test_discover.rb   2019-10-16 14:21:19.000000000 +0200
@@ -724,8 +724,8 @@
     end
 
     def test_noIdentifiers
-      assert_equal(@endpoint.get_local_id, nil)
-      assert_equal(@endpoint.claimed_id, nil)
+      assert_nil(@endpoint.get_local_id)
+      assert_nil(@endpoint.claimed_id)
     end
 
     def test_compatibility
@@ -733,7 +733,7 @@
     end
 
     def test_canonical_id
-      assert_equal(@endpoint.canonical_id, nil)
+      assert_nil(@endpoint.canonical_id)
     end
 
     def test_serverURL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/test/test_discovery_manager.rb 
new/test/test_discovery_manager.rb
--- old/test/test_discovery_manager.rb  2015-03-05 13:51:44.000000000 +0100
+++ new/test/test_discovery_manager.rb  2019-10-16 14:21:19.000000000 +0200
@@ -21,8 +21,8 @@
       assert_equal(@disco_services.next, @services[1])
       assert_equal(@disco_services.current, @services[1])
 
-      assert_equal(@disco_services.next, nil)
-      assert_equal(@disco_services.current, nil)
+      assert_nil(@disco_services.next)
+      assert_nil(@disco_services.current)
     end
 
     def test_for_url
@@ -84,7 +84,7 @@
     end
 
     def test_get_next_service
-      assert_equal(@session[@key], nil)
+      assert_nil(@session[@key])
 
       next_service = @manager.get_next_service {
         [@yadis_url, ["one", "two", "three"]]
@@ -123,24 +123,24 @@
         ["unused", []]
       }
 
-      assert_equal(result, nil)
+      assert_nil(result)
     end
 
     def test_cleanup
       # With no preexisting manager, cleanup() returns nil.
-      assert_equal(@manager.cleanup, nil)
+      assert_nil(@manager.cleanup)
 
       # With a manager, it returns the manager's current service.
       disco = Consumer::DiscoveredServices.new(@url, @yadis_url, ["one", 
"two"])
 
       @session[@key] = disco
-      assert_equal(@manager.cleanup, nil)
-      assert_equal(@session[@key], nil)
+      assert_nil(@manager.cleanup)
+      assert_nil(@session[@key])
 
       disco.next
       @session[@key] = disco
       assert_equal(@manager.cleanup, "one")
-      assert_equal(@session[@key], nil)
+      assert_nil(@session[@key])
 
       # The force parameter should be passed through to get_manager
       # and destroy_manager.
@@ -178,7 +178,7 @@
       disco2 = Consumer::DiscoveredServices.new("http://not.this.url.com/";,
                                                 "http://other.yadis.url/";, 
["one"])
       @session[@key] = disco2
-      assert_equal(@manager.get_manager, nil)
+      assert_nil(@manager.get_manager)
       assert_equal(@manager.get_manager(true), disco2)
     end
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/test/test_message.rb new/test/test_message.rb
--- old/test/test_message.rb    2015-03-05 13:51:44.000000000 +0100
+++ new/test/test_message.rb    2019-10-16 14:21:19.000000000 +0200
@@ -10,12 +10,14 @@
     # Tests a standard set of behaviors of Message.get_arg with
     # variations on handling defaults.
     def get_arg_tests(ns, key, expected=nil)
-      assert_equal(expected, @m.get_arg(ns, key))
-
       if expected.nil?
+        assert_nil(@m.get_arg(ns, key))
+
         assert_equal(@m.get_arg(ns, key, :a_default), :a_default)
         assert_raises(Message::KeyNotFound) { @m.get_arg(ns, key, NO_DEFAULT) }
       else
+        assert_equal(expected, @m.get_arg(ns, key))
+
         assert_equal(@m.get_arg(ns, key, :a_default), expected)
         assert_equal(@m.get_arg(ns, key, NO_DEFAULT), expected)
       end
@@ -73,7 +75,7 @@
     end
 
     def test_get_openid
-      assert_equal(nil, @m.get_openid_namespace)
+      assert_nil(@m.get_openid_namespace)
     end
 
     def test_get_key_openid
@@ -87,15 +89,15 @@
     end
 
     def test_get_key_ns1
-      assert_equal(nil, @m.get_key(OPENID1_NS, 'foo'))
+      assert_nil(@m.get_key(OPENID1_NS, 'foo'))
     end
 
     def test_get_key_ns2
-      assert_equal(nil, @m.get_key(OPENID2_NS, 'foo'))
+      assert_nil(@m.get_key(OPENID2_NS, 'foo'))
     end
 
     def test_get_key_ns3
-      assert_equal(nil, @m.get_key('urn:something-special', 'foo'))
+      assert_nil(@m.get_key('urn:something-special', 'foo'))
     end
 
     def test_has_key
@@ -202,7 +204,7 @@
     def _test_set_arg_ns(ns)
       key = 'Camper Van Beethoven'
       value = 'David Lowery'
-      assert_equal(nil, @m.get_arg(ns, key))
+      assert_nil(@m.get_arg(ns, key))
       @m.set_arg(ns, key, value)
       assert_equal(value, @m.get_arg(ns, key))
     end
@@ -228,7 +230,7 @@
 
     def _test_del_arg_ns(ns)
       key = 'Fleeting Joys'
-      assert_equal(nil, @m.del_arg(ns, key))
+      assert_nil(@m.del_arg(ns, key))
     end
 
     def test_del_arg_bare
@@ -362,11 +364,11 @@
     end
 
     def test_get_key_ns2
-      assert_equal(nil, @m.get_key(OPENID2_NS, 'mode'))
+      assert_nil(@m.get_key(OPENID2_NS, 'mode'))
     end
 
     def test_get_key_ns3
-      assert_equal(nil, @m.get_key('urn:xxx', 'mode'))
+      assert_nil(@m.get_key('urn:xxx', 'mode'))
     end
 
     def test_has_key
@@ -461,7 +463,7 @@
     def _test_set_arg_ns(ns)
       key = 'awesometown'
       value = 'funny'
-      assert_equal(nil, @m.get_arg(ns,key))
+      assert_nil(@m.get_arg(ns,key))
       @m.set_arg(ns, key, value)
       assert_equal(value, @m.get_arg(ns,key))
     end
@@ -478,7 +480,7 @@
       @m.set_arg(ns, key, value)
       assert_equal(value, @m.get_arg(ns,key))
       @m.del_arg(ns,key)
-      assert_equal(nil, @m.get_arg(ns,key))
+      assert_nil(@m.get_arg(ns,key))
     end
 
     def test_del_arg; _test_del_arg_ns(OPENID_NS); end
@@ -702,7 +704,7 @@
     end
 
     def test_get_key_ns1
-      assert_equal(nil, @m.get_key(OPENID1_NS, 'mode'))
+      assert_nil(@m.get_key(OPENID1_NS, 'mode'))
     end
 
     def test_get_key_ns2
@@ -710,7 +712,7 @@
     end
 
     def test_get_key_ns3
-      assert_equal(nil, @m.get_key('urn:xxx', 'mode'))
+      assert_nil(@m.get_key('urn:xxx', 'mode'))
     end
 
     def test_has_key_openid
@@ -739,11 +741,11 @@
     end
 
     def test_get_arg_bare
-      assert_equal(nil, @m.get_arg(BARE_NS,'mode'))
+      assert_nil(@m.get_arg(BARE_NS,'mode'))
     end
 
     def test_get_arg_ns1
-      assert_equal(nil, @m.get_arg(OPENID1_NS,'mode'))
+      assert_nil(@m.get_arg(OPENID1_NS,'mode'))
     end
 
     def test_get_arg_ns2
@@ -751,7 +753,7 @@
     end
 
     def test_get_arg_ns3
-      assert_equal(nil, @m.get_arg('urn:bananastand','mode'))
+      assert_nil(@m.get_arg('urn:bananastand','mode'))
     end
 
     def test_get_args_openid
@@ -813,7 +815,7 @@
     def _test_set_arg_ns(ns)
       key = "logan's"
       value = "run"
-      assert_equal(nil, @m.get_arg(ns,key))
+      assert_nil(@m.get_arg(ns,key))
       @m.set_arg(ns, key, value)
       assert_equal(value, @m.get_arg(ns,key))
     end
@@ -851,11 +853,11 @@
     def _test_del_arg_ns(ns)
       key = 'no'
       value = 'socks'
-      assert_equal(nil, @m.get_arg(ns, key))
+      assert_nil(@m.get_arg(ns, key))
       @m.set_arg(ns, key, value)
       assert_equal(value, @m.get_arg(ns, key))
       @m.del_arg(ns, key)
-      assert_equal(nil, @m.get_arg(ns, key))
+      assert_nil(@m.get_arg(ns, key))
     end
 
     def test_del_arg_openid; _test_del_arg_ns(OPENID_NS); end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/test/test_oauth.rb new/test/test_oauth.rb
--- old/test/test_oauth.rb      2015-03-05 13:51:44.000000000 +0100
+++ new/test/test_oauth.rb      2019-10-16 14:21:19.000000000 +0200
@@ -143,7 +143,6 @@
           'mode' => 'id_res',
           'ns' => OPENID2_NS,
           'ns.oauth' => OAuth::NS_URI,
-          'ns.oauth' => OAuth::NS_URI,
           'oauth.request_token' => 'REQUESTTOKEN',
           'oauth.scope' => "http://sample.com/some_scope";
         })
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/test/test_pape.rb new/test/test_pape.rb
--- old/test/test_pape.rb       2015-03-05 13:51:44.000000000 +0100
+++ new/test/test_pape.rb       2019-10-16 14:21:19.000000000 +0200
@@ -13,7 +13,7 @@
 
       def test_construct
         assert_equal([], @req.preferred_auth_policies)
-        assert_equal(nil, @req.max_auth_age)
+        assert_nil(@req.max_auth_age)
         assert_equal('pape', @req.ns_alias)
 
         req2 = PAPE::Request.new([PAPE::AUTH_MULTI_FACTOR], 1000)
@@ -53,7 +53,7 @@
 
       def test_parse_extension_args_empty
         @req.parse_extension_args({})
-        assert_equal(nil, @req.max_auth_age)
+        assert_nil(@req.max_auth_age)
         assert_equal([], @req.preferred_auth_policies)
       end
 
@@ -110,9 +110,9 @@
 
       def test_construct
         assert_equal([], @req.auth_policies)
-        assert_equal(nil, @req.auth_time)
+        assert_nil(@req.auth_time)
         assert_equal('pape', @req.ns_alias)
-        assert_equal(nil, @req.nist_auth_level)
+        assert_nil(@req.nist_auth_level)
 
         req2 = PAPE::Response.new([PAPE::AUTH_MULTI_FACTOR], 
"1983-11-05T12:30:24Z", 3)
         assert_equal([PAPE::AUTH_MULTI_FACTOR], req2.auth_policies)
@@ -168,7 +168,7 @@
 
       def test_parse_extension_args_empty
         @req.parse_extension_args({})
-        assert_equal(nil, @req.auth_time)
+        assert_nil(@req.auth_time)
         assert_equal([], @req.auth_policies)
       end
 
@@ -205,8 +205,8 @@
                 'nist_auth_level' => 'some'}
         @req.parse_extension_args(args)
         assert_equal(['http://foo','http://bar'], @req.auth_policies)
-        assert_equal(nil, @req.auth_time)
-        assert_equal(nil, @req.nist_auth_level)
+        assert_nil(@req.auth_time)
+        assert_nil(@req.nist_auth_level)
       end
 
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/test/test_responses.rb new/test/test_responses.rb
--- old/test/test_responses.rb  2015-03-05 13:51:44.000000000 +0100
+++ new/test/test_responses.rb  2019-10-16 14:21:19.000000000 +0200
@@ -55,7 +55,7 @@
           # Not all args in this NS are signed, so expect nil when
           # asking for them.
           utargs = resp.extension_response('urn:unittest', true)
-          assert_equal(nil, utargs)
+          assert_nil(utargs)
         end
       end
     end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/test/test_server.rb new/test/test_server.rb
--- old/test/test_server.rb     2015-03-05 13:51:44.000000000 +0100
+++ new/test/test_server.rb     2019-10-16 14:21:19.000000000 +0200
@@ -142,7 +142,7 @@
     def test_no_message
       e = Server::ProtocolError.new(nil, "no message")
       assert(e.get_return_to.nil?)
-      assert_equal(e.which_encoding, nil)
+      assert_nil(e.which_encoding)
     end
 
     def test_which_encoding_no_message
@@ -167,7 +167,7 @@
     def test_none
       args = {}
       r = @decode.call(args)
-      assert_equal(r, nil)
+      assert_nil(r)
     end
 
     def test_irrelevant
@@ -350,7 +350,7 @@
       assert(r.is_a?(Server::CheckIDRequest))
       assert_equal(r.mode, "checkid_setup")
       assert_equal(r.immediate, false)
-      assert_equal(r.identity, nil)
+      assert_nil(r.identity)
       assert_equal(r.trust_root, @tr_url)
       assert_equal(r.return_to, @rt_url)
     end
@@ -1896,9 +1896,9 @@
       response = @request.answer_unsupported(message)
       rfg = lambda { |f| response.fields.get_arg(OPENID_NS, f) }
       assert_equal(rfg.call('error_code'), 'unsupported-type')
-      assert_equal(rfg.call('assoc_type'), nil)
+      assert_nil(rfg.call('assoc_type'))
       assert_equal(rfg.call('error'), message)
-      assert_equal(rfg.call('session_type'), nil)
+      assert_nil(rfg.call('session_type'))
     end
 
     def test_openid1_unsupported_explode
@@ -2323,8 +2323,7 @@
     def test_getAssocInvalid
       ah = 'no-such-handle'
       silence_logging {
-        assert_equal(
-                     @signatory.get_association(ah, false), nil)
+        assert_nil(@signatory.get_association(ah, false))
       }
       # assert(!@messages, @messages)
     end
@@ -2333,8 +2332,7 @@
       # getAssociation(dumb=False) cannot get a dumb assoc
       assoc_handle = makeAssoc(true)
       silence_logging {
-        assert_equal(
-                     @signatory.get_association(assoc_handle, false), nil)
+        assert_nil(@signatory.get_association(assoc_handle, false))
       }
       # @failIf(@messages, @messages)
     end
@@ -2348,8 +2346,7 @@
       #   MAC keys.
       assoc_handle = makeAssoc(false)
       silence_logging {
-        assert_equal(
-                     @signatory.get_association(assoc_handle, true), nil)
+        assert_nil(@signatory.get_association(assoc_handle, true))
       }
       # @failIf(@messages, @messages)
     end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/test/test_sreg.rb new/test/test_sreg.rb
--- old/test/test_sreg.rb       2015-03-05 13:51:44.000000000 +0100
+++ new/test/test_sreg.rb       2019-10-16 14:21:19.000000000 +0200
@@ -154,7 +154,7 @@
           req = Request.new
           assert_equal([], req.optional)
           assert_equal([], req.required)
-          assert_equal(nil, req.policy_url)
+          assert_nil(req.policy_url)
           assert_equal(NS_URI, req.ns_uri)
         end
 
@@ -476,4 +476,3 @@
     end
   end
 end
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/test/test_stores.rb new/test/test_stores.rb
--- old/test/test_stores.rb     2015-03-05 13:51:44.000000000 +0100
+++ new/test/test_stores.rb     2019-10-16 14:21:19.000000000 +0200
@@ -218,7 +218,7 @@
       include StoreTestCase
 
       def setup
-        raise "filestoretest directory exists" if File.exists?('filestoretest')
+        raise "filestoretest directory exists" if File.exist?('filestoretest')
         @store = Filesystem.new('filestoretest')
       end
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/test/test_yadis_discovery.rb 
new/test/test_yadis_discovery.rb
--- old/test/test_yadis_discovery.rb    2015-03-05 13:51:44.000000000 +0100
+++ new/test/test_yadis_discovery.rb    2019-10-16 14:21:19.000000000 +0200
@@ -201,7 +201,7 @@
       def test_no_content_type
         with_fetcher(NoContentTypeFetcher.new) do
           result = Yadis.discover("http://bogus";)
-          assert_equal(nil, result.content_type)
+          assert_nil(result.content_type)
         end
       end
 


Reply via email to