parsecs 0.7.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32cb384a1378a217a7be582ca5ea2de6f3dc70c94689dee52f87f8b0d29977f6
-  data.tar.gz: f22282eaf3ded82725e7eeb4f8ea481e81d27b3860bbf9c57670ce904df70afe
+  metadata.gz: 872f4306482aab0ddea0dcc751284936637fe5693c3910f75a59ad8504f21114
+  data.tar.gz: e218fdce7f8449d8366429d45075f99e29acf2fef37a42b78bb383366c980b39
 SHA512:
-  metadata.gz: 203c5968bda180a314200b84c63b60401190334085580ccb6b908b78c82e7662c6fc857a88d8044b9455b04f880527f6c977f8a64233135c296f16af32c948bb
-  data.tar.gz: 552b910f8122d3b8de370b15a8921304658020d6fd429e007ebe1ef5dac23137775cc467e14ff2d5cebf22216d01f5f2918873935655aaadf7f01c42a61d738b
+  metadata.gz: c6852a76f55edeace33df216bcaf65e6491c7f6ef40dee3ff2d2c144d08ec659bc7b2e682ef0ca3589d75302a7ceff5b153b0d7950842391faeaa86b95d1c9d5
+  data.tar.gz: 37358e63b4cfb396dccca6da93172ebc6f097f74b0f85bf12b7083d0e0cf449e25afc93cf323f8e8b7360d4d303a3989835ef19af8095f93ba74f857032b9d7d

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 = '111de602d62b77b4c90ee8d834d7ca64355057de'.freeze
+COMMIT = '8942cecb71bec402c0487ab77fec97759ff82fdb'.freeze
 
 Dir.chdir(BASEDIR) do
   system('git init')

data/lib/parsec.rb

@@ -6,7 +6,7 @@ module Parsec
   class Parsec
     using StringToBooleanRefinements
 
-    VERSION = '0.7.0'.freeze
+    VERSION = '0.9.2'.freeze
 
     # evaluates the equation and returns only the result
     def self.eval_equation(equation)
@@ -15,7 +15,7 @@ module Parsec
 
     # evaluates the equation and returns the result and its data type
     def self.eval_equation_with_type(equation)
-      sanitize(equation, true)
+      equation = sanitize(equation, true)
 
       result = Libnativemath.native_eval(equation)
       { value: convert(result), type: result['type'].to_sym }
@@ -23,20 +23,20 @@ module Parsec
 
     # returns true or raise an error
     def self.validate_syntax!(equation)
-      sanitize(equation)
+      equation = sanitize(equation)
 
       validate(Libnativemath.native_eval(equation), true)
     end
 
     # returns true or an error string
     def self.validate_syntax(equation)
-      sanitize(equation)
+      equation = sanitize(equation)
 
       validate(Libnativemath.native_eval(equation), false)
     end
 
     def self.get_result_type(equation)
-      sanitize(equation, true)
+      equation = sanitize(equation, true)
 
       result = Libnativemath.native_eval(equation)
       result['type'].to_sym if validate(result, true)
@@ -45,11 +45,13 @@ module Parsec
     private_class_method
 
     def self.sanitize(equation, new_line = false)
-      equation.gsub!(/[\n\t\r]/, ' ')
+      equation = equation.gsub(/[\n\t\r]/, ' ')
 
       # The following regex remove all spaces that are not between quot marks
       # https://tinyurl.com/ybc7bng3
-      equation.gsub!(/( |(".*?"))/, '\\2') if new_line == true
+      equation = equation.gsub(/( |(".*?"))/, '\\2') if new_line == true
+
+      equation
     end
 
     def self.convert(ans)

data/test/test_parsec.rb

@@ -60,6 +60,12 @@ class TestParsec < Minitest::Test
     assert_equal(5, parser.eval_equation('number("5")'))
     assert_equal('Hello', parser.eval_equation('left("Hello World", 5)'))
     assert_equal('World', parser.eval_equation('right("Hello World", 5)'))
+    assert_equal('<a href="http://foo.bar">Title</a>', parser.eval_equation('link("Title", "http://foo.bar")'))
+    assert_equal('<a href="#">Title</a>', parser.eval_equation('link("Title", "#")'))
+    assert_equal('<a href="/test">Test title</a>', parser.eval_equation('link("Test title", "/test")'))
+    assert_raises(SyntaxError) { parser.eval_equation_with_type('link()') }
+    assert_raises(SyntaxError) { parser.eval_equation_with_type('link(1, 2, 3)') }
+    assert_raises(SyntaxError) { parser.eval_equation_with_type('link(1, "2")') }
   end
 
   def test_complex_string_manipulation
@@ -189,6 +195,44 @@ class TestParsec < Minitest::Test
     assert_equal('1-1234-1234-1234-1234', parsec.eval_equation('mask("0-0000-0000-0000-0000", 11234123412341234)'))
   end
 
+  def test_string_cast
+    parsec = Parsec::Parsec
+    assert_equal('4', parsec.eval_equation('string(4)'))
+    assert_equal('4.5', parsec.eval_equation('string(4.5)'))
+    assert_equal('true', parsec.eval_equation('string(true)'))
+    assert_equal('false', parsec.eval_equation('string(false)'))
+    assert_equal('4', parsec.eval_equation('string("4")'))
+  end
+
+  def test_default_value
+    parsec = Parsec::Parsec
+
+    # Success Scenarios
+    assert_equal(10, parsec.eval_equation('default_value(10, 1)'))
+    assert_equal(1, parsec.eval_equation('default_value(NULL, 1)'))
+    assert_equal(10.4, parsec.eval_equation('default_value(10.4, 1.01)'))
+    assert_equal(1.01, parsec.eval_equation('default_value(NULL, 1.01)'))
+    assert_equal('filled', parsec.eval_equation('default_value("filled", "default")'))
+    assert_equal('default', parsec.eval_equation('default_value(NULL, "default")'))
+    assert_equal(false, parsec.eval_equation('default_value(false, true)'))
+    assert_equal(true, parsec.eval_equation('default_value(NULL, true)'))
+
+    # Mixing number types
+    assert_equal(1, parsec.eval_equation('default_value(1, 4.5)'))
+    assert_equal(1, parsec.eval_equation('default_value(1, 10)'))
+    assert_equal(1, parsec.eval_equation('default_value(1, 10.0)'))
+    assert_equal(1, parsec.eval_equation('default_value(1.0, 10)'))
+    assert_equal(1, parsec.eval_equation('default_value(1.0, 10.0)'))
+    assert_equal(1.5, parsec.eval_equation('default_value(1.5, 10)'))
+    assert_equal(1.5, parsec.eval_equation('default_value(1.5, 10.0)'))
+    assert_equal(1.5, parsec.eval_equation('default_value(1.5, 10.5)'))
+
+    # Error Scenarios
+    assert_raises(SyntaxError) { parsec.eval_equation('default_value(4.5, "string")') }
+    assert_raises(SyntaxError) { parsec.eval_equation('default_value("string", true)') }
+    assert_raises(SyntaxError) { parsec.eval_equation('default_value(true, 1)') }
+  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)'))

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: parsecs
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Nilton Vasques
 - Victor Cordeiro
 - Beatriz Fagundes
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2021-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -62,7 +62,7 @@ homepage: https://github.com/niltonvasques/parsec
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -81,9 +81,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - swig
 - cmake
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: A gem to evaluate equations using muparserx C++ library
 test_files: