Allow explicit number inits with Float() and Integer()

Author: paulgoetze

2_Numbers/1_The_different_types_of_numbers/solution.rb

@@ -3,4 +3,4 @@
 bignum   = 100_000_000_000_000_000_000
 float    = 8.25
 rational = Rational(2, 7)
-complex  = Complex(0.1, 2.5)
+complex  = Complex(0.1, 2.5)

2_Numbers/2_Basic_operators/solution_spec.rb

@@ -4,25 +4,35 @@
 
 RSpec::Matchers.define :run_number_operations do |expected|
   match do |actual|
-    CodeBreaker.parse(actual).include?(expected)
+    actual_code = replace_explicit_numbers(actual)
+    CodeBreaker.parse(actual_code).include?(expected)
   end
 
   failure_message do |actual|
-    expected_operants = expected.values.first
-    variable_name = expected_operants[0]
+    expected_operants  = expected.values.first
+    variable_name      = expected_operants[0]
     expected_operation = "#{variable_name} = #{expected_operants[1].join(' ')}"
 
     actual_line = actual.split("\n").select do |output|
-      output.match(/#{variable_name} =.+/)
+      output.match(/#{variable_name}\s?=.+/)
     end
 
-    actual_parsed = CodeBreaker.parse(actual_line.join)
-    actual_operants = actual_parsed.values.first
-    actual_operation = "#{variable_name} = #{actual_operants[1].join(' ')}"
+    actual_code   = replace_explicit_numbers(actual_line.join)
+    actual_parsed = CodeBreaker.parse(actual_code)
+
+    actual_operants  = actual_parsed.values.first
+    actual_operation = "#{variable_name} = #{Array(actual_operants[1]).join(' ')}"
 
     %Q{Your code doesn't run the number operation "#{expected_operation}".
       ------- Instead you calculated "#{actual_operation}".}
   end
+
+  def replace_explicit_numbers(actual)
+    evaluate_match   = lambda { |_| eval($1) }
+    integer_or_float = /((Integer|Float)\(['"]?([-+]?\d*(_\d{1,})*(\.\d*)?)['"]?\))/
+
+    actual.gsub(integer_or_float, &evaluate_match)
+  end
 end
 
 # code_breaker outputs
@@ -39,14 +49,14 @@
 
   OPERATIONS.each do |operation|
     variable_name = operation.first.last.first
-    values = operation.values.first.last
+    values        = operation.values.first.last
 
     it "defines a variable with name \"#{variable_name}\"" do
       expect(local_variables.include?(variable_name)).to be true
     end
 
     if local_variables.include?(variable_name)
-      operants  = values.select.each_with_index { |_, i| i.even? }
+      operants      = values.select.each_with_index { |_, i| i.even? }
       same_operants = (operants.uniq.count == 1)
 
       numbers = if same_operants