Update rails to version 5.0.3 (#3054)

* Update rails to version 5.0.3

* Update aws-sdk to version 2.9.17

* Update capistrano to version 3.8.1

* Update climate_control to version 0.2.0

* Update debug_inspector to version 0.0.3

* Update et-orbi to version 1.0.4

* Update oj to version 3.0.7

* Update microformats2 to version 2.9.0

* Update lograge to version 0.5.1

* Clean up usage of Microformats2 object to remove deprecation warnings

* Update microformats2 to version 3.0.1

3 files changed, 64 insertions, 65 deletions

diff --git a/Gemfile b/Gemfile
index 00597af61..782c0da3c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -69,7 +69,7 @@ end
 group :test do
   gem 'capybara', '~> 2.14'
   gem 'faker', '~> 1.7'
-  gem 'microformats2', '~> 2.1'
+  gem 'microformats2', '~> 3.0'
   gem 'rails-controller-testing', '~> 1.0'
   gem 'rspec-sidekiq', '~> 3.0'
   gem 'simplecov', '~> 0.14', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index e1dd934a0..d52799fff 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,40 +1,40 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.2)
-      actionpack (= 5.0.2)
+    actioncable (5.0.3)
+      actionpack (= 5.0.3)
       nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
+    actionmailer (5.0.3)
+      actionpack (= 5.0.3)
+      actionview (= 5.0.3)
+      activejob (= 5.0.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.2)
-      actionview (= 5.0.2)
-      activesupport (= 5.0.2)
+    actionpack (5.0.3)
+      actionview (= 5.0.3)
+      activesupport (= 5.0.3)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.2)
-      activesupport (= 5.0.2)
+    actionview (5.0.3)
+      activesupport (= 5.0.3)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
     active_record_query_trace (1.5.4)
-    activejob (5.0.2)
-      activesupport (= 5.0.2)
+    activejob (5.0.3)
+      activesupport (= 5.0.3)
       globalid (>= 0.3.6)
-    activemodel (5.0.2)
-      activesupport (= 5.0.2)
-    activerecord (5.0.2)
-      activemodel (= 5.0.2)
-      activesupport (= 5.0.2)
+    activemodel (5.0.3)
+      activesupport (= 5.0.3)
+    activerecord (5.0.3)
+      activemodel (= 5.0.3)
+      activesupport (= 5.0.3)
       arel (~> 7.0)
-    activesupport (5.0.2)
+    activesupport (5.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -52,13 +52,13 @@ GEM
       encryptor (~> 3.0.0)
     av (0.9.0)
       cocaine (~> 0.5.3)
-    aws-sdk (2.9.15)
-      aws-sdk-resources (= 2.9.15)
-    aws-sdk-core (2.9.15)
+    aws-sdk (2.9.17)
+      aws-sdk-resources (= 2.9.17)
+    aws-sdk-core (2.9.17)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.9.15)
-      aws-sdk-core (= 2.9.15)
+    aws-sdk-resources (2.9.17)
+      aws-sdk-core (= 2.9.17)
     aws-sigv4 (1.0.0)
     bcrypt (3.1.11)
     better_errors (2.1.1)
@@ -75,7 +75,7 @@ GEM
     bundler-audit (0.5.0)
       bundler (~> 1.2)
       thor (~> 0.18)
-    capistrano (3.8.0)
+    capistrano (3.8.1)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
@@ -101,7 +101,7 @@ GEM
     chunky_png (1.3.8)
     cld3 (3.1.1)
       ffi (>= 1.1.0, < 1.10.0)
-    climate_control (0.1.0)
+    climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.1)
@@ -111,7 +111,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.2)
-    debug_inspector (0.0.2)
+    debug_inspector (0.0.3)
     devise (4.2.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -140,7 +140,7 @@ GEM
       thread_safe
     encryptor (3.0.0)
     erubis (2.7.0)
-    et-orbi (1.0.3)
+    et-orbi (1.0.4)
       tzinfo
     execjs (2.7.0)
     fabrication (2.16.1)
@@ -217,17 +217,16 @@ GEM
       letter_opener (~> 1.0)
       railties (>= 3.2)
     link_header (0.0.8)
-    lograge (0.5.0)
-      actionpack (>= 4, <= 5.1.0)
-      activesupport (>= 4, <= 5.1.0)
-      railties (>= 4, <= 5.1.0)
+    lograge (0.5.1)
+      actionpack (>= 4, < 5.2)
+      activesupport (>= 4, < 5.2)
+      railties (>= 4, < 5.2)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.5)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
-    microformats2 (2.1.0)
-      activesupport
+    microformats2 (3.0.1)
       json
       nokogiri
     mime-types (3.1)
@@ -235,17 +234,17 @@ GEM
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
     mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    minitest (5.10.2)
     multi_json (1.12.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (4.1.0)
     nio4r (2.0.0)
-    nokogiri (1.7.1)
+    nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
     nokogumbo (1.4.10)
       nokogiri
-    oj (3.0.6)
+    oj (3.0.7)
     openssl (2.0.3)
     orm_adapter (0.5.0)
     ostatus2 (2.0.0)
@@ -283,7 +282,7 @@ GEM
     puma (3.8.2)
     rabl (0.13.1)
       activesupport (>= 2.3.14)
-    rack (2.0.1)
+    rack (2.0.2)
     rack-attack (5.0.1)
       rack
     rack-cors (0.4.1)
@@ -292,25 +291,25 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     rack-timeout (0.4.2)
-    rails (5.0.2)
-      actioncable (= 5.0.2)
-      actionmailer (= 5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
-      activemodel (= 5.0.2)
-      activerecord (= 5.0.2)
-      activesupport (= 5.0.2)
+    rails (5.0.3)
+      actioncable (= 5.0.3)
+      actionmailer (= 5.0.3)
+      actionpack (= 5.0.3)
+      actionview (= 5.0.3)
+      activejob (= 5.0.3)
+      activemodel (= 5.0.3)
+      activerecord (= 5.0.3)
+      activesupport (= 5.0.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.2)
+      railties (= 5.0.3)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.1)
       actionpack (~> 5.x)
       actionview (~> 5.x)
       activesupport (~> 5.x)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails-i18n (5.0.4)
@@ -318,9 +317,9 @@ GEM
       railties (~> 5.0)
     rails-settings-cached (0.6.5)
       rails (>= 4.2.0)
-    railties (5.0.2)
-      actionpack (= 5.0.2)
-      activesupport (= 5.0.2)
+    railties (5.0.3)
+      actionpack (= 5.0.3)
+      activesupport (= 5.0.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -337,9 +336,9 @@ GEM
       redis-store (~> 1.3.0)
     redis-namespace (1.5.3)
       redis (~> 3.0, >= 3.0.4)
-      redis-store (>= 1.2, < 1.4)
     redis-rack (2.0.2)
       rack (>= 1.5, < 3)
+      redis-store (>= 1.2, < 1.4)
     redis-rails (5.0.2)
       redis-actionpack (>= 5.0, < 6)
       redis-activesupport (>= 5.0, < 6)
@@ -502,7 +501,7 @@ DEPENDENCIES
   letter_opener_web (~> 1.3)
   link_header (~> 0.0)
   lograge (~> 0.5)
-  microformats2 (~> 2.1)
+  microformats2 (~> 3.0)
   nokogiri (~> 1.7)
   oj (~> 3.0)
   ostatus2 (~> 2.0)
diff --git a/spec/views/stream_entries/show.html.haml_spec.rb b/spec/views/stream_entries/show.html.haml_spec.rb
index 7cbdf6762..cc380e6ea 100644
--- a/spec/views/stream_entries/show.html.haml_spec.rb
+++ b/spec/views/stream_entries/show.html.haml_spec.rb
@@ -32,8 +32,8 @@ describe 'stream_entries/show.html.haml', without_verify_partial_doubles: true d
     expect(mf2.entry.name.to_s).to eq status.text
     expect(mf2.entry.url.to_s).not_to be_empty
 
-    expect(mf2.entry.author.format.name.to_s).to eq alice.display_name
-    expect(mf2.entry.author.format.url.to_s).not_to be_empty
+    expect(mf2.entry.author.name.to_s).to eq alice.display_name
+    expect(mf2.entry.author.url.to_s).not_to be_empty
   end
 
   it 'has valid h-cites for p-in-reply-to and p-comment' do
@@ -58,13 +58,13 @@ describe 'stream_entries/show.html.haml', without_verify_partial_doubles: true d
     expect(mf2.entry.name.to_s).to eq reply.text
     expect(mf2.entry.url.to_s).not_to be_empty
 
-    expect(mf2.entry.comment.format.url.to_s).not_to be_empty
-    expect(mf2.entry.comment.format.author.format.name.to_s).to eq carl.display_name
-    expect(mf2.entry.comment.format.author.format.url.to_s).not_to be_empty
+    expect(mf2.entry.comment.url.to_s).not_to be_empty
+    expect(mf2.entry.comment.author.name.to_s).to eq carl.display_name
+    expect(mf2.entry.comment.author.url.to_s).not_to be_empty
 
-    expect(mf2.entry.in_reply_to.format.url.to_s).not_to be_empty
-    expect(mf2.entry.in_reply_to.format.author.format.name.to_s).to eq alice.display_name
-    expect(mf2.entry.in_reply_to.format.author.format.url.to_s).not_to be_empty
+    expect(mf2.entry.in_reply_to.url.to_s).not_to be_empty
+    expect(mf2.entry.in_reply_to.author.name.to_s).to eq alice.display_name
+    expect(mf2.entry.in_reply_to.author.url.to_s).not_to be_empty
   end
 
   it 'has valid opengraph tags' do