parsecs 0.11.4 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f31334656fdb4d48c312b6adabb100f74750060454bd21865d35594a340923af
-  data.tar.gz: bfab768c82d4b69dcaf018b63017c1027bd648a6ca4ad036fc4a32b100f41b60
+  metadata.gz: eb2d58cc370e6c777c700923e4fa4bfc75bb636787a6a6cc1072d6102bc6ad96
+  data.tar.gz: 45081cad563cf4dec9d10da97632a69b9018676868b774151fdf43428e2910d7
 SHA512:
-  metadata.gz: e67b9d458d4c15c4cc2dde06646ff019d9b8154b75546fb816781a92cf34c71f4d051d23b989799bba4ca0a443ed3c5b233ae4ffdb6c5c53b99e0b02583c8557
-  data.tar.gz: bf3f8a89c3e61852edef6ce8b2489356f9681d362f6709f568969eda34575de35282df78b27cee17010a2ce562e7d9604aef28b11ab3912309e6356fcd231a67
+  metadata.gz: fdea60ccb0971c7434f32ac105248908a2aca0bac01ce6c3ba1608ac4d6fc0e22a4c2ecaaee0f2d8ca5fc4242d401dbc0fc176b5532bf44a9c6ec7cf330f8dfb
+  data.tar.gz: 461f9ce0cf4507390ecee30d31e67c827ab601e71677037ecfbaaa62ef90f9c732f1345be130f58ced14078fffa99b0e2d8c0d339decece3abd0ca6f928c5dc3

data/ext/libnativemath/extconf.rb

@@ -38,7 +38,7 @@ libs.each do |lib|
 end
 
 GIT_REPOSITORY = 'https://github.com/niltonvasques/equations-parser.git'.freeze
-COMMIT = 'd49225cddcf2fb08d8604fc2a7e6198983dcd1b9'.freeze
+COMMIT = 'fe93ca5534484b05cd1eb68f7acfc32ff05dc20c'.freeze
 
 Dir.chdir(BASEDIR) do
   system('git init')

data/lib/parsec.rb

@@ -6,7 +6,7 @@ module Parsec
   class Parsec
     using StringToBooleanRefinements
 
-    VERSION = '0.11.4'.freeze
+    VERSION = '0.11.6'.freeze
 
     # evaluates the equation and returns only the result
     def self.eval_equation(equation)
@@ -49,7 +49,9 @@ module Parsec
 
       # The following regex remove all spaces that are not between quot marks
       # https://tinyurl.com/ybc7bng3
-      equation = equation.gsub(/( |(".*?[^\\]"))/, '\\2') if new_line == true
+      if new_line == true
+        equation.gsub!(/( |("([^"\\]|\\.)*")|('([^'\\]|\\.)*'))/, '\\2')
+      end
 
       equation
     end

data/test/test_parsec.rb

@@ -13,6 +13,11 @@ class TestParsec < Minitest::Test
     parser = Parsec::Parsec
     assert_equal(10, parser.eval_equation('(5 + 1) + (6 - 2)'))
     assert_equal(16, parser.eval_equation('4 + 4 * 3'))
+    assert_equal(604.1952, parser.eval_equation('35.52 * 17.01'))
+    assert_equal(404.5728, parser.eval_equation('35.52 * 11.39'))
+    assert_equal(634.2688, parser.eval_equation('11.84 * 53.57'))
+    assert_equal(423.3984, parser.eval_equation('11.84 * 35.76'))
+    assert_equal(309.96528, parser.eval_equation('(604.1952 + 404.5728 + 634.2688 + 423.3984) * 0.15'))
     assert_equal(2, parser.eval_equation('10.5 / 5.25'))
     assert_equal(5, parser.eval_equation('abs(-5)'))
     assert_equal(1, parser.eval_equation('log10(10)'))
@@ -25,8 +30,8 @@ class TestParsec < Minitest::Test
   def test_complex_math_equations
     parser = Parsec::Parsec
     assert_equal(6, parser.eval_equation('sqrt(16) + cbrt(8)'))
-    assert_equal(4.30259, parser.eval_equation('log10(10) + ln(e) + log(10)'))
-    assert_equal(2.0, parser.eval_equation('sin(1) + cos(0) + tan(0.15722)'))
+    assert_equal(4.30258509299405, parser.eval_equation('log10(10) + ln(e) + log(10)'))
+    assert_equal(1.99999931685569, parser.eval_equation('sin(1) + cos(0) + tan(0.15722)'))
     assert_equal(16, parser.eval_equation('max(1, 2) + min(3, 4) + sum(5, 6)'))
     assert_equal(9.6, parser.eval_equation('avg(9, 9.8, 10)'))
     assert_equal(8, parser.eval_equation('pow(2, 3)'))
@@ -56,6 +61,8 @@ class TestParsec < Minitest::Test
     assert_equal('TEST STRING', parser.eval_equation('toupper("test string")'))
     assert_equal('test string', parser.eval_equation('tolower("TEST STRING")'))
     assert_equal('Hello World', parser.eval_equation('concat("Hello ", "World")'))
+    assert_equal('Hello World', parser.eval_equation('concat("", "Hello World")'))
+    assert_equal('Hello World', parser.eval_equation('concat("Hello World", "")'))
     assert_equal('tes t "str \" " ing equa  "   tion', parser.eval_equation('concat(concat("tes t", " \\"str \\\\\" \\" ing "),string("equa  \\"   tion"))'))
     assert_equal(5, parser.eval_equation('str2number("5")'))
     assert_equal(5, parser.eval_equation('number("5")'))
@@ -95,7 +102,7 @@ class TestParsec < Minitest::Test
   def test_general_equations
     parsec = Parsec::Parsec
     assert_equal(1, parsec.eval_equation('((0.09/1.0)+2.58)-1.67'))
-    assert_equal(40.6853, parsec.eval_equation('10^log(3+2)'))
+    assert_equal(40.6853365119738, parsec.eval_equation('10^log(3+2)'))
     assert_equal(1, parsec.eval_equation('log(e)'))
     assert_equal(2, parsec.eval_equation('2^5^0'))
     assert_equal('yes', parsec.eval_equation('5 > 3 ? "yes" : "no"'))
@@ -263,7 +270,7 @@ class TestParsec < Minitest::Test
     assert_equal({ value: 362_880_0, type: :int }, parsec.eval_equation_with_type('10!'))
     equation_date = 'daysdiff("2018-01-01", "2017-12-31")'
     assert_equal({ value: 1, type: :int }, parsec.eval_equation_with_type(equation_date))
-    assert_equal({ value: 40.6853, type: :float }, parsec.eval_equation_with_type('10^log(3+2)'))
+    assert_equal({ value: 40.6853365119738, type: :float }, parsec.eval_equation_with_type('10^log(3+2)'))
     assert_equal({ value: 5.1, type: :float }, parsec.eval_equation_with_type('number("5.1")'))
     equation_if = '4 > 2 ? "bigger" : "smaller"'
     assert_equal({ value: 'bigger', type: :string }, parsec.eval_equation_with_type(equation_if))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parsecs
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.6
 platform: ruby
 authors:
 - Nilton Vasques
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-29 00:00:00.000000000 Z
+date: 2022-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest