parsecs 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 219c85823eeec9cf36a7623ce522c5059b7fb0d2b4e19fdff86bbf7a4fa0a763
-  data.tar.gz: c2f6a125b730db44fa8aefeb507287e913389be64d18806ea5e6e237fd6d1e8b
+  metadata.gz: 4f491689b423601f13d531240c70349c9af27d4ba39bcf0194771b415ffd567d
+  data.tar.gz: 5d051aea5ed0a8538397084ca40c231e8fbc1a48297960d2598a3d21d1adf017
 SHA512:
-  metadata.gz: 20b7f32e0dfa829c70db84c18885ff623f980045633bf8488ffcafdaa305f274d896a6a8cff01e564a3c5f969207ac8379d70010acde07255d9e5c5a76ab993a
-  data.tar.gz: cba4799932c699f0bccf18f0db670440a757d3c721fcde1018106211ea5b25ae853d1aa43d5aef43f4ade5371468430075191509b29bdfe797cb3769e88ee99d
+  metadata.gz: b0925569b881e6d3d6ac92b19024b4f4e065248fd049c85516fb1e535627b0b267f940e26ef449b39441a0d3b894cf64b02f94fdc53040b80d3039ca65939acc
+  data.tar.gz: 4dff210da8d09ace5f08df556ce49eaf48e2f511e395974853694276c18e7e044b233010ed26ae31c398664c8ff4edddaef486ab8084ee2e0904f1141d348a30

data/lib/parsec.rb

@@ -6,13 +6,19 @@ module Parsec
   class Parsec
     using StringToBooleanRefinements
 
-    VERSION = '0.4.1'.freeze
+    VERSION = '0.5.1'.freeze
 
-    # evaluates the equation
+    # evaluates the equation and returns only the result
     def self.eval_equation(equation)
+      eval_equation_with_type(equation)[:value]
+    end
+
+    # evaluates the equation and returns the result and its data type
+    def self.eval_equation_with_type(equation)
       remove(equation, true)
 
-      convert(Libnativemath.native_eval(equation))
+      result = Libnativemath.native_eval(equation)
+      { value: convert(result), type: result['type'].to_sym }
     end
 
     # returns true or raise an error
@@ -29,6 +35,13 @@ module Parsec
       validate(Libnativemath.native_eval(equation), false)
     end
 
+    def self.get_result_type(equation)
+      remove(equation, true)
+
+      result = Libnativemath.native_eval(equation)
+      result['type'].to_sym if validate(result, true)
+    end
+
     private_class_method
 
     def self.remove(equation, new_line = false)

data/test/test_parsec.rb

@@ -95,6 +95,12 @@ class TestParsec < Minitest::Test
     assert_equal(true, parsec.validate_syntax("\n4\n+ \n 2\n"))
   end
 
+  def test_equation_with_bad_syntax
+    parsec = Parsec::Parsec
+    assert_raises(SyntaxError) { parsec.eval_equation('concat(1, 2)') }
+    assert_raises(SyntaxError) { parsec.eval_equation('4 > 2 ? "smaller"') }
+  end
+
   def test_validate_syntax
     parsec = Parsec::Parsec
     refute_equal(true, parsec.validate_syntax('((0.09/1.0)+2.58)-1.6+'))
@@ -116,4 +122,26 @@ class TestParsec < Minitest::Test
     assert_equal(364, parsec.eval_equation('daysdiff("2100-01-01", "2100-12-31")'))
     assert_equal(1, parsec.eval_equation('daysdiff("2018-01-01", "2017-12-31")'))
   end
+
+  def test_eval_equation_with_type
+    parsec = Parsec::Parsec
+    assert_equal({ value: 10, type: :int }, parsec.eval_equation_with_type('(5 + 1) + (6 - 2)'))
+    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: 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))
+    assert_equal({ value: "5.123", type: :string }, parsec.eval_equation_with_type('string(5.123)'))
+    equation_boolean = '2 == 2 ? true : false'
+    assert_equal({ value: true, type: :boolean }, parsec.eval_equation_with_type(equation_boolean))
+    equation_boolean = '(3==3) and (3!=3)'
+    assert_equal({ value: false, type: :boolean }, parsec.eval_equation_with_type(equation_boolean))
+    assert_equal({ value: 'Infinity', type: :float }, parsec.eval_equation_with_type('4 / 0'))
+    assert_equal({ value: 'nan', type: :float }, parsec.eval_equation_with_type('0 / 0'))
+    # invalid equations raises an error
+    assert_raises(SyntaxError) { parsec.eval_equation_with_type('concat(1, 2)') }
+    assert_raises(SyntaxError) { parsec.eval_equation_with_type('4 > 2 ? "smaller"') }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parsecs
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Nilton Vasques
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -82,7 +82,7 @@ requirements:
 - swig
 - cmake
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A gem to evaluate equations using muparserx C++ library