little_math_pet 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/little_math_pet.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class LittleMathPet
 	# This is used to match numbers in regular expressions
 	NUMBER_RX = '[\+\-]?\d+(?:\.\d+)?'
@@ -23,12 +24,18 @@ class LittleMathPet
 		@math = math_expression
 		@math = @math.gsub(/\s/, '') # no spaces allowed
 
+		@math = @math.gsub(/\÷/, '/') # 4÷2 -> 4/2
 		@math = @math.gsub(/\:/, '/') # 4:2 -> 4/2
 		@math = @math.gsub(/\*\*/, '^') # 4**2 -> 4^2 to make it easier to differantiate from 4*2
 
+		@math = @math.gsub(/\×/, '*') # 4×2 -> 4*2
+
 		@math = @math.gsub(/\[/, '(')
 		@math = @math.gsub(/\]/, ')')
 
+		@math = @math.gsub(/\{/, '(')
+		@math = @math.gsub(/\}/, ')')
+
 		# If we add/subtract a percent, we multiply/divide by `1 + (percent / 100)`
 		@math.gsub!(/(\+|\-)(#{NUMBER_RX})%/) do |match|
 			case $1

data/little_math_pet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "little_math_pet"
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kostas Karachalios"]
-  s.date = "2014-10-22"
+  s.date = "2015-01-08"
   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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe LittleMathPet do
@@ -94,6 +95,22 @@ describe LittleMathPet do
 			"5 + 7" => 12.0,
 			"[5+2] : 2" => 3.5,
 			"100 + 40 %" => 140,
+			"12 ÷ 4 + 5" => 8,
+			"2 × 8 - 7" => 9,
+			"2 × [8 - 7]" => 2,
+		}
+
+		equations.each do |equation, result|
+			it "solves the equation (#{equation} = #{result})" do
+				LittleMathPet.new(equation).calc.should == result
+			end
+		end
+	end
+
+	context "when using curly brackets" do
+		equations = {
+			"{5*3}:10" => 1.5,
+			"-8/{2**2}" => -2.0,
 		}
 
 		equations.each do |equation, result|

metadata

@@ -2,14 +2,14 @@
 name: little_math_pet
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Kostas Karachalios
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2015-01-08 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: 557396944221374897
+      hash: -4137418140742752699
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false