marty 2.5.6 → 2.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89ed116d83e4c492715b16521b670d8cb76b7e26c24c50ae80e7feb15c0647f0
-  data.tar.gz: 966828b387e0fde5e25d089955c24d17455803ccf374fe281de4d8267851456e
+  metadata.gz: e21e7788214cabe5b48e33e15fbefcdbc30ba526f1a8870a3c5c7ab240b48b4d
+  data.tar.gz: 285129ffcd5648deeaa816a7923efc6b146adc01ba2a75624f0a5944063c7372
 SHA512:
-  metadata.gz: 422d57c6920da447203117add2a24298b754aa8bc4d08deb4476e5610a5b76be20ab324752966a5144f0221a8d14c036e43c7e6d39ab33841f6c03332b908f8f
-  data.tar.gz: 6891166c6703a0149ba2c548da687ff041c1ad1ef472d2c47a778b3fa46040b7c9eed1cbee7a3ad1186e18585b20bd22246282e49be9d55f2264ab70b54025b9
+  metadata.gz: 16931641ca8a4478ee399f24fe50398989d35aae7353efebd550e371ad76d45de9faf465f4e139cf4bbb28ae5502fb734f0be49de1f9e054d2d85369c059b190
+  data.tar.gz: de0f280f2a9d0077134e8d717d2e5882c0e35cb3909b9049b4127435b9cb34040bdc8de5081946be80e5085325aee769e48fe8906a919f07fcdc217486e2cf3e

data/.rubocop.yml

@@ -16,3 +16,9 @@ Layout/DotPosition:
 Style/StringLiterals:
   Enabled: true
   EnforcedStyle: single_quotes
+
+Metrics/BlockLength:
+  Max: 400
+  Exclude:
+    - 'spec/**/*'
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (2.5.6)
+    marty (2.5.7)
       aws-sigv4 (~> 1.0, >= 1.0.2)
       axlsx (= 3.0.0pre)
       coderay

data/app/components/marty/base_rule_view.rb

@@ -51,50 +51,81 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
     end
   end
 
-  def self.simple_to_hash(s)
+  # FSM to parse rule text into json
+  def self.ruletext_to_hash(s)
+    # states are
+    #  :start   - before any attr is defined
+    #  :in_attr - defining an attr
+    #  :end     - end of input
+    state = :start
     result = {}
-    save_linenos = {}
-    last_key = nil
-    s.lines.each.with_index(1) do |line, idx|
-      next if /\A\s*\z/.match(line)
+    cur_attr = nil
+    idx = 0
+    input = s.lines
+
+    # events are
+    #  :attr    - starting with <identifier>\s*=
+    #  :normal  - line not starting with ident =
+    #  :end     - no more lines
+    # get_event returns [event, data]
+    get_event = lambda {
+      line = input.try(&:shift)
+      next [:end] unless line
 
       line.chomp!
-      begin
-        m = /\A\s*([a-z][a-z0-9_]*)\s*=\s*(.*)\s*\z/.match(line)
-        if m
-          k, v = m[1], m[2]
-          raise DupKeyError.new(k, idx) if result.keys.include?(k)
-
-          save_linenos[k] = idx
-          result[k] = v
-          last_key = k
-        else
-          raise unless last_key
+      idx += 1
+      m = /\A\s*([a-z][a-z0-9_]*)\s* = (.*)\z/.match(line)
+      next [:attr, m[1..-1]] if m
+
+      [:normal, line]
+    }
+
+    # start a new attribute
+    # data is [ attr_name, everything after = ]
+    new_attr = lambda { |data|
+      cur_attr = data.shift
+      raise DupKeyError.new(cur_attr, idx) if result[cur_attr]
 
-          result[last_key] += "\n" + line.strip
+      result[cur_attr] = data[0]
+    }
+
+    begin
+      while state != :end
+        event, extra = get_event.call
+        case state
+        when :start
+          case event
+          when :attr
+            new_attr.call(extra)
+            state = :in_attr
+          when :normal
+            raise
+          when :end
+            state = :end
+          end
+        when :in_attr
+          case event
+          when :attr
+            new_attr.call(extra)
+          when :normal
+            result[cur_attr] += "\n" + extra
+          when :end
+            state = :end
+          end
         end
-      rescue DupKeyError => e
-        raise
-      rescue StandardError => e
-        raise "syntax error on line #{idx}"
       end
+    rescue DupKeyError => e
+      raise
+    rescue StandardError => e
+      raise "syntax error on line #{idx}"
     end
     result
   end
 
-  def self.hash_to_simple(h)
-    return unless h && h.present?
-
-    lhs_wid = h.keys.map(&:length).max
-    fmt = "%-#{lhs_wid}s = %s"
-    result = []
-    h.map do |k, vstr|
-      vlines = vstr.lines.map(&:chomp)
-      fst = vlines.shift
-      result << fmt % [k, fst]
-      vlines.each { |l| result << ' ' * (lhs_wid + 3) + l }
+  def self.hash_to_ruletext(h)
+    h.each_with_object('') do |(k, v), out|
+      out << k + ' = ' + v + "\n"
     end
-    result.join("\n")
   end
 
   def jsonb_getter(c)
@@ -102,7 +133,7 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
   end
 
   def jsonb_simple_getter(c)
-    lambda { |r| Marty::BaseRuleView.hash_to_simple(r.send(c)) }
+    lambda { |r| Marty::BaseRuleView.hash_to_ruletext(r.send(c)) }
   end
 
   def jsonb_simple_setter(c)
@@ -111,7 +142,7 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
       return r.send(msg, nil) if v.blank?
 
       begin
-        final = Marty::BaseRuleView.simple_to_hash(v)
+        final = Marty::BaseRuleView.ruletext_to_hash(v)
       rescue StandardError => e
         final = { "~~ERROR~~": e.message }
       end
@@ -205,14 +236,14 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
     [jsonb_field(:computed_guards,
                  getter: jsonb_simple_getter(:computed_guards),
                  setter: jsonb_simple_setter(:computed_guards),
-                 height: 150)]
+                 height: 100)]
   end
 
   def form_items_results
     [jsonb_field(:results,
                  getter: jsonb_simple_getter(:results),
                  setter: jsonb_simple_setter(:results),
-                 height: 150)]
+                 height: 225)]
   end
 
   def default_form_items

data/app/models/marty/promise.rb

@@ -200,4 +200,15 @@ class Marty::Promise < Marty::Base
       raw_conn.exec("UNLISTEN promise_#{id}")
     end
   end
+
+  delorean_fn :result_and_status, sig: 1 do |promise_id|
+    promise = find_by(id: promise_id)
+    next { error: 'not found' } if promise.nil?
+
+    {
+      completed: !promise.status.nil?,
+      status: promise.status,
+      result: promise.result
+    }
+  end
 end

data/delorean/promises.dl

@@ -0,0 +1,5 @@
+Status:
+    promise_id =? nil
+
+    result = Marty::Promise.result_and_status(promise_id)
+

data/lib/marty/rule_script_set.rb

@@ -34,7 +34,7 @@ class Marty::RuleScriptSet < Delorean::AbstractContainer
 
   def write_attr(k, v)
     equals, rhs = v == :parameter ? [' =?', ''] :
-                    [' =', "\n" + v.lines.map { |l| ' ' * 8 + l }.join("\n")]
+                    [' =', v.lines.map { |l| ' ' * 8 + l }.join]
     k + equals + rhs
   end
 
@@ -129,14 +129,23 @@ class Marty::RuleScriptSet < Delorean::AbstractContainer
   end
 
   def get_parse_error_field(ruleh, exc)
-    line = exc.line ? exc.line - self.class.body_lines : 0
-    errs = code_section_counts(ruleh)
-    line_count = 0
-    errs.each do |k, v|
-      line_count += v
-      return k if line <= line_count
+    line = (exc.line || 1) - 1
+    errs = { class_body: self.class.body_lines } + code_section_counts(ruleh)
+    ranges0 = errs.values.reduce([0]) do |acc, len|
+      acc + [acc.last + len]
     end
-    errs.keys.last
+    ranges = errs.keys.zip(ranges0.each_cons(2).to_a)
+    secnm, (st, en) = ranges.detect do |sec, (st, en)|
+      line.between?(st, en - 1)
+    end
+    [secnm, line - st + 1]
+  rescue StandardError => e
+    Marty::Logger.error('RuleScriptSet#get_parse_error_field',
+                        error: e.message,
+                        backtrace: e.backtrace,
+                        ruleh: ruleh,
+                        line: line)
+    ['Unknown', 0]
   end
 
   def get_engine(ruleh)
@@ -175,9 +184,10 @@ class Marty::RuleScriptSet < Delorean::AbstractContainer
         @@engines[[pt, sname]] = sset.parse_check(sname, get_code(ruleh))
       end
   rescue Delorean::ParseError => e
-      f = get_parse_error_field(ruleh, e)
+      secnm, line = get_parse_error_field(ruleh, e)
       msg = e.message.capitalize
-      raise "Error in rule '#{ruleh['name']}' field '#{f}': #{msg}"
+      raise "Error in rule '#{ruleh['name']}' field '#{secnm}' "\
+            "(line #{line}): #{msg}"
   end
 
   def self.indent(s)

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = '2.5.6'
+  VERSION = '2.5.7'
 end

data/spec/controllers/rpc_controller_spec.rb

@@ -524,6 +524,41 @@ describe Marty::RpcController do
     Delayed::Worker.delay_jobs = true
   end
 
+  it 'should be able to get background job status' do
+    Delayed::Worker.delay_jobs = false
+
+    post 'evaluate', params: {
+           format: :json,
+           script: 'M1',
+           node: 'B',
+           attrs: 'e',
+           tag: t1.name,
+           params: { a: 333, d: 5 }.to_json,
+           background: true,
+         }
+
+    res = ActiveSupport::JSON.decode response.body
+    expect(res).to include('job_id')
+    job_id = res['job_id']
+
+    marty_whodunnit
+    Marty::Script.load_scripts(File.join(Rails.root, '../../delorean'), Date.today)
+
+    post 'evaluate', params: {
+           format: :json,
+           script: 'Promises',
+           node: 'Status',
+           attrs: 'result',
+           params: { promise_id: job_id }.to_json
+         }
+
+    res = ActiveSupport::JSON.decode response.body
+    expect(res['completed']).to be true
+    expect(res['result']).to eq('e' => 4)
+
+    Delayed::Worker.delay_jobs = true
+  end
+
   it 'should be able to post background job with non-array attr' do
     Delayed::Worker.delay_jobs = false
     post 'evaluate', params: {

data/spec/dummy/lib/gemini/xyz_rule_script_set.rb

@@ -5,18 +5,24 @@ class Gemini::XyzRuleScriptSet < Marty::RuleScriptSet
   def self.body_start
     "import BaseCode\n#{node_name}: BaseCode::BaseCode\n"
   end
+  def xyz_header
+    "XyzNode:\n    xyz_param =? nil\n"
+  end
   def xyz_code(ruleh)
-    write_code(ruleh["computed_guards"].select{|k,_|k.starts_with?("xyz_")})
+    c = write_code(ruleh["computed_guards"].select{|k,_|k.starts_with?("xyz_")})
+    c.blank? ? '' : self.class.indent(c)
   end
   def guard_code(ruleh)
     write_code(ruleh["computed_guards"].reject{|k,_|k.starts_with?("xyz_")})
   end
   def get_code(ruleh)
     x = xyz_code(ruleh)
-    super + (x.blank? ? '' :
-      "XyzNode:\n    xyz_param =? nil\n" + self.class.indent(x))
+    super +
+      xyz_header +
+      xyz_code(ruleh)
   end
   def code_section_counts(ruleh)
-    super + { xyz: xyz_code(ruleh).count("\n") }
+    super + { xyz_header: xyz_header.count("\n"),
+              xyz: xyz_code(ruleh).count("\n") }
   end
 end

data/spec/features/rule_spec.rb

@@ -203,7 +203,8 @@ feature 'rule view', js: true do
     fill_in(:computed_guards, with: 'sadf asdf ljsf')
     press('OK')
     wait_for_ajax
-    exp = "Computed - Error in rule 'abc' field 'computed_guards': Syntax error on line 1"
+    exp = "Computed - Error in rule 'abc' field 'computed_guards': "\
+          'Syntax error on line 1'
     expect(page).to have_content(exp)
     sleep 2  # sleep needed for message to clear, otherwise failing tests could
     # pass due to prior messages
@@ -212,84 +213,94 @@ feature 'rule view', js: true do
     fill_in(:computed_guards, with: '0sadf = 123j')
     press('OK')
     wait_for_ajax
-    exp = "Computed - Error in rule 'abc' field 'computed_guards': Syntax error on line 1"
+    exp = "Computed - Error in rule 'abc' field 'computed_guards': "\
+          'Syntax error on line 1'
     expect(page).to have_content(exp)
     sleep 2
 
     # bad rhs - delorean compile will raise
-    fill_in(:computed_guards, with: 'var = 123j')
+    fill_in(:computed_guards, with: "x = true\ny = false\nvar = 123j\nz = true")
     press('OK')
     wait_for_ajax
-    exp = "Computed - Error in rule 'abc' field 'computed_guards': Syntax error"
+    exp = "Computed - Error in rule 'abc' field 'computed_guards' (line 3): "\
+          'Syntax error'
     expect(page).to have_content(exp)
     sleep 2
 
     fill_in(:computed_guards, with: %Q(var1 = "good"\nvar2 = 123\nvar3 = 123j))
     press('OK')
     wait_for_ajax
-    exp = "Computed - Error in rule 'abc' field 'computed_guards': Syntax error"
+    exp = "Computed - Error in rule 'abc' field 'computed_guards' (line 3): "\
+          'Syntax error'
     expect(page).to have_content(exp)
     sleep 2
 
     fill_in(:computed_guards, with: '')
-    fill_in(:results, with: %Q(var1 = "good"\nvar2 = 123\nvar3 = 123j))
+    fill_in(:results, with: %Q(var3 = 123j\nvar1 = "good"\nvar2 = 123))
     press('OK')
     wait_for_ajax
-    exp = "Computed - Error in rule 'abc' field 'results': Syntax error"
+    exp = "Computed - Error in rule 'abc' field 'results' (line 1): "\
+          'Syntax error'
     expect(page).to have_content(exp)
     sleep 2
 
-    fill_in(:results, with: %Q(abc = "def"\ndef = 5\nxyz=def+10\nsadf asdf lsf))
+    fill_in(:results, with: %Q(abc = "def"\ndef = 5\nxyz = def+10\nsadf asdf lsf))
     press('OK')
     wait_for_ajax
-    exp = "Computed - Error in rule 'abc' field 'results': Syntax error"
+    exp = "Computed - Error in rule 'abc' field 'results' (line 4): Syntax error"
     expect(page).to have_content(exp)
     sleep 2
 
     fill_in(:results,
             with: %Q(abc = "def"\ndef = "abc"\nklm = "3"\nabc = "xyz"))
-    exp = "Computed - Error in rule 'abc' field 'results': Keyword 'abc' specified more"\
-          ' than once (line 4)'
+
+    exp = "Computed - Error in rule 'abc' field 'results': Keyword 'abc' "\
+          'specified more than once (line 4)'
     press('OK')
     wait_for_ajax
     expect(page).to have_content(exp)
     sleep 2
 
-    multi_line = <<-EOL
-abc = "def"
-def = "abc"
-klm = 3 +
-     4 +
-if true then 5 else 0
+    klm = "    3 +    \n\n# hi mom\n     4 +\n    if true then 5 else 0\n\n"
+    bogus = <<-EOL
+
+# comment line
+
 EOL
-    multi_line_fixed = <<-EOL
+
+    multi_line = <<-EOL
 abc = "def"
 def = "abc"
-klm = 3 +
-      4 +
-      if true then 5 else 0
+klm = #{klm}
 EOL
 
+    fill_in(:results, with: bogus + multi_line)
+    press('OK')
+    wait_for_ajax
+    exp = "Computed - Error in rule 'abc' field 'results': "\
+          'Syntax error on line 1'
+    expect(page).to have_content(exp)
+
     fill_in(:results, with: multi_line)
     press('OK')
     wait_for_ajax
 
-    # re-edit twice to make sure re-indentation and stripping are correct
+    # re-edit twice to make sure identation and comments are preserved
     press('Edit')
     wait_for_ajax
-    expect(find_field(:results).value).to eq(multi_line_fixed.chomp)
+    expect(find_field(:results).value).to eq(multi_line)
     press('OK')
     wait_for_ajax
 
     press('Edit')
     wait_for_ajax
-    expect(find_field(:results).value).to eq(multi_line_fixed.chomp)
+    expect(find_field(:results).value).to eq(multi_line)
     press('OK')
     wait_for_ajax
 
     # when stored in rule, all lines of a multi line value s/b stripped
     r = Gemini::MyRule.where(name: 'abc', obsoleted_dt: 'infinity').first
-    expect(r.results['klm']).to eq("3 +\n4 +\nif true then 5 else 0")
+    expect(r.results['klm']).to eq(klm)
 
     # make sure change of key/value order is recognized as a change
     press('Edit')
@@ -302,22 +313,23 @@ EOL
     wait_for_ajax
     press('Edit')
     wait_for_ajax
-    val = find_field(:results).value + "\n"
+    val = find_field(:results).value
     expect(val).to eq(newval)
     press('OK')
     wait_for_ajax
 
-    exp = <<EOL
-simple_result  = "c value"
+    exp = <<-EOL
+simple_result = "c value"
 computed_value = if paramb
-                 then param1 / (grid1_grid_result||1)
-                 else (grid2_grid_result||1) / param1
+    then param1 / (grid1_grid_result||1)
+     else (grid2_grid_result||1) / param1
 EOL
+
     names = mrv.get_col_vals(:name, 9, 0)
     idx = names.index { |n| n == 'Rule3' } + 1
     mrv.select_row(idx)
     press('Edit')
-    expect(find_field(:results).value).to eq(exp.chomp)
+    expect(find_field(:results).value).to eq(exp)
     press('OK')
     wait_for_ajax
 

data/spec/fixtures/csv/rule/MyRule.csv

@@ -10,6 +10,6 @@ Rule2,SimpleRule,2017-2-1 14:00:00,2017-4-1,true,"{""g_array"":[""G1V2""],""g_si
 Rule2a,SimpleRule,2017-2-1 14:00:00,2017-4-1,true,"{""g_array"":[""G1V2""],""g_single"":""G2V3"",""g_string"":""abc"",""g_bool"":true,""g_range"":""(,50]"",""g_integer"":99}",,,"{""simple_result"":""\""b value\"""", ""sr2"":""true"", ""sr3"": ""123""}"
 Rule2b,SimpleRule,2017-2-1 14:00:00,2017-4-1,true,"{""g_array"":[""G1V2""],""g_single"":""G2V3"",""g_string"":""abc"",""g_bool"":true,""g_range"":""(,50]"",""g_integer"":999}",,"{""grid1"":""DataGrid1"",""grid2"":""DataGrid2""}",
 Rule2c,SimpleRule,2017-2-1 14:00:00,2017-4-1,true,"{""g_array"":[""G1V2""],""g_single"":""G2V3"",""g_string"":""abc"",""g_bool"":false,""g_range"":""(,50]"",""g_integer"":10}",,"{""grid1"":""DataGrid1"",""grid2"":""DataGrid2""}",
-Rule3,ComplexRule,2017-3-1 00:00:00,2017-4-1,false,"{""g_array"":[""G1V2"",""G1V3""],""g_string"":""def"",""g_integer"":11}","{""cguard1"":""1==1"",""cguard2"":""[param2 == 'abc', \""a string\""]""}","{""grid1"":""DataGrid1"",""grid2"":""DataGrid2""}","{""simple_result"":""\""c value\"""",""computed_value"":""if paramb\nthen param1 / (grid1_grid_result||1)\nelse (grid2_grid_result||1) / param1""}"
+Rule3,ComplexRule,2017-3-1 00:00:00,2017-4-1,false,"{""g_array"":[""G1V2"",""G1V3""],""g_string"":""def"",""g_integer"":11}","{""cguard1"":""1==1"",""cguard2"":""[param2 == 'abc', \""a string\""]""}","{""grid1"":""DataGrid1"",""grid2"":""DataGrid2""}","{""simple_result"":""\""c value\"""",""computed_value"":""if paramb\n    then param1 / (grid1_grid_result||1)\n     else (grid2_grid_result||1) / param1""}"
 Rule4,ComplexRule,2017-4-1 15:00:01,2017-5-1,,"{""g_array"":[""G1V2"",""G1V3""],""g_string"":""Hi Mom"",""g_integer"":11}","{""cguard1"":""1==1"",""cguard2"":""param2 == \""abc\""""}","{""grid1"":""DataGrid1"",""grid2"":""DataGrid2""}","{""computed_name_grid"":""\""DataGrid\""+\""X\"""", ""simple_result"":""computed_name_grid"",""grid_sum"":""computed_name_grid_result + (grid1_grid_result||0)+(grid2_grid_result||0)""}"
 Rule5,ComplexRule,2017-4-2 15:00:01,2017-5-1,,"{""g_string"":""zzz"",""g_integer"":3757,""g_has_default"":""foo""}","{""cguard1"":""[1==1, \""a string\""]""}",,"{""flavor"": ""[\""cherry\"",\""lemon\""][param2]"",""other_grid"": ""\""DataGrid4\"""",""final_value"": ""other_grid_result * 3""}"

data/spec/models/rule_spec.rb

@@ -73,33 +73,44 @@ module Marty::RuleSpec
       it 'detects errors in computed guards' do
         @rule_type = 'SimpleRule'
         @computed_guards = { 'guard1' => 'zvjsdf12.z8*' }
-        exp = /Computed - Error in rule 'testrule' field 'computed_guards': Syntax error/
+        exp = Regexp.new("Computed - Error in rule 'testrule' field "\
+                         "'computed_guards' .line 1.: Syntax error")
         expect { subject }.to raise_error(exp)
       end
       it 'detects errors in computed results' do
         @rule_type = 'SimpleRule'
-        @results = { 'does_not_compute' => 'zvjsdf12.z8*' }
+        @results = { 'does_compute' => '1+2',
+                     'does_not_compute' => 'zvjsdf12.z8*' }
         @grids = { 'grid1' => 'DataGrid1', 'grid2' => 'DataGrid2' }
-        exp = /Computed - Error in rule 'testrule' field 'results': Syntax error/
+        exp = Regexp.new("Computed - Error in rule 'testrule' field "\
+                         "'results' .line 2.: Syntax error")
         expect { subject }.to raise_error(exp)
       end
       it 'detects errors in computed results 2' do
         @rule_type = 'SimpleRule'
         @results = { 'does_not_compute' => 'zvjsdf12.z8*' }
-        @grids = { 'grid1' => 'DataGrid1', 'grid2' => 'DataGrid1', 'grid3' => 'DataGrid3' }
-        exp = /Computed - Error in rule 'testrule' field 'results': Syntax error/
+        @grids = { 'grid1' => 'DataGrid1', 'grid2' => 'DataGrid1',
+                   'grid3' => 'DataGrid3' }
+        exp = Regexp.new("Computed - Error in rule 'testrule' field "\
+                         "'results' .line 1.: Syntax error")
         expect { subject }.to raise_error(exp)
       end
       it 'detects errors in computed results 3' do
         @rule_type = 'SimpleRule'
-        @results = { 'does_not_compute' => 'zvjsdf12.z8*' }
-        @grids = { 'grid1' => 'DataGrid1', 'grid2' => 'DataGrid1', 'grid3' => 'DataGrid1' }
-        exp = /Computed - Error in rule 'testrule' field 'results': Syntax error/
+        @results = { 'does_compute' => '1+2',
+                     'does_compute2' => '"string".length',
+                     'does_not_compute' => 'zvjsdf12.z8*',
+                     'does_compute3' => '[does_compute].sum' }
+        @grids = { 'grid1' => 'DataGrid1', 'grid2' => 'DataGrid1',
+                   'grid3' => 'DataGrid1' }
+        exp = Regexp.new("Computed - Error in rule 'testrule' field "\
+                         "'results' .line 3.: Syntax error")
         expect { subject }.to raise_error(exp)
       end
       it 'reports bad grid names' do
         @rule_type = 'SimpleRule'
-        @grids = { 'grid1' => 'xyz', 'grid2' => 'DataGrid2', 'grid3' => 'DataGrid1' }
+        @grids = { 'grid1' => 'xyz', 'grid2' => 'DataGrid2',
+                   'grid3' => 'DataGrid1' }
         exp = /Grids - Bad grid name 'xyz' for 'grid1'/
         expect { subject }.to raise_error(exp)
       end
@@ -133,19 +144,22 @@ module Marty::RuleSpec
       it 'detects script errors' do
         @rule_type = 'XRule'
         @results = { 'x' => 'zx sdf wer' }
-        exp = /Computed - Error in rule 'testrule' field 'results': Syntax error/
+        exp = Regexp.new("Computed - Error in rule 'testrule' field "\
+                         "'results' .line 1.: Syntax error")
         expect { subject }.to raise_error(exp)
       end
       it 'rule script stuff overrides 1' do
         @rule_type = 'XRule'
         @computed_guards = { 'abc' => 'true', 'xyz_guard' => 'err err err' }
-        exp = /Computed - Error in rule 'testrule' field 'xyz': Syntax error/
+        exp = Regexp.new("Computed - Error in rule 'testrule' field "\
+                         "'xyz' .line 1.: Syntax error")
         expect { subject }.to raise_error(exp)
       end
       it 'rule script stuff overrides 2' do
         @rule_type = 'XRule'
         @computed_guards = { 'abc' => 'err err err', 'xyz_guard' => 'xyz_param' }
-        exp = /Computed - Error in rule 'testrule' field 'computed_guards': Syntax error/
+        exp = Regexp.new("Computed - Error in rule 'testrule' field "\
+                         "'computed_guards' .line 1.: Syntax error")
         expect { subject }.to raise_error(exp)
       end
       it 'rule script stuff overrides 3' do
@@ -376,9 +390,9 @@ module Marty::RuleSpec
         rescue Marty::DeloreanRule::ComputeError => e
           exp = 'no implicit conversion of Integer into String'
           expect(e.message).to include(exp)
-          expres = [/DELOREAN__XyzRule_\d+_1483228800.0:23:in .+'/,
-                    /DELOREAN__XyzRule_\d+_1483228800.0:23:in .tmp_var4__D'/,
-                    /DELOREAN__XyzRule_\d+_1483228800.0:27:in .bv__D'/]
+          expres = [/DELOREAN__XyzRule_\d+_1483228800.0:\d+:in .+'/,
+                    /DELOREAN__XyzRule_\d+_1483228800.0:\d+:in .tmp_var4__D'/,
+                    /DELOREAN__XyzRule_\d+_1483228800.0:\d+:in .bv__D'/]
           expres.each_with_index do |expre, i|
             expect(e.backtrace[i]).to match(expre)
           end
@@ -390,8 +404,8 @@ module Marty::RuleSpec
         rescue Marty::DeloreanRule::ComputeError => e
           exp = 'divided by 0'
           expect(e.message).to include(exp)
-          expres = [%r(DELOREAN__XyzRule_\d+_1483228800.0:5:in ./'),
-                    /DELOREAN__XyzRule_\d+_1483228800.0:5:in .cg1__D'/]
+          expres = [%r(DELOREAN__XyzRule_\d+_1483228800.0:\d+:in ./'),
+                    /DELOREAN__XyzRule_\d+_1483228800.0:\d+:in .cg1__D'/]
           expres.each_with_index do |expre, i|
             expect(e.backtrace[i]).to match(expre)
           end
@@ -429,9 +443,9 @@ module Marty::RuleSpec
                'err_section' => 'results',
                'err_message' => 'no implicit conversion of Integer into String' }
         expect(log_ents[1].details.except('err_stack')).to eq(exp)
-        expres = [/DELOREAN__XyzRule_\d+_1483228800.0:23:in .+'/,
-                  /DELOREAN__XyzRule_\d+_1483228800.0:23:in .tmp_var4__D'/,
-                  /DELOREAN__XyzRule_\d+_1483228800.0:27:in .bv__D'/]
+        expres = [/DELOREAN__XyzRule_\d+_1483228800.0:\d+:in .+'/,
+                  /DELOREAN__XyzRule_\d+_1483228800.0:\d+:in .tmp_var4__D'/,
+                  /DELOREAN__XyzRule_\d+_1483228800.0:\d+:in .bv__D'/]
         expres.each_with_index do |expre, i|
           expect(log_ents[1].details['err_stack'][i]).to match(expre)
         end
@@ -445,8 +459,8 @@ module Marty::RuleSpec
                'err_section' => 'computed_guards',
                'err_message' => 'divided by 0' }
         expect(log_ents[2].details.except('err_stack')).to eq(exp)
-        expres = [%r(DELOREAN__XyzRule_\d+_1483228800.0:5:in ./'),
-                  /DELOREAN__XyzRule_\d+_1483228800.0:5:in .cg1__D'/]
+        expres = [%r(DELOREAN__XyzRule_\d+_1483228800.0:\d+:in ./'),
+                  /DELOREAN__XyzRule_\d+_1483228800.0:\d+:in .cg1__D'/]
         expres.each_with_index do |expre, i|
           expect(log_ents[2].details['err_stack'][i]).to match(expre)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.5.6
+  version: 2.5.7
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -383,6 +383,7 @@ files:
 - delorean/blame_report.dl
 - delorean/diagnostics.dl
 - delorean/marty_fields.dl
+- delorean/promises.dl
 - delorean/script_report.dl
 - delorean/table_report.dl
 - docker-compose.dummy.yml