marty 1.0.7 → 1.0.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/marty/data_grid.rb +9 -1
- data/app/models/marty/promise.rb +2 -5
- data/lib/marty/version.rb +1 -1
- data/spec/models/data_grid_spec.rb +11 -0
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b1ea4f6bcc7d2dc454f65ba38f7cc922e7778354
|
4
|
+
data.tar.gz: efa8f6b874e09398b171995daeb4cc898833bed5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2df7d3c0f2dd6f1146d65320ba6e6386895d52e7542144e489896193f86f545777d2eecb7ae951f4b70cef9f62ae2f791a8f2ff489f2159f48f97c7646d449b3
|
7
|
+
data.tar.gz: cbf82d6f70c0e1546a17b4c3d8be986c7f95a81f52bbe7c09ffde36aa71b7a1c5a1264525c5864520233925502a058756888d6440ed380a1152a04f653f1adae
|
@@ -182,7 +182,14 @@ class Marty::DataGrid < Marty::Base
|
|
182
182
|
when "boolean"
|
183
183
|
v
|
184
184
|
else # AR class
|
185
|
-
|
185
|
+
# FIXME: really hacky to hard-code "name". Used to
|
186
|
+
# perform to_s which could lead ot strange failures when
|
187
|
+
# model had no to_s defined.
|
188
|
+
begin
|
189
|
+
String === v ? v : v.name
|
190
|
+
rescue NoMethodError
|
191
|
+
raise "could not get name for #{v}"
|
192
|
+
end
|
186
193
|
end
|
187
194
|
end
|
188
195
|
|
@@ -246,6 +253,7 @@ class Marty::DataGrid < Marty::Base
|
|
246
253
|
raise "non-hash arg #{h}" unless Hash === h
|
247
254
|
|
248
255
|
res = dg.lookup_grid_distinct(pt, h, false, distinct)
|
256
|
+
|
249
257
|
res["result"]
|
250
258
|
end
|
251
259
|
|
data/app/models/marty/promise.rb
CHANGED
@@ -68,11 +68,8 @@ class Marty::Promise < Marty::Base
|
|
68
68
|
end
|
69
69
|
|
70
70
|
def self.children_for_id(id, search_order)
|
71
|
-
|
72
|
-
|
73
|
-
else
|
74
|
-
find(id).children.live_search(search_order).order(id: :desc).includes(:children, :user)
|
75
|
-
end
|
71
|
+
q = id == 'root' ? where(parent_id: nil) : find(id).children
|
72
|
+
q.live_search(search_order).order(id: :desc).includes(:children, :user)
|
76
73
|
end
|
77
74
|
|
78
75
|
def leaf
|
data/lib/marty/version.rb
CHANGED
@@ -623,6 +623,17 @@ EOS
|
|
623
623
|
expect(res).to eq [70,"Gb"]
|
624
624
|
end
|
625
625
|
|
626
|
+
it "should handle typed (enum) data lookup_grid" do
|
627
|
+
pt = 'infinity'
|
628
|
+
ca = Gemini::State.find_by_name("CA")
|
629
|
+
dg = Marty::DataGrid.lookup(pt, "Gb")
|
630
|
+
|
631
|
+
res = Marty::DataGrid.
|
632
|
+
lookup_grid(pt, dg, {"property_state" => ca}, false)
|
633
|
+
|
634
|
+
expect(res).to eq 70
|
635
|
+
end
|
636
|
+
|
626
637
|
it "should return grid data and metadata simple" do
|
627
638
|
expected_data = [[1.1, 2.2, 3.3], [4.4, 5.5, 6.6], [1.2, 2.3, 3.4],
|
628
639
|
[4.5, 5.6, 6.7]]
|
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: 1.0.
|
4
|
+
version: 1.0.8
|
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: 2016-
|
17
|
+
date: 2016-09-01 00:00:00.000000000 Z
|
18
18
|
dependencies:
|
19
19
|
- !ruby/object:Gem::Dependency
|
20
20
|
name: pg
|