marty 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d4b9ec78b400c21d7508aea327a6ca0938e0d58
-  data.tar.gz: 30e58cfb52553a81c175c50083fe33f784ab9d76
+  metadata.gz: cc93810ae5dd275a46e3126262f32d3b1801eb0c
+  data.tar.gz: ec26658316552eb0be436ece29dcc3e5954604cb
 SHA512:
-  metadata.gz: 9347545575665dc478f1b704f659724a957a92780d955ced1ba3ef3244ba370080df8205f8943eb33b83b421e415411875a82def6eb2e3d4dd97c8de172096ba
-  data.tar.gz: 7e153da3ce81774de494b87ced870ad5153180e2c90ed08c68d70fe0615378de71e4403fd5d928c0e810022f28b69579fed669d586de685853db2cf1948db21a
+  metadata.gz: c0a913f766620e18ab38ea070872b071cc5f4581e9eb0819f62fe82de458d166746978826998df9e7cf055256d94655f9dfffa91965840a5dc0ae6faeb1f2abe
+  data.tar.gz: a377aa7395151b4a7588ff59bba50c91ecafc65a027f77abfc04e98db1262638850c9877b5ce7f388e68f162e1d2cfeef35355e91a40150ba33b36e844ae9212

data/app/models/marty/data_grid.rb

@@ -37,7 +37,7 @@ class Marty::DataGrid < Marty::Base
           inf["attr"], inf["type"], inf["keys"], inf["rs_keep"]
 
         unless rs_keep.nil? || rs_keep.empty?
-          m = /\A *(<|<=|>|>=)? *([a-z_]+) *\z/.match(rs_keep)
+          m = /\A *(<|<=|>|>=)? *([a-z][a-z_0-9]+) *\z/.match(rs_keep)
           unless m
             dg.errors.add(:base, "invalid grid modifier expression: #{rs_keep}")
             next
@@ -193,6 +193,9 @@ class Marty::DataGrid < Marty::Base
       h[attr] = val.is_a?(String) ?
                   ActiveRecord::Base.connection.quote(val)[1..-2] : val
     end
+    nilparams =  h.select{|k, v| v==nil}
+    raise "Data Grid #{dgh['name']} lookup with nil attrs #{nilparams}" if
+      nilparams.present?
 
     fn     = "lookup_grid_distinct"
     hjson  = "'#{h.to_json}'::JSONB"

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "2.0.8"
+  VERSION = "2.0.9"
 end

data/spec/models/data_grid_spec.rb

@@ -169,6 +169,15 @@ property_state\tstring\tv
 
 \tCA\t0.25
 700127\tCA\t0.35
+EOS
+
+Gk =<<EOS
+fha_203k_option\tstring\tv\tfha_203k_option
+
+Investor Services\t-0.625
+Admin Services\t-1.0
+Admin Services Plus\t-1.625
+Investor Services Acadamy\t-0.5
 EOS
 
     before(:each) do
@@ -269,6 +278,15 @@ EOS
           dg_from_import("Ga", g_bad)
         }.to raise_error(RuntimeError)
       end
+
+      it "validates grid modifier" do
+        bad = ': abc def'
+        g_bad = Gk.sub(/fha_203k_option$/, bad)
+        expect { dg_from_import( "Gk", g_bad)
+        }.to raise_error(/invalid grid modifier expression: #{bad}/)
+        expect { dg_from_import( "Gk", Gk)
+        }.not_to raise_error
+      end
     end
 
     describe "lookups for infinity" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg