marty 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 803d233d1eca573e9cf368dc8592895e9a4f237117842472e59d35dff646f8d5
-  data.tar.gz: 31aa8139cf13387596b37e4e934a59837b9e6dff7ca8eff801ff2b5bdc0dfde2
+  metadata.gz: 3f0011e12fd48a4e14d470ba22c2293428a0607316a8b278ffec4d651deaa0e3
+  data.tar.gz: 49430e4e1cf9936c10d42cdb6fd0d71ac45856c53c9f28330a8ceb1d97e2cc71
 SHA512:
-  metadata.gz: 82fa093b9db78af2ebe9b47a27673a023b4eafdeb46d2eb5f835113dc142ce12e16486a51098b1cbadf5e93022c28d636457ac01ccbce619fc362ee94832a568
-  data.tar.gz: 0db7610f06f94b2e6c48fcdee37b5c024361a8501659d01983892471677738f1c937c47c65c3eb529aa3399c1dc265072e6b9cc279544782dab58e9cf35a7e9e
+  metadata.gz: 56459fc03c3ed9a6240cb7bf593bb6e0ced8badfa6eb665f1b51289bbdb6bae1dcf17ce545ebbd490dd4cc452da008e77395610409fc4cdc8c8f88c548102952
+  data.tar.gz: 28893152b14ece8002bccfbb6c90077b5018764c6343fadd4e469e68721dfd32a9e65f8d29e682c85ae42411e2685fed3947681a28e132a9a2c123abe431d444

data/Gemfile.lock

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

data/app/models/marty/data_grid.rb

@@ -222,11 +222,16 @@ class Marty::DataGrid < Marty::Base
     raise "#{dgn} grid not found" unless dgh
     raise "non-hash arg #{h}" unless Hash === h
 
-    attrs = dgh['metadata'].map { |a| a['attr'] }
+    if dgh['data_type'] != 'Marty::DataGrid'
+      # Narrow hash to needed attrs -- makes the cache work a lot
+      # better in case the hash includes items not in grid
+      # attrs. Can't do this for multi-grids since they pass down
+      # their params.
+      attrs = dgh['metadata'].map { |a| a['attr'] }
+      h = h.slice(*attrs)
+    end
 
-    # Narrow hash to needed attrs -- makes the cache work a lot better
-    # in case the hash includes items not in grid attrs.
-    lookup_grid_h_priv(pt, dgh, h.slice(*attrs), distinct)
+    lookup_grid_h_priv(pt, dgh, h, distinct)
   end
 
   # private method used to cache lookup_grid_distinct_entry_h result

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = '2.7.2'
+  VERSION = '2.7.3'
 end

data/spec/models/data_grid_spec.rb

@@ -578,6 +578,11 @@ describe 'lookups for infinity' do
     res = lookup_grid_helper('infinity', 'G8', h, true)
 
     expect(g1_res).to eq res
+
+    # make sure lookup_grid_h works too
+    res_h = Marty::DataGrid.lookup_grid_h('infinity', 'G8', h, true)
+
+    expect(g1_res[0]).to eq res_h
   end
 
   it 'should handle DataGrid typed data grids' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Arman Bostani