parsecs 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e7b3b272aa00c84d85c8ed2e54564840f6cda8d34865125a7e2b47eb2313946
-  data.tar.gz: 9a0eca31231d8dbcd6d5006e0e0c3e1de8d008e4cf5d6891a50af7fd25924c01
+  metadata.gz: baad050f7884ccde189b53870ea8b12919bf9814c389677794119e64590b0c37
+  data.tar.gz: f46692c9899acb7993f103a223dfd2c8c582defba944c23b19bae345bbeda45e
 SHA512:
-  metadata.gz: 5e9a252ffde2b57982a3bd68491d144514af414ff7bc5235002b914ecae0a11eff42a95db1acc22b5acb4e81165d6cf80f5f04f1379733f221ae4955c54a5327
-  data.tar.gz: b1709ff79e5870d03c1579ec717d5ef9c932838fecbee26cb3e5c132b168e606a35c8a2cd6302ff6aef38062c3708a59abf605a13b3f305bc4ae890d962584f1
+  metadata.gz: f7b5293ef8325c2dffed4e73ec8957fcaf5e5f6ebe25ccfd9c3b2b44d1f0869c25324ca336da667fba9b4d0e82ba79ddb39d4a252371746b87d9e6bad69d19a4
+  data.tar.gz: 57759958a8205ca77b00f8ff62629e6023aaf81e14c9a3d4cbfaf14404c7473909839e474ba16168b332746e3d72188669fc4591def308c73b76b66e61534297

data/ext/libnativemath/libnativemath.i

@@ -20,8 +20,8 @@ extern std::string native_direct_eval(std::string input);
     switch (*$2) {
       case 'i': rb_hash_aset($result, rb_str_new2("type"), rb_str_new2("int")); break;
       case 'f': rb_hash_aset($result, rb_str_new2("type"), rb_str_new2("float")); break;
-      case 's': rb_hash_aset($result, rb_str_new2("type"), rb_str_new2("string")); break;
       case 'b': rb_hash_aset($result, rb_str_new2("type"), rb_str_new2("boolean")); break;
+      case 's': rb_hash_aset($result, rb_str_new2("type"), rb_str_new2("string")); break;
       case 'c': rb_hash_aset($result, rb_str_new2("type"), rb_str_new2("complex")); break;
       case 'm': rb_hash_aset($result, rb_str_new2("type"), rb_str_new2("matrix")); break;
     }

data/lib/parsec.rb

@@ -6,36 +6,43 @@ module Parsec
   class Parsec
     using StringToBooleanRefinements
 
-    VERSION = '0.2.19'.freeze
+    VERSION = '0.2.20'.freeze
 
     # evaluates the equation
     def self.eval_equation(equation)
-      remove_spaces(equation)
+      remove(equation, true)
 
       convert(Libnativemath.native_eval(equation))
     end
 
     # returns true or raise an error
-    def self.validate_syntax(equation)
+    def self.validate_syntax!(equation)
+      remove(equation)
+
       validate(Libnativemath.native_eval(equation), true)
     end
 
     # returns true or an error string
-    def self.verify_syntax(equation)
+    def self.validate_syntax(equation)
+      remove(equation)
+
       validate(Libnativemath.native_eval(equation), false)
     end
 
     private_class_method
 
-    def self.remove_spaces(equation)
-      # This line removes all spaces that are not between quotation marks
-      # https://stackoverflow.com/questions/205521/using-regex-to-replace-all-spaces-not-in-quotes-in-ruby?utm_medium=organic&utm_source=google_rich_qa&utm_campaign=google_rich_qa
-      equation.gsub!(/( |(".*?"))/, '\\2')
+    def self.remove(equation, new_line = false)
+      equation.gsub!(/[\n\t\r]/, ' ')
+
+      # The following regex remove all spaces that are not between quot marks
+      # https://goo.gl/exJ66Y
+      equation.gsub!(/( |(".*?"))/, '\\2') if new_line == true
     end
 
     def self.convert(ans)
       case ans['value']
       when 'inf' then return 'Infinity'
+      when '-inf' then return '-Infinity'
       when 'nan' then return ans['value']
       end
 
@@ -44,7 +51,8 @@ module Parsec
       when 'float'   then return ans['value'].to_f
       when 'boolean' then return ans['value'].to_bool
       when 'string'  then return error_check(ans['value'])
-      when 'c'       then return 'complex number'
+      when 'complex' then return 'complex number' # Maybe future implementation
+      when 'matrix'  then return 'matrix value'   # Maybe future implementation
       end
     end
 

data/test/test_parsec.rb

@@ -83,4 +83,22 @@ class TestParsec < Minitest::Test
     assert_equal(5, parsec.eval_equation('round(4.62)'))
     assert_equal(4.63, parsec.eval_equation('round_decimal(4.625, 2)'))
   end
+
+  def test_newlines_remotion
+    parsec = Parsec::Parsec
+    assert_equal(true, parsec.validate_syntax("4 + \n 2"))
+    assert_equal(true, parsec.validate_syntax("\n4\n+ \n 2\n"))
+  end
+
+  def test_validate_syntax
+    parsec = Parsec::Parsec
+    assert_equal(true, parsec.validate_syntax('((0.09/1.0)+2.58)-1.6+'))
+    assert_equal('Missing parenthesis.', parsec.validate_syntax('(0.09/1.0'))
+  end
+
+  def test_validate_syntax!
+    parsec = Parsec::Parsec
+    assert_equal(true, parsec.validate_syntax!('((0.09/1.0)+2.58)-1.6+'))
+    assert_raises(parsec.validate_syntax!('(0.09/1.0'))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parsecs
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.20
 platform: ruby
 authors:
 - Nilton Vasques
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-06-19 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