Applied RuboCop Style/BlockDelimiters to improve readability.

.rubocop.yml

@@ -99,14 +99,6 @@ Style/EmptyLinesAroundModuleBody:
   Description: "Keeps track of empty lines around module bodies."
   Enabled: false
 
-Style/BlockDelimiters:
-  Description: >-
-                Avoid using {...} for multi-line blocks (multiline chaining is
-                always ugly).
-                Prefer {...} over do...end for single-line blocks.
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#single-line-blocks'
-  Enabled: false
-
 Style/MultilineBlockChain:
   Description: 'Avoid multi-line chains of blocks.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#single-line-blocks'

app/controllers/application_controller/handles_errors.rb

@@ -44,12 +44,12 @@ module ApplicationController::HandlesErrors
 
     respond_to do |format|
       format.json { render json: humanize_error(e.message), status: status }
-      format.any {
+      format.any do
         @exception = e
         @traceback = !Rails.env.production?
         file = File.open(Rails.root.join('public', "#{status_code}.html"), 'r')
         render inline: file.read, status: status
-      }
+      end
     end
   end
 

app/controllers/application_controller/logs_http_access.rb

@@ -22,14 +22,14 @@ module ApplicationController::LogsHttpAccess
       content_encoding: request.headers['Content-Encoding'],
       source: request.headers['User-Agent'] || request.headers['Server'],
     }
-    request.headers.each { |key, value|
+    request.headers.each do |key, value|
       next if key[0, 5] != 'HTTP_'
       request_data[:content] += if key == 'HTTP_COOKIE'
                                   "#{key}: xxxxx\n"
                                 else
                                   "#{key}: #{value}\n"
                                 end
-    }
+    end
     body = request.body.read
     if body
       request_data[:content] += "\n" + body
@@ -44,9 +44,9 @@ module ApplicationController::LogsHttpAccess
       content_encoding: nil,
       source: nil,
     }
-    response.headers.each { |key, value|
+    response.headers.each do |key, value|
       response_data[:content] += "#{key}: #{value}\n"
-    }
+    end
     body = response.body
     if body
       response_data[:content] += "\n" + body

app/controllers/application_controller/renders_models.rb

@@ -111,9 +111,9 @@ module ApplicationController::RendersModels
 
     if params[:expand]
       list = []
-      generic_objects.each { |generic_object|
+      generic_objects.each do |generic_object|
         list.push generic_object.attributes_with_association_names
-      }
+      end
       render json: list, status: :ok
       return
     end
@@ -121,10 +121,10 @@ module ApplicationController::RendersModels
     if params[:full]
       assets = {}
       item_ids = []
-      generic_objects.each { |item|
+      generic_objects.each do |item|
         item_ids.push item.id
         assets = item.assets(assets)
-      }
+      end
       render json: {
         record_ids: item_ids,
         assets: assets,
@@ -133,9 +133,9 @@ module ApplicationController::RendersModels
     end
 
     generic_objects_with_associations = []
-    generic_objects.each { |item|
+    generic_objects.each do |item|
       generic_objects_with_associations.push item.attributes_with_association_ids
-    }
+    end
     model_index_render_result(generic_objects_with_associations)
   end
 

app/controllers/applications_controller.rb

@@ -8,7 +8,7 @@ class ApplicationsController < ApplicationController
     if params[:full]
       assets = {}
       item_ids = []
-      all.each { |item|
+      all.each do |item|
         item_ids.push item.id
         if !assets[:Application]
           assets[:Application] = {}
@@ -16,7 +16,7 @@ class ApplicationsController < ApplicationController
         application = item.attributes
         application[:clients] = Doorkeeper::AccessToken.where(application_id: item.id).count
         assets[:Application][item.id] = application
-      }
+      end
       render json: {
         record_ids: item_ids,
         assets: assets,

app/controllers/calendars_controller.rb

@@ -8,10 +8,10 @@ class CalendarsController < ApplicationController
     # calendars
     assets = {}
     calendar_ids = []
-    Calendar.all.order(:name, :created_at).each { |calendar|
+    Calendar.all.order(:name, :created_at).each do |calendar|
       calendar_ids.push calendar.id
       assets = calendar.assets(assets)
-    }
+    end
 
     ical_feeds = Calendar.ical_feeds
     timezones = Calendar.timezones

app/controllers/channels_email_controller.rb

@@ -11,12 +11,12 @@ class ChannelsEmailController < ApplicationController
     not_used_email_address_ids = []
     accounts_fixed = []
     assets = {}
-    Channel.order(:id).each { |channel|
+    Channel.order(:id).each do |channel|
       if system_online_service && channel.preferences && channel.preferences['online_service_disable']
         email_addresses = EmailAddress.where(channel_id: channel.id)
-        email_addresses.each { |email_address|
+        email_addresses.each do |email_address|
           accounts_fixed.push email_address
-        }
+        end
         next
       end
       if channel.area == 'Email::Account'
@@ -26,15 +26,15 @@ class ChannelsEmailController < ApplicationController
         notification_channel_ids.push channel.id
         assets = channel.assets(assets)
       end
-    }
-    EmailAddress.all.each { |email_address|
+    end
+    EmailAddress.all.each do |email_address|
       next if system_online_service && email_address.preferences && email_address.preferences['online_service_disable']
       email_address_ids.push email_address.id
       assets = email_address.assets(assets)
       if !email_address.channel_id || !email_address.active || !Channel.find_by(id: email_address.channel_id)
         not_used_email_address_ids.push email_address.id
       end
-    }
+    end
     render json: {
       accounts_fixed: accounts_fixed,
       assets: assets,
@@ -224,7 +224,7 @@ class ChannelsEmailController < ApplicationController
     # save settings
     if result[:result] == 'ok'
 
-      Channel.where(area: 'Email::Notification').each { |channel|
+      Channel.where(area: 'Email::Notification').each do |channel|
         active = false
         if adapter =~ /^#{channel.options[:outbound][:adapter]}$/i
           active = true
@@ -239,7 +239,7 @@ class ChannelsEmailController < ApplicationController
         end
         channel.active = active
         channel.save
-      }
+      end
     end
     render json: result
   end
@@ -247,7 +247,7 @@ class ChannelsEmailController < ApplicationController
   private
 
   def account_duplicate?(result, channel_id = nil)
-    Channel.where(area: 'Email::Account').each { |channel|
+    Channel.where(area: 'Email::Account').each do |channel|
       next if !channel.options
       next if !channel.options[:inbound]
       next if !channel.options[:inbound][:adapter]
@@ -261,7 +261,7 @@ class ChannelsEmailController < ApplicationController
         message: 'Account already exists!',
       }
       return true
-    }
+    end
     false
   end
 

app/controllers/channels_facebook_controller.rb

@@ -5,14 +5,14 @@ class ChannelsFacebookController < ApplicationController
 
   def index
     assets = {}
-    ExternalCredential.where(name: 'facebook').each { |external_credential|
+    ExternalCredential.where(name: 'facebook').each do |external_credential|
       assets = external_credential.assets(assets)
-    }
+    end
     channel_ids = []
-    Channel.where(area: 'Facebook::Account').order(:id).each { |channel|
+    Channel.where(area: 'Facebook::Account').order(:id).each do |channel|
       assets = channel.assets(assets)
       channel_ids.push channel.id
-    }
+    end
     render json: {
       assets: assets,
       channel_ids: channel_ids,

app/controllers/channels_telegram_controller.rb

@@ -7,10 +7,10 @@ class ChannelsTelegramController < ApplicationController
   def index
     assets = {}
     channel_ids = []
-    Channel.where(area: 'Telegram::Bot').order(:id).each { |channel|
+    Channel.where(area: 'Telegram::Bot').order(:id).each do |channel|
       assets = channel.assets(assets)
       channel_ids.push channel.id
-    }
+    end
     render json: {
       assets: assets,
       channel_ids: channel_ids

app/controllers/channels_twitter_controller.rb

@@ -5,14 +5,14 @@ class ChannelsTwitterController < ApplicationController
 
   def index
     assets = {}
-    ExternalCredential.where(name: 'twitter').each { |external_credential|
+    ExternalCredential.where(name: 'twitter').each do |external_credential|
       assets = external_credential.assets(assets)
-    }
+    end
     channel_ids = []
-    Channel.where(area: 'Twitter::Account').order(:id).each { |channel|
+    Channel.where(area: 'Twitter::Account').order(:id).each do |channel|
       assets = channel.assets(assets)
       channel_ids.push channel.id
-    }
+    end
     render json: {
       assets: assets,
       channel_ids: channel_ids,