occi 2.5.17 → 2.5.18

Sign up to get free protection for your applications and to get access to all the features.
@@ -89,7 +89,8 @@ module OCCI
89
89
  # @param [OCCI::Model] model representation of the OCCI model to check the attributes against
90
90
  def check(model)
91
91
  raise "No kind defined" unless @kind
92
- definitions = model.get_by_id(@kind).attributes
92
+ definitions = Occi::Core::Attributes.new
93
+ definitions.merge!(model.get_by_id(@kind).attributes)
93
94
  @mixins.each do |mixin_id|
94
95
  mixin = model.get_by_id(mixin_id)
95
96
  next if mixin.nil?
data/lib/occi/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module OCCI
2
- VERSION = "2.5.17" unless defined?(::OCCI::VERSION)
2
+ VERSION = "2.5.18" unless defined?(::OCCI::VERSION)
3
3
  end
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: 2.5.17
4
+ version: 2.5.18
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-08-02 00:00:00.000000000 Z
13
+ date: 2013-08-08 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: json