From 8f54cf18f56b886abb9e5358b3ab00b9dd49a1f4 Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Thu, 7 May 2015 12:11:45 +0200 Subject: [PATCH] Corrected with rubocop cop 'Style/NilComparison'. --- .rubocop.yml | 5 ----- app/controllers/rss_controller.rb | 2 +- app/models/application_model.rb | 6 +++--- app/models/channel/email_parser.rb | 2 +- app/models/history.rb | 6 +++--- app/models/observer/ticket/article/communicate_email.rb | 2 +- app/models/observer/ticket/article/communicate_facebook.rb | 2 +- app/models/observer/ticket/article/communicate_twitter.rb | 2 +- app/models/observer/ticket/article/fillup_from_email.rb | 2 +- app/models/observer/ticket/article/fillup_from_general.rb | 2 +- app/models/observer/ticket/article_changes.rb | 4 ++-- app/models/store/file.rb | 2 +- app/models/ticket/escalation.rb | 2 +- lib/auth/ldap.rb | 2 +- 14 files changed, 18 insertions(+), 23 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 96629d76c..54a14b13e 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -186,11 +186,6 @@ Rails/FindBy: Description: 'Prefer find_by over where.first.' Enabled: false -Style/NilComparison: - Description: 'Prefer x.nil? to x == nil.' - StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#predicate-methods' - Enabled: false - Style/SymbolProc: Description: 'Use symbols as procs instead of blocks when possible.' Enabled: false diff --git a/app/controllers/rss_controller.rb b/app/controllers/rss_controller.rb index 256505bdb..832124e3a 100644 --- a/app/controllers/rss_controller.rb +++ b/app/controllers/rss_controller.rb @@ -20,7 +20,7 @@ curl http://localhost/api/v1/rss_fetch.json -v -u #{login}:#{password} -H "Conte def fetch items = Rss.fetch(params[:url], params[:limit]) - if items == nil + if items.nil? render json: { message: "failed to fetch #{ params[:url] }", status: :unprocessable_entity } return end diff --git a/app/models/application_model.rb b/app/models/application_model.rb index de075ac36..06e23506c 100644 --- a/app/models/application_model.rb +++ b/app/models/application_model.rb @@ -69,7 +69,7 @@ returns def self.param_cleanup(params, newObject = false) - if params == nil + if params.nil? raise "No params for #{self}!" end @@ -467,7 +467,7 @@ end key = "#{self.new.class.name}_latest_change" expires_in = 31_536_000 # 1 year - if updated_at == nil + if updated_at.nil? Cache.delete( key ) else Cache.write( key, updated_at, { expires_in: expires_in } ) @@ -1037,7 +1037,7 @@ get assets of object list def attachments_buffer_check # do nothing if no attachment exists - return 1 if attachments_buffer == nil + return 1 if attachments_buffer.nil? # store attachments article_store = [] diff --git a/app/models/channel/email_parser.rb b/app/models/channel/email_parser.rb index f03a6de8c..a4869fff7 100644 --- a/app/models/channel/email_parser.rb +++ b/app/models/channel/email_parser.rb @@ -508,7 +508,7 @@ class Channel::EmailParser # fillup %w(firstname lastname).each { |item| - if data[item.to_sym] == nil + if data[item.to_sym].nil? data[item.to_sym] = '' end } diff --git a/app/models/history.rb b/app/models/history.rb index 0526bb93b..016796eee 100644 --- a/app/models/history.rb +++ b/app/models/history.rb @@ -185,11 +185,11 @@ returns data.delete('history_attribute_id') data.delete( 'updated_at' ) - if data['id_to'] == nil && data['id_from'] == nil + if data['id_to'].nil? && data['id_from'].nil? data.delete( 'id_to' ) data.delete( 'id_from' ) end - if data['value_to'] == nil && data['value_from'] == nil + if data['value_to'].nil? && data['value_from'].nil? data.delete( 'value_to' ) data.delete( 'value_from' ) end @@ -198,7 +198,7 @@ returns end data.delete( 'related_history_object_id' ) - if data['related_o_id'] == nil + if data['related_o_id'].nil? data.delete( 'related_o_id' ) end diff --git a/app/models/observer/ticket/article/communicate_email.rb b/app/models/observer/ticket/article/communicate_email.rb index cf94e112d..b2efb34fd 100644 --- a/app/models/observer/ticket/article/communicate_email.rb +++ b/app/models/observer/ticket/article/communicate_email.rb @@ -10,7 +10,7 @@ class Observer::Ticket::Article::CommunicateEmail < ActiveRecord::Observer # if sender is customer, do not communication sender = Ticket::Article::Sender.lookup( id: record.sender_id ) - return 1 if sender == nil + return 1 if sender.nil? return 1 if sender['name'] == 'Customer' # only apply on emails diff --git a/app/models/observer/ticket/article/communicate_facebook.rb b/app/models/observer/ticket/article/communicate_facebook.rb index 82d6c56e9..ea6e4bf84 100644 --- a/app/models/observer/ticket/article/communicate_facebook.rb +++ b/app/models/observer/ticket/article/communicate_facebook.rb @@ -10,7 +10,7 @@ class Observer::Ticket::Article::CommunicateFacebook < ActiveRecord::Observer # if sender is customer, do not communication sender = Ticket::Article::Sender.lookup( id: record.sender_id ) - return 1 if sender == nil + return 1 if sender.nil? return 1 if sender['name'] == 'Customer' # only apply on emails diff --git a/app/models/observer/ticket/article/communicate_twitter.rb b/app/models/observer/ticket/article/communicate_twitter.rb index 8b38779ab..36fb70f44 100644 --- a/app/models/observer/ticket/article/communicate_twitter.rb +++ b/app/models/observer/ticket/article/communicate_twitter.rb @@ -10,7 +10,7 @@ class Observer::Ticket::Article::CommunicateTwitter < ActiveRecord::Observer # if sender is customer, do not communication sender = Ticket::Article::Sender.lookup( id: record.sender_id ) - return 1 if sender == nil + return 1 if sender.nil? return 1 if sender['name'] == 'Customer' # only apply on tweets diff --git a/app/models/observer/ticket/article/fillup_from_email.rb b/app/models/observer/ticket/article/fillup_from_email.rb index 08fcf3778..59f6adc22 100644 --- a/app/models/observer/ticket/article/fillup_from_email.rb +++ b/app/models/observer/ticket/article/fillup_from_email.rb @@ -10,7 +10,7 @@ class Observer::Ticket::Article::FillupFromEmail < ActiveRecord::Observer # if sender is customer, do not change anything sender = Ticket::Article::Sender.lookup( id: record.sender_id ) - return if sender == nil + return if sender.nil? return if sender['name'] == 'Customer' # set email attributes diff --git a/app/models/observer/ticket/article/fillup_from_general.rb b/app/models/observer/ticket/article/fillup_from_general.rb index 99a907159..f257b18e5 100644 --- a/app/models/observer/ticket/article/fillup_from_general.rb +++ b/app/models/observer/ticket/article/fillup_from_general.rb @@ -10,7 +10,7 @@ class Observer::Ticket::Article::FillupFromGeneral < ActiveRecord::Observer # if sender is customer, do not change anything sender = Ticket::Article::Sender.lookup( id: record.sender_id ) - return if sender == nil + return if sender.nil? return if sender['name'] == 'Customer' # set from if not given diff --git a/app/models/observer/ticket/article_changes.rb b/app/models/observer/ticket/article_changes.rb index f122f747d..d4beac442 100644 --- a/app/models/observer/ticket/article_changes.rb +++ b/app/models/observer/ticket/article_changes.rb @@ -73,8 +73,8 @@ class Observer::Ticket::ArticleChanges < ActiveRecord::Observer if sender.name == 'Customer' # check if last communication is done by agent, else do not set last_contact_customer - if record.ticket.last_contact_customer == nil || - record.ticket.last_contact_agent == nil || + if record.ticket.last_contact_customer.nil? || + record.ticket.last_contact_agent.nil? || record.ticket.last_contact_agent.to_i > record.ticket.last_contact_customer.to_i # set last_contact customer diff --git a/app/models/store/file.rb b/app/models/store/file.rb index 85d48f48b..794bd64de 100644 --- a/app/models/store/file.rb +++ b/app/models/store/file.rb @@ -10,7 +10,7 @@ class Store sha = Digest::SHA256.hexdigest( data ) file = Store::File.where( sha: sha ).first - if file == nil + if file.nil? # load backend based on config adapter_name = Setting.get('storage_provider') || 'DB' diff --git a/app/models/ticket/escalation.rb b/app/models/ticket/escalation.rb index 5eac458dd..d4c08ba41 100644 --- a/app/models/ticket/escalation.rb +++ b/app/models/ticket/escalation.rb @@ -175,7 +175,7 @@ returns def escalation_calculation_get_sla sla_selected = nil sla_list = Cache.get( 'SLA::List::Active' ) - if sla_list == nil + if sla_list.nil? sla_list = Sla.where( active: true ) Cache.write( 'SLA::List::Active', sla_list, { expires_in: 1.hour } ) end diff --git a/lib/auth/ldap.rb b/lib/auth/ldap.rb index f205911e6..836def97f 100644 --- a/lib/auth/ldap.rb +++ b/lib/auth/ldap.rb @@ -46,7 +46,7 @@ module Auth::Ldap end end - if user_dn == nil + if user_dn.nil? Rails.logger.info "ldap entry found for user '#{username}' with filter #{filter} failed!" return nil end