marty 2.5.8 → 2.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17d4c8cca5e227120b347328f76f6b5c2844a3662fe4fa31c186d4ac5b422f9b
-  data.tar.gz: 5ae6f1ec90da4b1543ed781e2bd9b9ef88224d9b51bde8257f9e9188dc44b82c
+  metadata.gz: ec3679621406e9c0a3d3a343f38bc89cd467a9e39c353b7a2a4911877482194d
+  data.tar.gz: fde0d9513d1f964b7a9a7022d964971a6aa486785027e7e96ddb1da11c815807
 SHA512:
-  metadata.gz: 5705fbd63836311b4f6b2847d9b2b2fe998a413980a5a795a98494f94e8dc0dda78dc0a3a05d994c821102e8bf8320afe6465393dd663674cb22b5cfa2b63a52
-  data.tar.gz: 806137fda06674d6d4fa937689a0da78898f1c4589ee1f52833030aea10537e48a76037ebbe2acc7a1c90eaccee1bb4d2af7ea325a09f93dbbc35028af5f37e9
+  metadata.gz: d520244f0c0e98a1ae3c779660f049663514f2062eabd837e3167bb6098754476abef431e5f9c22fdd460567c56791a7d08095b852af0c807a628c6998148cfc
+  data.tar.gz: f6d70ee23ab6b1a571a5bb913ffc10e453169731b4e5736a8ac22ff830262b65d19e9cf81361f8e54f54fd774d64b6149f6d572c524249af8c80a9315537da95

data/Gemfile

@@ -16,6 +16,7 @@ group :development, :test do
   gem 'chromedriver-helper'
   gem 'connection_pool'
   gem 'database_cleaner'
+  gem 'pry-byebug'
   gem 'pry-rails'
   gem 'rails-controller-testing'
   gem 'rspec-instafail', require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (2.5.8)
+    marty (2.5.9)
       aws-sigv4 (~> 1.0, >= 1.0.2)
       axlsx (= 3.0.0pre)
       coderay
@@ -69,6 +69,7 @@ GEM
       nokogiri (~> 1.8, >= 1.8.2)
       rubyzip (~> 1.2, >= 1.2.1)
     builder (3.2.3)
+    byebug (11.0.0)
     capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
@@ -152,6 +153,9 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
+      pry (~> 0.10)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (3.0.3)
@@ -264,6 +268,7 @@ DEPENDENCIES
   mcfly
   netzke (= 6.5.0.0)
   pg
+  pry-byebug
   pry-rails
   rails (~> 5.1.4)
   rails-controller-testing

data/app/components/marty/script_tester.rb

@@ -52,7 +52,7 @@ class Marty::ScriptTester < Marty::Form
 
     begin
       phash = ActiveSupport::JSON.decode("{ #{pjson} }")
-    rescue MultiJson::DecodeError
+    rescue JSON::ParserError
       client.netzke_notify 'Malformed input parameters'
       return
     end

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 ? [' =?', ''] :
-                    [' =', v.lines.map { |l| ' ' * 8 + l }.join]
+                    [" =\n", v.lines.map { |l| ' ' * 8 + l }.join]
     k + equals + rhs
   end
 
@@ -128,24 +128,33 @@ class Marty::RuleScriptSet < Delorean::AbstractContainer
     errs
   end
 
-  def get_parse_error_field(ruleh, exc)
-    line = (exc.line || 1) - 1
-    errs = { class_body: self.class.body_lines } + code_section_counts(ruleh)
-    ranges0 = errs.values.reduce([0]) do |acc, len|
+  def search_ranges(oh, line)
+    ranges0 = oh.values.reduce([0]) do |acc, len|
       acc + [acc.last + len]
     end
-    ranges = errs.keys.zip(ranges0.each_cons(2).to_a)
+    ranges = oh.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]
+  end
+
+  def get_parse_error_field(ruleh, exc)
+    line = (exc.line || 1) - 1
+    errs = { class_body: self.class.body_lines } + code_section_counts(ruleh)
+    secnm, line_in_sec = search_ranges(errs, line)
+    if [:computed_guards, :results].include?(secnm)
+      h = Hash[ruleh[secnm.to_s].map { |k, v| [k, v.lines.count + 1] }]
+      attrnm, = search_ranges(h, line_in_sec)
+    end
+    [secnm, attrnm || line_in_sec]
   rescue StandardError => e
     Marty::Logger.error('RuleScriptSet#get_parse_error_field',
                         error: e.message,
                         backtrace: e.backtrace,
                         ruleh: ruleh,
                         line: line)
-    ['Unknown', 0]
+    [nil, nil]
   end
 
   def get_engine(ruleh)
@@ -184,10 +193,16 @@ class Marty::RuleScriptSet < Delorean::AbstractContainer
         @@engines[[pt, sname]] = sset.parse_check(sname, get_code(ruleh))
       end
   rescue Delorean::ParseError => e
-      secnm, line = get_parse_error_field(ruleh, e)
+      secnm, attr_or_line = get_parse_error_field(ruleh, e)
       msg = e.message.capitalize
-      raise "Error in rule '#{ruleh['name']}' field '#{secnm}' "\
-            "(line #{line}): #{msg}"
+      field = secnm ? "field '#{secnm}'" : ''
+      where = if attr_or_line.is_a?(String)
+              then "(attribute #{attr_or_line})"
+              elsif attr_or_line.is_a?(Integer)
+              then "(line #{attr_or_line})"
+              else ''
+              end
+      raise "Error in rule '#{ruleh['name']}' #{field} #{where}: #{msg}"
   end
 
   def self.indent(s)

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = '2.5.8'
+  VERSION = '2.5.9'
 end

data/spec/features/rule_spec.rb

@@ -222,16 +222,16 @@ feature 'rule view', js: true do
     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' (line 3): "\
-          'Syntax error'
+    exp = "Computed - Error in rule 'abc' field 'computed_guards' "\
+          '(attribute var): 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' (line 3): "\
-          'Syntax error'
+    exp = "Computed - Error in rule 'abc' field 'computed_guards' "\
+          '(attribute var3): Syntax error'
     expect(page).to have_content(exp)
     sleep 2
 
@@ -239,7 +239,7 @@ feature 'rule view', js: true do
     fill_in(:results, with: %Q(var3 = 123j\nvar1 = "good"\nvar2 = 123))
     press('OK')
     wait_for_ajax
-    exp = "Computed - Error in rule 'abc' field 'results' (line 1): "\
+    exp = "Computed - Error in rule 'abc' field 'results' (attribute var3): "\
           'Syntax error'
     expect(page).to have_content(exp)
     sleep 2
@@ -247,7 +247,8 @@ feature 'rule view', js: true do
     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' (line 4): Syntax error"
+    exp = "Computed - Error in rule 'abc' field 'results' (attribute xyz): "\
+          'Syntax error'
     expect(page).to have_content(exp)
     sleep 2
 

data/spec/features/scripting_test_spec.rb

@@ -119,6 +119,13 @@ DELOREAN
       expect(page).to have_content 'undefined parameter p0'
     end
 
+    and_by 'see malformed params error' do
+      fill_in('params', with: 'a = Wrong::Class.last')
+      press('Compute')
+      wait_for_ajax
+      expect(page).to have_content 'Malformed input parameters'
+    end
+
     and_by 'compute attrs with good params' do
       fill_in('params', with: "a = 1.1\nc = 2.2\np0 = 3.3\n")
       press('Compute')

data/spec/models/rule_spec.rb

@@ -74,7 +74,7 @@ module Marty::RuleSpec
         @rule_type = 'SimpleRule'
         @computed_guards = { 'guard1' => 'zvjsdf12.z8*' }
         exp = Regexp.new("Computed - Error in rule 'testrule' field "\
-                         "'computed_guards' .line 1.: Syntax error")
+                         "'computed_guards' .attribute guard1.: Syntax error")
         expect { subject }.to raise_error(exp)
       end
       it 'detects errors in computed results' do
@@ -83,7 +83,7 @@ module Marty::RuleSpec
                      'does_not_compute' => 'zvjsdf12.z8*' }
         @grids = { 'grid1' => 'DataGrid1', 'grid2' => 'DataGrid2' }
         exp = Regexp.new("Computed - Error in rule 'testrule' field "\
-                         "'results' .line 2.: Syntax error")
+                         "'results' .attribute does_not_compute.: Syntax error")
         expect { subject }.to raise_error(exp)
       end
       it 'detects errors in computed results 2' do
@@ -92,9 +92,16 @@ module Marty::RuleSpec
         @grids = { 'grid1' => 'DataGrid1', 'grid2' => 'DataGrid1',
                    'grid3' => 'DataGrid3' }
         exp = Regexp.new("Computed - Error in rule 'testrule' field "\
-                         "'results' .line 1.: Syntax error")
+                         "'results' .attribute does_not_compute.: Syntax error")
         expect { subject }.to raise_error(exp)
       end
+      it 'avoids delorean parse bug (redline 168745)' do
+        @rule_type = 'SimpleRule'
+        @results = { 'parse_bug' => "true\n&& false" }
+        @grids = { 'grid1' => 'DataGrid1', 'grid2' => 'DataGrid1',
+                   'grid3' => 'DataGrid3' }
+        expect { subject }.to_not raise_error
+      end
       it 'detects errors in computed results 3' do
         @rule_type = 'SimpleRule'
         @results = { 'does_compute' => '1+2',
@@ -104,7 +111,7 @@ module Marty::RuleSpec
         @grids = { 'grid1' => 'DataGrid1', 'grid2' => 'DataGrid1',
                    'grid3' => 'DataGrid1' }
         exp = Regexp.new("Computed - Error in rule 'testrule' field "\
-                         "'results' .line 3.: Syntax error")
+                         "'results' .attribute does_not_compute.: Syntax error")
         expect { subject }.to raise_error(exp)
       end
       it 'reports bad grid names' do
@@ -145,7 +152,7 @@ module Marty::RuleSpec
         @rule_type = 'XRule'
         @results = { 'x' => 'zx sdf wer' }
         exp = Regexp.new("Computed - Error in rule 'testrule' field "\
-                         "'results' .line 1.: Syntax error")
+                         "'results' .attribute x.: Syntax error")
         expect { subject }.to raise_error(exp)
       end
       it 'rule script stuff overrides 1' do
@@ -159,7 +166,7 @@ module Marty::RuleSpec
         @rule_type = 'XRule'
         @computed_guards = { 'abc' => 'err err err', 'xyz_guard' => 'xyz_param' }
         exp = Regexp.new("Computed - Error in rule 'testrule' field "\
-                         "'computed_guards' .line 1.: Syntax error")
+                         "'computed_guards' .attribute abc.: Syntax error")
         expect { subject }.to raise_error(exp)
       end
       it 'rule script stuff overrides 3' do

data/spec/other/diagnostic/delayed_job_workers_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 require 'job_helper'
 
 describe Marty::Diagnostic::DelayedJobWorkers do
-  def sample_data opts={}
+  def sample_data opts = {}
     ip, error, status = opts.values_at(:ip, :error, :status)
     {
       ip || Marty::Helper.my_ip => {
         'Delayed Workers / Node' => {
           'description' => error ? '3' : '4',
-          'status'      => status,
+          'status'      => status || true,
           'consistent'  => nil
         },
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.5.8
+  version: 2.5.9
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg