Safely autocorrect Rails/ActionOrder

Inspecting 1481 files .........................................C.................C.........................................................CC........C..........C.C.........C.................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................. Offenses: app/controllers/admin/resource_controller.rb:39:5: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 0. def update ^^^^^^^^^^ app/controllers/admin/resource_controller.rb:39:5: C: [Corrected] Rails/ActionOrder: Action create should appear before update. def create ... ^^^^^^^^^^ app/controllers/admin/resource_controller.rb:51:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/controllers/admin/resource_controller.rb:52:5: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 2. def update_positions ^^^^^^^^^^^^^^^^^^^^ app/controllers/api/v0/orders_controller.rb:13:7: C: [Corrected] Rails/ActionOrder: Action index should appear before show. def index ... ^^^^^^^^^ app/controllers/api/v0/orders_controller.rb:23:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 0. def show ^^^^^^^^ app/controllers/api/v0/orders_controller.rb:28:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/controllers/api/v0/orders_controller.rb:29:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 2. def update ^^^^^^^^^^ app/controllers/spree/admin/images_controller.rb:26:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 0. def create ^^^^^^^^^^ app/controllers/spree/admin/images_controller.rb:37:7: C: [Corrected] Rails/ActionOrder: Action edit should appear before create. def edit ... ^^^^^^^^ app/controllers/spree/admin/images_controller.rb:40:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/controllers/spree/admin/images_controller.rb:41:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 2. def update ^^^^^^^^^^ app/controllers/spree/admin/invoices_controller.rb:19:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 0. def create ^^^^^^^^^^ app/controllers/spree/admin/invoices_controller.rb:43:7: C: [Corrected] Rails/ActionOrder: Action show should appear before create. def show ... ^^^^^^^^ app/controllers/spree/admin/invoices_controller.rb:49:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/controllers/spree/admin/invoices_controller.rb:50:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 2. def poll ^^^^^^^^ app/controllers/spree/admin/products_controller.rb:23:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 0. def new ^^^^^^^ app/controllers/spree/admin/products_controller.rb:23:7: C: [Corrected] Rails/ActionOrder: Action show should appear before new. def show ... ^^^^^^^^ app/controllers/spree/admin/products_controller.rb:24:7: C: [Corrected] Rails/ActionOrder: Action index should appear before show. def index ... ^^^^^^^^^ app/controllers/spree/admin/products_controller.rb:27:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/controllers/spree/admin/products_controller.rb:27:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 0. def create ^^^^^^^^^^ app/controllers/spree/admin/products_controller.rb:28:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/controllers/spree/admin/products_controller.rb:28:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 0. def new ^^^^^^^ app/controllers/spree/admin/products_controller.rb:28:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 2. def index ^^^^^^^^^ app/controllers/spree/admin/products_controller.rb:28:7: C: [Corrected] Rails/ActionOrder: Action index should appear before new. def index ... ^^^^^^^^^ app/controllers/spree/admin/products_controller.rb:29:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 2. def new ^^^^^^^ app/controllers/spree/admin/products_controller.rb:32:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/controllers/spree/admin/products_controller.rb:32:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 0. def create ^^^^^^^^^^ app/controllers/spree/admin/products_controller.rb:33:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 2. def edit ^^^^^^^^ app/controllers/spree/admin/products_controller.rb:36:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 0. def create ^^^^^^^^^^ app/controllers/spree/admin/products_controller.rb:38:7: C: [Corrected] Rails/ActionOrder: Action show should appear before create. def show ... ^^^^^^^^ app/controllers/spree/admin/products_controller.rb:42:7: C: [Corrected] Rails/ActionOrder: Action index should appear before create. def index ... ^^^^^^^^^ app/controllers/spree/admin/products_controller.rb:43:7: C: [Corrected] Rails/ActionOrder: Action index should appear before create. def index ... ^^^^^^^^^ app/controllers/spree/admin/products_controller.rb:43:7: C: [Corrected] Rails/ActionOrder: Action index should appear before show. def index ... ^^^^^^^^^ app/controllers/spree/admin/products_controller.rb:47:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/controllers/spree/admin/products_controller.rb:48:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 2. def edit ^^^^^^^^ app/controllers/spree/admin/products_controller.rb:48:7: C: [Corrected] Rails/ActionOrder: Action edit should appear before create. def edit ... ^^^^^^^^ app/controllers/spree/admin/products_controller.rb:51:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/controllers/spree/admin/products_controller.rb:52:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 2. def update ^^^^^^^^^^ app/controllers/spree/admin/taxons_controller.rb:13:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 0. def create ^^^^^^^^^^ app/controllers/spree/admin/taxons_controller.rb:29:7: C: [Corrected] Rails/ActionOrder: Action edit should appear before create. def edit ... ^^^^^^^^ app/controllers/spree/admin/taxons_controller.rb:34:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/controllers/spree/admin/taxons_controller.rb:35:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 2. def update ^^^^^^^^^^ app/controllers/spree/admin/variants_controller.rb:17:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 0. def edit ^^^^^^^^ app/controllers/spree/admin/variants_controller.rb:18:7: C: [Corrected] Rails/ActionOrder: Action new should appear before edit. def new ... ^^^^^^^ app/controllers/spree/admin/variants_controller.rb:21:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/controllers/spree/admin/variants_controller.rb:21:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 0. def update ^^^^^^^^^^ app/controllers/spree/admin/variants_controller.rb:22:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 2. def create ^^^^^^^^^^ app/controllers/spree/admin/variants_controller.rb:31:7: C: [Corrected] Rails/ActionOrder: Action new should appear before update. def new ... ^^^^^^^ app/controllers/spree/admin/variants_controller.rb:34:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/controllers/spree/admin/variants_controller.rb:35:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 2. def create ^^^^^^^^^^ app/controllers/spree/admin/variants_controller.rb:35:7: C: [Corrected] Rails/ActionOrder: Action create should appear before update. def create ... ^^^^^^^^^^ app/controllers/spree/admin/variants_controller.rb:42:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 0. def update ^^^^^^^^^^ app/controllers/spree/admin/variants_controller.rb:55:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/controllers/spree/admin/variants_controller.rb:56:7: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 2. def search ^^^^^^^^^^ app/controllers/user_confirmations_controller.rb:14:3: C: [Corrected] Rails/ActionOrder: Action show should appear before new. def show ... ^^^^^^^^ app/controllers/user_confirmations_controller.rb:15:3: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 0. def new ^^^^^^^ app/controllers/user_confirmations_controller.rb:19:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/controllers/user_confirmations_controller.rb:20:3: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 0. def create ^^^^^^^^^^ app/controllers/user_confirmations_controller.rb:21:3: C: [Corrected] Layout/EmptyLineBetweenDefs: Expected 1 empty line between method definitions; found 2. def create ^^^^^^^^^^ app/controllers/user_confirmations_controller.rb:37:3: C: [Corrected] Rails/ActionOrder: Action show should appear before create. def show ... ^^^^^^^^ app/controllers/user_confirmations_controller.rb:42:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. app/controllers/user_confirmations_controller.rb:43:1: C: [Corrected] Layout/EmptyLines: Extra blank line detected. 1481 files inspected, 63 offenses detected, 63 offenses corrected
2026-03-04 02:31:33 +00:00 · 2023-08-01 09:59:03 +09:00
parent e49c9e9061
commit a1560263a1
9 changed files with 67 additions and 83 deletions
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -443,22 +443,6 @@ Naming/VariableNumber:
    - 'spec/models/spree/tax_rate_spec.rb'
    - 'spec/requests/api/orders_spec.rb'

-# Offense count: 9
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: ExpectedOrder, Include.
-# ExpectedOrder: index, show, new, edit, create, update, destroy
-# Include: app/controllers/**/*.rb
-Rails/ActionOrder:
-  Exclude:
-    - 'app/controllers/admin/resource_controller.rb'
-    - 'app/controllers/api/v0/orders_controller.rb'
-    - 'app/controllers/spree/admin/images_controller.rb'
-    - 'app/controllers/spree/admin/invoices_controller.rb'
-    - 'app/controllers/spree/admin/products_controller.rb'
-    - 'app/controllers/spree/admin/taxons_controller.rb'
-    - 'app/controllers/spree/admin/variants_controller.rb'
-    - 'app/controllers/user_confirmations_controller.rb'
-
 # Offense count: 12
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Include.
--- a/app/controllers/admin/resource_controller.rb
+++ b/app/controllers/admin/resource_controller.rb
@@ -24,9 +24,10 @@ module Admin
      end
    end

-    def update
-      if @object.update(permitted_resource_params)
-        flash[:success] = flash_message_for(@object, :successfully_updated)
+    def create
+      @object.attributes = permitted_resource_params
+      if @object.save
+        flash[:success] = flash_message_for(@object, :successfully_created)
        respond_with(@object) do |format|
          format.html { redirect_to location_after_save }
          format.js   { render layout: false }
@@ -36,10 +37,9 @@ module Admin
      end
    end

-    def create
-      @object.attributes = permitted_resource_params
-      if @object.save
-        flash[:success] = flash_message_for(@object, :successfully_created)
+    def update
+      if @object.update(permitted_resource_params)
+        flash[:success] = flash_message_for(@object, :successfully_updated)
        respond_with(@object) do |format|
          format.html { redirect_to location_after_save }
          format.js   { render layout: false }
--- a/app/controllers/api/v0/orders_controller.rb
+++ b/app/controllers/api/v0/orders_controller.rb
@@ -5,11 +5,6 @@ module Api
    class OrdersController < Api::V0::BaseController
      include PaginationData

-      def show
-        authorize! :read, order
-        render json: order, serializer: Api::OrderDetailedSerializer, current_order: order
-      end
-
      def index
        authorize! :admin, Spree::Order

@@ -26,6 +21,11 @@ module Api
        }
      end

+      def show
+        authorize! :read, order
+        render json: order, serializer: Api::OrderDetailedSerializer, current_order: order
+      end
+
      def update
        authorize! :admin, order

--- a/app/controllers/spree/admin/images_controller.rb
+++ b/app/controllers/spree/admin/images_controller.rb
@@ -20,6 +20,10 @@ module Spree
        render layout: !request.xhr?
      end

+      def edit
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+      end
+
      def create
        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
        set_viewable
@@ -34,10 +38,6 @@ module Spree
        end
      end

-      def edit
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-      end
-
      def update
        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
        set_viewable
--- a/app/controllers/spree/admin/invoices_controller.rb
+++ b/app/controllers/spree/admin/invoices_controller.rb
@@ -10,6 +10,13 @@ module Spree
        authorize! :invoice, @order
      end

+      def show
+        invoice_id = params[:id]
+        invoice_pdf = BulkInvoiceService.new.filepath(invoice_id)
+
+        send_file(invoice_pdf, type: 'application/pdf', disposition: :inline)
+      end
+
      def create
        Spree::Order.where(id: params[:order_ids]).find_each do |order|
          authorize! :invoice, order
@@ -40,13 +47,6 @@ module Spree
        redirect_back(fallback_location: spree.admin_dashboard_path)
      end

-      def show
-        invoice_id = params[:id]
-        invoice_pdf = BulkInvoiceService.new.filepath(invoice_id)
-
-        send_file(invoice_pdf, type: 'application/pdf', disposition: :inline)
-      end
-
      def poll
        invoice_id = params[:invoice_id]

--- a/app/controllers/spree/admin/products_controller.rb
+++ b/app/controllers/spree/admin/products_controller.rb
@@ -16,10 +16,24 @@ module Spree
      before_action :load_spree_api_key, only: [:index, :variant_overrides]
      before_action :strip_new_properties, only: [:create, :update]

+      def index
+        @current_user = spree_current_user
+        @show_latest_import = params[:latest_import] || false
+      end
+
+      def show
+        session[:return_to] ||= request.referer
+        redirect_to( action: :edit )
+      end
+
      def new
        @object.shipping_category = DefaultShippingCategory.find_or_create
      end

+      def edit
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+      end
+
      def create
        delete_stock_params_and_set_after do
          @object.attributes = permitted_resource_params
@@ -35,20 +49,6 @@ module Spree
        end
      end

-      def show
-        session[:return_to] ||= request.referer
-        redirect_to( action: :edit )
-      end
-
-      def index
-        @current_user = spree_current_user
-        @show_latest_import = params[:latest_import] || false
-      end
-
-      def edit
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-      end
-
      def update
        @url_filters = ::ProductFilters.new.extract(request.query_parameters)

--- a/app/controllers/spree/admin/taxons_controller.rb
+++ b/app/controllers/spree/admin/taxons_controller.rb
@@ -5,6 +5,12 @@ module Spree
    class TaxonsController < Spree::Admin::BaseController
      respond_to :html, :json, :js

+      def edit
+        @taxonomy = Taxonomy.find(params[:taxonomy_id])
+        @taxon = @taxonomy.taxons.find(params[:id])
+        @permalink_part = @taxon.permalink.split("/").last
+      end
+
      def create
        @taxonomy = Taxonomy.find(params[:taxonomy_id])
        @taxon = @taxonomy.taxons.build(params[:taxon])
@@ -26,12 +32,6 @@ module Spree
        end
      end

-      def edit
-        @taxonomy = Taxonomy.find(params[:taxonomy_id])
-        @taxon = @taxonomy.taxons.find(params[:id])
-        @permalink_part = @taxon.permalink.split("/").last
-      end
-
      def update
        @taxonomy = Taxonomy.find(params[:taxonomy_id])
        @taxon = @taxonomy.taxons.find(params[:id])
--- a/app/controllers/spree/admin/variants_controller.rb
+++ b/app/controllers/spree/admin/variants_controller.rb
@@ -11,27 +11,14 @@ module Spree
        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
      end

-      def edit
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-      end
-
-      def update
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-
-        if @object.update(permitted_resource_params)
-          flash[:success] = flash_message_for(@object, :successfully_updated)
-          redirect_to spree.admin_product_variants_url(params[:product_id], @url_filters)
-        else
-          redirect_to spree.edit_admin_product_variant_url(params[:product_id],
-                                                           @object,
-                                                           @url_filters)
-        end
-      end
-
      def new
        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
      end

+      def edit
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+      end
+
      def create
        @url_filters = ::ProductFilters.new.extract(request.query_parameters)

@@ -53,6 +40,19 @@ module Spree
        @object.on_hand = on_hand.to_i if on_hand.present?
      end

+      def update
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+
+        if @object.update(permitted_resource_params)
+          flash[:success] = flash_message_for(@object, :successfully_updated)
+          redirect_to spree.admin_product_variants_url(params[:product_id], @url_filters)
+        else
+          redirect_to spree.edit_admin_product_variant_url(params[:product_id],
+                                                           @object,
+                                                           @url_filters)
+        end
+      end
+
      def search
        scoper = OpenFoodNetwork::ScopeVariantsForSearch.new(variant_search_params)
        @variants = scoper.search
--- a/app/controllers/user_confirmations_controller.rb
+++ b/app/controllers/user_confirmations_controller.rb
@@ -5,6 +5,13 @@ class UserConfirmationsController < DeviseController
  include Spree::Core::ControllerHelpers::Auth
  include CablecarResponses

+  # GET /resource/confirmation?confirmation_token=abcdef
+  def show
+    self.resource = resource_class.confirm_by_token(params[:confirmation_token])
+
+    respond_with_navigational(resource){ redirect_to after_confirmation_path_for(resource) }
+  end
+
  # GET /resource/confirmation/new
  def new
    build_resource({})
@@ -33,13 +40,6 @@ class UserConfirmationsController < DeviseController
    respond_with_navigational(resource){ redirect_to login_path }
  end

-  # GET /resource/confirmation?confirmation_token=abcdef
-  def show
-    self.resource = resource_class.confirm_by_token(params[:confirmation_token])
-
-    respond_with_navigational(resource){ redirect_to after_confirmation_path_for(resource) }
-  end
-
  protected

  def set_return_url