lib/utilities/inspec_util.rb in inspec_tools-1.8.3 vs lib/utilities/inspec_util.rb in inspec_tools-2.0.0

@@ -4,42 +4,16 @@
 require 'uri'
 require 'net/http'
 require 'fileutils'
 require 'exceptions/impact_input_error'
 require 'exceptions/severity_input_error'
+require 'overrides/false_class'
+require 'overrides/true_class'
+require 'overrides/nil_class'
+require 'overrides/object'
+require 'overrides/string'
 
-# Add rails style blank? method to all classes
-class NilClass
-  def blank?
-    true
-  end
-end
-
-class String
-  def blank?
-    self.strip.empty?
-  end
-end
-
-class FalseClass
-  def blank?
-    true
-  end
-end
-
-class TrueClass
-  def blank?
-    false
-  end
-end
-
-class Object
-  def blank?
-    respond_to?(:empty?) ? empty? : !self
-  end
-end
-
 # rubocop:disable Metrics/ClassLength
 # rubocop:disable Metrics/AbcSize
 # rubocop:disable Metrics/PerceivedComplexity
 # rubocop:disable Metrics/CyclomaticComplexity
 # rubocop:disable Metrics/BlockLength
@@ -322,11 +296,11 @@
         control.add_tag(::Inspec::Object::Tag.new('ref', json_control['tags']['ref'])) unless json_control['tags']['ref'].blank?
         control.add_tag(::Inspec::Object::Tag.new('false_negatives', json_control['tags']['false_negatives'])) unless json_control['tags']['false_positives'].blank?
         control.add_tag(::Inspec::Object::Tag.new('false_positives', json_control['tags']['false_positives'])) unless json_control['tags']['false_positives'].blank?
         control.add_tag(::Inspec::Object::Tag.new('documentable', json_control['tags']['documentable'])) unless json_control['tags']['documentable'].blank?
         control.add_tag(::Inspec::Object::Tag.new('mitigations', json_control['tags']['mitigations'])) unless json_control['tags']['mitigations'].blank?
-        control.add_tag(::Inspec::Object::Tag.new('severity_override_guidance', json_control['tags']['documentable'])) unless json_control['tags']['severity_override_guidance'].blank?
+        control.add_tag(::Inspec::Object::Tag.new('severity_override_guidance', json_control['tags']['severity_override_guidance'])) unless json_control['tags']['severity_override_guidance'].blank?
         control.add_tag(::Inspec::Object::Tag.new('potential_impacts', json_control['tags']['potential_impacts'])) unless json_control['tags']['potential_impacts'].blank?
         control.add_tag(::Inspec::Object::Tag.new('third_party_tools', json_control['tags']['third_party_tools'])) unless json_control['tags']['third_party_tools'].blank?
         control.add_tag(::Inspec::Object::Tag.new('mitigation_controls', json_control['tags']['mitigation_controls'])) unless json_control['tags']['mitigation_controls'].blank?
         control.add_tag(::Inspec::Object::Tag.new('responsibility', json_control['tags']['responsibility'])) unless json_control['tags']['responsibility'].blank?
         control.add_tag(::Inspec::Object::Tag.new('ia_controls', json_control['tags']['ia_controls'])) unless json_control['tags']['ia_controls'].blank?
@@ -401,10 +375,11 @@
       if separated
         if output_format == 'ruby'
           controls.each do |control|
             file_name = control.id.to_s
             myfile = File.new("#{directory}/controls/#{file_name}.rb", 'w')
+            myfile.puts "# encoding: UTF-8\n\n"
             myfile.puts wrap(control.to_ruby, WIDTH) + "\n"
             myfile.close
           end
         else
           controls.each do |control|
@@ -416,9 +391,10 @@
         end
       else
         myfile = File.new("#{directory}/controls/controls.rb", 'w')
         if output_format == 'ruby'
           controls.each do |control|
+            myfile.puts "# encoding: UTF-8\n\n"
             myfile.puts wrap(control.to_ruby, WIDTH) + "\n"
           end
         else
           controls.each do |control|
             if (defined? control.desc).nil?