meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

code cleanup: rubocop: fix Lint/IneffectiveAccessModifier in app/models/mailer.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@18778 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2019-10-19 13:33:21 +00:00
parent 7738078717
commit b0e28db7c7
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.rubocop_todo.yml
View File

@ -393,7 +393,6 @@ Lint/IneffectiveAccessModifier:
- 'app/models/attachment.rb' - 'app/models/attachment.rb'
- 'app/models/issue.rb' - 'app/models/issue.rb'
- 'app/models/mail_handler.rb' - 'app/models/mail_handler.rb'
- 'app/models/mailer.rb'
- 'app/models/user.rb' - 'app/models/user.rb'
Lint/InterpolationCheck: Lint/InterpolationCheck:

43
app/models/mailer.rb
View File

@ -742,28 +742,31 @@ class Mailer < ActionMailer::Base
h.each { |k,v| headers["X-Redmine-#{k}"] = v.to_s } h.each { |k,v| headers["X-Redmine-#{k}"] = v.to_s }
end end
def self.token_for(object, user) # Singleton class method is public
timestamp = object.send(object.respond_to?(:created_on) ? :created_on : :updated_on) class << self
hash = [ def token_for(object, user)
"redmine", timestamp = object.send(object.respond_to?(:created_on) ? :created_on : :updated_on)
"#{object.class.name.demodulize.underscore}-#{object.id}", hash = [
timestamp.utc.strftime("%Y%m%d%H%M%S") "redmine",
] "#{object.class.name.demodulize.underscore}-#{object.id}",
hash << user.id if user timestamp.utc.strftime("%Y%m%d%H%M%S")
host = Setting.mail_from.to_s.strip.gsub(%r{^.*@|>}, '') ]
host = "#{::Socket.gethostname}.redmine" if host.empty? hash << user.id if user
"#{hash.join('.')}@#{host}" host = Setting.mail_from.to_s.strip.gsub(%r{^.*@|>}, '')
end host = "#{::Socket.gethostname}.redmine" if host.empty?
"#{hash.join('.')}@#{host}"
end
# Returns a Message-Id for the given object # Returns a Message-Id for the given object
def self.message_id_for(object, user) def message_id_for(object, user)
token_for(object, user) token_for(object, user)
end end
# Returns a uniq token for a given object referenced by all notifications # Returns a uniq token for a given object referenced by all notifications
# related to this object # related to this object
def self.references_for(object, user) def references_for(object, user)
token_for(object, user) token_for(object, user)
end
end end
def message_id(object) def message_id(object)