occi 3.1.2 → 3.1.3

data/lib/occi/core/entity.rb

@@ -134,9 +134,10 @@ module Occi
       # @param [Occi::Model] model representation of the Occi model to check the attributes against
       def check
         raise "No model associated" unless @model
-        definitions = model.get_by_id(@kind.to_s).attributes
+        definitions = Occi::Core::Attributes.new
+        definitions.merge!(@model.get_by_id(@kind.to_s).attributes)
         @mixins.each do |mixin_id|
-          mixin = model.get_by_id(mixin_id)
+          mixin = @model.get_by_id(mixin_id)
           next if mixin.nil?
           definitions.merge!(mixin.attributes) if mixin.attributes
         end if @mixins

data/lib/occi/version.rb

@@ -1,3 +1,3 @@
 module Occi
-  VERSION = "3.1.2" unless defined?(::Occi::VERSION)
+  VERSION = "3.1.3" unless defined?(::Occi::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json