Merge pull request #1381 from ochagata/fix_block_delimiter_violations

Fixed violations that had to do with using {...} for multi-line operations

Author: dblock

.rubocop_todo.yml

@@ -43,20 +43,6 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Max: 16
 
-# Offense count: 44
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
-# SupportedStyles: line_count_based, semantic, braces_for_chaining
-# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
-# FunctionalMethods: let, let!, subject, watch
-# IgnoredMethods: lambda, proc, it
-Style/BlockDelimiters:
-  Exclude:
-    - 'spec/grape/api_spec.rb'
-    - 'spec/grape/exceptions/validation_errors_spec.rb'
-    - 'spec/grape/middleware/versioner/header_spec.rb'
-    - 'spec/grape/request_spec.rb'
-
 # Offense count: 111
 Style/Documentation:
   Enabled: false

spec/grape/api_spec.rb

@@ -2170,9 +2170,9 @@ def static
         expect(last_response.body).to eq('["a","b,c"]')
       end
       it 'sets params' do
-        expect(subject.routes.map { |route|
+        expect(subject.routes.map do |route|
           { params: route.params }
-        }).to eq [
+        end).to eq [
           {
             params: {
               'string' => '',
@@ -2200,9 +2200,9 @@ def static
         end
       end
       it 'sets params' do
-        expect(subject.routes.map { |route|
+        expect(subject.routes.map do |route|
           { params: route.params }
-        }).to eq [
+        end).to eq [
           {
             params: {
               'one' => { required: true, desc: 'a token' },
@@ -2231,9 +2231,9 @@ def static
         end
       end
       it 'sets params' do
-        expect(subject.routes.map { |route|
+        expect(subject.routes.map do |route|
           { params: route.params }
-        }).to eq [
+        end).to eq [
           {
             params: {
               'one' => { required: true, desc: 'a token' },
@@ -2285,7 +2285,7 @@ def static
     end
     it 'describes a method' do
       subject.desc 'first method'
-      subject.get :first do; end
+      subject.get :first
       expect(subject.routes.length).to eq(1)
       route = subject.routes.first
       expect(route.description).to eq('first method')
@@ -2295,52 +2295,52 @@ def static
     end
     it 'has params which does not include format and version as named captures' do
       subject.version :v1, using: :path
-      subject.get :first do; end
+      subject.get :first
       param_keys = subject.routes.first.params.keys
       expect(param_keys).not_to include('format')
       expect(param_keys).not_to include('version')
     end
     it 'describes methods separately' do
       subject.desc 'first method'
-      subject.get :first do; end
+      subject.get :first
       subject.desc 'second method'
-      subject.get :second do; end
+      subject.get :second
       expect(subject.routes.count).to eq(2)
-      expect(subject.routes.map { |route|
+      expect(subject.routes.map do |route|
         { description: route.description, params: route.params }
-      }).to eq [
+      end).to eq [
         { description: 'first method', params: {} },
         { description: 'second method', params: {} }
       ]
     end
     it 'resets desc' do
       subject.desc 'first method'
-      subject.get :first do; end
-      subject.get :second do; end
-      expect(subject.routes.map { |route|
+      subject.get :first
+      subject.get :second
+      expect(subject.routes.map do |route|
         { description: route.description, params: route.params }
-      }).to eq [
+      end).to eq [
         { description: 'first method', params: {} },
         { description: nil, params: {} }
       ]
     end
     it 'namespaces and describe arbitrary parameters' do
       subject.namespace 'ns' do
         desc 'ns second', foo: 'bar'
-        get 'second' do; end
+        get 'second'
       end
-      expect(subject.routes.map { |route|
+      expect(subject.routes.map do |route|
         { description: route.description, foo: route.route_foo, params: route.params }
-      }).to eq [
+      end).to eq [
         { description: 'ns second', foo: 'bar', params: {} }
       ]
     end
     it 'includes details' do
       subject.desc 'method', details: 'method details'
-      subject.get 'method' do; end
-      expect(subject.routes.map { |route|
+      subject.get 'method'
+      expect(subject.routes.map do |route|
         { description: route.description, details: route.details, params: route.params }
-      }).to eq [
+      end).to eq [
         { description: 'method', details: 'method details', params: {} }
       ]
     end
@@ -2349,9 +2349,9 @@ def static
       subject.get 'reverse' do
         params[:s].reverse
       end
-      expect(subject.routes.map { |route|
+      expect(subject.routes.map do |route|
         { description: route.description, params: route.params }
-      }).to eq [
+      end).to eq [
         { description: 'Reverses a string.', params: { 's' => { desc: 'string to reverse', type: 'string' } } }
       ]
     end
@@ -2362,17 +2362,17 @@ def static
         optional :param2
       end
       subject.namespace 'ns1' do
-        get do; end
+        get { ; }
       end
       subject.params do
         optional :param2
       end
       subject.namespace 'ns2' do
-        get do; end
+        get { ; }
       end
-      routes_doc = subject.routes.map { |route|
+      routes_doc = subject.routes.map do |route|
         { description: route.description, params: route.params }
-      }
+      end
       expect(routes_doc).to eq [
         { description: 'global description',
           params: {
@@ -2397,12 +2397,12 @@ def static
         params do
           optional :method_param, desc: 'method parameter'
         end
-        get 'method' do; end
+        get 'method'
       end
 
-      routes_doc = subject.routes.map { |route|
+      routes_doc = subject.routes.map do |route|
         { description: route.description, params: route.params }
-      }
+      end
       expect(routes_doc).to eq [
         { description: 'method',
           params: {
@@ -2429,12 +2429,12 @@ def static
           params do
             optional :method_param, desc: 'method param'
           end
-          get 'method' do; end
+          get 'method'
         end
       end
-      expect(subject.routes.map { |route|
+      expect(subject.routes.map do |route|
         { description: route.description, params: route.params }
-      }).to eq [
+      end).to eq [
         { description: 'method',
           params: {
             'ns_param' => { required: true, desc: 'ns param 2' },
@@ -2457,7 +2457,7 @@ def static
           requires :param2, desc: 'group2 param2 desc'
         end
       end
-      subject.get 'method' do; end
+      subject.get 'method'
 
       expect(subject.routes.map(&:params)).to eq [{
         'group1'         => { required: true, type: 'Array' },
@@ -2476,10 +2476,10 @@ def static
           requires :nested_param, desc: 'nested param'
         end
       end
-      subject.get 'method' do; end
-      expect(subject.routes.map { |route|
+      subject.get 'method'
+      expect(subject.routes.map do |route|
         { description: route.description, params: route.params }
-      }).to eq [
+      end).to eq [
         { description: 'nesting',
           params: {
             'root_param' => { required: true, desc: 'root param' },
@@ -2500,10 +2500,10 @@ def static
       subject.params do
         requires :one_param, desc: 'one param'
       end
-      subject.get 'method' do; end
-      expect(subject.routes.map { |route|
+      subject.get 'method'
+      expect(subject.routes.map do |route|
         { description: route.description, params: route.params }
-      }).to eq [
+      end).to eq [
         { description: nil, params: { 'one_param' => { required: true, desc: 'one param' } } }
       ]
     end
@@ -2512,9 +2512,9 @@ def static
       subject.get 'reverse/:s' do
         params[:s].reverse
       end
-      expect(subject.routes.map { |route|
+      expect(subject.routes.map do |route|
         { description: route.description, params: route.params }
-      }).to eq [
+      end).to eq [
         { description: 'Reverses a string.', params: { 's' => { desc: 'string to reverse', type: 'string' } } }
       ]
     end

spec/grape/exceptions/validation_errors_spec.rb

@@ -6,11 +6,11 @@
   let(:validation_error) { OpenStruct.new(params: [validation_message]) }
 
   context 'initialize' do
-    let(:headers) {
+    let(:headers) do
       {
         'A-Header-Key' => 'A-Header-Value'
       }
-    }
+    end
 
     subject do
       described_class.new(errors: [validation_error], headers: headers)

spec/grape/middleware/versioner/header_spec.rb

@@ -263,13 +263,13 @@
   end
 
   context 'when there are multiple versions with complex vendor specified with rescue_from :all' do
-    subject {
+    subject do
       Class.new(Grape::API) do
         rescue_from :all
       end
-    }
+    end
 
-    let(:v1_app) {
+    let(:v1_app) do
       Class.new(Grape::API) do
         version 'v1', using: :header, vendor: 'test.a-cool_resource', cascade: false, strict: true
         content_type :v1_test, 'application/vnd.test.a-cool_resource-v1+json'
@@ -282,9 +282,9 @@
           end
         end
       end
-    }
+    end
 
-    let(:v2_app) {
+    let(:v2_app) do
       Class.new(Grape::API) do
         version 'v2', using: :header, vendor: 'test.a-cool_resource', strict: true
         content_type :v2_test, 'application/vnd.test.a-cool_resource-v2+json'
@@ -297,7 +297,7 @@
           end
         end
       end
-    }
+    end
 
     def app
       subject.mount v2_app