Fix RuboCop offenses

Author: sferik

.rubocop.yml

@@ -1,6 +1,7 @@
 inherit_from:
   - .rubocop/layout.yml
   - .rubocop/metrics.yml
+  - .rubocop/rspec.yml
   - .rubocop/style.yml
 
 plugins:

.rubocop/rspec.yml

@@ -0,0 +1,11 @@
+RSpec/ExampleLength:
+  Max: 25
+
+RSpec/MultipleExpectations:
+  Max: 5
+
+RSpec/MultipleMemoizedHelpers:
+  Max: 6
+
+RSpec/NestedGroups:
+  Max: 4

http-form_data.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   DESC
 
   spec.metadata["changelog_uri"] = "https://github.com/httprb/form_data/blob/master/CHANGES.md"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}).map { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.5"

lib/http/form_data.rb

@@ -86,7 +86,7 @@ def multipart?(data)
         data.any? do |_, v|
           next true if v.is_a? FormData::Part
 
-          v.respond_to?(:to_ary) && v.to_ary.any? { |e| e.is_a? FormData::Part }
+          v.respond_to?(:to_ary) && v.to_ary.any?(FormData::Part)
         end
       end
     end

lib/http/form_data/urlencoded.rb

@@ -67,23 +67,26 @@ module DefaultEncoder
           class << self
             def encode(value, prefix = nil)
               case value
-              when Hash
-                encode_hash(value, prefix)
-              when Array
-                if prefix
-                  value.map { |v| encode(v, "#{prefix}[]") }.join("&")
-                else
-                  encode_pairs(value)
-                end
-              when nil then prefix.to_s
+              when Hash  then encode_hash(value, prefix)
+              when Array then encode_array(value, prefix)
+              when nil   then prefix.to_s
               else
                 raise ArgumentError, "value must be a Hash" if prefix.nil?
+
                 "#{prefix}=#{escape(value)}"
               end
             end
 
             private
 
+            def encode_array(value, prefix)
+              if prefix
+                value.map { |v| encode(v, "#{prefix}[]") }.join("&")
+              else
+                encode_pairs(value)
+              end
+            end
+
             def encode_pairs(pairs)
               pairs.map { |k, v| encode(v, escape(k)) }.reject(&:empty?).join("&")
             end

spec/lib/http/form_data/composite_io_spec.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
 RSpec.describe HTTP::FormData::CompositeIO do
-  subject(:composite_io) { HTTP::FormData::CompositeIO.new(ios) }
+  subject(:composite_io) { described_class.new(ios) }
 
   let(:ios) { ["Hello", " ", "", "world", "!"].map { |s| StringIO.new(s) } }
 
   describe "#initialize" do
     it "accepts IOs and strings" do
-      io = HTTP::FormData::CompositeIO.new(["Hello ", StringIO.new("world!")])
+      io = described_class.new(["Hello ", StringIO.new("world!")])
       expect(io.read).to eq "Hello world!"
     end
 
     it "fails if an IO is neither a String nor an IO" do
-      expect { HTTP::FormData::CompositeIO.new %i[hello world] }
+      expect { described_class.new %i[hello world] }
         .to raise_error(ArgumentError)
     end
   end
@@ -36,7 +36,7 @@
 
     it "returns nil when no partial data was retrieved" do
       composite_io.read
-      expect(composite_io.read(3)).to eq nil
+      expect(composite_io.read(3)).to be_nil
     end
 
     it "reads partial data with a buffer" do
@@ -62,12 +62,12 @@
     it "returns nil when no partial data was retrieved with a buffer" do
       outbuf = String.new("content")
       composite_io.read
-      expect(composite_io.read(3, outbuf)).to eq nil
+      expect(composite_io.read(3, outbuf)).to be_nil
       expect(outbuf).to eq ""
     end
 
     it "returns data in binary encoding" do
-      io = HTTP::FormData::CompositeIO.new(%w[Janko Marohnić])
+      io = described_class.new(%w[Janko Marohnić])
 
       expect(io.read(5).encoding).to eq Encoding::BINARY
       expect(io.read(9).encoding).to eq Encoding::BINARY
@@ -79,7 +79,7 @@
 
     it "reads data in bytes" do
       emoji = "😃"
-      io = HTTP::FormData::CompositeIO.new([emoji])
+      io = described_class.new([emoji])
 
       expect(io.read(1)).to eq emoji.b[0]
       expect(io.read(1)).to eq emoji.b[1]
@@ -102,7 +102,7 @@
     end
 
     it "returns 0 when there are no IOs" do
-      empty_composite_io = HTTP::FormData::CompositeIO.new []
+      empty_composite_io = described_class.new []
       expect(empty_composite_io.size).to eq 0
     end
   end

spec/lib/http/form_data/file_spec.rb

@@ -9,22 +9,27 @@
 
     context "when file given as a String" do
       let(:file) { fixture("the-http-gem.info").to_s }
+
       it { is_expected.to eq fixture("the-http-gem.info").size }
     end
 
     context "when file given as a Pathname" do
       let(:file) { fixture("the-http-gem.info") }
+
       it { is_expected.to eq fixture("the-http-gem.info").size }
     end
 
     context "when file given as File" do
       let(:file) { fixture("the-http-gem.info").open }
+
       after { file.close }
+
       it { is_expected.to eq fixture("the-http-gem.info").size }
     end
 
     context "when file given as IO" do
       let(:file) { StringIO.new "привет мир!" }
+
       it { is_expected.to eq 20 }
     end
   end
@@ -34,6 +39,7 @@
 
     context "when file given as a String" do
       let(:file) { fixture("the-http-gem.info").to_s }
+
       it { is_expected.to eq fixture("the-http-gem.info").read(:mode => "rb") }
 
       it "rewinds content" do
@@ -45,6 +51,7 @@
 
     context "when file given as a Pathname" do
       let(:file) { fixture("the-http-gem.info") }
+
       it { is_expected.to eq fixture("the-http-gem.info").read(:mode => "rb") }
 
       it "rewinds content" do
@@ -56,7 +63,9 @@
 
     context "when file given as File" do
       let(:file) { fixture("the-http-gem.info").open("rb") }
+
       after { file.close }
+
       it { is_expected.to eq fixture("the-http-gem.info").read(:mode => "rb") }
 
       it "rewinds content" do
@@ -68,6 +77,7 @@
 
     context "when file given as IO" do
       let(:file) { StringIO.new "привет мир!" }
+
       it { is_expected.to eq "привет мир!" }
 
       it "rewinds content" do
@@ -83,22 +93,27 @@
 
     context "when file given as a String" do
       let(:file) { fixture("the-http-gem.info").to_s }
+
       it { is_expected.to eq fixture("the-http-gem.info").read(:mode => "rb") }
     end
 
     context "when file given as a Pathname" do
       let(:file) { fixture("the-http-gem.info") }
+
       it { is_expected.to eq fixture("the-http-gem.info").read(:mode => "rb") }
     end
 
     context "when file given as File" do
       let(:file) { fixture("the-http-gem.info").open("rb") }
+
       after { file.close }
+
       it { is_expected.to eq fixture("the-http-gem.info").read(:mode => "rb") }
     end
 
     context "when file given as IO" do
       let(:file) { StringIO.new "привет мир!" }
+
       it { is_expected.to eq "привет мир!" }
     end
   end
@@ -126,6 +141,7 @@
 
     context "when file given as File" do
       let(:file) { fixture("the-http-gem.info").open("rb") }
+
       after { file.close }
 
       it "rewinds the underlying IO object" do
@@ -152,33 +168,37 @@
     context "when file given as a String" do
       let(:file) { fixture("the-http-gem.info").to_s }
 
-      it { is_expected.to eq ::File.basename file }
+      it { is_expected.to eq File.basename file }
 
-      context "and filename given with options" do
+      context "with filename given in options" do
         let(:opts) { { :filename => "foobar.txt" } }
+
         it { is_expected.to eq "foobar.txt" }
       end
     end
 
     context "when file given as a Pathname" do
       let(:file) { fixture("the-http-gem.info") }
 
-      it { is_expected.to eq ::File.basename file }
+      it { is_expected.to eq File.basename file }
 
-      context "and filename given with options" do
+      context "with filename given in options" do
         let(:opts) { { :filename => "foobar.txt" } }
+
         it { is_expected.to eq "foobar.txt" }
       end
     end
 
     context "when file given as File" do
       let(:file) { fixture("the-http-gem.info").open }
+
       after { file.close }
 
       it { is_expected.to eq "the-http-gem.info" }
 
-      context "and filename given with options" do
+      context "with filename given in options" do
         let(:opts) { { :filename => "foobar.txt" } }
+
         it { is_expected.to eq "foobar.txt" }
       end
     end
@@ -188,27 +208,30 @@
 
       it { is_expected.to eq "stream-#{file.object_id}" }
 
-      context "and filename given with options" do
+      context "with filename given in options" do
         let(:opts) { { :filename => "foobar.txt" } }
+
         it { is_expected.to eq "foobar.txt" }
       end
     end
   end
 
   describe "#content_type" do
-    let(:file) { StringIO.new }
     subject    { form_file.content_type }
 
+    let(:file) { StringIO.new }
+
     it { is_expected.to eq "application/octet-stream" }
 
     context "when it was given with options" do
       let(:opts) { { :content_type => "application/json" } }
+
       it { is_expected.to eq "application/json" }
     end
   end
 
   describe "#mime_type" do
-    it "should be an alias of #content_type" do
+    it "is an alias of #content_type" do
       expect(described_class.instance_method(:mime_type))
         .to eq(described_class.instance_method(:content_type))
     end

spec/lib/http/form_data/multipart_spec.rb

@@ -37,7 +37,7 @@ def disposition(params)
 
     context "with user-defined boundary" do
       subject(:form_data) do
-        HTTP::FormData::Multipart.new params, :boundary => "my-boundary"
+        described_class.new params, :boundary => "my-boundary"
       end
 
       it "uses the given boundary" do
@@ -56,7 +56,7 @@ def disposition(params)
 
     context "with filename set to nil" do
       let(:part) { HTTP::FormData::Part.new("s", :content_type => "mime/type") }
-      let(:form_data) { HTTP::FormData::Multipart.new({ :foo => part }) }
+      let(:form_data) { described_class.new({ :foo => part }) }
 
       it "doesn't include a filename" do
         boundary_value = form_data.content_type[/(#{boundary})$/, 1]
@@ -73,7 +73,7 @@ def disposition(params)
 
     context "with content type set to nil" do
       let(:part) { HTTP::FormData::Part.new("s") }
-      let(:form_data) { HTTP::FormData::Multipart.new({ :foo => part }) }
+      let(:form_data) { described_class.new({ :foo => part }) }
 
       it "doesn't include a filename" do
         boundary_value = form_data.content_type[/(#{boundary})$/, 1]
@@ -88,7 +88,7 @@ def disposition(params)
     end
 
     it "supports any Enumerable of pairs" do
-      enum = Enumerator.new { |y| y << [:foo, :bar] << [:foo, :baz] }
+      enum = Enumerator.new { |y| y << %i[foo bar] << %i[foo baz] }
       form_data = described_class.new(enum)
 
       boundary_value = form_data.boundary
@@ -172,7 +172,7 @@ def disposition(params)
 
     context "with user-defined boundary" do
       let(:form_data) do
-        HTTP::FormData::Multipart.new params, :boundary => "my-boundary"
+        described_class.new params, :boundary => "my-boundary"
       end
 
       it "includes the given boundary" do
@@ -184,6 +184,7 @@ def disposition(params)
 
   describe "#content_length" do
     subject { form_data.content_length }
+
     it { is_expected.to eq form_data.to_s.bytesize }
   end
 
@@ -194,7 +195,7 @@ def disposition(params)
 
     context "with user-defined boundary" do
       let(:form_data) do
-        HTTP::FormData::Multipart.new params, :boundary => "my-boundary"
+        described_class.new params, :boundary => "my-boundary"
       end
 
       it "returns the given boundary" do