Rubocop fixes

CHANGELOG.md

@@ -1,6 +1,8 @@
 # History
 
 ## 1.2.6
+
+- Major wildfly_resource refactor
 - Recursively stringify array values to avoid non-idempotent behavior
 - Allow resources with special characters in its name using quotes
 

lib/puppet/type/wildfly_deployment.rb

@@ -42,9 +42,7 @@
     desc 'Operation timeout. Defaults to 120'
     defaultto 300
 
-    munge do |value|
-      value.to_i
-    end
+    munge(&:to_i)
   end
 
   newparam(:operation_headers) do

lib/puppet/type/wildfly_resource.rb

@@ -1,4 +1,4 @@
-require 'puppet_x/wildfly/hash'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/wildfly/hash'))
 
 Puppet::Type.newtype(:wildfly_resource) do
   @doc = 'Manages JBoss resources like datasources, messaging, ssl, modcluster, etc'

lib/puppet/type/wildfly_restart.rb

@@ -27,18 +27,14 @@
     desc 'Number of times it will check if server is running after a restart'
     defaultto 3
 
-    munge do |value|
-      value.to_i
-    end
+    munge(&:to_i)
   end
 
   newparam(:wait) do
     desc 'Amount of time (in seconds) that it will wait before next attempt'
     defaultto 10
 
-    munge do |value|
-      value.to_i
-    end
+    munge(&:to_i)
   end
 
   newparam(:reload) do

lib/puppet_x/wildfly/cli_command.rb

@@ -34,7 +34,7 @@ def address_to_key_value_list(node)
 
           nodes.size.times do |index|
             element = nodes[index]
-            list << { element.elements[1].text_value => element.elements[3].text_value.gsub('"', '') }
+            list << { element.elements[1].text_value => element.elements[3].text_value.delete('"') }
           end
         end
 

lib/puppet_x/wildfly/hash.rb

@@ -8,10 +8,10 @@ def deep_obfuscate_sensitive_values
   end
 
   def deep_transform_values(&block)
-    _deep_transform_values_in_object(self, &block)
+    _deep_transform_values_in_object(self, false, &block)
   end
 
-  def _deep_transform_values_in_object(object, obfuscate = false, &block)
+  def _deep_transform_values_in_object(object, obfuscate, &block)
     case object
     when Hash
       object.inject({}) do |result, (key, value)|
@@ -26,17 +26,15 @@ def _deep_transform_values_in_object(object, obfuscate = false, &block)
     end
   end
 
+  # Return a hash containing the keys of this hash that are also present in the other hash
   def deep_intersect(other)
     diff = {}
-    managed_keys = other.keys
 
     each do |key, value|
+      next if other[key].nil?
       if value.is_a? Hash
-        other_nested_hash = other[key]
-        unless other_nested_hash.nil?
-          diff[key] = value.deep_intersect(other_nested_hash)
-        end
-      elsif managed_keys.include? key
+        diff[key] = value.deep_intersect(other[key])
+      elsif other.keys.include? key
         diff[key] = value
       end
     end