From c6741dda3601bd280303a694c3a8cf4dc4569736 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Mon, 31 Aug 2020 15:54:39 +0100 Subject: [PATCH] Fix rubocop complexity issues by making code easier to read --- .../variant_and_line_item_naming.rb | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/open_food_network/variant_and_line_item_naming.rb b/lib/open_food_network/variant_and_line_item_naming.rb index 3b5a7de47c..c1c065efc2 100644 --- a/lib/open_food_network/variant_and_line_item_naming.rb +++ b/lib/open_food_network/variant_and_line_item_naming.rb @@ -24,17 +24,20 @@ module OpenFoodNetwork end def presentation(option_value) - if option_value.option_type.name == "unit_weight" - if has_attribute?(:display_as) && display_as.present? - return display_as - elsif respond_to?(:variant) && variant.present? && - variant.respond_to?(:display_as) && variant.display_as.present? - return variant.display_as - end - end + return option_value.presentation unless option_value.option_type.name == "unit_weight" + + return display_as if has_attribute?(:display_as) && display_as.present? + + return variant.display_as if variant_display_as? + option_value.presentation end + def variant_display_as? + respond_to?(:variant) && variant.present? && + variant.respond_to?(:display_as) && variant.display_as.present? + end + def product_and_full_name return "#{product.name} - #{full_name}" unless full_name.start_with? product.name @@ -62,14 +65,11 @@ module OpenFoodNetwork end def unit_to_display - if has_attribute?(:display_as) && display_as.present? - display_as - elsif respond_to?(:variant) && variant.present? && - variant.respond_to?(:display_as) && variant.display_as.present? - variant.display_as - else - options_text - end + return display_as if has_attribute?(:display_as) && display_as.present? + + return variant.display_as if variant_display_as? + + options_text end def update_units