Lint: Fix blocks

Fixes the following cops:
- Layout/MultilineBlockLayout
- Lint/ConstantDefinitionInBlock
- Lint/EmptyBlock
- Lint/UnusedBlockArgument
- Style/BlockDelimiters
- Style/ExplicitBlockArgument

See also #1134

Author: sunny

.rubocop_todo.yml

@@ -208,8 +208,8 @@ def unregister(curr)
         existed ? true : false
       end
 
-      def each
-        all.each { |c| yield(c) }
+      def each(&)
+        all.each(&)
       end
 
       def reset!

lib/money/currency.rb

@@ -72,9 +72,7 @@ def marshal_dump
 
       # Wraps block execution in a thread-safe transaction
       def transaction(&)
-        guard.synchronize do
-          yield
-        end
+        guard.synchronize(&)
       end
 
       # Iterate over rate tuples (iso_from, iso_to, rate)

lib/money/rates_store/memory.rb

@@ -17,16 +17,18 @@
   end
 
   describe "#setup" do
-    it "calls #setup after #initialize" do
-      class MyBank < described_class
+    let(:bank_class) do
+      Class.new(described_class) do
         attr_reader :setup_called
 
         def setup
           @setup_called = true
         end
       end
+    end
 
-      bank = MyBank.new
+    it "calls #setup after #initialize" do
+      bank = bank_class.new
       expect(bank.setup_called).to be true
     end
   end

spec/bank/base_spec.rb

@@ -3,9 +3,9 @@
 RSpec.describe Money::Bank::SingleCurrency do
   describe "#exchange_with" do
     it "raises when called" do
-      expect {
+      expect do
         subject.exchange_with(Money.new(100, 'USD'), 'EUR')
-      }.to raise_error(Money::Bank::DifferentCurrencyError, "No exchanging of currencies allowed: 1.00 USD to EUR")
+      end.to raise_error(Money::Bank::DifferentCurrencyError, "No exchanging of currencies allowed: 1.00 USD to EUR")
     end
   end
 end

spec/bank/single_currency_spec.rb

@@ -6,11 +6,11 @@
 RSpec.describe Money::Bank::VariableExchange do
   describe "#initialize" do
     context "without &block" do
-      let(:bank) {
+      let(:bank) do
         described_class.new.tap do |bank|
           bank.add_rate('USD', 'EUR', 1.33)
         end
-      }
+      end
 
       describe '#store' do
         it 'defaults to Memory store' do
@@ -86,12 +86,12 @@
     end
 
     context "with &block" do
-      let(:bank) {
+      let(:bank) do
         proc = Proc.new { |n| n.ceil }
         described_class.new(&proc).tap do |bank|
           bank.add_rate('USD', 'EUR', 1.33)
         end
-      }
+      end
 
       describe "#exchange_with" do
         it "uses the stored truncation method" do

spec/bank/variable_exchange_spec.rb

@@ -1,18 +1,29 @@
 # frozen_string_literal: true
 
+FOO = {
+  priority: 1,
+  iso_code: "FOO",
+  iso_numeric: "840",
+  name: "United States Dollar",
+  symbol: "$",
+  subunit: "Cent",
+  subunit_to_unit: 1000,
+  symbol_first: true,
+  html_entity: "$",
+  decimal_mark: ".",
+  thousands_separator: ",",
+  smallest_denomination: 1,
+}.freeze
+
 RSpec.describe Money::Currency do
-  FOO = '{ "priority": 1, "iso_code": "FOO", "iso_numeric": "840", "name": "United States Dollar", "symbol": "$", "subunit": "Cent", "subunit_to_unit": 1000, "symbol_first": true, "html_entity": "$", "decimal_mark": ".", "thousands_separator": ",", "smallest_denomination": 1 }'
-
-  def register_foo(opts = {})
-    foo_attrs = JSON.parse(FOO, symbolize_names: true)
-    # Pass an array of attribute names to 'skip' to remove them from the 'FOO'
-    # json before registering foo as a currency.
-    Array(opts[:skip]).each { |attr| foo_attrs.delete(attr) }
-    described_class.register(foo_attrs)
+  # Pass an array of attribute names to skip to remove them from the registered
+  # currency.
+  def register_foo(skip: [])
+    described_class.register(FOO.except(*skip))
   end
 
   def unregister_foo
-    described_class.unregister(JSON.parse(FOO, symbolize_names: true))
+    described_class.unregister(FOO)
   end
 
   describe "UnknownCurrency" do
@@ -45,19 +56,22 @@ def unregister_foo
   end
 
   describe ".find_by_iso_numeric" do
+    let(:mock_class) do
+      Class.new do
+        def to_s
+          "208"
+        end
+      end
+    end
+
     it "returns currency matching given numeric code" do
       expect(described_class.find_by_iso_numeric(978)).to eq     described_class.new(:eur)
       expect(described_class.find_by_iso_numeric(208)).not_to eq described_class.new(:eur)
       expect(described_class.find_by_iso_numeric('840')).to eq   described_class.new(:usd)
       expect(described_class.find_by_iso_numeric(51)).to eq described_class.new(:amd)
 
-      class Mock
-        def to_s
-          '208'
-        end
-      end
-      expect(described_class.find_by_iso_numeric(Mock.new)).to eq     described_class.new(:dkk)
-      expect(described_class.find_by_iso_numeric(Mock.new)).not_to eq described_class.new(:usd)
+      expect(described_class.find_by_iso_numeric(mock_class.new)).to eq described_class.new(:dkk)
+      expect(described_class.find_by_iso_numeric(mock_class.new)).not_to eq described_class.new(:usd)
     end
 
     it "returns nil if no currency has the given numeric code" do
@@ -171,9 +185,9 @@ def to_s
     end
 
     specify ":iso_code must be present" do
-      expect {
+      expect do
         described_class.register(name: "New Currency")
-      }.to raise_error(KeyError)
+      end.to raise_error(KeyError)
     end
   end
 

spec/currency_spec.rb

@@ -755,21 +755,21 @@
     end
 
     it "raises TypeError dividing by a Money (unless other is a Money)" do
-      expect {
+      expect do
         2 / Money.new(2, 'USD')
-      }.to raise_error(TypeError)
+      end.to raise_error(TypeError)
     end
 
     it "raises TypeError subtracting by a Money (unless other is a Money)" do
-      expect {
+      expect do
         2 - Money.new(2, 'USD')
-      }.to raise_error(TypeError)
+      end.to raise_error(TypeError)
     end
 
     it "raises TypeError adding by a Money (unless other is a Money)" do
-      expect {
+      expect do
         2 + Money.new(2, 'USD')
-      }.to raise_error(TypeError)
+      end.to raise_error(TypeError)
     end
 
     it "allows subtraction from numeric zero" do
@@ -783,35 +783,35 @@
     end
 
     it "treats multiplication as commutative" do
-      expect {
+      expect do
         2 * Money.new(2, 'USD')
-      }.not_to raise_error
+      end.not_to raise_error
       result = 2 * Money.new(2, 'USD')
       expect(result).to eq(Money.new(4, 'USD'))
     end
 
     it "doesn't work with non-numerics" do
-      expect {
+      expect do
         "2" * Money.new(2, 'USD')
-      }.to raise_error(TypeError)
+      end.to raise_error(TypeError)
     end
 
     it "correctly handles <=>" do
-      expect {
+      expect do
         2 < Money.new(2, 'USD')
-      }.to raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
 
-      expect {
+      expect do
         2 > Money.new(2, 'USD')
-      }.to raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
 
-      expect {
+      expect do
         2 <= Money.new(2, 'USD')
-      }.to raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
 
-      expect {
+      expect do
         2 >= Money.new(2, 'USD')
-      }.to raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
 
       expect(2 <=> Money.new(2, 'USD')).to be_nil
     end
@@ -823,17 +823,17 @@
     end
 
     it "raises errors for all numeric types, not just Integer" do
-      expect {
+      expect do
         2.0 / Money.new(2, 'USD')
-      }.to raise_error(TypeError)
+      end.to raise_error(TypeError)
 
-      expect {
+      expect do
         Rational(2, 3) / Money.new(2, 'USD')
-      }.to raise_error(TypeError)
+      end.to raise_error(TypeError)
 
-      expect {
+      expect do
         BigDecimal(2) / Money.new(2, 'USD')
-      }.to raise_error(TypeError)
+      end.to raise_error(TypeError)
     end
   end
 

spec/money/arithmetic_spec.rb

@@ -2,9 +2,9 @@
 
 RSpec.describe Money::FormattingRules do
   it 'does not modify frozen rules in place' do
-    expect {
+    expect do
       described_class.new(Money::Currency.new('USD'), { separator: '.' }.freeze)
-    }.not_to raise_error
+    end.not_to raise_error
   end
 
   it 'does not modify rules in place' do