From 2c65cea911b33ce8b16bb5eee2d8a3d501a5989a Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Mon, 6 Jul 2020 15:40:10 +0100 Subject: [PATCH] Fix easy rubocop issues --- lib/spree/responder.rb | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/lib/spree/responder.rb b/lib/spree/responder.rb index b87d0f0daa..3c0e60aa5b 100644 --- a/lib/spree/responder.rb +++ b/lib/spree/responder.rb @@ -1,27 +1,39 @@ +# frozen_string_literal: true + module Spree class Responder < ::ActionController::Responder #:nodoc: - attr_accessor :on_success, :on_failure - def initialize(controller, resources, options={}) + def initialize(controller, resources, options = {}) super class_name = controller.class.name.to_sym action_name = options.delete(:action_name) - if result = Spree::BaseController.spree_responders[class_name].try(:[], action_name).try(:[], self.format.to_sym) - self.on_success = handler(controller, result, :success) - self.on_failure = handler(controller, result, :failure) - end + result = Spree::BaseController.spree_responders[class_name]. + try(:[], action_name). + try(:[], self.format.to_sym) + return unless result + + self.on_success = handler(controller, result, :success) + self.on_failure = handler(controller, result, :failure) end def to_html - super and return if !(on_success || on_failure) + if !(on_success || on_failure) + super + return + end + has_errors? ? controller.instance_exec(&on_failure) : controller.instance_exec(&on_success) end def to_format - super and return if !(on_success || on_failure) + if !(on_success || on_failure) + super + return + end + has_errors? ? controller.instance_exec(&on_failure) : controller.instance_exec(&on_success) end