occi-core 4.2.7 → 4.2.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzcwYjFmMTUyNWUwN2FkNGU1MjA1NjU1ZGZjZjQ5YjFkZDJiZjU5MA==
-  data.tar.gz: !binary |-
-    NmRlZjVhZmQ5ZDQ2MjE2NzQwMGNiMmYwNGMxOGY0M2ZiZTljM2Q3ZQ==
+SHA1:
+  metadata.gz: fe9f229bab5b1ec66e0bde20117f04809e49fc3c
+  data.tar.gz: 6c198e622744e85891327bb44eb3c59768aef3d6
 SHA512:
-  metadata.gz: !binary |-
-    YTYxYTczMWVjZjM0ZWNhNzI4MmY0MDMxNmJhYThjZWU0M2VjNzkzOTdkOTE5
-    MDc4YWE3ZTM1ZDU5NGNmNzY0Njk0NDg3NzI1NDk2N2YyZTUzYjUxNjJlOTNl
-    MGE2MTFmMjk1M2QxODUxYTg1NDMyMGRmODgwOTA4YTUwM2FiZTE=
-  data.tar.gz: !binary |-
-    ZDFjMmViMmRlMDk0YjAxNjcwNWM1NjgwMDA1MWViY2FiYTkzMmNkMDgwNjkx
-    M2E2Mjk2MTY5MzhjOTE5OGNjZThhY2M5OTlkMTVhZmQxZDljY2E3MmUxNTZi
-    OGMwODg1YzM5YTMwMGJiYTQ0ZjNlYjYwOTUyZDViN2Q3ZGJlYjA=
+  metadata.gz: 4d6db094b91ba1b68846a6fb2f750a5096c61d75e1a87392fa1eb1b7387cd5892b7b77d43a9a863425344167097e5c10fa61d17369f076ceb3fd570e652c448e
+  data.tar.gz: def0771cdaa027734d13cdb23155da859d157fa0ef40eaf2741896eb0e782cb3d5af1aac453e3f9db792423da51ae692e54b432de9dc215593cce49281a90423

data/lib/occi/core/entity.rb

@@ -170,7 +170,8 @@ module Occi
  
         @mixins.each do |mxn|
           mixin = @model.get_by_id(mxn.to_s)
-          next if mixin.nil?
+          raise Occi::Errors::CategoryNotDefinedError,
+                "Mixin #{mxn.to_s.inspect} not declared in the model!" unless mixin && mixin.kind_of?(Occi::Core::Mixin)
  
           definitions.merge!(mixin.attributes) if mixin.attributes
         end if @mixins

data/lib/occi/version.rb

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

data/spec/occi/core/entity_spec.rb

@@ -210,6 +210,7 @@ Link: </TestLoc/1?action=testaction>;rel="http://schemas.ogf.org/occi/core/entit
                                                :mutable => true }
           defmixin }
         let(:mixin){ Occi::Core::Mixin.new 'http://schemas.ogf.org/occi/core#', 'testmixin' }
+        let(:undefmixin){ Occi::Core::Mixin.new 'http://schemas.ogf.org/occi/core#', 'fake_mixin' }
 
         let(:entity){ entity = Occi::Core::Entity.new(kind, [], defs)
           entity.model = model
@@ -220,11 +221,13 @@ Link: </TestLoc/1?action=testaction>;rel="http://schemas.ogf.org/occi/core/entit
         before(:each){ Occi::Settings['compatibility']=false 
                        Occi::Settings['verify_attribute_pattern']=true }
         after(:each) { Occi::Settings.reload! }
+
         context 'unsupported types' do
           it 'refuses unsupported type' do
             expect{ entity.attributes['othertype'] = { :type => 'other', :default => 'defaultvalue' } }.to raise_exception(Occi::Errors::AttributePropertyTypeError)
           end
         end
+
         context 'defaults' do
           context 'setting defaults' do
             it 'sets numeric default' do
@@ -292,12 +295,19 @@ Link: </TestLoc/1?action=testaction>;rel="http://schemas.ogf.org/occi/core/entit
             expect{ ent.check(true) }.to raise_exception ArgumentError
           end
 
-          it 'raises exception for inexistent kind' do
+          it 'raises exception for nonexistent kind' do
             ent = Occi::Core::Entity.new(kind, [], defs)
             mod = Occi::Model.new
             ent.model = mod
             expect{ ent.check(true) }.to raise_exception Occi::Errors::KindNotDefinedError
           end
+
+          it 'raises expection for nonexistent mixins' do
+            ent = Occi::Core::Entity.new(kind, [], defs)
+            ent.model = model
+            ent.mixins << undefmixin
+            expect{ ent.check }.to raise_exception Occi::Errors::CategoryNotDefinedError
+          end
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.2.7
+  version: 4.2.8
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,48 +10,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.3
 - !ruby/object:Gem::Dependency
@@ -86,14 +86,14 @@ dependencies:
   name: settingslogic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: OCCI is a collection of classes to simplify the implementation of the
@@ -253,12 +253,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []