From: Tom Hughes <tom@compton.nu>
Date: Thu, 5 Oct 2017 19:22:24 +0000 (+0100)
Subject: Use Hash#dig to simplify code
X-Git-Tag: live~4200
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/e16311125ea536561ca810413f2581db4db76c26

Use Hash#dig to simplify code
---

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f03767698..41bd7c80a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -227,9 +227,3 @@ Style/NumericLiterals:
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
   Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/RescueModifier:
-  Exclude:
-    - 'app/helpers/browse_helper.rb'
diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 0470d41a2..c4ce41b06 100644
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -114,17 +114,9 @@ module BrowseHelper
     # the correct page.
     lookup_us = lookup.tr(" ", "_")
 
-    if page = begin
-                WIKI_PAGES[locale][type][lookup_us]
-              rescue
-                nil
-              end
+    if page = WIKI_PAGES.dig(locale, type, lookup_us)
       url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
-    elsif page = begin
-                   WIKI_PAGES["en"][type][lookup_us]
-                 rescue
-                   nil
-                 end
+    elsif page = WIKI_PAGES.dig("en", type, lookup_us)
       url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
     end