Merge pull request #873 from codeforamerica/mb-update-gems

Update gems
codeforamerica · Apr 3, 2018 · 093dd8d · 093dd8d
2 parents 5a6bb54 + 4a21a98
commit 093dd8d
Show file tree

Hide file tree

Showing 14 changed files with 118 additions and 116 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 ruby '2.3.3'
-gem 'actionmailer', '~> 4.2.9'
+gem 'actionmailer', '~> 5.1.6'
 gem 'compass-rails'
 gem 'dalli', '~> 2.7.1'
 gem 'faraday-http-cache', '~> 2.0'
@@ -17,9 +17,9 @@ gem 'ohanakapa', '~> 1.1.1'
 gem 'puma'
 gem 'rack-cache', '~> 1.2'
 gem 'rack-rewrite', '~> 1.5.0'
-gem 'railties', '~> 4.2'
+gem 'railties', '~> 5.1.6'
 gem 'sass-rails', '~> 5.0.1'
-gem 'sprockets', '~> 2.12'
+gem 'sprockets', '~> 3.7.1'
 gem 'uglifier'
 gem 'webpacker', '~> 3.2'
 
@@ -31,12 +31,11 @@ end
 # dev and debugging tools
 group :development do
   gem 'better_errors'
-  gem 'binding_of_caller', '~> 0.7.2', platforms: %i[mri_19 rbx]
+  gem 'binding_of_caller', platforms: %i[mri_19 rbx]
   gem 'bummr'
   gem 'derailed'
   gem 'flamegraph'
   gem 'letter_opener'
-  gem 'quiet_assets'
   gem 'rack-mini-profiler'
   gem 'reek'
   gem 'spring'
@@ -52,6 +51,7 @@ group :test do
   gem 'email_spec'
   gem 'haml_lint'
   gem 'poltergeist'
+  gem 'rails-controller-testing'
   gem 'rubocop'
   gem 'vcr'
   gem 'webmock', '~> 2.1'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,32 +1,32 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
+    actionmailer (5.1.6)
+      actionpack (= 5.1.6)
+      actionview (= 5.1.6)
+      activejob (= 5.1.6)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.9)
-      actionview (= 4.2.9)
-      activesupport (= 4.2.9)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.6)
+      actionview (= 5.1.6)
+      activesupport (= 5.1.6)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.9)
-      activesupport (= 4.2.9)
+    actionview (5.1.6)
+      activesupport (= 5.1.6)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.9)
-      activesupport (= 4.2.9)
-      globalid (>= 0.3.0)
-    activesupport (4.2.9)
-      i18n (~> 0.7)
+    activejob (5.1.6)
+      activesupport (= 5.1.6)
+      globalid (>= 0.3.6)
+    activesupport (5.1.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
@@ -40,13 +40,13 @@ GEM
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
-    binding_of_caller (0.7.2)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
     bummr (0.2.1)
       rainbow
       thor
-    capybara (2.17.0)
+    capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
@@ -86,8 +86,8 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.3)
-    dalli (2.7.6)
-    debug_inspector (0.0.2)
+    dalli (2.7.7)
+    debug_inspector (0.0.3)
     declarative (0.0.10)
     declarative-option (0.1.0)
     derailed (0.1.0)
@@ -109,7 +109,7 @@ GEM
       launchy (~> 2.1)
       mail (~> 2.6)
     equalizer (0.0.11)
-    erubi (1.7.0)
+    erubi (1.7.1)
     erubis (2.7.0)
     execjs (2.7.0)
     faraday (0.14.0)
@@ -125,7 +125,7 @@ GEM
     get_process_mem (0.2.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    google-api-client (0.19.6)
+    google-api-client (0.20.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.5, < 0.7.0)
       httpclient (>= 2.8.1, < 3.0)
@@ -157,15 +157,14 @@ GEM
       sysexits (~> 1.1)
     hashdiff (0.3.2)
     heapy (0.1.2)
-    hike (1.2.3)
     html2haml (2.2.0)
       erubis (~> 2.7.0)
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
     htmlentities (4.3.4)
     httpclient (2.8.3)
-    i18n (0.9.4)
+    i18n (1.0.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.1.0)
@@ -187,14 +186,15 @@ GEM
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    loofah (2.1.1)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
     memcachier (0.0.2)
     memoist (0.16.0)
     memory_profiler (0.9.6)
+    method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
@@ -209,55 +209,54 @@ GEM
       sawyer (~> 0.8)
     os (0.9.6)
     parallel (1.12.1)
-    parser (2.4.0.2)
-      ast (~> 2.3)
+    parser (2.5.0.5)
+      ast (~> 2.4.0)
     poltergeist (1.17.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
-    public_suffix (3.0.1)
-    puma (3.11.2)
-    quiet_assets (1.1.0)
-      railties (>= 3.1, < 5.0)
-    rack (1.6.8)
+    public_suffix (3.0.2)
+    puma (3.11.3)
+    rack (2.0.4)
     rack-cache (1.7.1)
       rack (>= 0.4)
-    rack-mini-profiler (0.10.7)
+    rack-mini-profiler (1.0.0)
       rack (>= 1.2.0)
-    rack-proxy (0.6.3)
+    rack-proxy (0.6.4)
       rack
     rack-rewrite (1.5.1)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    rails-controller-testing (1.0.2)
+      actionpack (~> 5.x, >= 5.0.1)
+      actionview (~> 5.x, >= 5.0.1)
+      activesupport (~> 5.x)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.4)
-    railties (4.2.9)
-      actionpack (= 4.2.9)
-      activesupport (= 4.2.9)
+    railties (5.1.6)
+      actionpack (= 5.1.6)
+      activesupport (= 5.1.6)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.0.0)
     rake (10.5.0)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    reek (4.7.3)
+    reek (4.8.0)
       codeclimate-engine-rb (~> 0.4.0)
-      parser (>= 2.4.0.0, < 2.5)
-      rainbow (~> 2.0)
+      parser (>= 2.5.0.0, < 2.6)
+      rainbow (~> 3.0)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
@@ -320,11 +319,9 @@ GEM
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
-    sprockets (2.12.4)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -336,12 +333,12 @@ GEM
       tins (~> 1.0)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (1.4.1)
+    tilt (2.0.8)
     tins (1.14.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uber (0.1.0)
-    uglifier (4.1.6)
+    uglifier (4.1.8)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.3.0)
     vcr (4.0.0)
@@ -354,7 +351,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    webpacker (3.2.2)
+    webpacker (3.4.3)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)
@@ -369,9 +366,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer (~> 4.2.9)
+  actionmailer (~> 5.1.6)
   better_errors
-  binding_of_caller (~> 0.7.2)
+  binding_of_caller
   bummr
   capybara (~> 2.4)
   compass-rails
@@ -394,20 +391,20 @@ DEPENDENCIES
   ohanakapa (~> 1.1.1)
   poltergeist
   puma
-  quiet_assets
   rack-cache (~> 1.2)
   rack-mini-profiler
   rack-rewrite (~> 1.5.0)
+  rails-controller-testing
   rails_12factor
-  railties (~> 4.2)
+  railties (~> 5.1.6)
   reek
   rspec-rails (~> 3.1)
   rubocop
   sass-rails (~> 5.0.1)
   spring
   spring-commands-rspec
   spring-watcher-listen
-  sprockets (~> 2.12)
+  sprockets (~> 3.7.1)
   stackprof
   uglifier
   vcr

diff --git a/app/views/about/index.html.haml b/app/views/about/index.html.haml
@@ -1,3 +1,3 @@
 - title 'About'
 = render 'component/about/about'
-= render 'component/about/feedback'
+= render 'component/about/feedback', user_agent: @user_agent
diff --git a/app/views/component/about/_feedback.html.haml b/app/views/component/about/_feedback.html.haml
@@ -10,11 +10,15 @@
       = form_tag('/feedback', method: :post) do
         %p
           = label_tag 'message', t('views.feedback.submit_comment_label')
-          = text_area_tag 'message', nil, placeholder: 'enter your comment, question, etc.', |
-            rows: '4', required: 'true', class: 'comment'
+          = text_area_tag('message',
+                          nil,
+                          placeholder: 'enter your comment, question, etc.',
+                          rows: '4',
+                          required: 'true',
+                          class: 'comment')
         %p
           = label_tag 'from', 'Email:'
           = email_field_tag 'from', nil, placeholder: 'your email address (optional)', class: 'email'
-          = hidden_field_tag 'agent', @user_agent
+          = hidden_field_tag 'agent', user_agent
         %p
           = button_tag 'Send!', class: 'button-feedback-send'
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -11,7 +11,7 @@
   %body{ class: "#{controller_name == 'home' ? '' : 'inside '}#{controller_name} #{action_name}" }
     %section#content
       = render 'shared/alert'
-      = render 'shared/header'
+      = render 'shared/header', user_agent: @user_agent
       %main.main= yield
       = render 'shared/footer'
 

diff --git a/app/views/shared/_header.html.haml b/app/views/shared/_header.html.haml
@@ -23,4 +23,4 @@
     .popup-container.hide
       .arrow
         %span
-      = render 'component/about/feedback'
+      = render 'component/about/feedback', user_agent: user_agent
diff --git a/bin/webpack b/bin/webpack
@@ -1,11 +1,7 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'webpack' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
+
+ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
+ENV["NODE_ENV"]  ||= ENV["NODE_ENV"] || "development"
 
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
@@ -14,4 +10,6 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
 require "rubygems"
 require "bundler/setup"
 
-load Gem.bin_path("webpacker", "webpack")
+require "webpacker"
+require "webpacker/webpack_runner"
+Webpacker::WebpackRunner.run(ARGV)