marty 2.3.2 → 2.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2fb6d90732c17f4ab041eb82ae67e3fad52c8523
4
- data.tar.gz: 632dc06927d9fe338b0478efd3f786a5fd234d17
3
+ metadata.gz: 32082f65d9fdf54bcb9627cb0f8d61dd25f0fd90
4
+ data.tar.gz: b665330724fba3b17af184a758b1b74f88d4b5f9
5
5
  SHA512:
6
- metadata.gz: 942020fa194b20663602f5b1a935ab3a0ba2fcfe8f23aad9bb908150eec51d07ec7bd1c0842b0caa6b2fdeeb29ccd227a0e8a7d1df416344db239920a21679f3
7
- data.tar.gz: ada94398b38415927ad5ead385ed7f8e69c40fc4ba8885ce1ea9e5b7f7d721595d55d2cb34859162d2f07bdbe845c2d4f9ccd800932d809a2dd0afc239c2ea41
6
+ metadata.gz: 3fae4e53a601bd5db40eea6a0170d4e146924f944c79fc235cafeb8c943404593dd26cf88aee32187f21a80f3345e76cf986e84221c9eda4172a793e233325ac
7
+ data.tar.gz: f58a912424cc921443b9b9c0c18279307b9e0a29b0d318b197addd97bfa9a59423cdf3ccf301cbc3af3e78fc98f96b6b9e29258fb49bfc993bce801b1c19b69f
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- marty (2.3.2)
4
+ marty (2.3.3)
5
5
  aws-sigv4 (~> 1.0, >= 1.0.2)
6
6
  axlsx (= 3.0.0pre)
7
7
  coderay
@@ -41,7 +41,7 @@ class Marty::Grid < ::Netzke::Grid::Base
41
41
  // block creation of toolbars in parent
42
42
  delete this.bbar;
43
43
  var paging = this.paging
44
- this.paging = false;
44
+ if (paging != 'buffered') { this.paging = false; }
45
45
  this.callParent();
46
46
  this.paging = paging
47
47
 
@@ -188,7 +188,7 @@ class Marty::DataGrid < Marty::Base
188
188
  h = dgh["metadata"].each_with_object({}) do |m, h|
189
189
  attr = m["attr"]
190
190
  inc = h_passed.fetch(attr, :__nf__)
191
- next if inc == :__nf__ || inc.nil?
191
+ next if inc == :__nf__
192
192
  val = (defined? inc.name) ? inc.name : inc
193
193
  h[attr] = val.is_a?(String) ?
194
194
  ActiveRecord::Base.connection.quote(val)[1..-2] : val
data/lib/marty/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Marty
2
- VERSION = "2.3.2"
2
+ VERSION = "2.3.4"
3
3
  end
@@ -495,15 +495,21 @@ EOS
495
495
 
496
496
  expect{lookup_grid_helper('infinity',
497
497
  "G9",
498
- {"state" => nil, "ltv" => 81},
498
+ {"ltv" => 81},
499
499
  )}.to raise_error(/matches > 1/)
500
500
 
501
- res = lookup_grid_helper('infinity',
501
+ err = /Data Grid lookup failed/
502
+ expect{lookup_grid_helper('infinity',
502
503
  "G9",
503
504
  {"state" => "CA", "ltv" => nil},
505
+ false, false)}.to raise_error(err)
506
+
507
+ res = lookup_grid_helper('infinity',
508
+ "G9",
509
+ {"state" => nil, "ltv" => 81},
504
510
  false, false)
505
- expect(res).to eq [123,"G9"]
506
511
 
512
+ expect(res).to eq [456,"G9"]
507
513
  end
508
514
 
509
515
  it "should handle boolean keys" do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: marty
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.2
4
+ version: 2.3.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Arman Bostani
@@ -14,7 +14,7 @@ authors:
14
14
  autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
- date: 2018-08-17 00:00:00.000000000 Z
17
+ date: 2018-08-25 00:00:00.000000000 Z
18
18
  dependencies:
19
19
  - !ruby/object:Gem::Dependency
20
20
  name: pg