From c6796267dd57913f021484d769d3d86dab1b478f Mon Sep 17 00:00:00 2001
From: jetabajrami <51212556+jetabajrami@users.noreply.github.com>
Date: Wed, 5 Feb 2020 10:38:33 -0800
Subject: [PATCH 1/4] Create calculator.rb

---
 calculator.rb | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 calculator.rb

diff --git a/calculator.rb b/calculator.rb
new file mode 100644
index 0000000..2f93ac5
--- /dev/null
+++ b/calculator.rb
@@ -0,0 +1,41 @@
+puts "Welcome to the Calculator program! Which operator would you like to use?"
+puts "1. add(+)"
+puts "2. substracte(-)"
+puts "multiply(*)"
+puts "divide(/)"
+ 
+puts "Please choose one operatore (name or symbol):"
+operator = gets.chomp
+
+if operator == "add" || operator == "+"
+  puts "We're adding numbers, please enter the firs number"
+  first_nr = gets.chomp.to_i
+  puts "Please enter the seconde number"
+  seconde_number = gets.chomp.to_i
+  result = first_nr + seconde_number
+  puts "Result is #{result}"
+elsif operator == "subtract" || operator == "-"
+  puts "We're subtracting numbers, please enter the firs number"
+  first_nr = gets.chomp.to_i
+  puts "Please enter the seconde number"
+  seconde_number = gets.chomp.to_i
+  result = first_nr - seconde_number
+  puts "Result is #{result}"
+elsif operator == "multiply" || operator == "*"
+  puts "We're multiplying numbers, please enter the firs number"
+  first_nr = gets.chomp.to_i
+  puts "Please enter the seconde number"
+  seconde_number = gets.chomp.to_i
+  result = first_nr * seconde_number
+  puts "Result is #{result}"
+elsif operator == "divide" || operator == "/"
+  puts "We're dividing numbers, please enter the firs number"
+  first_nr = gets.chomp.to_i
+  puts "Please enter the seconde number"
+  seconde_number = gets.chomp.to_i
+  result = first_nr / seconde_number
+  puts "Result is #{result}"
+else
+  puts "That is not an operator, plz instert operator?!"
+  operator = gets.chomp
+end

From e330188229ceceb07d9d22a4679403eb4cf4d3a0 Mon Sep 17 00:00:00 2001
From: jetabajrami <51212556+jetabajrami@users.noreply.github.com>
Date: Wed, 5 Feb 2020 12:31:05 -0800
Subject: [PATCH 2/4] Create calculator_final.rb

Day 2 - Ada Homework - Calculator
---
 calculator_final.rb | 56 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 calculator_final.rb

diff --git a/calculator_final.rb b/calculator_final.rb
new file mode 100644
index 0000000..020526d
--- /dev/null
+++ b/calculator_final.rb
@@ -0,0 +1,56 @@
+#Add,Subtract,Multiply,Divide Methode
+def operation(num_one, math_operation, num_two)
+  if math_operation == "Add" || math_operation == "+"
+      result = ((num_one.to_f) + (num_two.to_f)).round(2)
+  elsif math_operation == "Subtract" || math_operation == "-"
+      result = ((num_one.to_f) - (num_two.to_f)).round(2)
+  elsif math_operation == "Multiply" || math_operation == "*"
+      result = ((num_one.to_f) * (num_two.to_f)).round(2)
+  elsif math_operation == "Divide" || math_operation == "/"
+      result = ((num_one.to_f) / (num_two.to_f)).round(2)
+end
+return result
+end
+
+#Validate if input is an math operator
+def ValidOperator (math_operation)  
+until ["Add","+", "Subtract","-", "Multiply", "*", "Divide", "/"].include? math_operation
+puts "Enter a valid selection"
+math_operation = gets.chomp
+end
+return math_operation
+end
+
+#Validate if the input is Number
+def ValidNumber (number)
+until number.to_i == number
+  puts "Enter a valid number"
+  number = gets.chomp.to_i
+end
+return number.to_i
+end
+
+#Program Start
+puts "Welcome to the Calcuator Program."
+
+operator_array = ["Add(+)", "Subtract(-)", "Multiply(*)", "Divide(/)"]
+puts operator_array
+
+#Accept operator input
+puts"Please enter the operator would you like to use?"
+math_operation = gets.chomp
+math_operation = ValidOperator(math_operation)
+
+#Accept first number
+puts "Enter your first number."
+num_one = gets.chomp.to_i
+num_one = ValidNumber(num_one)
+
+#Accept second number
+puts "Enter your second number."
+num_two = gets.chomp.to_i
+num_two = ValidNumber(num_two)
+
+
+final_result = operation(num_one, math_operation, num_two)
+puts "Result is #{final_result}"

From cc85a1f76e89e05159c0eecbfc887ab3b9637455 Mon Sep 17 00:00:00 2001
From: jetabajrami <51212556+jetabajrami@users.noreply.github.com>
Date: Wed, 5 Feb 2020 13:51:10 -0800
Subject: [PATCH 3/4] Delete calculator.rb

This is my first draft and I upload my second one alredy.
---
 calculator.rb | 41 -----------------------------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 calculator.rb

diff --git a/calculator.rb b/calculator.rb
deleted file mode 100644
index 2f93ac5..0000000
--- a/calculator.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-puts "Welcome to the Calculator program! Which operator would you like to use?"
-puts "1. add(+)"
-puts "2. substracte(-)"
-puts "multiply(*)"
-puts "divide(/)"
- 
-puts "Please choose one operatore (name or symbol):"
-operator = gets.chomp
-
-if operator == "add" || operator == "+"
-  puts "We're adding numbers, please enter the firs number"
-  first_nr = gets.chomp.to_i
-  puts "Please enter the seconde number"
-  seconde_number = gets.chomp.to_i
-  result = first_nr + seconde_number
-  puts "Result is #{result}"
-elsif operator == "subtract" || operator == "-"
-  puts "We're subtracting numbers, please enter the firs number"
-  first_nr = gets.chomp.to_i
-  puts "Please enter the seconde number"
-  seconde_number = gets.chomp.to_i
-  result = first_nr - seconde_number
-  puts "Result is #{result}"
-elsif operator == "multiply" || operator == "*"
-  puts "We're multiplying numbers, please enter the firs number"
-  first_nr = gets.chomp.to_i
-  puts "Please enter the seconde number"
-  seconde_number = gets.chomp.to_i
-  result = first_nr * seconde_number
-  puts "Result is #{result}"
-elsif operator == "divide" || operator == "/"
-  puts "We're dividing numbers, please enter the firs number"
-  first_nr = gets.chomp.to_i
-  puts "Please enter the seconde number"
-  seconde_number = gets.chomp.to_i
-  result = first_nr / seconde_number
-  puts "Result is #{result}"
-else
-  puts "That is not an operator, plz instert operator?!"
-  operator = gets.chomp
-end

From 5502ef946adfbe3a94f97d76778f659ab4baaabd Mon Sep 17 00:00:00 2001
From: jetabajrami <51212556+jetabajrami@users.noreply.github.com>
Date: Wed, 5 Feb 2020 13:57:12 -0800
Subject: [PATCH 4/4] Update calculator_final.rb

Modify line nr 26
---
 calculator_final.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/calculator_final.rb b/calculator_final.rb
index 020526d..2aa508e 100644
--- a/calculator_final.rb
+++ b/calculator_final.rb
@@ -23,7 +23,7 @@ def ValidOperator (math_operation)
 
 #Validate if the input is Number
 def ValidNumber (number)
-until number.to_i == number
+  until (Integer(number) rescue nil) !=nil || (Float(number) rescue nil) !=nil #Returns nil if it is not integer or Float else returns number
   puts "Enter a valid number"
   number = gets.chomp.to_i
 end