rbbt-rest 1.2.1 → 1.2.2
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 +8 -8
- data/lib/rbbt/rest/common/table.rb +29 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
YjJlNWNkNzk5Y2Q2NDIyNDI0MjNhYjcxYTQ4OTY4ZTYxYWQyNzkwYw==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
YjllNzlmNDdmYTM4M2ViOTE3MThjM2NhNTViZWY1Y2IzZTMwZmFkNA==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
MTRkYjEwOWM1YzczNjI5MTZiZWUyYTcwYjlhOTkyNjYwYTI5NDA4YzljOTE3
|
10
|
+
NWFmZDAyM2Y0ODk0Yzc5NjJlYWU5Yjg1YjkxOWQ2MDNhY2I5N2JkYzY3ZjEx
|
11
|
+
ODViNzRlODQ3NDQ1OTYzYzExZDhmMmRmY2ExODRlNTU3MWFiNjY=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
MjA0ZDMwNzk1OGYxMjUxYzg2YmQ2ZmUyZWY3YzQ3NmVmYjVlNzkxMTExOWIx
|
14
|
+
MjIxYWQ1NGM1MTNiZmM3YjkxNWY4MTk0NTcyNGI5ODMyZTk3NWFiZTBmZjY5
|
15
|
+
NGE0MzliNGIxYTdjZWNkZjUwYWQ3ZDQ0NTgyOTJlZTM3NWY0ZGU=
|
@@ -134,12 +134,31 @@ module RbbtRESTHelpers
|
|
134
134
|
if filter and filter.to_s != "false"
|
135
135
|
filter.split(";;").each do |f|
|
136
136
|
key, value = f.split("~")
|
137
|
+
|
138
|
+
#invert
|
137
139
|
if value =~ /^!\s*(.*)/
|
138
140
|
value = $1
|
139
141
|
invert = true
|
140
142
|
else
|
141
143
|
invert = false
|
142
144
|
end
|
145
|
+
|
146
|
+
#name
|
147
|
+
if value =~ /^:name:\s*(.*)/
|
148
|
+
value = $1
|
149
|
+
name = true
|
150
|
+
else
|
151
|
+
name = false
|
152
|
+
end
|
153
|
+
|
154
|
+
if name
|
155
|
+
old_tsv = tsv
|
156
|
+
tsv = tsv.reorder(:key, key).add_field "NAME" do |k,values|
|
157
|
+
NamedArray === values ? values[key].name : values.name
|
158
|
+
end
|
159
|
+
key = "NAME"
|
160
|
+
end
|
161
|
+
|
143
162
|
case
|
144
163
|
when value =~ /^([<>]=?)(.*)/
|
145
164
|
tsv = tsv.select(key, invert){|k| k = k.first if Array === k; k.to_f.send($1, $2.to_f)}
|
@@ -150,9 +169,12 @@ module RbbtRESTHelpers
|
|
150
169
|
else
|
151
170
|
tsv = tsv.select({key => value}, invert)
|
152
171
|
end
|
172
|
+
|
173
|
+
tsv = old_tsv.select(tsv.keys) if name
|
153
174
|
end
|
154
175
|
end
|
155
176
|
|
177
|
+
|
156
178
|
tsv = tsv.column(column) if column and not column.empty?
|
157
179
|
|
158
180
|
tsv
|
@@ -261,7 +283,13 @@ module RbbtRESTHelpers
|
|
261
283
|
tsv.entity_templates.each do |field,template|
|
262
284
|
next if options[:headers].include? field
|
263
285
|
next if template.nil?
|
264
|
-
|
286
|
+
|
287
|
+
info = template.info
|
288
|
+
info.delete :format
|
289
|
+
info.delete :annotation_types
|
290
|
+
info.delete :annotated_array
|
291
|
+
|
292
|
+
options[:headers][field] = [template.annotation_types.last.to_s, info]
|
265
293
|
end
|
266
294
|
end
|
267
295
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rbbt-rest
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.2.
|
4
|
+
version: 1.2.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Miguel Vazquez
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-10-
|
11
|
+
date: 2013-10-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|