Merge pull request #555 from sul-dlss/update-dependencies

Update dependencies

Gemfile.lock

@@ -101,7 +101,7 @@ GEM
     crass (1.0.6)
     deep_merge (1.2.1)
     diff-lcs (1.3)
-    dlss-capistrano (3.7.0)
+    dlss-capistrano (3.8.0)
       capistrano (~> 3.0)
       capistrano-bundle_audit (>= 0.3.0)
       capistrano-one_time_key
@@ -156,7 +156,7 @@ GEM
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     hashdiff (1.0.1)
-    honeybadger (4.6.0)
+    honeybadger (4.7.0)
     http (4.4.1)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
@@ -168,7 +168,7 @@ GEM
     http-parser (1.2.1)
       ffi-compiler (>= 1.0, < 2.0)
     httpclient (2.8.3)
-    i18n (1.8.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     jbuilder (2.10.0)
       activesupport (>= 5.0.0)
@@ -200,11 +200,11 @@ GEM
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.0.2)
-    newrelic_rpm (6.10.0.364)
+    newrelic_rpm (6.11.0.365)
     nio4r (2.5.2)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    okcomputer (1.18.1)
+    okcomputer (1.18.2)
     parallel (1.19.1)
     parser (2.7.1.3)
       ast (~> 2.4.0)
@@ -251,7 +251,7 @@ GEM
       ffi (~> 1.0)
     recaptcha (5.5.0)
       json
-    regexp_parser (1.7.0)
+    regexp_parser (1.7.1)
     rexml (3.2.4)
     rspec-core (3.9.2)
       rspec-support (~> 3.9.3)
@@ -270,22 +270,23 @@ GEM
       rspec-mocks (~> 3.9)
       rspec-support (~> 3.9)
     rspec-support (3.9.3)
-    rubocop (0.84.0)
+    rubocop (0.85.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
       rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-ast (0.0.3)
       parser (>= 2.7.0.1)
-    rubocop-performance (1.6.0)
+    rubocop-performance (1.6.1)
       rubocop (>= 0.71.0)
-    rubocop-rails (2.5.2)
-      activesupport
+    rubocop-rails (2.6.0)
+      activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.72.0)
+      rubocop (>= 0.82.0)
     rubocop-rspec (1.39.0)
       rubocop (>= 0.68.1)
     ruby-oci8 (2.2.8)
@@ -305,7 +306,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sassc (2.3.0)
+    sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
       railties (>= 4.0.0)
@@ -364,7 +365,7 @@ GEM
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    webdrivers (4.4.0)
+    webdrivers (4.4.1)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)
@@ -374,7 +375,7 @@ GEM
       hashdiff (>= 0.4.0, < 2.0.0)
     websocket-driver (0.7.2)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 

app/controllers/renewals_controller.rb

@@ -49,9 +49,8 @@ def bulk_renewal_flash(response, type:)
     flash[type] = I18n.t(
       "mylibrary.renew_all_items.#{type}_html",
       count: response[type].length,
-      items: content_tag(
-        'ul',
-        safe_join(response[type].collect { |renewal| content_tag('li', renewal.title) }, '')
+      items: tag.ul(
+        safe_join(response[type].collect { |renewal| tag.li(renewal.title) }, '')
       )
     )
   end

app/helpers/application_helper.rb

@@ -33,8 +33,8 @@ def format_human_readable_date(date)
   def detail_link_to_searchworks(catkey)
     return if catkey.blank?
 
-    content_tag(:div, class: 'row') do
-      content_tag(:div, class: 'col-11 offset-1 col-md-10 offset-md-2') do
+    tag.div(class: 'row') do
+      tag.div(class: 'col-11 offset-1 col-md-10 offset-md-2') do
         link_to Settings.sw.url + catkey, rel: 'noopener', target: '_blank' do
           sul_icon(:'sharp-open_in_new-24px') + ' View in SearchWorks'
         end
@@ -51,7 +51,7 @@ def detail_link_to_searchworks(catkey)
   def sul_icon(icon_name, options = {})
     Rails.cache.fetch([:sul_icon, icon_name, options]) do
       icon = Icon.new(icon_name, options)
-      content_tag(:span, icon.svg.html_safe, icon.options) # rubocop:disable Rails/OutputSafety
+      tag.span(icon.svg.html_safe, icon.options) # rubocop:disable Rails/OutputSafety
     end
   end
 

app/helpers/checkouts_helper.rb

@@ -36,15 +36,15 @@ def render_checkout_status(checkout)
                            text: 'Overdue',
                            accrued: checkout.accrued)
     else
-      content_tag :span, 'OK', class: 'd-none d-md-block'
+      tag.span 'OK', class: 'd-none d-md-block'
     end
   end
   # rubocop:enable Metrics/MethodLength
 
   private
 
   def checkout_status_html(css_class: nil, icon: nil, text:, accrued: 0)
-    content_tag(:span, class: css_class) do
+    tag.span(class: css_class) do
       safe_join([
                   (sul_icon(icon) if icon),
                   text,