Code formatting:

- Clean up the code to be a bit more like what I write.
- Create a .rubocop.yml that disables bone-headed defaults and
  sets things I agree with.

7 files changed, 34 insertions, 50 deletions

diff --git a/test/minitest_helper.rb b/test/minitest_helper.rb
index 40b1ef8..27c3913 100644
--- a/test/minitest_helper.rb
+++ b/test/minitest_helper.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
-
 require 'mime/type'
 require 'fileutils'
 
diff --git a/test/test_mime_type.rb b/test/test_mime_type.rb
index 70690c7..feae3f9 100644
--- a/test/test_mime_type.rb
+++ b/test/test_mime_type.rb
@@ -1,13 +1,9 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
-
 require 'mime/types'
 require 'minitest_helper'
 
 describe MIME::Type do
-  # it { fail }
-
   def mime_type(content_type)
     MIME::Type.new(content_type) { |mt| yield mt if block_given? }
   end
@@ -333,8 +329,8 @@ describe MIME::Type do
     end
 
     it 'sorts (2) based on extensions' do
-      text_1.extensions = ["foo", "bar"]
-      text_2.extensions = ["foo"]
+      text_1.extensions = ['foo', 'bar']
+      text_2.extensions = ['foo']
 
       assert_priority_same text_1, text_2
 
@@ -476,7 +472,7 @@ describe MIME::Type do
 
   describe '#to_s, #to_str' do
     it 'represents itself as a string of the canonical content_type' do
-      assert_equal 'text/plain', "#{text_plain}"
+      assert_equal 'text/plain', "#{text_plain}" # rubocop:disable Style/UnneededInterpolation
     end
 
     it 'acts like a string of the canonical content_type for comparison' do
@@ -490,7 +486,7 @@ describe MIME::Type do
 
   describe '#xrefs, #xrefs=' do
     let(:expected) {
-      MIME::Types::Container.new({ 'rfc' => Set[*%w(rfc1234 rfc5678)] })
+      MIME::Types::Container.new('rfc' => Set['rfc1234', 'rfc5678'])
     }
 
     it 'returns the expected results' do
@@ -518,13 +514,13 @@ describe MIME::Type do
     let(:type) {
       mime_type('a/b').tap do |t|
         t.xrefs = {
-          'draft'      => [ 'RFC1' ],
-          'template'   => [ 'a/b' ],
-          'person'     => [ 'p-1' ],
-          'rfc'        => [ 'rfc-1' ],
-          'rfc-errata' => [ 'err-1' ],
-          'uri'        => [ 'http://example.org' ],
-          'text'       => [ 'text' ]
+          'draft' => ['RFC1'],
+          'template' => ['a/b'],
+          'person' => ['p-1'],
+          'rfc' => ['rfc-1'],
+          'rfc-errata' => ['err-1'],
+          'uri' => ['http://example.org'],
+          'text' => ['text']
         }
       end
     }
@@ -588,10 +584,10 @@ describe MIME::Type do
 
     it 'merges new values from an array parameter' do
       expected = { 'en' => 'Text files' }
-      assert_equal expected, text_plain.friendly([ 'en', 'Text files' ])
+      assert_equal expected, text_plain.friendly(['en', 'Text files'])
       expected.update('fr' => 'des fichiers texte')
       assert_equal expected,
-        text_plain.friendly([ 'fr', 'des fichiers texte' ])
+        text_plain.friendly(['fr', 'des fichiers texte'])
     end
 
     it 'merges new values from a hash parameter' do
diff --git a/test/test_mime_types.rb b/test/test_mime_types.rb
index f4528a3..f8b1a0b 100644
--- a/test/test_mime_types.rb
+++ b/test/test_mime_types.rb
@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
-
 require 'mime/types'
 require 'minitest_helper'
 
 describe MIME::Types do
   def mime_types
-    @mime_types ||= MIME::Types.new.tap do |mt|
+    @mime_types ||= MIME::Types.new.tap { |mt|
       mt.add MIME::Type.new(['text/plain', %w(txt)]),
         MIME::Type.new(['image/jpeg', %w(jpg jpeg)]),
         MIME::Type.new('application/x-wordperfect6.1'),
@@ -21,12 +19,12 @@ describe MIME::Types do
           'extensions' => 'gz',
           'registered' => true
         )
-    end
+    }
   end
 
   describe 'is enumerable' do
     it 'correctly uses an Enumerable method like #any?' do
-      assert mime_types.any? { |type| type.content_type == 'text/plain' }
+      assert(mime_types.any? { |type| type.content_type == 'text/plain' })
     end
 
     it 'implements each with no parameters to return an Enumerator' do
@@ -95,11 +93,11 @@ describe MIME::Types do
 
   describe '#add' do
     let(:eruby) { MIME::Type.new('application/x-eruby') }
-    let(:jinja) { MIME::Type.new('application/jinja2' )}
+    let(:jinja) { MIME::Type.new('application/jinja2') }
 
     it 'successfully adds a new type' do
       mime_types.add(eruby)
-      assert_equal mime_types['application/x-eruby'], [ eruby ]
+      assert_equal mime_types['application/x-eruby'], [eruby]
     end
 
     it 'complains about adding a duplicate type' do
@@ -115,13 +113,13 @@ describe MIME::Types do
       assert_output '', '' do
         mime_types.add(eruby, :silent)
       end
-      assert_equal mime_types['application/x-eruby'], [ eruby ]
+      assert_equal mime_types['application/x-eruby'], [eruby]
     end
 
     it 'successfully adds from an array' do
-      mime_types.add([ eruby, jinja ])
-      assert_equal mime_types['application/x-eruby'], [ eruby ]
-      assert_equal mime_types['application/jinja2'], [ jinja ]
+      mime_types.add([eruby, jinja])
+      assert_equal mime_types['application/x-eruby'], [eruby]
+      assert_equal mime_types['application/jinja2'], [jinja]
     end
 
     it 'successfully adds from another MIME::Types' do
@@ -130,7 +128,7 @@ describe MIME::Types do
       assert_equal mime_types.count, mt.count
 
       mime_types.each do |type|
-        assert_equal mt[type.content_type], [ type ]
+        assert_equal mt[type.content_type], [type]
       end
     end
   end
diff --git a/test/test_mime_types_cache.rb b/test/test_mime_types_cache.rb
index 2209cab..b56526f 100644
--- a/test/test_mime_types_cache.rb
+++ b/test/test_mime_types_cache.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
-
 require 'mime/types'
 require 'minitest_helper'
 
@@ -69,7 +67,7 @@ describe MIME::Types::Cache do
     it 'outputs an error when there is a marshal file incompatibility' do
       MIME::Types::Cache.save
       data = File.binread(@cache_file).reverse
-      File.open(@cache_file, 'wb') { |f| f.write(data) }
+      File.open(@cache_file, 'wb') do |f| f.write(data) end
       MIME::Types.instance_variable_set(:@__types__, nil)
       assert_output '', /incompatible marshal file format/ do
         MIME::Types['text/html']
diff --git a/test/test_mime_types_class.rb b/test/test_mime_types_class.rb
index 578341e..418678a 100644
--- a/test/test_mime_types_class.rb
+++ b/test/test_mime_types_class.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
-
 require 'mime/types'
 require 'minitest_helper'
 
@@ -12,7 +10,7 @@ describe MIME::Types, 'registry' do
 
   describe 'is enumerable' do
     it 'correctly uses an Enumerable method like #any?' do
-      assert MIME::Types.any? { |type| type.content_type == 'text/plain' }
+      assert(MIME::Types.any? { |type| type.content_type == 'text/plain' })
     end
 
     it 'implements each with no parameters to return an Enumerator' do
@@ -45,7 +43,7 @@ describe MIME::Types, 'registry' do
 
     it 'sorts by priority with multiple matches' do
       types = MIME::Types[/gzip$/].select { |t|
-        t == 'application/gzip' || t == 'application/x-gzip' || t == 'multipart/x-gzip'
+        %w(application/gzip application/x-gzip multipart/x-gzip).include?(t)
       }
       # This is this way because of a new type ending with gzip that only
       # appears in some data files.
@@ -117,11 +115,11 @@ describe MIME::Types, 'registry' do
     end
 
     let(:eruby) { MIME::Type.new('application/x-eruby') }
-    let(:jinja) { MIME::Type.new('application/jinja2' )}
+    let(:jinja) { MIME::Type.new('application/jinja2') }
 
     it 'successfully adds a new type' do
       MIME::Types.add(eruby)
-      assert_equal MIME::Types['application/x-eruby'], [ eruby ]
+      assert_equal MIME::Types['application/x-eruby'], [eruby]
     end
 
     it 'complains about adding a duplicate type' do
@@ -137,13 +135,13 @@ describe MIME::Types, 'registry' do
       assert_silent do
         MIME::Types.add(eruby, :silent)
       end
-      assert_equal MIME::Types['application/x-eruby'], [ eruby ]
+      assert_equal MIME::Types['application/x-eruby'], [eruby]
     end
 
     it 'successfully adds from an array' do
-      MIME::Types.add([ eruby, jinja ])
-      assert_equal MIME::Types['application/x-eruby'], [ eruby ]
-      assert_equal MIME::Types['application/jinja2'], [ jinja ]
+      MIME::Types.add([eruby, jinja])
+      assert_equal MIME::Types['application/x-eruby'], [eruby]
+      assert_equal MIME::Types['application/jinja2'], [jinja]
     end
 
     it 'successfully adds from another MIME::Types' do
@@ -155,7 +153,7 @@ describe MIME::Types, 'registry' do
       MIME::Types.add(mt)
       assert_equal old_count + 1, MIME::Types.count
 
-      assert_equal MIME::Types[eruby.content_type], [ eruby ]
+      assert_equal MIME::Types[eruby.content_type], [eruby]
     end
   end
 end
diff --git a/test/test_mime_types_lazy.rb b/test/test_mime_types_lazy.rb
index e730ba1..12233c0 100644
--- a/test/test_mime_types_lazy.rb
+++ b/test/test_mime_types_lazy.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
-
 require 'mime/types'
 require 'minitest_helper'
 
diff --git a/test/test_mime_types_loader.rb b/test/test_mime_types_loader.rb
index 2515f81..3f3206a 100644
--- a/test/test_mime_types_loader.rb
+++ b/test/test_mime_types_loader.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
-
 require 'mime/types'
 require 'minitest_helper'
 
@@ -18,7 +16,7 @@ describe MIME::Types::Loader do
     refute(types['audio/webm'].first.registered?)
 
     assert_equal('Fixes a bug with IE6 and progressive JPEGs',
-                 types['image/pjpeg'].first.docs)
+      types['image/pjpeg'].first.docs)
 
     assert(types['audio/vnd.qcelp'].first.obsolete?)
     assert_equal('audio/QCELP', types['audio/vnd.qcelp'].first.use_instead)