marty 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da7cae1ae6b567cbf3f8674cea6376869f6c81f8
-  data.tar.gz: 5eede83f082569ef70cba547e2a654b1697b95c5
+  metadata.gz: 0db6d8e6e7a0dc67169859bba31125097aa70c9c
+  data.tar.gz: 9b11c8a3d5997bbcdcc73358d5084f810762c0e7
 SHA512:
-  metadata.gz: 5611d1364fd1ecea6dc10c7c90d27c57bfdc7e4b27949ac5811fc3e709546a2aae03063afb786418bef2b28d82da14af50ea869143b1bc29a69e2262ab305dff
-  data.tar.gz: 235f9cd65d8e63075fbe546b70f796293fda42f332090e5acf16436ab90a2d4b059d40ce2d34051ca141667ecfe85f9221f5de8c21b073a28c328c96df7b1dee
+  metadata.gz: a4c280fa84312477d80b62a23ef206efd8f8361f596a74a85f36b504479f03cb758020abdb9784011c15459c987519e322dee5ced41f71b032565a10011692f3
+  data.tar.gz: 836352b102307c751300a3f752c20f42f63081e6beb7f9331982f89315230279f3cc194fd67c09ccec96df224c43b7a60f085db12a6bde20d91420c2795ce6f4

data/app/models/marty/delorean_rule.rb

@@ -48,19 +48,19 @@ class Marty::DeloreanRule < Marty::BaseRule
     computed_guards.keys
   end
 
-  def self.comp_res_keys(results, grids, ecl)
-    defkeys = (Marty::Config[results_cfg_var] || {}).keys
+  def self.comp_res_keys(results, grids, ecl, pcfg = nil)
+    defkeys = (pcfg || Marty::Config[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(grids, ecl)
   end
   def self.grid_keys(grids, eclass)
       grids.keys.map{|k| eclass.grid_final_name(k) }
   end
-  def self.base_compute(ruleh, params, dgparams=params)
-    id, name, engine, computed_guards, grids, results, fixed_results =
+  def self.base_compute2(ruleh, metadata_opts, params, dgparams=params)
+    id, name, eclassname, computed_guards, grids, results, fixed_results =
         ruleh.values_at("id", "name", "engine", "computed_guards", "grids",
                         "results", "fixed_results")
-    eclass = engine && engine.constantize || Marty::RuleScriptSet
+    eclass = eclassname && eclassname.constantize || Marty::RuleScriptSet
     engine = eclass.new(params["pt"]).get_engine(ruleh) if
       computed_guards.present? || results.present?
 
@@ -78,8 +78,9 @@ class Marty::DeloreanRule < Marty::BaseRule
 
     grids_computed = false
     grid_results = {}
-    crkeys = comp_res_keys(results, grids, eclass)
-    if (results.keys - fixed_results.keys).present?
+    grkeys = grid_keys(grids, eclass)
+    crkeys = comp_res_keys(results, grids, eclass, metadata_opts)
+    if (crkeys - grkeys - fixed_results.keys).present?
         begin
           eval_result = engine.evaluate(
             eclass.node_name,
@@ -92,8 +93,8 @@ class Marty::DeloreanRule < Marty::BaseRule
           raise e, "Error (results) in rule '#{id}:#{name}': #{e}", e.backtrace
         end
         result = Hash[crkeys.zip(eval_result)]
-    elsif fixed_results.keys.sort == results.keys.sort
-      result = fixed_results
+    else
+      result = fixed_results.slice(*crkeys)
     end
 
     if grids.present? && !grids_computed
@@ -110,10 +111,26 @@ class Marty::DeloreanRule < Marty::BaseRule
     end
     result + grid_results
   end
+  def self.base_compute(ruleh, params, dgparams=params)
+    base_compute2(ruleh, nil, params, dgparams)
+  end
   delorean_fn :route_compute, sig: 4 do
     |ruleh, pt, params, grid_names_p|
     kl = ruleh["classname"].constantize
-    kl.compute(ruleh, pt, params, grid_names_p)
+    kl.compute(ruleh, nil, pt, params, grid_names_p)
+  end
+  delorean_fn :route_compute2, sig: 5 do
+    |ruleh, metadata_opts, pt, params, grid_names_p|
+    kl = ruleh["classname"].constantize
+    kl.compute(ruleh, metadata_opts, pt, params, grid_names_p)
+  end
+  delorean_fn :reporting_metadata, sig: 2 do
+    |ruleh, metadata_opts|
+    rmdkeys = metadata_opts.select{|_, v| v["reporting_metadata"]}.keys
+    rmdkeys.each_with_object({}) do |k, h|
+      fr = ruleh['fixed_results']
+      h[k] = fr[k] if fr.include?(k)
+    end
   end
   delorean_fn :route_compute_rs, sig: 3 do
     |ruleh, pt, features|

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

data/spec/models/rule_spec.rb

@@ -10,7 +10,9 @@ module Marty::RuleSpec
       Marty::Config['RULEOPTS_MYRULE']={'simple_result'=>{},
                                         'computed_value'=>{},
                                         'final_value'=>{},
-                                        'grid_sum'=>{}
+                                        'grid_sum'=>{},
+                                        'c1'=>{},
+                                        'sr2'=>{},
                                        }
       Marty::Config['RULEOPTS_XYZ']={'bvlength'=>{},
                                      'bv'=>{},
@@ -309,7 +311,7 @@ module Marty::RuleSpec
         expect(simple2a.compute({"pt"=>Time.zone.now})).to eq(
                                        {"simple_result"=>"b value",
                                         "sr2"=>true,
-                                        "sr3"=>123})
+                                       })
         # simple2b should return grid results without evaluation
         expect(simple2b.
                  compute({"pt"=>Time.zone.now,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg