marty 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7660337b038582cb1d61e1815be6a1053a3b50d7
-  data.tar.gz: 3402612fbfb97cdb57ce87a8285fe12e8cd12f75
+  metadata.gz: fbcd682cde37ed604e64d620393437a1724e9f30
+  data.tar.gz: d3473e2724bd6e74973f3c8747e3a40f680ccda1
 SHA512:
-  metadata.gz: 233e3f37aa925df7c444ccaff61333d515c318fb65dfd2ce3558a794f5f45b7edd5c553c0d59696b307d0606727ada743a7edab2f515a004ccc9a29f7dfed1ee
-  data.tar.gz: 9b0a208473b3cdd99620f82b0b16cf9c86805aff90fbbb5496165117ca935b233b67fe321d9e9d6a47286b9df386c3371875872f75227d2786058a0720f35bbd
+  metadata.gz: 021540ab0f6c04931ee8aa2a343dbf1f9f16bbce2b2d26a5ce245020afc5a4573acaca71ff9a8dd32abde5449afb731e582ba2cf87f1ae7b2d2c0f7832728f01
+  data.tar.gz: cd4eadcc498283fa179c04ca61f2b36e5b9cbab57755d47abbd06a3d147525d8c2e831f18eec18d5fcd57e72cffc6dd63d463c7b5d6b49adeb2fef6599d2a00e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (2.1.4)
+    marty (2.1.5)
       aws-sigv4 (~> 1.0, >= 1.0.2)
       axlsx (= 3.0.0pre)
       coderay
@@ -59,7 +59,7 @@ GEM
     archive-zip (0.7.0)
       io-like (~> 0.3.0)
     arel (8.0.0)
-    aws-sigv4 (1.0.2)
+    aws-sigv4 (1.0.3)
     axlsx (3.0.0.pre)
       htmlentities (~> 4.3, >= 4.3.4)
       mimemagic (~> 0.3)

data/app/components/marty/grid.rb

@@ -71,6 +71,7 @@ class Marty::Grid < ::Netzke::Grid::Base
 
     c.editing      = :both
     c.store_config = {page_size: 30}
+    c.view_config  = {preserve_scroll_on_reload: true}
   end
 
   def has_search_action?

data/app/models/marty/data_grid.rb

@@ -188,7 +188,7 @@ class Marty::DataGrid < Marty::Base
     h = dgh["metadata"].each_with_object({}) do |m, h|
       attr = m["attr"]
       inc = h_passed.fetch(attr, :__nf__)
-      next if inc == :__nf__ || inc.nil?
+      next if inc == :__nf__
       val = (defined? inc.name) ? inc.name : inc
       h[attr] = val.is_a?(String) ?
                   ActiveRecord::Base.connection.quote(val)[1..-2] : val

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "2.1.4"
+  VERSION = "2.1.5"
 end

data/spec/models/data_grid_spec.rb

@@ -495,15 +495,21 @@ EOS
 
         expect{lookup_grid_helper('infinity',
                                "G9",
-                               {"state" => nil, "ltv" => 81},
+                               {"ltv" => 81},
                                )}.to raise_error(/matches > 1/)
 
-        res = lookup_grid_helper('infinity',
+        err = /Data Grid lookup failed/
+        expect{lookup_grid_helper('infinity',
                                  "G9",
                                  {"state" => "CA", "ltv" => nil},
+                                 false, false)}.to raise_error(err)
+
+        res = lookup_grid_helper('infinity',
+                                 "G9",
+                                 {"state" => nil, "ltv" => 81},
                                  false, false)
-        expect(res).to eq [123,"G9"]
 
+        expect(res).to eq [456,"G9"]
       end
 
       it "should handle boolean keys" do

metadata

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