parsecs 0.5.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f491689b423601f13d531240c70349c9af27d4ba39bcf0194771b415ffd567d
-  data.tar.gz: 5d051aea5ed0a8538397084ca40c231e8fbc1a48297960d2598a3d21d1adf017
+  metadata.gz: 794032417267277d5b12e9ef7d76b3bbcbc4e2590fa1230c1d4600388a74aa55
+  data.tar.gz: 7005495e663ef1656090b582bba5738cc2ccf8075bc182c672a5b87db6a034bd
 SHA512:
-  metadata.gz: b0925569b881e6d3d6ac92b19024b4f4e065248fd049c85516fb1e535627b0b267f940e26ef449b39441a0d3b894cf64b02f94fdc53040b80d3039ca65939acc
-  data.tar.gz: 4dff210da8d09ace5f08df556ce49eaf48e2f511e395974853694276c18e7e044b233010ed26ae31c398664c8ff4edddaef486ab8084ee2e0904f1141d348a30
+  metadata.gz: 01edc288484e0c48e71afa19d9bca1a93e329f39c9af0d1efcba725e3783c9ba7c3d09bccd347f014f185460154b456d99dce2df7ec8caadbd89ec5e8a5e0b9d
+  data.tar.gz: db1b0a6a59331065e8d279d9be948164cc103ba8c29331f94143f109c6b72e018bc92ebd74cc492cf047a5aa51cce0c434b7600f8c062379cd061c6a62427a55

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 = '65ff99e53961d86f14d214e49154ae26c94ec221'.freeze
+COMMIT = 'eca316d8ad99d4f2e68539a1efd7524288817006'.freeze
 
 Dir.chdir(BASEDIR) do
   system('git init')

data/lib/parsec.rb

@@ -6,7 +6,7 @@ module Parsec
   class Parsec
     using StringToBooleanRefinements
 
-    VERSION = '0.5.1'.freeze
+    VERSION = '0.8.0'.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)
-      remove(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)
-      remove(equation)
+      equation = sanitize(equation)
 
       validate(Libnativemath.native_eval(equation), true)
     end
 
     # returns true or an error string
     def self.validate_syntax(equation)
-      remove(equation)
+      equation = sanitize(equation)
 
       validate(Libnativemath.native_eval(equation), false)
     end
 
     def self.get_result_type(equation)
-      remove(equation, true)
+      equation = sanitize(equation, true)
 
       result = Libnativemath.native_eval(equation)
       result['type'].to_sym if validate(result, true)
@@ -44,19 +44,21 @@ module Parsec
 
     private_class_method
 
-    def self.remove(equation, new_line = false)
-      equation.gsub!(/[\n\t\r]/, ' ')
+    def self.sanitize(equation, new_line = false)
+      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)
       case ans['value']
       when 'inf' then return 'Infinity'
       when '-inf' then return '-Infinity'
-      when 'nan' then return ans['value']
+      when 'nan', '-nan' then return 'nan'
       end
 
       case ans['type']

data/test/test_parsec.rb

@@ -115,7 +115,8 @@ class TestParsec < Minitest::Test
 
   def test_date_functions
     parsec = Parsec::Parsec
-    assert_equal(Date.today, Date.parse(parsec.eval_equation("current_date()")))
+    assert_equal(Date.today, Date.parse(parsec.eval_equation('current_date()')))
+    assert_match(/^\d{4}-\d{2}-\d{2}$/, parsec.eval_equation('current_date()'))
     assert_equal(364, parsec.eval_equation('daysdiff("2018-01-01", "2018-12-31")'))
     assert_equal(365, parsec.eval_equation('daysdiff("2016-01-01", "2016-12-31")'))
     assert_equal(365, parsec.eval_equation('daysdiff("2000-01-01", "2000-12-31")'))
@@ -123,6 +124,91 @@ class TestParsec < Minitest::Test
     assert_equal(1, parsec.eval_equation('daysdiff("2018-01-01", "2017-12-31")'))
   end
 
+  def test_datetime_functions
+    parsec = Parsec::Parsec
+    assert_equal(24, parsec.eval_equation('hoursdiff("2018-01-01", "2018-01-02")'))
+    assert_equal(24, parsec.eval_equation('hoursdiff("2018-01-01", "2018-1-02")'))
+    assert_equal(24, parsec.eval_equation('hoursdiff("2018-1-01", "2018-01-02")'))
+    assert_equal(24, parsec.eval_equation('hoursdiff("2018-1-01", "2018-1-02")'))
+    assert_equal(24, parsec.eval_equation('hoursdiff("2018-01-01", "2018-01-2")'))
+    assert_equal(24, parsec.eval_equation('hoursdiff("2018-01-1", "2018-01-02")'))
+    assert_equal(24, parsec.eval_equation('hoursdiff("2018-01-1", "2018-01-2")'))
+    assert_equal(24, parsec.eval_equation('hoursdiff("2018-1-1", "2018-1-2")'))
+    assert_equal(288, parsec.eval_equation('hoursdiff("2019-02-01", "2019-02-13")'))
+    assert_equal(4, parsec.eval_equation('hoursdiff("2019-02-01T08:00", "2019-02-01T12:00")'))
+    assert_equal(28, parsec.eval_equation('hoursdiff("2019-02-01T08:00", "2019-02-02T12:00")'))
+    assert_equal(3.67, parsec.eval_equation('hoursdiff("2019-02-01T08:20", "2019-02-01T12:00")'))
+    assert_equal(0, parsec.eval_equation('hoursdiff(current_date(), current_date())'))
+    assert_operator(parsec.eval_equation('hoursdiff(current_date(), "2000-01-01")'), :<, 0)
+    assert_equal(0, parsec.eval_equation('hoursdiff("2018-01-01", "2018-01-01")'))
+    assert_equal(-20, parsec.eval_equation('hoursdiff("2018-01-02T08:00", "2018-01-01T12:00")'))
+    assert_raises(SyntaxError) { parsec.eval_equation('hoursdiff("2018-01-01", "INVALID2")') }
+    assert_raises(SyntaxError) { parsec.eval_equation('hoursdiff("INVALID1", "2018-01-01")') }
+    assert_raises(SyntaxError) { parsec.eval_equation('hoursdiff("INVALID1", "INVALID2")') }
+    assert_raises(SyntaxError) { parsec.eval_equation('hoursdiff(2, 3)') }
+    assert_raises(SyntaxError) { parsec.eval_equation('hoursdiff("2018-01-01", "2018-01-01T12:00")') }
+    assert_raises(SyntaxError) { parsec.eval_equation('hoursdiff("2018-01-01T12:00", "2018-01-01")') }
+    assert_raises(SyntaxError) { parsec.eval_equation('hoursdiff(current_date(), "2010-01-01T08:30")') }
+  end
+
+  def test_add_days
+    parsec = Parsec::Parsec
+
+    # With Dates
+    assert_equal('2019-01-01', parsec.eval_equation('add_days("2019-01-01", 0)'))
+    assert_equal('2019-01-02', parsec.eval_equation('add_days("2019-01-01", 1)'))
+    assert_equal('2018-12-31', parsec.eval_equation('add_days("2019-01-01", -1)'))
+    assert_equal('2019-01-04', parsec.eval_equation('add_days("2019-01-01", 3)'))
+
+    # # With DateTimes
+    assert_equal('2019-01-01T08:30', parsec.eval_equation('add_days("2019-01-01T08:30", 0)'))
+    assert_equal('2019-02-01T12:30', parsec.eval_equation('add_days("2019-01-01T12:30", 31)'))
+    assert_equal('2019-01-02T15:30', parsec.eval_equation('add_days("2019-01-01T15:30", 1)'))
+    assert_equal('2019-01-02T20:30', parsec.eval_equation('add_days("2019-01-01T08:30", 1.5)'))
+    assert_equal('2018-12-31T08:30', parsec.eval_equation('add_days("2019-01-01T08:30", -1)'))
+
+    # With Errors
+    assert_raises(SyntaxError) { parsec.eval_equation_with_type('add_days("2019-01-33", 0)') }
+    # assert_raises(SyntaxError) { parsec.eval_equation_with_type('add_days("2019-01-01T08:61", 0)') } # Dont work on Linux
+    assert_raises(SyntaxError) { parsec.eval_equation_with_type('add_days()') }
+    assert_raises(SyntaxError) { parsec.eval_equation_with_type('add_days(1, 2, 3)') }
+    assert_raises(SyntaxError) { parsec.eval_equation_with_type('add_days(1, 2)') }
+  end
+
+  def test_mask
+    parsec = Parsec::Parsec
+    assert_equal('123-456', parsec.eval_equation('mask("000-000", 123456)'))
+    assert_equal('00014', parsec.eval_equation('mask("00000", 14)'))
+    assert_equal('000 14', parsec.eval_equation('mask("000 00", 14)'))
+    assert_equal('#123', parsec.eval_equation('concat("#", mask("000", 123))'))
+    assert_equal('12345', parsec.eval_equation('mask("0000", 12345)'))
+    assert_equal('123 45', parsec.eval_equation('mask("00 00", 12345)'))
+    assert_equal('3-5591-1801', parsec.eval_equation('mask("0-0000-0000", 355911801)'))
+    assert_equal('35-5591-1801', parsec.eval_equation('mask("00-0000-0000", 3555911801)'))
+    assert_equal('12-1234-1234-1234', parsec.eval_equation('mask("00-0000-0000-0000", 12123412341234)'))
+    assert_equal('1-1234-1234-1234-1234', parsec.eval_equation('mask("0-0000-0000-0000-0000", 11234123412341234)'))
+  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)'))
+
+    # Error Scenarios
+    assert_raises(SyntaxError) { parsec.eval_equation('default_value(1, 4.5)') }
+    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)'))
@@ -132,8 +218,8 @@ class TestParsec < Minitest::Test
     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)'))
+    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)'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parsecs
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Nilton Vasques
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-01 00:00:00.000000000 Z
+date: 2020-06-29 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.3
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: A gem to evaluate equations using muparserx C++ library