parsecs 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e50265b6776233a62be0fc29e04ae1a74e59352fb40338b7493debc49d8debf
-  data.tar.gz: 3272ffdb8a3f9a31b2bb74853f0f672943a4812b729058b65c92311039fc7000
+  metadata.gz: 32cb384a1378a217a7be582ca5ea2de6f3dc70c94689dee52f87f8b0d29977f6
+  data.tar.gz: f22282eaf3ded82725e7eeb4f8ea481e81d27b3860bbf9c57670ce904df70afe
 SHA512:
-  metadata.gz: 202a869978505c0ba7f46528e6414bac4c157ff1343f766c6ead677690cb06a75c74e3c6fc29616bd5f8224d57657895295bfc832b24acd2c53fa1467da6e7db
-  data.tar.gz: 4b1318018190be70d492686f85877a2d9cf507a836e3bc8a5818c04807567581e6241ec54f12b7cdb8a5acb67601dbf59f0b3288819495759ef238322f57f7aa
+  metadata.gz: 203c5968bda180a314200b84c63b60401190334085580ccb6b908b78c82e7662c6fc857a88d8044b9455b04f880527f6c977f8a64233135c296f16af32c948bb
+  data.tar.gz: 552b910f8122d3b8de370b15a8921304658020d6fd429e007ebe1ef5dac23137775cc467e14ff2d5cebf22216d01f5f2918873935655aaadf7f01c42a61d738b

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

data/lib/parsec.rb

@@ -6,7 +6,7 @@ module Parsec
   class Parsec
     using StringToBooleanRefinements
 
-    VERSION = '0.6.4'.freeze
+    VERSION = '0.7.0'.freeze
 
     # evaluates the equation and returns only the result
     def self.eval_equation(equation)
@@ -56,7 +56,7 @@ module Parsec
       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,8 +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_match(/^\d{4}-\d{2}-\d{2}$/, 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")'))
@@ -151,6 +151,44 @@ class TestParsec < Minitest::Test
     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_eval_equation_with_type
     parsec = Parsec::Parsec
     assert_equal({ value: 10, type: :int }, parsec.eval_equation_with_type('(5 + 1) + (6 - 2)'))
@@ -160,8 +198,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.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Nilton Vasques
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-04-25 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.7
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: A gem to evaluate equations using muparserx C++ library