(maint) Fix stylistic issues

Author: hlindberg

lib/puppet/functions/merge.rb

@@ -36,10 +36,9 @@
 # The iterative `merge()` has an advantage over doing the same with a general `reduce()` in that the constructed hash
 # does not have to be copied in each iteration and thus will perform much better with large inputs.
 #
-Puppet::Functions.create_function(:'merge') do
-
+Puppet::Functions.create_function(:merge) do
   dispatch :merge2hashes do
-    repeated_param 'Variant[Hash, Undef, String[0,0]]', :args  # this strange type is backwards compatible
+    repeated_param 'Variant[Hash, Undef, String[0,0]]', :args # this strange type is backwards compatible
     return_type 'Hash'
   end
 
@@ -55,14 +54,13 @@
     return_type 'Hash'
   end
 
-
   def merge2hashes(*hashes)
     accumulator = {}
-    hashes.each {|h| accumulator.merge!(h) if h.is_a?(Hash)}
+    hashes.each { |h| accumulator.merge!(h) if h.is_a?(Hash) }
     accumulator
   end
 
-  def merge_iterable2(iterable, &block)
+  def merge_iterable2(iterable)
     accumulator = {}
     enum = Puppet::Pops::Types::Iterable.asserted_iterable(self, iterable)
     enum.each do |v|
@@ -72,7 +70,7 @@ def merge_iterable2(iterable, &block)
     accumulator
   end
 
-  def merge_iterable3(iterable, &block)
+  def merge_iterable3(iterable)
     accumulator = {}
     enum = Puppet::Pops::Types::Iterable.asserted_iterable(self, iterable)
     if enum.hash_style?
@@ -88,7 +86,7 @@ def merge_iterable3(iterable, &block)
           accumulator.merge!(r) if r.is_a?(Hash)
           index += 1
         end
-      rescue StopIteration
+      rescue StopIteration # rubocop:disable Lint/HandleExceptions
       end
     end
     accumulator

spec/functions/merge_spec.rb

@@ -2,9 +2,24 @@
 
 describe 'merge' do
   it { is_expected.not_to eq(nil) }
-  it { is_expected.to run.with_params({}, 'two').and_raise_error(ArgumentError, Regexp.new(Regexp.escape("rejected: parameter 'args' expects a value of type Undef, Hash, or String[0, 0], got String"))) }
-  it { is_expected.to run.with_params({}, 1).and_raise_error(ArgumentError, %r{parameter 'args' expects a value of type Undef, Hash, or String, got Integer}) }
-  it { is_expected.to run.with_params({ 'one' => 1, 'three' => { 'four' => 4 } }, 'two' => 'dos', 'three' => { 'five' => 5 }).and_return('one' => 1, 'three' => { 'five' => 5 }, 'two' => 'dos') }
+  it {
+    is_expected.to run \
+      .with_params({}, 'two') \
+      .and_raise_error(
+        ArgumentError, \
+        Regexp.new(Regexp.escape("rejected: parameter 'args' expects a value of type Undef, Hash, or String[0, 0], got String")),
+      )
+  }
+  it {
+    is_expected.to run \
+      .with_params({}, 1) \
+      .and_raise_error(ArgumentError, %r{parameter 'args' expects a value of type Undef, Hash, or String, got Integer})
+  }
+  it {
+    is_expected.to run \
+      .with_params({ 'one' => 1, 'three' => { 'four' => 4 } }, 'two' => 'dos', 'three' => { 'five' => 5 }) \
+      .and_return('one' => 1, 'three' => { 'five' => 5 }, 'two' => 'dos')
+  }
 
   it { is_expected.to run.with_params.and_return({}) }
   it { is_expected.to run.with_params({}).and_return({}) }
@@ -14,6 +29,7 @@
   describe 'should accept empty strings as puppet undef' do
     it { is_expected.to run.with_params({}, '').and_return({}) }
   end
+
   it { is_expected.to run.with_params({ 'key' => 'value' }, {}).and_return('key' => 'value') }
   it { is_expected.to run.with_params({}, 'key' => 'value').and_return('key' => 'value') }
   it { is_expected.to run.with_params({ 'key' => 'value1' }, 'key' => 'value2').and_return('key' => 'value2') }
@@ -23,36 +39,42 @@
       .and_return('key1' => 'value1', 'key2' => 'value2', 'key3' => 'value3')
   }
   describe 'should accept iterable and merge produced hashes' do
-
-    it { is_expected.to run \
-      .with_params([1,2,3]) \
-      .with_lambda {|hsh, val| { val => val } } \
-      .and_return({ 1 => 1, 2 => 2, 3 => 3 }) }
-
-    it { is_expected.to run \
-      .with_params([1,2,3]) \
-      .with_lambda {|hsh, val| { val => val } unless val == 2} \
-      .and_return({ 1 => 1, 3 => 3 }) }
-
-    it { is_expected.to run \
-      .with_params([1,2,3]) \
-      .with_lambda {|hsh, val| raise StopIteration.new if val == 3; { val => val } } \
-      .and_return({ 1 => 1, 2 => 2 }) }
-
-    it { is_expected.to run \
-      .with_params(['a', 'b', 'b', 'c', 'b']) \
-      .with_lambda {|hsh, val| { val => (hsh[val] || 0) + 1 } } \
-      .and_return({ 'a' => 1, 'b' => 3, 'c' => 1 }) }
-
-    it { is_expected.to run \
-      .with_params(['a', 'b', 'c']) \
-      .with_lambda {|hsh, idx, val| { idx => val } } \
-      .and_return({ 0 => 'a', 1 => 'b', 2 => 'c'}) }
-
-    it { is_expected.to run \
-      .with_params({'a' => 'A', 'b' => 'B', 'c' => 'C'}) \
-      .with_lambda {|hsh, key, val| { key => "#{key}#{val}" } } \
-      .and_return({ 'a' => 'aA', 'b' => 'bB', 'c' => 'cC'}) }
-
+    it {
+      is_expected.to run \
+        .with_params([1, 2, 3]) \
+        .with_lambda { |_hsh, val| { val => val } } \
+        .and_return(1 => 1, 2 => 2, 3 => 3)
+    }
+    it {
+      is_expected.to run \
+        .with_params([1, 2, 3]) \
+        .with_lambda { |_hsh, val| { val => val } unless val == 2 } \
+        .and_return(1 => 1, 3 => 3)
+    }
+    it {
+      is_expected.to run \
+        .with_params([1, 2, 3]) \
+        # rubocop:disable Style/Semicolon
+        .with_lambda { |_hsh, val| raise StopIteration if val == 3; { val => val } } \
+        .and_return(1 => 1, 2 => 2)
+    }
+    it {
+      is_expected.to run \
+        .with_params(['a', 'b', 'b', 'c', 'b']) \
+        .with_lambda { |hsh, val| { val => (hsh[val] || 0) + 1 } } \
+        .and_return('a' => 1, 'b' => 3, 'c' => 1)
+    }
+    it {
+      is_expected.to run \
+        .with_params(['a', 'b', 'c']) \
+        .with_lambda { |_hsh, idx, val| { idx => val } } \
+        .and_return(0 => 'a', 1 => 'b', 2 => 'c')
+    }
+    it {
+      is_expected.to run \
+        .with_params('a' => 'A', 'b' => 'B', 'c' => 'C') \
+        .with_lambda { |_hsh, key, val| { key => "#{key}#{val}" } } \
+        .and_return('a' => 'aA', 'b' => 'bB', 'c' => 'cC')
+    }
   end
 end