From 3161fa38010a5fd5d21384b77ffc0d4bcffe508f Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Mon, 9 Apr 2018 17:33:16 +0200
Subject: [PATCH] Auto correct Rubocop's
 Layout/EmptyLinesAroundExceptionHandlingKeywords cop

---
 .rubocop_todo.yml                         | 12 ------------
 app/controllers/checkout_controller.rb    |  1 -
 app/controllers/enterprises_controller.rb |  1 -
 app/controllers/shop_controller.rb        |  1 -
 app/models/spree/adjustment_decorator.rb  |  1 -
 app/models/spree/tax_rate_decorator.rb    |  1 -
 lib/tasks/users.rake                      |  1 -
 spec/features/admin/overview_spec.rb      |  1 -
 8 files changed, 19 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b80f2ed33b..72f5e2c7e2 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -336,18 +336,6 @@ Layout/EmptyLinesAroundClassBody:
     - 'lib/open_food_network/rack_request_blocker.rb'
     - 'lib/open_food_network/reports/bulk_coop_report.rb'
 
-# Offense count: 7
-# Cop supports --auto-correct.
-Layout/EmptyLinesAroundExceptionHandlingKeywords:
-  Exclude:
-    - 'app/controllers/checkout_controller.rb'
-    - 'app/controllers/enterprises_controller.rb'
-    - 'app/controllers/shop_controller.rb'
-    - 'app/models/spree/adjustment_decorator.rb'
-    - 'app/models/spree/tax_rate_decorator.rb'
-    - 'lib/tasks/users.rake'
-    - 'spec/features/admin/overview_spec.rb'
-
 # Offense count: 4
 # Cop supports --auto-correct.
 Layout/EmptyLinesAroundMethodBody:
diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index 31933a5138..428626ef2e 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -133,7 +133,6 @@ class CheckoutController < Spree::CheckoutController
   def advance_order_state(order)
     tries ||= 3
     order.next
-
   rescue ActiveRecord::StaleObjectError
     retry unless (tries -= 1).zero?
     false
diff --git a/app/controllers/enterprises_controller.rb b/app/controllers/enterprises_controller.rb
index 451e60ceb4..2b2a639b87 100644
--- a/app/controllers/enterprises_controller.rb
+++ b/app/controllers/enterprises_controller.rb
@@ -33,7 +33,6 @@ class EnterprisesController < BaseController
     begin
       Rails.application.routes.recognize_path( "/#{ params[:permalink].to_s }" )
       render text: params[:permalink], status: 409
-
     rescue ActionController::RoutingError
       render text: params[:permalink], status: 200
     end
diff --git a/app/controllers/shop_controller.rb b/app/controllers/shop_controller.rb
index 4634536766..a32d5d0b85 100644
--- a/app/controllers/shop_controller.rb
+++ b/app/controllers/shop_controller.rb
@@ -18,7 +18,6 @@ class ShopController < BaseController
       products_json = filter(renderer.products_json)
 
       render json: products_json
-
     rescue OpenFoodNetwork::CachedProductsRenderer::NoProducts
       render status: 404, json: ''
     end
diff --git a/app/models/spree/adjustment_decorator.rb b/app/models/spree/adjustment_decorator.rb
index 4d0b8421e3..bca08752da 100644
--- a/app/models/spree/adjustment_decorator.rb
+++ b/app/models/spree/adjustment_decorator.rb
@@ -72,7 +72,6 @@ module Spree
       skip_callback :destroy, :after, :update_adjustable
 
       result = yield
-
     ensure
       set_callback :save, :after, :update_adjustable
       set_callback :destroy, :after, :update_adjustable
diff --git a/app/models/spree/tax_rate_decorator.rb b/app/models/spree/tax_rate_decorator.rb
index 7126e8ac29..fd111084ce 100644
--- a/app/models/spree/tax_rate_decorator.rb
+++ b/app/models/spree/tax_rate_decorator.rb
@@ -51,7 +51,6 @@ module Spree
       calculator.calculable.included_in_price = true
 
       result = yield
-
     ensure
       self.included_in_price = old_included_in_price
       calculator.calculable.included_in_price = old_included_in_price
diff --git a/lib/tasks/users.rake b/lib/tasks/users.rake
index b668191328..0391c2d4ae 100644
--- a/lib/tasks/users.rake
+++ b/lib/tasks/users.rake
@@ -75,7 +75,6 @@ namespace :openfoodnetwork do
       ba_country = Spree::Country.find_by_name row[43]
       ba = Spree::Address.create!({firstname: row[35], lastname: row[36], address1: row[37], address2: row[38], city: row[39], zipcode: row[40], phone: row[41], state: ba_state, country: ba_country, created_at: row[44], updated_at: row[45], company: row[46]}, without_protection: true)
       user.update_column :bill_address_id, ba.id
-
     rescue ActiveRecord::RecordInvalid => e
       puts "#{row[2]} - #{e.message}"
     end
diff --git a/spec/features/admin/overview_spec.rb b/spec/features/admin/overview_spec.rb
index 26a7afd046..c1119a252e 100644
--- a/spec/features/admin/overview_spec.rb
+++ b/spec/features/admin/overview_spec.rb
@@ -132,7 +132,6 @@ feature %q{
     expect(Spree::Dash::Config.configured?).to be true
 
     block.call
-
   ensure
     Spree::Dash::Config.preferred_app_id = nil
     Spree::Dash::Config.preferred_site_id = nil