washout_builder 0.9.10 → 0.9.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/app/helpers/washout_builder_helper.rb +13 -6
- data/lib/washout_builder/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
Mzk1MTAyYzkzMjllNWU3Mjk5NTMxOTAyZTUwMDI0M2IzN2Y2NDNlMg==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
NzdmNzEwNGMzZTY4YTMzMDBiMjZlZTU2ZWE1MGE3YTQyMDk2NmJhZQ==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
YTE0ZjE0OTQzNjBhNGM2MmMxZDQzZTUzMzZhMjYxZWRiZDU2MWFkYzkzNzcy
|
10
|
+
OGQ4YzEwMjg1MTE3MjgwYTdhM2ZlZDYwOWYzZTBjYjA0MGQ3YWQ4ZDBmZTRm
|
11
|
+
N2ZjNTk4OTc1ZThjMDEyNTYwYjhmZDc0ZmJlYWNlY2YxM2U3NDk=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
ZDg0ZjJmNThlM2E2YjhmMGY3NDdmMDYxNDVkOWMwMTMxZDY4YTZmNTdhNThh
|
14
|
+
NTkwNWM5MWU5Y2I2NmMxMTY3OTA5ODJhYWVkYjc2YWE2NDJkZjM5NTIwMDZk
|
15
|
+
YmE5ZmI0ODA0MmY1ZTc0Yjg4N2E4YmU5MDQ0YTNlMTRlN2JkM2Y=
|
@@ -51,7 +51,7 @@ module WashoutBuilderHelper
|
|
51
51
|
ancestor_object = WashOut::Param.parse_def(@soap_config,ancestor_structure)[0]
|
52
52
|
bool_the_same = same_structure_as_ancestor?(param, ancestor_object)
|
53
53
|
unless bool_the_same
|
54
|
-
|
54
|
+
top_ancestors = get_class_ancestors(ancestor_object,ancestors[0], defined)
|
55
55
|
defined << {:class =>ancestors[0], :obj =>ancestor_object , :ancestors => top_ancestors }
|
56
56
|
end
|
57
57
|
end
|
@@ -109,8 +109,8 @@ module WashoutBuilderHelper
|
|
109
109
|
if ancestors.blank?
|
110
110
|
defined << {:fault => fault,:structure =>get_virtus_model_structure(fault) ,:ancestors => [] }
|
111
111
|
else
|
112
|
-
|
113
|
-
|
112
|
+
fault_structure = remove_fault_type_inheritable_elements(fault, get_virtus_model_structure(ancestors[0]).keys)
|
113
|
+
defined << {:fault => fault,:structure =>fault_structure ,:ancestors => ancestors }
|
114
114
|
get_fault_class_ancestors(ancestors[0], defined)
|
115
115
|
end
|
116
116
|
ancestors unless bool_the_same
|
@@ -144,7 +144,7 @@ module WashoutBuilderHelper
|
|
144
144
|
|
145
145
|
param_class = complex_class.is_a?(Class) ? complex_class : complex_class.constantize rescue nil
|
146
146
|
if !param_class.nil? && param_class.ancestors.include?(Virtus::Model::Core)
|
147
|
-
|
147
|
+
get_fault_class_ancestors(param_class, complex_types)
|
148
148
|
elsif !param_class.nil? && !param_class.ancestors.include?(Virtus::Model::Core)
|
149
149
|
raise RuntimeError, "Non-existent use of `#{param_class}` type name or this class does not use Virtus.model. Consider using classified types that include Virtus.mode for exception atribute types."
|
150
150
|
end
|
@@ -258,11 +258,18 @@ module WashoutBuilderHelper
|
|
258
258
|
|
259
259
|
|
260
260
|
xml.p("class" => "pre"){ |pre|
|
261
|
-
|
261
|
+
unless formats[:out].nil?
|
262
|
+
complex_class = get_complex_class_name(formats[:out][0])
|
262
263
|
if WashoutBuilder::Type::BASIC_TYPES.include?(formats[:out][0].type)
|
263
264
|
xml.span("class" => "blue") { |y| y<< "#{formats[:out][0].type}" }
|
264
265
|
else
|
265
|
-
|
266
|
+
unless complex_class.nil?
|
267
|
+
if formats[:out][0].multiplied == false
|
268
|
+
pre << "<a href='##{complex_class}'><span class='lightBlue'>#{complex_class}</span></a>"
|
269
|
+
else
|
270
|
+
pre << "<a href='##{complex_class}'><span class='lightBlue'>Array of #{complex_class}</span></a>"
|
271
|
+
end
|
272
|
+
end
|
266
273
|
end
|
267
274
|
else
|
268
275
|
pre << "void"
|