marty 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7de135b5a4bf224982326860d6741402abea2d23
-  data.tar.gz: c24dfff6a7c31694b37ef0e6f0d0cae4ef843db3
+  metadata.gz: a43ada9ddaab7056da1f6ba07f3f346e586e914b
+  data.tar.gz: 96f089596edaa9ff0e7859333443335225e24694
 SHA512:
-  metadata.gz: 8a2649e6ea371e5dccc52aaa50ae0f9db245657f2ad0dc56ee65c8a7d1a823af0f2c97272dce953486f69a95420abe0e6ec5e42ab7604e57507e30f544202ffc
-  data.tar.gz: 298317fcd41ef5fee4d9687439a56e19c7f31ffe5cffbc55b4256f7f2adc2dcf67c558866d5a41cb69eb21969129f4fcf57047545dd383d96f5463d474be30dc
+  metadata.gz: a1f36125117b6f1f8b83422c4bfccc15a0cd2f401fb570b3ed60add7bb403a692277e263dd660f6e099bda55689c964421db77255839122f3ff7b867de837977
+  data.tar.gz: 83c6831a7e8ee10b17f642fca62a233b7e01e767fc70e8829e525cffc92eb09ff65e621a8359b80dec67e657072cf958976873fdb5122ffbab88f2fdf6262899

data/Gemfile.lock

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

data/app/models/marty/data_grid.rb

@@ -89,9 +89,8 @@ class Marty::DataGrid < Marty::Base
   gen_mcfly_lookup :lookup, [:name], cache: true
   gen_mcfly_lookup :get_all, [], mode: nil
 
-  cached_delorean_fn :lookup_h, sig: [2,3] do
-    |pt, name, fields = %w(id group_id created_dt metadata data_type)|
-
+  def self.lookup_h(pt, name, fields = nil)
+    fields ||= %w(id group_id created_dt metadata data_type)
     dga = get_all(pt).where(name: name).pluck(*fields).first
     dga && Hash[fields.zip(dga)]
   end
@@ -101,6 +100,11 @@ class Marty::DataGrid < Marty::Base
     find_by_group_id group_id
   end
 
+  cached_delorean_fn :exists, sig: 2 do
+    |pt, name|
+    Marty::DataGrid.mcfly_pt(pt).where(name: name).exists?
+  end
+
   def to_s
     name
   end
@@ -214,29 +218,14 @@ class Marty::DataGrid < Marty::Base
     res
   end
 
-  # FIXME: added for Apollo -- not sure where this belongs given that
-  # DGs were moved to marty.  Should add documentation about callers
-  # keeping the hash small.
-  # DEPRECATED: should use lookup_grid_h instead
-  cached_delorean_fn :lookup_grid, sig: 4 do
-    |pt, dg, h, distinct|
-    raise "bad DataGrid #{dg}" unless Marty::DataGrid === dg
-    raise "non-hash arg #{h}" unless Hash === h
-
-    warn "DEPRECATED: lookup_grid. Use lookup_grid_h instead"
-
-    dgh = dg.attributes.slice("id","group_id","created_dt",
-                              "metadata", "data_type")
-    res = plv_lookup_grid_distinct(h, dgh, false, distinct)
-    res["result"]
-  end
-
   cached_delorean_fn :lookup_grid_h, sig: 4 do
-    |pt, dgh, h, distinct|
-    raise "bad DataGrid #{dgh}" unless Hash === dgh
+    |pt, dgn, h, distinct|
+
+    dgh = lookup_h(pt, dgn)
+    raise "#{dgn} grid not found" unless dgh
     raise "non-hash arg #{h}" unless Hash === h
 
-    res = plv_lookup_grid_distinct(h, dgh, false, distinct)
+    res = lookup_grid_distinct_entry_h(pt, h, dgh, nil, true, false, distinct)
     res["result"]
   end
 
@@ -253,7 +242,7 @@ class Marty::DataGrid < Marty::Base
   end
 
   delorean_fn :lookup_grid_distinct_entry_h, sig: [3,6] do
-    |pt, h, dgh, visited=nil, follow=true, return_grid_data=false|
+    |pt, h, dgh, visited=nil, follow=true, return_grid_data=false, distinct=true|
 
     # Perform grid lookup, if result is another data_grid, and follow is true,
     # then perform lookup on the resulting grid.  Allows grids to be nested
@@ -265,7 +254,7 @@ class Marty::DataGrid < Marty::Base
     #   "name"     => <grid name>
     #   "data"     => <grid's data array>
     #   "metadata" => <grid's metadata (array of hashes)>
-    vhash = plv_lookup_grid_distinct(h, dgh, return_grid_data)
+    vhash = plv_lookup_grid_distinct(h, dgh, return_grid_data, distinct)
 
     next vhash if vhash["result"].nil? || !dgh['data_type']
 
@@ -296,7 +285,8 @@ class Marty::DataGrid < Marty::Base
     raise "#{self.class} recursion loop detected -- #{visited}" if
       visited.member?(v['group_id'])
 
-    lookup_grid_distinct_entry_h(pt, h, v, visited, follow, return_grid_data)
+    lookup_grid_distinct_entry_h(pt, h, v, visited, follow, return_grid_data,
+                                 distinct)
   end
 
   # DEPRECATED: use lookup_grid_distinct_entry_h instead

data/lib/marty/rule_script_set.rb

@@ -48,14 +48,9 @@ class Marty::RuleScriptSet < Delorean::AbstractContainer
       h[final_name] = "#{cache[dgname]}"
     else
       h[dgid] = dgname
-      h["#{dgid}_dg__"] = <<~EOS
-      Marty::DataGrid.lookup_h(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"
-      h["#{dgid}_h__"] = "Marty::DataGrid.#{lgde}(pt,#{dgid}_dgp__,#{dgid}_dg__)"
-      h[final_name] = "#{dgid}_h__ && #{dgid}_h__.result"
+      lgde = "lookup_grid_h"
+      h[final_name] = "Marty::DataGrid.#{lgde}(pt,#{dgid},#{dgid}_dgp__,true)"
       cache[dgname] = final_name
     end
   end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

data/spec/models/data_grid_spec.rb

@@ -294,7 +294,7 @@ EOS
       end
 
       context "should handle NULL key values" do
-        let(:dgh) { Marty::DataGrid.lookup_h(pt, "Gf") }
+        let(:dgh) { "Gf" }
 
         it 'true returns Y' do
           res = Marty::DataGrid.lookup_grid_h(pt, dgh, {"b"=>true}, false)
@@ -334,40 +334,36 @@ EOS
       end
 
       it "should handle ambiguous lookups" do
-        dgh = Marty::DataGrid.lookup_h(pt, "Gh")
-
         h1 = {
           "property_state" => "NY",
           "county_name"    => "R",
         }
 
-        res = Marty::DataGrid.lookup_grid_h(pt, dgh, h1, false)
+        res = Marty::DataGrid.lookup_grid_h(pt, "Gh", h1, false)
         expect(res).to eq(10)
       end
 
       it "should handle ambiguous lookups (2)" do
-        dgh = Marty::DataGrid.lookup_h(pt, "Gg")
         res = Marty::DataGrid.
-              lookup_grid_h(pt, dgh, {"i1"=>2, "i2"=>1}, false)
+              lookup_grid_h(pt, "Gg", {"i1"=>2, "i2"=>1}, false)
         expect(res).to eq(1)
 
         res = Marty::DataGrid.
-              lookup_grid_h(pt, dgh, {"i1"=>3, "i2"=>1}, false)
+              lookup_grid_h(pt, "Gg", {"i1"=>3, "i2"=>1}, false)
         expect(res).to eq(1)
 
         res = Marty::DataGrid.
-              lookup_grid_h(pt, dgh, {"i1"=>2, "i2"=>3}, false)
+              lookup_grid_h(pt, "Gg", {"i1"=>2, "i2"=>3}, false)
         expect(res).to eq(20)
       end
 
       it "should handle non-distinct lookups" do
-        dgh = Marty::DataGrid.lookup_h(pt, "Ge")
-        res = Marty::DataGrid.lookup_grid_h(pt, dgh, {"ltv"=>500}, false)
+        res = Marty::DataGrid.lookup_grid_h(pt, "Ge", {"ltv"=>500}, false)
 
         expect(res).to eq(1.1)
 
         expect {
-          Marty::DataGrid.lookup_grid_h(pt, dgh, {"ltv"=>500}, true)
+          Marty::DataGrid.lookup_grid_h(pt, "Ge", {"ltv"=>500}, true)
         }.to raise_error(RuntimeError)
       end
 
@@ -376,14 +372,13 @@ EOS
           "client_id" => 700127,
           "property_state" => "CA",
         }
-        dgh = Marty::DataGrid.lookup_h(pt, "Gj")
-        res = Marty::DataGrid.lookup_grid_h(pt, dgh, params, false)
+        res = Marty::DataGrid.lookup_grid_h(pt, "Gj", params, false)
 
         # should return the upper left corner match
         expect(res).to eq(0.25)
 
         expect {
-          Marty::DataGrid.lookup_grid_h(pt, dgh, params, true)
+          Marty::DataGrid.lookup_grid_h(pt, "Gj", params, true)
         }.to raise_error(RuntimeError)
       end
 
@@ -626,10 +621,9 @@ EOS
       it "should handle typed (enum) data lookup_grid" do
         pt = 'infinity'
         ca = Gemini::State.find_by_name("CA")
-        dgh = Marty::DataGrid.lookup_h(pt, "Gb")
 
         res = Marty::DataGrid.
-              lookup_grid_h(pt, dgh, {"property_state" => ca}, false)
+              lookup_grid_h(pt, "Gb", {"property_state" => ca}, false)
 
         expect(res).to eq 70
       end

data/spec/models/rule_spec.rb

@@ -112,13 +112,13 @@ module Marty::RuleSpec
           |r|
           [r.name, r.simple_guards["g_has_default"]]
         end
-        expect(vals).to eq([["Rule1", "different"],
+        expect(vals.sort).to eq([["Rule1", "different"],
                             ["Rule2", "string default"],
                             ["Rule2a", "string default"],
                             ["Rule2b", "string default"],
                             ["Rule3", "string default"],
                             ["Rule4", "string default"],
-                            ["Rule5", "foo"]])
+                            ["Rule5", "foo"]].sort)
       end
     end
     context "validation (xyz type)" do
@@ -319,7 +319,7 @@ module Marty::RuleSpec
       end
       it "reports bad grid name" do
         exp = Regexp.new("Error .results. in rule '\\d+:Rule4': "\
-                         "grid 'computed_name_grid' .'DataGridX'. not found")
+                         "DataGridX grid not found")
         expect{gridcomputedname.compute({"pt"=>Time.zone.now,
                              'param1'=> 66,
                              'param2'=>'abc',

metadata

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