marty 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ce8e00805092bcb838e01a7f27fb452f9c4302c
-  data.tar.gz: '08ba3a7fae36b08f7503b3da6f9ee298161c146b'
+  metadata.gz: 4869432086cbb253966cbb6dc2b723bf3e1e39fb
+  data.tar.gz: 60ed80fcbf3f7ba5c28d6d8178fd0756f3fa241d
 SHA512:
-  metadata.gz: 263d011eb1c69a38e68449ad6b2031f8f529bc3c89b166ba033d3cd4243b111357601142f8d362a5eb4aa4d72c065cb9531920e4564fbd4217a5c287bce25bd7
-  data.tar.gz: 994794315f3c2e50222bc70c354e4feb1f9fbac4a7af4a476e2aeef99ab1a001bbbe289db72277b8d870c83bf68a934829d938d0eed187cc341334bde5f71737
+  metadata.gz: c05a246f66a03be87ee1a9ae7ba9ab45044716a12a05b9ca5268e370f23898650596ed4380989bb6a33719d3beb2576d70d3c292a9af18a4f6f2fca80bd79fa1
+  data.tar.gz: e2d7751ee36906871b524a13a9888571ab18eb35dc678d131505f84c6c559a8bbb27ac8cf8881b675f61af220b665d7b2d863e56d6e8b35643c56305f8114bc5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (1.2.2)
+    marty (1.2.3)
       axlsx (= 2.1.0pre)
       coderay
       delorean_lang (~> 0.3.33)

data/app/models/marty/base_rule.rb

@@ -58,17 +58,6 @@ class Marty::BaseRule < Marty::Base
     res_err = results.delete("~~ERROR~~")
     errors[:computed] <<
       "- Error in rule '#{name}' field 'results': #{res_err.capitalize}" if res_err
-
-    same_name_diff_guards = self.class.
-        where(obsoleted_dt: 'infinity', name: self.name).
-        # id is nil on new rules
-        where.not(id: self.id).
-        where("simple_guards != '#{self.simple_guards.to_json}'")
-
-    errors[:base] =
-      "Can't have rule with same name and different type/guards" +
-      " - #{self.name}" if same_name_diff_guards.exists?
-
   end
 
   validates_presence_of :name

data/app/models/marty/data_grid.rb

@@ -105,13 +105,22 @@ class Marty::DataGrid < Marty::Base
     self
   end
 
+  def self.register_rule_handler(handler)
+    (@@rule_handlers ||= []) << handler
+  end
+  def update_rules(old, new)
+    @@rule_handlers.each { |rh| rh.call(old, new) }
+  end
+
   # FIXME: not sure what's the right way to perform the save in a
   # transaction -- i.e. together with build_index.  before_save would
   # be OK, but then save inside it would cause an infinite loop.
   def save!
     if self.changed?
       transaction do
+        nc, nw, n = [name_changed?, name_was, name]
         res = super
+        update_rules(nw, n) if nc && nw.present?
         reload
         build_index
         res

data/app/models/marty/delorean_rule.rb

@@ -5,15 +5,6 @@ class Marty::DeloreanRule < Marty::BaseRule
 
   def validate
     super
-    if self.class.where(obsoleted_dt: 'infinity', name: name).
-        where.not(id: id).
-        where("(start_dt, coalesce(end_dt, 'infinity')) OVERLAPS (?, ?)",
-              start_dt, end_dt || 'infinity').exists?
-      return errors[:base] <<
-             "Can't have rule with same name and overlapping start/end dates"\
-             " - #{name}"
-    end
-
     return errors[:base] = "Start date must be before end date" if
       start_dt && end_dt && start_dt >= end_dt
 
@@ -54,13 +45,13 @@ class Marty::DeloreanRule < Marty::BaseRule
     computed_guards.keys
   end
 
-  def compres_keys
-    defkeys = (Marty::Config[self.class.results_cfg_var] || {}).keys +
-              ["adjustment", "breakeven"]
-    results.keys.select{|k| defkeys.include?(k)} + grid_keys
+  def comp_res_keys(ecl)
+    defkeys = (Marty::Config[self.class.results_cfg_var] || {}).keys
+    results.keys.map {|k| k.ends_with?("_grid") ? ecl.grid_final_name(k) : k}.
+       select{|k| defkeys.include?(k)} + grid_keys(ecl)
   end
-  def grid_keys
-      grids.keys.map{|k|k.ends_with?("_grid") ? k : k + "_grid"}
+  def grid_keys(eclass)
+      grids.keys.map{|k| eclass.grid_final_name(k) }
   end
   def base_compute(params, dgparams=params)
     eclass = engine && engine.constantize || Marty::RuleScriptSet
@@ -79,11 +70,12 @@ class Marty::DeloreanRule < Marty::BaseRule
     end
     grids_computed = false
     grid_results = {}
+    crkeys = comp_res_keys(eclass)
     if (results.keys - fixed_results.keys).present?
         begin
           eval_result = engine.evaluate(
             eclass.node_name,
-            compres_keys,
+            crkeys,
             params + {
               "dgparams__" => dgparams,
             })
@@ -91,7 +83,7 @@ class Marty::DeloreanRule < Marty::BaseRule
         rescue => e
           raise e, "Error (results) in rule '#{id}:#{name}': #{e}", e.backtrace
         end
-        result = Hash[compres_keys.zip(eval_result)]
+        result = Hash[crkeys.zip(eval_result)]
     elsif fixed_results.keys.sort == results.keys.sort
       result = fixed_results
     end
@@ -99,7 +91,7 @@ class Marty::DeloreanRule < Marty::BaseRule
       pt = params['pt']
       gres = {}
       grid_results = grids.each_with_object({}) do |(gvar, gname), h|
-        usename = gvar.ends_with?("_grid") ? gvar : gvar + "_grid"
+        usename = eclass.grid_final_name(gvar)
         next h[usename] = gres[gname] if gres[gname]
         dg = Marty::DataGrid.lookup(pt,gname)
         dgr = dg && dg.lookup_grid_distinct_entry(pt, dgparams)
@@ -118,4 +110,19 @@ class Marty::DeloreanRule < Marty::BaseRule
     q
   end
 
+  def self.get_grid_rename_handler(klass)
+    Proc.new do |old, new|
+      klass.where(obsoleted_dt: 'infinity').each do |r|
+        r.grids.each { |k, v| r.grids[k] = new if v == old }
+        r.results.each { |k, v| r.results[k] = %Q("#{new}") if
+                         k.ends_with?("_grid") && r.fixed_results[k] == old }
+        r.save! if r.changed?
+      end
+    end
+  end
+
+  def self.init_dg_handler
+    Marty::DataGrid.register_rule_handler(get_grid_rename_handler(self))
+  end
+
 end

data/lib/marty/rule_script_set.rb

@@ -39,12 +39,19 @@ class Marty::RuleScriptSet < Delorean::AbstractContainer
                          map {|k| %Q("#{k}": #{k}) }.join(",\n") + "}"
   end
 
+  def self.grid_final_name(dgid)
+    dgid.ends_with?("_grid") ?  dgid + "_result" : dgid + "_grid_result"
+  end
   def expand_grid_code(h, dgid, dgname, cache, extra_params)
-    final_name = dgid.ends_with?("_grid") ?  dgid : dgid + "_grid"
+    final_name = self.class.grid_final_name(dgid)
     if cache[dgname]
       h[final_name] = "#{cache[dgname]}"
     else
-      h["#{dgid}_dg__"] = "Marty::DataGrid.lookup(pt,'#{dgname}')"
+      h[dgid] = dgname
+      h["#{dgid}_dg__"] = <<~EOS
+      Marty::DataGrid.lookup(pt,#{dgid}) ||
+        ERR("grid '#{dgid}' ('%s') not found" % #{dgid})
+      EOS
       h["#{dgid}_dgp__"] = "dgparams__ + \n" + self.class.indent(paramify_h(h))
       lgde = "lookup_grid_distinct_entry"
       h["#{dgid}_h__"] = "#{dgid}_dg__.#{lgde}(pt,#{dgid}_dgp__)"
@@ -69,7 +76,7 @@ class Marty::RuleScriptSet < Delorean::AbstractContainer
     dgcache = {}
     h = {}
     rule.grids.each do |k, v|
-      expand_grid_code(h, k, v, dgcache, {})
+      expand_grid_code(h, k.ends_with?('_grid')?k:k+'_grid', %Q("#{v}"), dgcache, {})
     end
     h.map { |k, v| write_attr(k, v) }.join("\n") + "\n"
   end
@@ -106,6 +113,7 @@ class Marty::RuleScriptSet < Delorean::AbstractContainer
     #puts '-'
     #puts code
     #puts '-'*10
+
     code
   end
 

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/spec/dummy/app/models/gemini/my_rule.rb

@@ -10,7 +10,7 @@ class Gemini::MyRule < Marty::DeloreanRule
     find_by_group_id group_id
   end
 
-  mcfly_validates_uniqueness_of :name, scope: [:start_dt, :end_dt]
+  mcfly_validates_uniqueness_of :name
 
   def self.guard_info
     super + {"g_array" => { multi: true, type: :string,
@@ -43,4 +43,5 @@ class Gemini::MyRule < Marty::DeloreanRule
     base_compute(*args)
   end
 
+  self.init_dg_handler
 end

data/spec/dummy/app/models/gemini/xyz_rule.rb

@@ -10,7 +10,7 @@ class Gemini::XyzRule < Marty::DeloreanRule
     find_by_group_id group_id
   end
 
-  mcfly_validates_uniqueness_of :name, scope: [:start_dt, :end_dt]
+  mcfly_validates_uniqueness_of :name
 
   def self.results_cfg_var
     'RULEOPTS_XYZ'
@@ -59,5 +59,5 @@ class Gemini::XyzRule < Marty::DeloreanRule
     res.all?
   end
 
-
+  self.init_dg_handler
 end

data/spec/features/rule_spec.rb

@@ -83,6 +83,7 @@ feature 'rule view', js: true do
     wait_for_ajax
     fill_in('name', with: 'abc')
     press('OK')
+    wait_for_ajax
     expect(page).to have_content("Rule type can't be blank")
     expect(page).to have_content("Start dt can't be blank")
     # create and verify rule
@@ -126,6 +127,7 @@ feature 'rule view', js: true do
     press("Edit")
     fill_in(:g_string, with: "12345")
     press("OK")
+    wait_for_ajax
     expect(page).to have_content("Bad value '12345' for 'g_string'")
     # type validation (range)
     fill_in(:g_string, with: "Hi Mom")
@@ -136,6 +138,7 @@ feature 'rule view', js: true do
     fill_in(:g_integer, with: 123)
     fill_in(:g_range, with: "asfd")
     press("OK")
+    wait_for_ajax
     expect(page).to have_content("Wrong type for 'g_range'")
     # validate rule
     fill_in(:g_range, with: "<=100")
@@ -170,15 +173,18 @@ feature 'rule view', js: true do
     press("Edit")
     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"
     expect(page).to have_content(exp)
     fill_in(:computed_guards, with: 'sadf = 123j s /*fdjOIb')
     press("OK")
+    wait_for_ajax
     exp = "Computed - Error in rule 'abc' field 'computed_guards': syntax error"
     expect(page).to have_content(exp)
     fill_in(:computed_guards, with: '')
     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 on line 4"
     expect(page).to have_content(exp)
     fill_in(:results,
@@ -186,21 +192,18 @@ feature 'rule view', js: true do
     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)
     fill_in(:results,
             with: %Q(abc = "def"\ndef = "abc"\nklm = "3"))
     press("OK")
+    wait_for_ajax
 
     press("Dup in form")
-    press("OK")
-    exp = Regexp.new("Can't have rule with same name and overlapping start"\
-                     "/end dates - abc")
-    expect(page).to have_content(exp)
     netzke_find('Single Guard', 'combobox').select_values("G2V3")
     press("OK")
-    exp = Regexp.new("Can't have rule with same name and different "\
-                     "type/guards - abc")
-    expect(page).to have_content(exp)
+    wait_for_ajax
+    expect(page).to have_content(/record must be unique/)
 
     press("Cancel")
     # column sorting, etc
@@ -261,5 +264,43 @@ feature 'rule view', js: true do
                                                %Q({"grid1":"DataGrid2"}),
                                                %Q({"grid1":"DataGrid1"}),
                                                %Q({"grid1":"DataGrid1"})])
+    press("Applications")
+    press("Data Grids")
+    dgv = netzke_find("data_grid_view")
+    cvs = dgv.col_values(:name, 4, 0)
+    ind1 = cvs.index("DataGrid1")+1
+    ind4 = cvs.index("DataGrid4")+1
+    dgv.select_row(ind1)
+    press("Edit")
+    fill_in("Name", with: "DataGrid1 new")
+    press("OK")
+    wait_for_ajax
+    dgv.select_row(ind4)
+    press("Edit")
+    fill_in("Name", with: "DataGrid4 new")
+    press("OK")
+    wait_for_ajax
+
+    go_to_xyz_rules
+    wait_for_ajax
+
+    names = xrv.col_values(:name, 5, 0)
+    gvs = xrv.col_values(:grids, 5, 0)
+    g1h = {"grid1"=>"DataGrid1 new"}
+    expect(JSON.parse(gvs[names.index("ZRule1")])).to eq(g1h)
+    expect(JSON.parse(gvs[names.index("ZRule2")])).to eq(g1h)
+
+    go_to_my_rules
+    wait_for_ajax
+
+    names = mrv.col_values(:name, 8, 0)
+    gvs = mrv.col_values(:grids, 8, 0)
+    rvs = mrv.col_values(:results, 8, 0)
+    expect(JSON.parse(gvs[names.index('abc')])).to eq(g1h)
+    expect(JSON.parse(gvs[names.index('Rule2b')])).to eq(g1h +
+                                                         {"grid2"=>"DataGrid2"})
+    expect(JSON.parse(rvs[names.index('Rule5')])["other_grid"]).to eq(
+                                                               '"DataGrid4 new"')
+
   end
 end

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

@@ -9,6 +9,6 @@ Rule2,SimpleRule,2017-2-1 14:00:00,2017-4-1,true,"{""g_array"":[""G1V2""],""g_si
 ""stringwithhash"": ""\"" string that contains a # character\""""}"
 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""}",
-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'""}","{""grid1"":""DataGrid1"",""grid2"":""DataGrid2""}","{""simple_result"":""\""c value\"""",""computed_value"":""if paramb then param1 / (grid1_grid||1) else (grid2_grid||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""}","{""simple_result"":""\""c value\"""",""grid_sum"":""(grid1_grid||0)+(grid2_grid||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""}",,"{""flavor"": ""[\""cherry\"",\""lemon\""][param2]"",""other_grid"": ""DataGrid4"",""final_value"": ""other_grid * 3""}"
+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'""}","{""grid1"":""DataGrid1"",""grid2"":""DataGrid2""}","{""simple_result"":""\""c value\"""",""computed_value"":""if paramb then param1 / (grid1_grid_result||1) 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""}",,"{""flavor"": ""[\""cherry\"",\""lemon\""][param2]"",""other_grid"": ""\""DataGrid4\"""",""final_value"": ""other_grid_result * 3""}"

data/spec/models/rule_spec.rb

@@ -9,6 +9,7 @@ module Marty::RuleSpec
       Marty::Config['RULEOPTS_MYRULE']={'simple_result'=>{},
                                         'computed_value'=>{},
                                         'final_value'=>{},
+                                        'grid_sum'=>{}
                                        }
       Marty::Config['RULEOPTS_XYZ']={'bvlength'=>{},
                                      'bv'=>{},
@@ -265,6 +266,10 @@ module Marty::RuleSpec
         Gemini::MyRule.get_matches('infinity',
                                    {'rule_type'=>'ComplexRule'},
                                    {"g_integer"=>3757}).first }
+      let(:gridcomputedname) {
+        Gemini::MyRule.get_matches('infinity',
+                                   {'rule_type'=>'ComplexRule'},
+                                   {"g_string"=>"Hi Mom", "g_integer"=>11}).first }
       it "computed guards work" do
         c = complex.compute({"pt"=>Time.zone.now,
                              'param2'=>'def'})
@@ -291,8 +296,8 @@ module Marty::RuleSpec
         expect(simple2b.compute({"pt"=>Time.zone.now,
                                  'param1'=> 66,
                                  'param2'=>'abc',
-                                 'paramb'=>false})).to eq({"grid1_grid"=>3,
-                                                           "grid2_grid"=>1300})
+                                 'paramb'=>false})).to eq({"grid1_grid_result"=>3,
+                                                           "grid2_grid_result"=>1300})
 
       end
       it "returns computed results" do
@@ -301,7 +306,8 @@ module Marty::RuleSpec
                              'param2'=>'abc',
                              'paramb'=>false})
         expect(c).to eq({"simple_result"=>"c value",
-                         "computed_value"=>19, "grid1_grid"=>3, "grid2_grid"=>1300})
+                         "computed_value"=>19, "grid1_grid_result"=>3,
+                         "grid2_grid_result"=>1300})
       end
       it "returns computed results (with delorean import)" do
         c = xyz.compute({"pt"=>Time.zone.now+1,
@@ -309,7 +315,15 @@ module Marty::RuleSpec
                          "p2"=>3,
                          "flavor"=>"cherry"})
         expect(c).to eq({"bvlength"=>13,"bv"=>"cherry --> 36",
-                         "grid1_grid"=>19})
+                         "grid1_grid_result"=>19})
+      end
+      it "reports bad grid name" do
+        exp = Regexp.new("Error .results. in rule '\\d+:Rule4': "\
+                         "grid 'computed_name_grid' .'DataGridX'. not found")
+        expect{gridcomputedname.compute({"pt"=>Time.zone.now,
+                             'param1'=> 66,
+                             'param2'=>'abc',
+                             'paramb'=>false})}.to raise_error(exp)
       end
       it "grids embedded in result work properly and receive prior attrs" do
         v = altgridmethod.compute({"pt"=>Time.zone.now,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg