little_math_pet 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/little_math_pet.rb

@@ -1,9 +1,11 @@
 class LittleMathPet
 	# This is used to match numbers in regular expressions
-	NUMBER_RX = '([\+\-]?\d+(\.\d+)?)'
+	NUMBER_RX = '[\+\-]?\d+(?:\.\d+)?'
 
 	# This is used to match mathematical signs in regular expressions
-	SIGN_RX = '([\+\-\/\*\^])'
+	SIGN_RX = '[\+\-\/\*\^]'
+
+	PARENTHESES_CAPTURE_RX = /\(([^\(\)]+)\)/
 
 	# The proper math order (power, multiplication/division and addiction/subtraction)
 	MATH_ORDER = [%w[^], %w[* /], %w[+ -]]
@@ -60,35 +62,35 @@ class LittleMathPet
 	# This is the top level method which deals with the various cases
 	def do_math(math)
 		case math
-		when /\([^\)]+\)/ # match parentheses
-			math = math.gsub(/\(([^\)]+)\)/) do |match|
+		when PARENTHESES_CAPTURE_RX # match parentheses
+			math = math.gsub(PARENTHESES_CAPTURE_RX) do |match|
 				do_math($1)
 			end
 
 			do_math(math)
-		when /^#{NUMBER_RX}(#{SIGN_RX}#{NUMBER_RX})+$/
+		when /^#{NUMBER_RX}(?:#{SIGN_RX}#{NUMBER_RX})+$/
 			solve_math(math)
 		when /^#{NUMBER_RX}$/
 			math.to_f
 		when /^#{SIGN_RX}$/
 			math
-		when ""
-			# this appears when '-5' gets split to ['', '-', '5']
-			0.0
 		else
-			raise 'Invalid math expression'
+			raise "Invalid math expression: #{math}"
 		end
 	end
 
 	# This is the actual solver that invokes the marh Procs
 	def solve_math(math)
-		parts = math.split(/#{SIGN_RX}/)
+		first_number, rest = math.scan(/^(#{NUMBER_RX})((?:#{SIGN_RX}#{NUMBER_RX})+)$/).flatten
+		parts = ([first_number] + rest.scan(/(#{SIGN_RX})(#{NUMBER_RX})/)).flatten
+		# at this point, `parts` consists of math signs and numbers in string format
 
 		until parts.all?{|p| p.to_s[/^#{SIGN_RX}$/] or p.is_a?(Float)}
 			parts.collect! do |part|
 				do_math(part)
 			end
 		end
+		# at this point, `parts consists of math signs and numbers in float format
 
 		# reduces the math expression one process at a time until we have a number
 		until parts.length == 1

data/little_math_pet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "little_math_pet"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kostas Karachalios"]
-  s.date = "2014-02-23"
+  s.date = "2014-10-22"
   s.description = "LittleMathPet understands simple math expressions in string format with mutliple variables and returns the result of the expression"
   s.email = "kostas.karachalios@me.com"
   s.extra_rdoc_files = [

data/spec/little_math_pet_spec.rb

@@ -46,6 +46,10 @@ describe LittleMathPet do
 			"15/5*2" => 6.0,
 			"-15/5*7" => -21.0,
 			"12+10+50%+20%" => 30,
+			"-6 * 5" => -30,
+			"6 * -5" => -30,
+			"30 / -3" => -10,
+			"-30 / -3" => 10,
 		}
 
 		equations.each do |equation, result|
@@ -70,6 +74,19 @@ describe LittleMathPet do
 		end
 	end
 
+	context "when an equation with multiple parenthesis is given" do
+		equations = {
+			"5 - (-3 - (-8 / 2))" => 4.0,
+			"((7 - 2) * 6) / 2" => 15.0,
+		}
+
+		equations.each do |equation, result|
+			it "respects the proper math order (#{equation} = #{result})" do
+				LittleMathPet.new(equation).calc.should == equations[equation]
+			end
+		end
+	end
+
 	context "when a different grammar is used for the equation" do
 		equations = {
 			"5*3:10" => 1.5,
@@ -86,7 +103,7 @@ describe LittleMathPet do
 		end
 	end
 
-	context "when something unkown is given as math" do
+	context "when something unknown is given as math" do
 		equations = [
 			"five * 5",
 			"something else",
@@ -99,7 +116,7 @@ describe LittleMathPet do
 					LittleMathPet.new(equation).calc
 					true.should == false
 				rescue => e
-					e.message.should == 'Invalid math expression'
+					e.message.should =~ /Invalid math expression/
 				end
 			end
 		end

metadata

@@ -2,14 +2,14 @@
 name: little_math_pet
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kostas Karachalios
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 1957235786522962572
+      hash: 557396944221374897
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false