Corrected with rubocop cop 'Style/GuardClause'.

app/controllers/application_controller.rb

@@ -35,15 +35,17 @@ class ApplicationController < ActionController::Base
   # text/plain.
 
   def cors_preflight_check
-    if request.method == 'OPTIONS'
+
+    return if request.method != 'OPTIONS'
+
     headers['Access-Control-Allow-Origin']      = '*'
     headers['Access-Control-Allow-Methods']     = 'POST, GET, PUT, DELETE, OPTIONS'
     headers['Access-Control-Allow-Headers']     = 'Content-Type, Depth, User-Agent, X-File-Size, X-Requested-With, If-Modified-Since, X-File-Name, Cache-Control, Accept-Language'
     headers['Access-Control-Max-Age']           = '1728000'
     headers['Access-Control-Allow-Credentials'] = 'true'
     render text: '', content_type: 'text/plain'
-      return false
+
-    end
+    false
   end
 
   private
@@ -90,10 +92,10 @@ class ApplicationController < ActionController::Base
     end
 
     # fill user agent
-    if !session[:user_agent]
+    return if session[:user_agent]
+
     session[:user_agent] = request.env['HTTP_USER_AGENT']
   end
-  end
 
   def authentication_check_only
 

app/controllers/ticket_articles_controller.rb

@@ -159,7 +159,8 @@ class TicketArticlesController < ApplicationController
     )
 
     # find file
-    if list
+    return if !list
+
     file = Store.find(list.first)
     send_data(
       file.content,
@@ -168,6 +169,5 @@ class TicketArticlesController < ApplicationController
       disposition: 'inline'
     )
   end
-  end
 
 end

app/controllers/tickets_controller.rb

@@ -531,11 +531,11 @@ class TicketsController < ApplicationController
     end
 
     # remove attachments from upload cache
-    if form_id
+    return if !form_id
+
     Store.remove(
       object: 'UploadCache',
       o_id: form_id,
     )
   end
-  end
 end

app/models/application_model.rb

@@ -44,12 +44,12 @@ class ApplicationModel < ActiveRecord::Base
   @@import_class_list = ['Ticket', 'Ticket::Article', 'History', 'Ticket::State', 'Ticket::StateType', 'Ticket::Priority', 'Group', 'User', 'Role' ]
 
   def check_attributes_protected
-    if !Setting.get('system_init_done') || ( Setting.get('import_mode') && @@import_class_list.include?( self.class.to_s ) )
+
     # do noting, use id as it is
-    else
+    return if !Setting.get('system_init_done') || ( Setting.get('import_mode') && @@import_class_list.include?( self.class.to_s ) )
+
     self[:id] = nil
   end
-  end
 
 =begin
 
@@ -197,15 +197,16 @@ returns
         self.updated_by_id = UserInfo.current_user_id
       end
     end
-    if self.class.column_names.include? 'created_by_id'
+
-      if UserInfo.current_user_id
+    return if !self.class.column_names.include? 'created_by_id'
+
+    return if !UserInfo.current_user_id
+
     if self.created_by_id && self.created_by_id != UserInfo.current_user_id
       logger.info "NOTICE create - self.created_by_id is different: #{self.created_by_id.to_s}/#{UserInfo.current_user_id.to_s}"
     end
     self.created_by_id = UserInfo.current_user_id
   end
-    end
-  end
 
 =begin
 
@@ -223,10 +224,10 @@ returns
 
   def fill_up_user_update
     return if !self.class.column_names.include? 'updated_by_id'
-    if UserInfo.current_user_id
+    return if !UserInfo.current_user_id
+
     self.updated_by_id = UserInfo.current_user_id
   end
-  end
 
   def cache_update(o)
     #    puts 'u ' + self.class.to_s
@@ -268,13 +269,14 @@ returns
       key = self.class.to_s + ':f:' + self.name.to_s
       Cache.delete( key.to_s )
     end
-    if self[:login]
+
+    return if !self[:login]
+
     key = self.class.to_s + '::' + self.login.to_s
     Cache.delete( key.to_s )
     key = self.class.to_s + ':f:' + self.login.to_s
     Cache.delete( key.to_s )
   end
-  end
 
   def self.cache_set(data_id, data, full = false)
     if !full
@@ -962,10 +964,10 @@ store attachments for this object
     self.attachments_buffer = attachments
 
     # update if object already exists
-    if self.id && self.id != 0
+    return if !( self.id && self.id != 0 )
+
     attachments_buffer_check
   end
-  end
 
 =begin
 

app/models/channel/imap.rb

@@ -91,8 +91,9 @@ class Channel::IMAP < Channel::EmailParser
   end
 
   def disconnect
-    if @imap
+
+    return if !@imap
+
     @imap.disconnect()
   end
-  end
 end

app/models/channel/pop3.rb

@@ -72,9 +72,10 @@ class Channel::POP3 < Channel::EmailParser
   end
 
   def disconnect
-    if @pop
+
+    return if !@pop
+
     @pop.finish
   end
-  end
 
 end

app/models/channel/twitter2.rb

@@ -13,10 +13,11 @@ class Channel::TWITTER2
   end
 
   def disconnect
-    if @client
+
+    return if !@client
+
     @client = nil
   end
-  end
 
   def fetch (channel)
 
@@ -288,7 +289,8 @@ class Channel::TWITTER2
       return dm
     end
 
-    if attr[:type] == 'twitter status'
+    return if attr[:type] != 'twitter status'
+
     message = client.update(
       attr[:body].to_s,
       {
@@ -298,6 +300,4 @@ class Channel::TWITTER2
     #      puts message.inspect
     return message
   end
-
-  end
 end

app/models/observer/session.rb

@@ -15,11 +15,12 @@ class Observer::Session < ActiveRecord::Observer
   def check(record)
     return if !record.data
     return if record[:request_type]
+
     # remember request type
-    if record.data['request_type']
+    return if !record.data['request_type']
+
     record[:request_type] = record.data['request_type']
     record.data.delete('request_type')
   end
-  end
 
 end

app/models/observer/ticket/article/communicate_email/background_job.rb

@@ -44,7 +44,9 @@ class Observer::Ticket::Article::CommunicateEmail::BackgroundJob
         recipient_list += record[key]
       end
     }
-    if recipient_list != ''
+
+    return if recipient_list == ''
+
     History.add(
       o_id: record.id,
       history_type: 'email',
@@ -56,5 +58,4 @@ class Observer::Ticket::Article::CommunicateEmail::BackgroundJob
       created_by_id: record.created_by_id,
     )
   end
-  end
 end

app/models/observer/ticket/article/fillup_from_general.rb

@@ -14,9 +14,9 @@ class Observer::Ticket::Article::FillupFromGeneral < ActiveRecord::Observer
     return if sender['name'] == 'Customer'
 
     # set from if not given
-    if !record.from
+    return if record.from
+
     user        = User.find( record.created_by_id )
     record.from = "#{user.firstname} #{user.lastname}"
   end
-  end
 end

app/models/observer/ticket/last_contact.rb

@@ -31,7 +31,7 @@ class Observer::Ticket::LastContact < ActiveRecord::Observer
     end
 
     # if sender is not agent
-    if sender.name == 'Agent'
+    return if sender.name != 'Agent'
 
     # set last_contact_agent
     record.ticket.last_contact_agent = record.created_at
@@ -42,5 +42,4 @@ class Observer::Ticket::LastContact < ActiveRecord::Observer
     # save ticket
     record.ticket.save
   end
-  end
 end

app/models/observer/ticket/notification/background_job.rb

@@ -128,7 +128,8 @@ class Observer::Ticket::Notification::BackgroundJob
     end
 
     # add history record
-    if recipient_list != ''
+    return if recipient_list == ''
+
     History.add(
       o_id: ticket.id,
       history_type: 'notification',
@@ -137,7 +138,6 @@ class Observer::Ticket::Notification::BackgroundJob
       created_by_id: ticket.updated_by_id ||  1
     )
   end
-  end
 
   def human_changes(user, record)
 

app/models/observer/ticket/ref_object_touch.rb

@@ -40,8 +40,8 @@ class Observer::Ticket::RefObjectTouch < ActiveRecord::Observer
     end
 
     # touch new/current organization
-    if record.organization
+    return if !record.organization
+
     record.organization.touch
   end
-  end
 end

app/models/observer/ticket/user_ticket_counter.rb

@@ -42,9 +42,10 @@ class Observer::Ticket::UserTicketCounter < ActiveRecord::Observer
       need_update = true
       customer[:preferences][:tickets_closed] = tickets_closed
     end
-    if need_update
+
+    return if !need_update
+
     customer.save
   end
-  end
 
 end

app/models/setting.rb

@@ -58,10 +58,11 @@ class Setting < ApplicationModel
     self.state_initial = self.state
   end
   def state_check
-    if self.state || self.state == false
+
-      if !self.state.respond_to?('has_key?') || !self.state.has_key?(:value)
+    return if !(self.state || self.state == false)
+
+    return if !( !self.state.respond_to?('has_key?') || !self.state.has_key?(:value) )
+
     self.state = { value: self.state }
   end
-    end
-  end
 end

app/models/ticket.rb

@@ -201,22 +201,24 @@ returns
   end
 
   def check_title
-    if self.title
+
+    return if !self.title
+
     self.title.gsub!(/\s|\t|\r/, ' ')
   end
-  end
 
   def check_defaults
     if !self.owner_id
       self.owner_id = 1
     end
-    if self.customer_id
+
+    return if !self.customer_id
+
     customer = User.find( self.customer_id )
-      if self.organization_id != customer.organization_id
+    return if self.organization_id == customer.organization_id
+
     self.organization_id = customer.organization_id
   end
-    end
-  end
 
   def reset_pending_time
 
@@ -228,10 +230,10 @@ returns
     current_state_type = Ticket::StateType.lookup( id: current_state.state_type_id )
 
     # in case, set pending_time to nil
-    if current_state_type.name !~ /^pending/i
+    return if current_state_type.name =~ /^pending/i
+
     self.pending_time = nil
   end
-  end
 
   def destroy_dependencies
 

app/models/ticket/article.rb

@@ -30,10 +30,11 @@ class Ticket::Article < ApplicationModel
   private
 
   def check_subject
-    if self.subject
+
+    return if !self.subject
+
     self.subject.gsub!(/\s|\t|\r/, ' ')
   end
-  end
 
   class Flag < ApplicationModel
   end

app/models/ticket/escalation.rb

@@ -152,11 +152,12 @@ returns
     if sla_selected.close_time && self.close_time_in_min
       self.close_time_diff_in_min = sla_selected.close_time - self.close_time_in_min
     end
-    if self.changed?
+
+    return if !self.changed?
+
     self.callback_loop = true
     self.save
   end
-  end
 
 =begin
 

app/models/translation.rb

@@ -168,10 +168,10 @@ translate strings in ruby context, e. g. for notifications
 
   private
   def set_initial
-    if !target_initial
+
+    return if target_initial
     self.target_initial = self.target
   end
-  end
   def cache_clear
     Cache.delete( 'Translation::' + self.locale.downcase )
   end

app/models/user.rb

@@ -449,10 +449,11 @@ returns
   end
 
   def check_email
-    if self.email
+
+    return if !self.email
+
     self.email = self.email.downcase
   end
-  end
 
   def check_login
 
@@ -469,7 +470,8 @@ returns
     end
 
     # check if login already exists
-    if self.login
+    return if !self.login
+
     self.login = self.login.downcase
     check      = true
     while check
@@ -481,7 +483,6 @@ returns
       end
     end
   end
-  end
 
   def avatar_check
 
@@ -499,11 +500,11 @@ returns
     )
 
     # update user link
-    if avatar
+    return if !avatar
+
     self.update_column( :image, avatar.store_hash )
     self.cache_delete
   end
-  end
 
   def avatar_destroy
     Avatar.remove( 'User', self.id )
@@ -524,9 +525,9 @@ returns
     end
 
     # crypt password if not already crypted
-    if self.password && self.password !~ /^\{sha2\}/
+    return if !( self.password && self.password !~ /^\{sha2\}/ )
+
     crypted       = Digest::SHA2.hexdigest( self.password )
     self.password = "{sha2}#{crypted}"
   end
-  end
 end

db/migrate/20150112000001_update_overview_and_ticket_state.rb

@@ -5,7 +5,9 @@ class UpdateOverviewAndTicketState < ActiveRecord::Migration
     overview_role = Role.where( name: 'Agent' ).first
     add_column :ticket_states, :next_state_id,  :integer, null: true
     UserInfo.current_user_id = 1
-    if overview_role
+
+    return true if !overview_role
+
     Overview.create_or_update(
       name: 'My pending reached Tickets',
       link: 'my_pending_reached',
@@ -120,7 +122,6 @@ class UpdateOverviewAndTicketState < ActiveRecord::Migration
       updated_by_id: 1,
     )
   end
-  end
 
   def down
   end

db/migrate/20150223000001_update_overview2.rb

@@ -2,7 +2,9 @@ class UpdateOverview2 < ActiveRecord::Migration
   def up
 
     overview_role = Role.where( name: 'Agent' ).first
-    if overview_role
+
+    return true if !overview_role
+
     UserInfo.current_user_id = 1
     Overview.create_or_update(
       name: 'My assigned Tickets',
@@ -25,7 +27,6 @@ class UpdateOverview2 < ActiveRecord::Migration
       },
     )
   end
-  end
 
   def down
   end

script/source_code_filter.rb

@@ -61,9 +61,9 @@ def checkForHeader(fileName)
   t_file.unlink
 
   # beautify ruby file
-  if !isCoffee
+  return if isCoffee
+
   t_file = RBeautify.beautify_file(fileName)
-  end
 end
 
 #folder array