🚨 More linting

Author: pboling

.rubocop_gradual.lock

@@ -1,22 +1,22 @@
 #!/usr/bin/env rake
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 
-require 'rake/testtask'
+require "rake/testtask"
 
-desc 'Run tests'
-Rake::TestTask.new('test') do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.test_files = FileList['test/**/test_*.rb']
+desc "Run tests"
+Rake::TestTask.new("test") do |t|
+  t.libs << "lib"
+  t.libs << "test"
+  t.test_files = FileList["test/**/test_*.rb"]
   t.verbose = false
 end
 
 begin
-  require 'rubocop/lts'
+  require "rubocop/lts"
   Rubocop::Lts.install_tasks
 rescue LoadError
   task(:rubocop_gradual) do
-    warn('RuboCop (Gradual) is disabled')
+    warn("RuboCop (Gradual) is disabled")
   end
 end
 

Rakefile

@@ -1,18 +1,18 @@
 #!/usr/bin/env ruby
 
-require 'openid/consumer/associationmanager'
-require 'openid/store/memory'
+require "openid/consumer/associationmanager"
+require "openid/store/memory"
 
 store = OpenID::Store::Memory.new
 ARGV.each do |server_url|
-  unless URI::DEFAULT_PARSER.make_regexp =~ server_url
+  unless URI::DEFAULT_PARSER.make_regexp&.match?(server_url)
     puts "`#{server_url}` will be skipped for invalid URI format."
     next
   end
 
   mgr = OpenID::Consumer::AssociationManager.new(store, server_url)
-  puts '=' * 50
+  puts "=" * 50
   puts "Server: #{server_url}"
   puts mgr.get_association.serialize
-  puts '-' * 50
+  puts "-" * 50
 end

admin/mkassoc

@@ -1,24 +1,24 @@
 # Use this migration to create the tables for the ActiveRecord store
 class AddOpenIdStoreToDb < ActiveRecord::Migration
   def self.up
-    create_table 'open_id_associations', force: true do |t|
-      t.column 'server_url', :string, null: false
-      t.column 'handle', :string, null: false
-      t.column 'secret', :binary, null: false
-      t.column 'issued', :integer, null: false
-      t.column 'lifetime', :integer, null: false
-      t.column 'assoc_type', :string, null: false
+    create_table("open_id_associations", force: true) do |t|
+      t.column("server_url", :string, null: false)
+      t.column("handle", :string, null: false)
+      t.column("secret", :binary, null: false)
+      t.column("issued", :integer, null: false)
+      t.column("lifetime", :integer, null: false)
+      t.column("assoc_type", :string, null: false)
     end
 
-    create_table 'open_id_nonces', force: true do |t|
-      t.column :server_url, :string, null: false
-      t.column :timestamp, :integer, null: false
-      t.column :salt, :string, null: false
+    create_table("open_id_nonces", force: true) do |t|
+      t.column(:server_url, :string, null: false)
+      t.column(:timestamp, :integer, null: false)
+      t.column(:salt, :string, null: false)
     end
   end
 
   def self.down
-    drop_table 'open_id_associations'
-    drop_table 'open_id_nonces'
+    drop_table("open_id_associations")
+    drop_table("open_id_nonces")
   end
 end

examples/active_record_openid_store/XXX_add_open_id_store_to_db.rb

@@ -2,25 +2,25 @@
 # to the new 2.0 schema.
 class UpgradeOpenIdStore < ActiveRecord::Migration
   def self.up
-    drop_table 'open_id_settings'
-    drop_table 'open_id_nonces'
-    create_table 'open_id_nonces', force: true do |t|
-      t.column :server_url, :string, null: false
-      t.column :timestamp, :integer, null: false
-      t.column :salt, :string, null: false
+    drop_table("open_id_settings")
+    drop_table("open_id_nonces")
+    create_table("open_id_nonces", force: true) do |t|
+      t.column(:server_url, :string, null: false)
+      t.column(:timestamp, :integer, null: false)
+      t.column(:salt, :string, null: false)
     end
   end
 
   def self.down
-    drop_table 'open_id_nonces'
-    create_table 'open_id_nonces', force: true do |t|
-      t.column 'nonce', :string
-      t.column 'created', :integer
+    drop_table("open_id_nonces")
+    create_table("open_id_nonces", force: true) do |t|
+      t.column("nonce", :string)
+      t.column("created", :integer)
     end
 
-    create_table 'open_id_settings', force: true do |t|
-      t.column 'setting', :string
-      t.column 'value', :binary
+    create_table("open_id_settings", force: true) do |t|
+      t.column("setting", :string)
+      t.column("value", :binary)
     end
   end
 end

examples/active_record_openid_store/XXX_upgrade_open_id_store.rb

@@ -1,8 +1,8 @@
 # might using the ruby-openid gem
 begin
-  require 'rubygems'
+  require "rubygems"
 rescue LoadError
   nil
 end
-require 'openid'
-require 'openid_ar_store'
+require "openid"
+require "openid_ar_store"

examples/active_record_openid_store/init.rb

@@ -1,8 +1,8 @@
-require 'openid/association'
-require 'time'
+require "openid/association"
+require "time"
 
 class Association < ActiveRecord::Base
-  set_table_name 'open_id_associations'
+  set_table_name "open_id_associations"
   def from_record
     OpenID::Association.new(handle, secret, Time.at(issued), lifetime, assoc_type)
   end

examples/active_record_openid_store/lib/association.rb

@@ -1,3 +1,3 @@
 class Nonce < ActiveRecord::Base
-  set_table_name 'open_id_nonces'
+  set_table_name "open_id_nonces"
 end

examples/active_record_openid_store/lib/nonce.rb

@@ -1,28 +1,30 @@
-require 'association'
-require 'nonce'
-require 'openid/store/interface'
+require "association"
+require "nonce"
+require "openid/store/interface"
 
 # not in OpenID module to avoid namespace conflict
 class ActiveRecordStore < OpenID::Store::Interface
   def store_association(server_url, assoc)
     remove_association(server_url, assoc.handle)
-    Association.create!(server_url: server_url,
-                        handle: assoc.handle,
-                        secret: assoc.secret,
-                        issued: assoc.issued.to_i,
-                        lifetime: assoc.lifetime,
-                        assoc_type: assoc.assoc_type)
+    Association.create!(
+      server_url: server_url,
+      handle: assoc.handle,
+      secret: assoc.secret,
+      issued: assoc.issued.to_i,
+      lifetime: assoc.lifetime,
+      assoc_type: assoc.assoc_type,
+    )
   end
 
   def get_association(server_url, handle = nil)
     assocs = if handle.blank?
-               Association.find_all_by_server_url(server_url)
-             else
-               Association.find_all_by_server_url_and_handle(server_url, handle)
-             end
+      Association.find_all_by_server_url(server_url)
+    else
+      Association.find_all_by_server_url_and_handle(server_url, handle)
+    end
 
     if assocs.any?
-      assocs.reverse.each do |assoc|
+      assocs.reverse_each do |assoc|
         a = assoc.from_record
         return a unless a.expires_in.zero?
 
@@ -34,7 +36,7 @@ def get_association(server_url, handle = nil)
   end
 
   def remove_association(server_url, handle)
-    Association.delete_all(['server_url = ? AND handle = ?', server_url, handle]) > 0
+    Association.delete_all(["server_url = ? AND handle = ?", server_url, handle]) > 0
   end
 
   def use_nonce(server_url, timestamp, salt)
@@ -47,11 +49,11 @@ def use_nonce(server_url, timestamp, salt)
 
   def cleanup_nonces
     now = Time.now.to_i
-    Nonce.delete_all(['timestamp > ? OR timestamp < ?', now + OpenID::Nonce.skew, now - OpenID::Nonce.skew])
+    Nonce.delete_all(["timestamp > ? OR timestamp < ?", now + OpenID::Nonce.skew, now - OpenID::Nonce.skew])
   end
 
   def cleanup_associations
     now = Time.now.to_i
-    Association.delete_all(['issued + lifetime < ?', now])
+    Association.delete_all(["issued + lifetime < ?", now])
   end
 end

examples/active_record_openid_store/lib/openid_ar_store.rb

@@ -1,11 +1,11 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'test/unit'
-RAILS_ENV = 'test'
-require File.expand_path(File.join(File.dirname(__FILE__), '../../../../config/environment.rb'))
+$:.unshift(File.dirname(__FILE__) + "/../lib")
+require "test/unit"
+RAILS_ENV = "test"
+require File.expand_path(File.join(File.dirname(__FILE__), "../../../../config/environment.rb"))
 
 module StoreTestCase
   @@allowed_handle = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~'
-  @@allowed_nonce = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+  @@allowed_nonce = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 
   def _gen_nonce
     OpenID::CryptUtil.random_string(8, @@allowed_nonce)
@@ -22,8 +22,13 @@ def _gen_secret(n, chars = nil)
   def _gen_assoc(issued, lifetime = 600)
     secret = _gen_secret(20)
     handle = _gen_handle(128)
-    OpenID::Association.new(handle, secret, Time.now + issued, lifetime,
-                            'HMAC-SHA1')
+    OpenID::Association.new(
+      handle,
+      secret,
+      Time.now + issued,
+      lifetime,
+      "HMAC-SHA1",
+    )
   end
 
   def _check_retrieve(url, handle = nil, expected = nil)
@@ -40,11 +45,12 @@ def _check_retrieve(url, handle = nil, expected = nil)
 
   def _check_remove(url, handle, expected)
     present = @store.remove_association(url, handle)
+
     assert_equal(expected, present)
   end
 
   def test_store
-    server_url = 'http://www.myopenid.com/openid'
+    server_url = "http://www.myopenid.com/openid"
     assoc = _gen_assoc(0)
 
     # Make sure that a missing association returns no result
@@ -62,10 +68,10 @@ def test_store
     _check_retrieve(server_url, nil, assoc)
 
     # Removing an association that does not exist returns not present
-    _check_remove(server_url, assoc.handle + 'x', false)
+    _check_remove(server_url, assoc.handle + "x", false)
 
     # Removing an association that does not exist returns not present
-    _check_remove(server_url + 'x', assoc.handle, false)
+    _check_remove(server_url + "x", assoc.handle, false)
 
     # Removing an association that is present returns present
     _check_remove(server_url, assoc.handle, true)
@@ -136,24 +142,26 @@ def test_store
     assoc_expired_2 = _gen_assoc(-7200, 3600)
 
     @store.cleanup_associations
-    @store.store_association(server_url + '1', assoc_valid_1)
-    @store.store_association(server_url + '1', assoc_expired_1)
-    @store.store_association(server_url + '2', assoc_expired_2)
-    @store.store_association(server_url + '3', assoc_valid_2)
+    @store.store_association(server_url + "1", assoc_valid_1)
+    @store.store_association(server_url + "1", assoc_expired_1)
+    @store.store_association(server_url + "2", assoc_expired_2)
+    @store.store_association(server_url + "3", assoc_valid_2)
 
     cleaned = @store.cleanup_associations
-    assert_equal(2, cleaned, 'cleaned up associations')
+
+    assert_equal(2, cleaned, "cleaned up associations")
   end
 
-  def _check_use_nonce(nonce, expected, server_url, msg = '')
+  def _check_use_nonce(nonce, expected, server_url, msg = "")
     stamp, salt = OpenID::Nonce.split_nonce(nonce)
     actual = @store.use_nonce(server_url, stamp, salt)
+
     assert_equal(expected, actual, msg)
   end
 
   def test_nonce
-    server_url = 'http://www.myopenid.com/openid'
-    [server_url, ''].each do |url|
+    server_url = "http://www.myopenid.com/openid"
+    [server_url, ""].each do |url|
       nonce1 = OpenID::Nonce.mk_nonce
 
       _check_use_nonce(nonce1, true, url, "#{url}: nonce allowed by default")
@@ -175,23 +183,30 @@ def test_nonce
     @store.cleanup_nonces
     OpenID::Nonce.skew = 1_000_000
     ts, salt = OpenID::Nonce.split_nonce(old_nonce1)
-    assert(@store.use_nonce(server_url, ts, salt), 'oldnonce1')
+
+    assert(@store.use_nonce(server_url, ts, salt), "oldnonce1")
     ts, salt = OpenID::Nonce.split_nonce(old_nonce2)
-    assert(@store.use_nonce(server_url, ts, salt), 'oldnonce2')
+
+    assert(@store.use_nonce(server_url, ts, salt), "oldnonce2")
     ts, salt = OpenID::Nonce.split_nonce(recent_nonce)
-    assert(@store.use_nonce(server_url, ts, salt), 'recent_nonce')
+
+    assert(@store.use_nonce(server_url, ts, salt), "recent_nonce")
 
     OpenID::Nonce.skew = 1000
     cleaned = @store.cleanup_nonces
+
     assert_equal(2, cleaned, "Cleaned #{cleaned} nonces")
 
     OpenID::Nonce.skew = 100_000
     ts, salt = OpenID::Nonce.split_nonce(old_nonce1)
-    assert(@store.use_nonce(server_url, ts, salt), 'oldnonce1 after cleanup')
+
+    assert(@store.use_nonce(server_url, ts, salt), "oldnonce1 after cleanup")
     ts, salt = OpenID::Nonce.split_nonce(old_nonce2)
-    assert(@store.use_nonce(server_url, ts, salt), 'oldnonce2 after cleanup')
+
+    assert(@store.use_nonce(server_url, ts, salt), "oldnonce2 after cleanup")
     ts, salt = OpenID::Nonce.split_nonce(recent_nonce)
-    assert(!@store.use_nonce(server_url, ts, salt), 'recent_nonce after cleanup')
+
+    assert(!@store.use_nonce(server_url, ts, salt), "recent_nonce after cleanup")
 
     OpenID::Nonce.skew = orig_skew
   end