cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix new rubocop warnings

Browse source
This commit is contained in:
Tom Hughes 2020-07-07 10:44:52 +01:00
parent 1ea946636b
commit 9f993fe8c8
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

@ -235,7 +235,7 @@ class ApplicationController < ActionController::Base
e = e.cause
if e.is_a?(Timeout::Error) ||
(e.is_a?(ActiveRecord::StatementInvalid) && e.message =~ /execution expired/)
(e.is_a?(ActiveRecord::StatementInvalid) && e.message.include?("execution expired"))
render :action => "timeout"
else
raise

24
app/models/trace.rb
View file

@ -120,10 +120,10 @@ class Trace < ApplicationRecord
def mime_type
filetype = Open3.capture2("/usr/bin/file", "-Lbz", trace_name).first.chomp
gzipped = filetype =~ /gzip compressed/
bzipped = filetype =~ /bzip2 compressed/
zipped = filetype =~ /Zip archive/
tarred = filetype =~ /tar archive/
gzipped = filetype.include?("gzip compressed")
bzipped = filetype.include?("bzip2 compressed")
zipped = filetype.include?("Zip archive")
tarred = filetype.include?("tar archive")
mimetype = if gzipped
"application/x-gzip"
@ -142,10 +142,10 @@ class Trace < ApplicationRecord
def extension_name
filetype = Open3.capture2("/usr/bin/file", "-Lbz", trace_name).first.chomp
gzipped = filetype =~ /gzip compressed/
bzipped = filetype =~ /bzip2 compressed/
zipped = filetype =~ /Zip archive/
tarred = filetype =~ /tar archive/
gzipped = filetype.include?("gzip compressed")
bzipped = filetype.include?("bzip2 compressed")
zipped = filetype.include?("Zip archive")
tarred = filetype.include?("tar archive")
extension = if tarred && gzipped
".tar.gz"
@ -211,10 +211,10 @@ class Trace < ApplicationRecord
def xml_file
filetype = Open3.capture2("/usr/bin/file", "-Lbz", trace_name).first.chomp
gzipped = filetype =~ /gzip compressed/
bzipped = filetype =~ /bzip2 compressed/
zipped = filetype =~ /Zip archive/
tarred = filetype =~ /tar archive/
gzipped = filetype.include?("gzip compressed")
bzipped = filetype.include?("bzip2 compressed")
zipped = filetype.include?("Zip archive")
tarred = filetype.include?("tar archive")
if gzipped || bzipped || zipped || tarred
file = Tempfile.new("trace.#{id}")

2
config/initializers/eslint.rb
View file

@ -3,7 +3,7 @@ if defined?(ESLintRails::Runner)
module ESLintRails
module ExcludeI18n
def assets
super.reject { |a| a.to_s =~ %r{/i18n/} }
super.reject { |a| a.to_s.include?("/i18n/") }
end
end
end

4
lib/password_hash.rb
View file

@ -18,7 +18,7 @@ module PasswordHash
def self.check(hash, salt, candidate)
if salt.nil?
candidate = Digest::MD5.hexdigest(candidate)
elsif salt.match?(/!/)
elsif salt.include?("!")
algorithm, iterations, salt = salt.split("!")
size = Base64.strict_decode64(hash).length
candidate = self.hash(candidate, salt, iterations.to_i, size, algorithm)
@ -32,7 +32,7 @@ module PasswordHash
def self.upgrade?(hash, salt)
if salt.nil?
return true
elsif salt.match?(/!/)
elsif salt.include?("!")
algorithm, iterations, salt = salt.split("!")
return true if Base64.strict_decode64(salt).length != SALT_BYTE_SIZE
return true if Base64.strict_decode64(hash).length != HASH_BYTE_SIZE