occi 3.1.2 → 3.1.3
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/entity.rb +3 -2
- data/lib/occi/version.rb +1 -1
- metadata +2 -2
data/lib/occi/core/entity.rb
CHANGED
|
@@ -134,9 +134,10 @@ module Occi
|
|
|
134
134
|
# @param [Occi::Model] model representation of the Occi model to check the attributes against
|
|
135
135
|
def check
|
|
136
136
|
raise "No model associated" unless @model
|
|
137
|
-
definitions =
|
|
137
|
+
definitions = Occi::Core::Attributes.new
|
|
138
|
+
definitions.merge!(@model.get_by_id(@kind.to_s).attributes)
|
|
138
139
|
@mixins.each do |mixin_id|
|
|
139
|
-
mixin = model.get_by_id(mixin_id)
|
|
140
|
+
mixin = @model.get_by_id(mixin_id)
|
|
140
141
|
next if mixin.nil?
|
|
141
142
|
definitions.merge!(mixin.attributes) if mixin.attributes
|
|
142
143
|
end if @mixins
|
data/lib/occi/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: occi
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.1.
|
|
4
|
+
version: 3.1.3
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -11,7 +11,7 @@ authors:
|
|
|
11
11
|
autorequire:
|
|
12
12
|
bindir: bin
|
|
13
13
|
cert_chain: []
|
|
14
|
-
date: 2013-
|
|
14
|
+
date: 2013-08-08 00:00:00.000000000 Z
|
|
15
15
|
dependencies:
|
|
16
16
|
- !ruby/object:Gem::Dependency
|
|
17
17
|
name: json
|