occi 2.5.14 → 2.5.15
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.
- data/lib/occi/core/attribute_properties.rb +3 -3
- data/lib/occi/version.rb +1 -1
- metadata +1 -1
|
@@ -19,8 +19,8 @@ module OCCI
|
|
|
19
19
|
# @return [Array] list of full attribute names
|
|
20
20
|
def combine
|
|
21
21
|
array = []
|
|
22
|
-
self.each_key do |key|
|
|
23
|
-
if self[key].key?
|
|
22
|
+
self.each_key do |key|
|
|
23
|
+
if self[key].key?('Type') || self[key].key?('type')
|
|
24
24
|
array << key
|
|
25
25
|
else
|
|
26
26
|
attribute = self[key]
|
|
@@ -35,7 +35,7 @@ module OCCI
|
|
|
35
35
|
def combine_with_defaults
|
|
36
36
|
hash = { }
|
|
37
37
|
self.each_key do |key|
|
|
38
|
-
if self[key].include?
|
|
38
|
+
if self[key].include?('Type') || self[key].include?('type')
|
|
39
39
|
hash[key] = self[key]['Default']
|
|
40
40
|
else
|
|
41
41
|
self[key].combine_with_defaults.each { |k, v| hash[key + '.' + k] = v }
|
data/lib/occi/version.rb
CHANGED