occi-core 4.2.12 → 4.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ae8a9a2f1e04abc912900002e1a20ffc7d14c4a
-  data.tar.gz: e61f0a1b597466384b814c331792dd27e0cfd0e9
+  metadata.gz: 9b13e9998a9a2ccb704efa4c1cbb283ae7aa7d46
+  data.tar.gz: c8e5a5a2dfe2df264cd24c46e86f7ec3d28b10b9
 SHA512:
-  metadata.gz: 80566d28dd52b33ce23de9cb2dff9943d2a082a04a6acf8dfecdab40b79a20aaa08b20f7b7bcd7712c4dfad34d85e2c6de82a9b8cacc3729db4069e65d50e9ec
-  data.tar.gz: 09dfb7c50b7ad1c603df9affc70406e4bb59a430844f965e8380430bc957af17cf0e5dcbe525d5935fc7e42b69a8edb8bc95953761670be128daf04ed044f21e
+  metadata.gz: 2093cc6c116bf9dc2e281a57ba5cfc2b05528e81da87695bc6a46c4078830c4575e9fde4aff0392edcea820b6c6f20e5c3a9232e83aacb54930f09d9701b9937
+  data.tar.gz: 01acb909e3a5942c83988de6966fb036827d07e7ac481b6862358356b99d06d79c0335de9151d9bdf3ab8f2d6fda5dbb38dba44a22eea40331568358ac069740

data/LICENSE

@@ -1,13 +1,19 @@
-Copyright (c) 2012 GWDG
+# @markup text
+
+The work represented by this source file is partially or entirely funded
+by the EGI-InSPIRE project through the European Commission's 7th Framework
+Programme (contract # INFSO-RI-261323)
+
+Copyright (c) 2012-2014 GWDG, CESNET
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.

data/Rakefile

@@ -6,6 +6,9 @@ task :default => 'test'
 desc "Run all tests; includes rspec and coverage reports"
 task :test => 'rcov:all'
 
+desc "Run all tests; includes rspec and coverage reports"
+task :spec => 'test'
+
 Gem::Tasks.new(:build => {:tar => true, :zip => true}, :sign => {:checksum => true, :pgp => false})
 
 namespace :rcov do

data/lib/occi/collection.rb

@@ -65,11 +65,12 @@ module Occi
     end
 
     # @param incl_categories [Boolean] check every category against the model
+    # @param set_default_attrs [Boolean] set default attribute values for all entities
     # @return [Boolean] result
-    def check(incl_categories = false)
-      @resources.check
-      @links.check
-      @action.check if @action
+    def check(incl_categories = false, set_default_attrs = false)
+      @resources.check(set_default_attrs)
+      @links.check(set_default_attrs)
+      @action.check(set_default_attrs) if @action
 
       if incl_categories
         @kinds.check
@@ -222,7 +223,7 @@ module Occi
       elsif standalone_action_instance?
         header = self.action.to_header
       else
-        header['Category'] = self.categories.collect { |category| category.to_string_short }.join(',') if self.categories.any?
+        header['Category'] = self.categories.collect { |category| category.to_string }.join(',') if self.categories.any?
         raise "Only one resource allowed for rendering to text/occi!" if self.resources.size > 1
         header = self.class.header_merge(header, self.resources.first.to_header) if self.resources.any?
         header['Link'] = self.links.collect { |link| link.to_string }.join(',') if self.links.any?

data/lib/occi/core/entities.rb

@@ -21,8 +21,8 @@ module Occi
         each { |entity| entity.model = model }
       end
 
-      def check
-        each { |entity| entity.check }
+      def check(set_defaults = false)
+        each { |entity| entity.check(set_defaults) }
       end
 
       def create(*args)

data/lib/occi/core/entity.rb

@@ -171,22 +171,22 @@ module Occi
       # @param [true,false] set default values for all empty attributes
       def check(set_defaults = false)
         raise ArgumentError, 'No model has been assigned to this entity' unless @model
- 
+
         kind = @model.get_by_id(@kind.to_s, true)
         raise Occi::Errors::KindNotDefinedError,
               "Kind not found for entity #{self.class.name}[#{self.to_s.inspect}]!" unless kind
- 
+
         definitions = Occi::Core::Attributes.new
         definitions.merge! kind.attributes
- 
+
         @mixins.each do |mxn|
           mixin = @model.get_by_id(mxn.to_s)
           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
- 
+
         @attributes.check!(definitions, set_defaults)
       end
 
@@ -208,11 +208,11 @@ module Occi
 
       # @return [String] text representation
       def to_text
-        text = "Category: #{self.kind.term};scheme=#{self.kind.scheme.inspect};class=\"kind\";location=#{self.kind.location.inspect}"
+        text = "Category: #{self.kind.term};scheme=#{self.kind.scheme.inspect};class=\"kind\";location=#{self.kind.location.inspect};title=#{self.kind.title.inspect}"
         @mixins.each do |mixin|
           scheme, term = mixin.to_s.split('#')
           scheme << '#'
-          text << "\nCategory: #{term};scheme=#{scheme.inspect};class=\"mixin\";location=#{mixin.location.inspect}"
+          text << "\nCategory: #{term};scheme=#{scheme.inspect};class=\"mixin\";location=#{mixin.location.inspect};title=#{mixin.title ? mixin.title.inspect : ''.inspect}"
         end
 
         text << @attributes.to_text
@@ -225,12 +225,12 @@ module Occi
       # @return [Hash] hash containing the HTTP headers of the text/occi rendering
       def to_header
         header = Hashie::Mash.new
-        header['Category'] = "#{self.kind.term};scheme=#{self.kind.scheme.inspect};class=\"kind\";location=#{self.kind.location.inspect}"
+        header['Category'] = "#{self.kind.term};scheme=#{self.kind.scheme.inspect};class=\"kind\";location=#{self.kind.location.inspect};title=#{self.kind.title.inspect}"
 
         @mixins.each do |mixin|
           scheme, term = mixin.to_s.split('#')
           scheme << '#'
-          header['Category'] << ",#{term};scheme=#{scheme.inspect};class=\"mixin\";location=#{mixin.location.inspect}"
+          header['Category'] << ",#{term};scheme=#{scheme.inspect};class=\"mixin\";location=#{mixin.location.inspect};title=#{mixin.title ? mixin.title.inspect : ''.inspect}"
         end
 
         attributes = @attributes.to_header

data/lib/occi/parser.rb

@@ -119,7 +119,13 @@ module Occi
 
         header.delete_if { |k, v| v.blank? || !OCCI_HEADERS.include?(k) }
 
-        header.map { |k, v| v.to_s.split(',').collect { |w| "#{k}: #{w}" } }.flatten
+        header = header.map do |k, v|
+          # sometimes header values arrive as single-value arrays!
+          v = v.first if v.kind_of?(Array)
+          v.to_s.split(',').collect { |w| "#{k}: #{w}".strip }
+        end
+
+        header.flatten
       end
 
     end

data/lib/occi/parser/text.rb

@@ -108,7 +108,7 @@ module Occi
           # match string to regular expression
           match = regexp.match string
 
-          raise Occi::Errors::ParserInputError, "Could not match #{string}" unless match
+          raise Occi::Errors::ParserInputError, "Could not match #{string.inspect}" unless match
 
           term = match[:term].downcase
           scheme = match[:scheme]
@@ -135,16 +135,16 @@ module Occi
 
           case match[:class]
           when 'kind'
-            Occi::Log.debug "[#{self}] class #{match[:class]} identified as kind"
+            Occi::Log.debug "[#{self}] class #{match[:class].inspect} identified as kind"
             Occi::Core::Kind.new scheme, term, title, attributes, related, actions, location
           when 'mixin'
-            Occi::Log.debug "[#{self}] class #{match[:class]} identified as mixin"
+            Occi::Log.debug "[#{self}] class #{match[:class].inspect} identified as mixin"
             Occi::Core::Mixin.new scheme, term, title, attributes, related, actions, location
           when 'action'
-            Occi::Log.debug "[#{self}] class #{match[:class]} identified as action"
+            Occi::Log.debug "[#{self}] class #{match[:class].inspect} identified as action"
             Occi::Core::Action.new scheme, term, title, attributes
           else
-            raise Occi::Errors::ParserInputError, "Category with class #{match[:class]} not recognized in string: #{string}"
+            raise Occi::Errors::ParserInputError, "Category with class #{match[:class].inspect} not recognized in string: #{string}"
           end
         end
 
@@ -155,7 +155,7 @@ module Occi
           # match string to regular expression
           match = regexp.match string
 
-          raise Occi::Errors::ParserInputError, "Could not match #{string}" unless match
+          raise Occi::Errors::ParserInputError, "Could not match #{string.inspect}" unless match
 
           value = match[:string] if match[:string]
 
@@ -174,7 +174,7 @@ module Occi
           # match string to regular expression
           match = regexp.match string
 
-          raise Occi::Errors::ParserInputError, "Could not match #{string}" unless match
+          raise Occi::Errors::ParserInputError, "Could not match #{string.inspect}" unless match
 
           if match[:uri].include?('?action=')
             link_string_action match
@@ -223,7 +223,7 @@ module Occi
           # match string to regular expression
           match = regexp.match string
 
-          raise Occi::Errors::ParserInputError, "Could not match #{string}" unless match
+          raise Occi::Errors::ParserInputError, "Could not match #{string.inspect}" unless match
 
           match[:location]
         end

data/lib/occi/version.rb

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

data/spec/occi/collection_spec.rb

@@ -3,7 +3,7 @@ module Occi
 
     context 'initialization' do
       let(:collection){ collection = Occi::Collection.new }
-      
+
       context 'with base objects' do
         before(:each) {
           collection.kinds << "http://schemas.ogf.org/occi/infrastructure#compute"
@@ -39,14 +39,14 @@ module Occi
         end
       end
     end
-      
+
     context '#model' do
       let(:collection){ collection = Occi::Collection.new }
       it 'registers a model' do
         expect(collection.model).to be_kind_of Occi::Model
       end
     end
-      
+
     context '#resources' do
       let(:collection){ collection = Occi::Collection.new }
       it 'can create a new OCCI Resource' do
@@ -57,10 +57,22 @@ module Occi
 
     context '#check' do
       let(:collection){ collection = Occi::Collection.new }
+
       it 'checks against model without failure' do
         collection.resources.create 'http://schemas.ogf.org/occi/core#resource'
         expect{ collection.check }.to_not raise_error
       end
+
+      it 'does not raise an error for unknown categories by default' do
+        collection.kinds << Occi::Core::Kind.new('http://example.org/test/stuff#', 'here')
+        expect { collection.check }.to_not raise_error
+      end
+
+      it 'raises an error for unknown categories when requested' do
+        collection.kinds << Occi::Core::Kind.new('http://example.org/test/stuff#', 'here')
+        expect { collection.check(true) }.to raise_error
+      end
+
     end
 
     context '#get_related_to' do
@@ -218,7 +230,7 @@ module Occi
           it 'kept the correct number of mixins' do
             expect(coll2.mixins.count).to eql 1
           end
-        
+
           it 'kept the correct number of actions' do
             expect(coll2.actions.count).to eql 1
           end
@@ -247,7 +259,7 @@ module Occi
     end
 
     context '#merge!' do
-      let(:collection){ collection = Occi::Collection.new 
+      let(:collection){ collection = Occi::Collection.new
         collection.kinds << "http://schemas.ogf.org/occi/infrastructure#compute"
         collection.mixins << "http://example.com/occi/tags#my_mixin"
         collection.actions << "http://schemas.ogf.org/occi/infrastructure/compute/action#start"
@@ -327,7 +339,7 @@ module Occi
           it 'kept the correct number of mixins' do
             expect(coll2.mixins.count).to eql 1
           end
-        
+
           it 'kept the correct number of actions' do
             expect(coll2.actions.count).to eql 1
           end
@@ -500,7 +512,7 @@ module Occi
           it 'kept the correct number of mixins' do
             expect(coll2.mixins.count).to eql 2
           end
-        
+
           it 'kept the correct number of actions' do
             expect(coll2.actions.count).to eql 2
           end
@@ -528,7 +540,7 @@ module Occi
     end
     context '#intersect!' do
       let(:collection){
-        collection = Occi::Collection.new 
+        collection = Occi::Collection.new
         collection.kinds << "http://schemas.ogf.org/occi/infrastructure#compute"
         collection.kinds << "http://schemas.ogf.org/occi/infrastructure#network"
         collection.mixins << "http://example.com/occi/tags#my_mixin"
@@ -634,7 +646,7 @@ module Occi
           it 'kept the correct number of mixins' do
             expect(coll2.mixins.count).to eql 2
           end
-        
+
           it 'kept the correct number of actions' do
             expect(coll2.actions.count).to eql 2
           end
@@ -652,7 +664,7 @@ module Occi
       context 'collections with no intersection' do
         let(:action){ Occi::Core::Action.new scheme='http://schemas.ogf.org/occi/core/entity/action#', term='testaction', title='testaction action' }
         let(:uniq1) {
-          uniq1 = Occi::Collection.new 
+          uniq1 = Occi::Collection.new
           uniq1.kinds << "http://schemas.ogf.org/occi/infrastructure#compute"
           uniq1.mixins << "http://example.com/occi/tags#my_mixin"
           uniq1.actions << "http://schemas.ogf.org/occi/infrastructure/compute/action#start"
@@ -686,14 +698,14 @@ module Occi
 
         it 'works with first collection empty' do
           empty = Occi::Collection.new
-   
+
           uniq1.intersect!(empty)
           expect(empty.empty?).to eql true
         end
 
         it 'works with second collection empty' do
           empty = Occi::Collection.new
-   
+
           empty.intersect!(uniq2)
           expect(empty.empty?).to eql true
         end
@@ -701,7 +713,7 @@ module Occi
     end
 
     context '#get_by_...' do
-      let(:collection){ collection = Occi::Collection.new 
+      let(:collection){ collection = Occi::Collection.new
         collection.kinds << "http://schemas.ogf.org/occi/infrastructure#compute"
         collection.mixins << "http://example.com/occi/tags#my_mixin"
         collection.actions << "http://schemas.ogf.org/occi/infrastructure/compute/action#start"
@@ -798,15 +810,15 @@ module Occi
         collection.resources << Occi::Core::Resource.new
         collection.links << Occi::Core::Link.new
         expected = "{\"actions\":[{\"scheme\":\"http://schemas.ogf.org/occi/infrastructure/compute/action#\",\"term\":\"start\",\"attributes\":{}}],\"kinds\":[{\"parent\":\"http://schemas.ogf.org/occi/core#resource\",\"related\":[\"http://schemas.ogf.org/occi/core#resource\"],\"actions\":[\"http://schemas.ogf.org/occi/infrastructure/compute/action#start\",\"http://schemas.ogf.org/occi/infrastructure/compute/action#stop\",\"http://schemas.ogf.org/occi/infrastructure/compute/action#restart\",\"http://schemas.ogf.org/occi/infrastructure/compute/action#suspend\"],\"location\":\"/compute/\",\"scheme\":\"http://schemas.ogf.org/occi/infrastructure#\",\"term\":\"compute\",\"title\":\"compute resource\",\"attributes\":{\"occi\":{\"core\":{\"id\":{\"type\":\"string\",\"required\":false,\"mutable\":false,\"pattern\":\"[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}\"},\"title\":{\"type\":\"string\",\"required\":false,\"mutable\":true,\"pattern\":\".*\"},\"summary\":{\"type\":\"string\",\"required\":false,\"mutable\":true,\"pattern\":\".*\"}},\"compute\":{\"architecture\":{\"type\":\"string\",\"required\":false,\"mutable\":true,\"pattern\":\"x86|x64\"},\"cores\":{\"type\":\"number\",\"required\":false,\"mutable\":true,\"pattern\":\".*\"},\"hostname\":{\"type\":\"string\",\"required\":false,\"mutable\":true,\"pattern\":\"(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\\\-]*[a-zA-Z0-9])\\\\.)*\"},\"memory\":{\"type\":\"number\",\"required\":false,\"mutable\":true,\"pattern\":\".*\"},\"speed\":{\"type\":\"number\",\"required\":false,\"mutable\":true,\"pattern\":\".*\"},\"state\":{\"default\":\"inactive\",\"type\":\"string\",\"required\":false,\"mutable\":false,\"pattern\":\"inactive|active|suspended|error\"}}}}}],\"links\":[{\"kind\":\"http://schemas.ogf.org/occi/core#link\",\"attributes\":{\"occi\":{\"core\":{\"id\":\"#{collection.links.first.id}\"}}},\"id\":\"#{collection.links.first.id}\",\"rel\":\"http://schemas.ogf.org/occi/core#link\"}],\"mixins\":[{\"location\":\"/mixin/my_mixin/\",\"scheme\":\"http://example.com/occi/tags#\",\"term\":\"my_mixin\",\"attributes\":{}}],\"resources\":[{\"kind\":\"http://schemas.ogf.org/occi/core#resource\",\"attributes\":{\"occi\":{\"core\":{\"id\":\"#{collection.resources.first.id}\"}}},\"id\":\"#{collection.resources.first.id}\"}]}"
-        
+
         hash=Hashie::Mash.new(JSON.parse(expected))
-        expect(collection.as_json).to eql(hash) 
+        expect(collection.as_json).to eql(hash)
       end
 
       it 'renders JSON for an empty collection' do
         collection = Occi::Collection.new
         hash=Hashie::Mash.new
-        expect(collection.as_json).to eql(hash) 
+        expect(collection.as_json).to eql(hash)
       end
 
       it 'renders JSON for a collection with no resources' do
@@ -817,9 +829,9 @@ module Occi
         collection.action = Occi::Core::ActionInstance.new
         collection.links << Occi::Core::Link.new
         expected = "{\"actions\":[{\"scheme\":\"http://schemas.ogf.org/occi/infrastructure/compute/action#\",\"term\":\"start\",\"attributes\":{}}],\"kinds\":[{\"parent\":\"http://schemas.ogf.org/occi/core#resource\",\"related\":[\"http://schemas.ogf.org/occi/core#resource\"],\"actions\":[\"http://schemas.ogf.org/occi/infrastructure/compute/action#start\",\"http://schemas.ogf.org/occi/infrastructure/compute/action#stop\",\"http://schemas.ogf.org/occi/infrastructure/compute/action#restart\",\"http://schemas.ogf.org/occi/infrastructure/compute/action#suspend\"],\"location\":\"/compute/\",\"scheme\":\"http://schemas.ogf.org/occi/infrastructure#\",\"term\":\"compute\",\"title\":\"compute resource\",\"attributes\":{\"occi\":{\"core\":{\"id\":{\"type\":\"string\",\"required\":false,\"mutable\":false,\"pattern\":\"[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}\"},\"title\":{\"type\":\"string\",\"required\":false,\"mutable\":true,\"pattern\":\".*\"},\"summary\":{\"type\":\"string\",\"required\":false,\"mutable\":true,\"pattern\":\".*\"}},\"compute\":{\"architecture\":{\"type\":\"string\",\"required\":false,\"mutable\":true,\"pattern\":\"x86|x64\"},\"cores\":{\"type\":\"number\",\"required\":false,\"mutable\":true,\"pattern\":\".*\"},\"hostname\":{\"type\":\"string\",\"required\":false,\"mutable\":true,\"pattern\":\"(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\\\-]*[a-zA-Z0-9])\\\\.)*\"},\"memory\":{\"type\":\"number\",\"required\":false,\"mutable\":true,\"pattern\":\".*\"},\"speed\":{\"type\":\"number\",\"required\":false,\"mutable\":true,\"pattern\":\".*\"},\"state\":{\"default\":\"inactive\",\"type\":\"string\",\"required\":false,\"mutable\":false,\"pattern\":\"inactive|active|suspended|error\"}}}}}],\"links\":[{\"kind\":\"http://schemas.ogf.org/occi/core#link\",\"attributes\":{\"occi\":{\"core\":{\"id\":\"#{collection.links.first.id}\"}}},\"id\":\"#{collection.links.first.id}\",\"rel\":\"http://schemas.ogf.org/occi/core#link\"}],\"mixins\":[{\"location\":\"/mixin/my_mixin/\",\"scheme\":\"http://example.com/occi/tags#\",\"term\":\"my_mixin\",\"attributes\":{}}]}"
-        
+
         hash=Hashie::Mash.new(JSON.parse(expected))
-        expect(collection.as_json).to eql(hash) 
+        expect(collection.as_json).to eql(hash)
       end
     end
 
@@ -833,7 +845,7 @@ module Occi
         collection.resources << Occi::Core::Resource.new
         collection.links << Occi::Core::Link.new
 
-        expected = "Category: compute;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";title=\"compute resource\";rel=\"http://schemas.ogf.org/occi/core#resource\";location=\"/compute/\";attributes=\"occi.core.id{immutable} occi.core.title occi.core.summary occi.compute.architecture occi.compute.cores occi.compute.hostname occi.compute.memory occi.compute.speed occi.compute.state{immutable}\";actions=\"http://schemas.ogf.org/occi/infrastructure/compute/action#start http://schemas.ogf.org/occi/infrastructure/compute/action#stop http://schemas.ogf.org/occi/infrastructure/compute/action#restart http://schemas.ogf.org/occi/infrastructure/compute/action#suspend\"\nCategory: my_mixin;scheme=\"http://example.com/occi/tags#\";class=\"mixin\";location=\"/mixin/my_mixin/\"\nCategory: start;scheme=\"http://schemas.ogf.org/occi/infrastructure/compute/action#\";class=\"action\"\nCategory: resource;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/resource/\"\nX-OCCI-Attribute: occi.core.id=\"#{collection.resources.first.id}\"Link: <>;rel=\"http://schemas.ogf.org/occi/core#link\";self=\"/link/#{collection.links.first.id}\";category=\"http://schemas.ogf.org/occi/core#link\";occi.core.id=\"#{collection.links.first.id}\"Category: action_instance;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"action\""
+        expected = "Category: compute;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";title=\"compute resource\";rel=\"http://schemas.ogf.org/occi/core#resource\";location=\"/compute/\";attributes=\"occi.core.id{immutable} occi.core.title occi.core.summary occi.compute.architecture occi.compute.cores occi.compute.hostname occi.compute.memory occi.compute.speed occi.compute.state{immutable}\";actions=\"http://schemas.ogf.org/occi/infrastructure/compute/action#start http://schemas.ogf.org/occi/infrastructure/compute/action#stop http://schemas.ogf.org/occi/infrastructure/compute/action#restart http://schemas.ogf.org/occi/infrastructure/compute/action#suspend\"\nCategory: my_mixin;scheme=\"http://example.com/occi/tags#\";class=\"mixin\";location=\"/mixin/my_mixin/\"\nCategory: start;scheme=\"http://schemas.ogf.org/occi/infrastructure/compute/action#\";class=\"action\"\nCategory: resource;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/resource/\";title=\"resource\"\nX-OCCI-Attribute: occi.core.id=\"#{collection.resources.first.id}\"Link: <>;rel=\"http://schemas.ogf.org/occi/core#link\";self=\"/link/#{collection.links.first.id}\";category=\"http://schemas.ogf.org/occi/core#link\";occi.core.id=\"#{collection.links.first.id}\"Category: action_instance;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"action\""
         expect(collection.to_text).to eql(expected)
       end
 
@@ -871,13 +883,13 @@ module Occi
 
       it 'renders text correctly, resources only' do
         collection.resources << Occi::Core::Resource.new
-        expected = "Category: resource;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/resource/\"\nX-OCCI-Attribute: occi.core.id=\"#{collection.resources.first.id}\""
+        expected = "Category: resource;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/resource/\";title=\"resource\"\nX-OCCI-Attribute: occi.core.id=\"#{collection.resources.first.id}\""
         expect(collection.to_text).to eql(expected)
       end
 
       it 'renders text correctly, links only' do
         collection.links << Occi::Core::Link.new
-        expected = "Category: link;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/link/\"\nX-OCCI-Attribute: occi.core.id=\"#{collection.links.first.id}\""
+        expected = "Category: link;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/link/\";title=\"link\"\nX-OCCI-Attribute: occi.core.id=\"#{collection.links.first.id}\""
         expect(collection.to_text).to eql(expected)
       end
 
@@ -894,7 +906,7 @@ module Occi
         collection.links << Occi::Core::Link.new
 
         expected=Hashie::Mash.new
-        expected["Category"] = "compute;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\",my_mixin;scheme=\"http://example.com/occi/tags#\";class=\"mixin\",start;scheme=\"http://schemas.ogf.org/occi/infrastructure/compute/action#\";class=\"action\",resource;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/resource/\",action_instance;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"action\""
+        expected["Category"] = "compute;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";title=\"compute resource\";rel=\"http://schemas.ogf.org/occi/core#resource\";location=\"/compute/\";attributes=\"occi.core.id{immutable} occi.core.title occi.core.summary occi.compute.architecture occi.compute.cores occi.compute.hostname occi.compute.memory occi.compute.speed occi.compute.state{immutable}\";actions=\"http://schemas.ogf.org/occi/infrastructure/compute/action#start http://schemas.ogf.org/occi/infrastructure/compute/action#stop http://schemas.ogf.org/occi/infrastructure/compute/action#restart http://schemas.ogf.org/occi/infrastructure/compute/action#suspend\",my_mixin;scheme=\"http://example.com/occi/tags#\";class=\"mixin\";location=\"/mixin/my_mixin/\",start;scheme=\"http://schemas.ogf.org/occi/infrastructure/compute/action#\";class=\"action\",resource;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/resource/\";title=\"resource\",action_instance;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"action\""
         expected["Link"] = "<>;rel=\"http://schemas.ogf.org/occi/core#link\";self=\"/link/#{collection.links.first.id}\";category=\"http://schemas.ogf.org/occi/core#link\";occi.core.id=\"#{collection.links.first.id}\""
         expected["X-OCCI-Attribute"] = "occi.core.id=\"#{collection.resources.first.id}\""
         expect(collection.to_header).to eql(expected)
@@ -908,14 +920,14 @@ module Occi
       it 'renders text correctly, kinds only' do
         collection.kinds << "http://schemas.ogf.org/occi/infrastructure#compute"
         expected=Hashie::Mash.new
-        expected["Category"] = "compute;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\""
+        expected["Category"] = "compute;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";title=\"compute resource\";rel=\"http://schemas.ogf.org/occi/core#resource\";location=\"/compute/\";attributes=\"occi.core.id{immutable} occi.core.title occi.core.summary occi.compute.architecture occi.compute.cores occi.compute.hostname occi.compute.memory occi.compute.speed occi.compute.state{immutable}\";actions=\"http://schemas.ogf.org/occi/infrastructure/compute/action#start http://schemas.ogf.org/occi/infrastructure/compute/action#stop http://schemas.ogf.org/occi/infrastructure/compute/action#restart http://schemas.ogf.org/occi/infrastructure/compute/action#suspend\""
         expect(collection.to_header).to eql(expected)
       end
 
       it 'renders text correctly, mixins only' do
         collection.mixins << "http://example.com/occi/tags#my_mixin"
         expected=Hashie::Mash.new
-        expected["Category"] = "my_mixin;scheme=\"http://example.com/occi/tags#\";class=\"mixin\""
+        expected["Category"] = "my_mixin;scheme=\"http://example.com/occi/tags#\";class=\"mixin\";location=\"/mixin/my_mixin/\""
         expect(collection.to_header).to eql(expected)
       end
 
@@ -939,7 +951,7 @@ module Occi
       it 'renders text correctly, resources only' do
         collection.resources << Occi::Core::Resource.new
         expected=Hashie::Mash.new
-        expected["Category"] = "resource;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/resource/\""
+        expected["Category"] = "resource;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/resource/\";title=\"resource\""
         expected["X-OCCI-Attribute"] = "occi.core.id=\"#{collection.resources.first.id}\""
         expect(collection.to_header).to eql(expected)
       end
@@ -947,7 +959,7 @@ module Occi
       it 'renders text correctly, links only' do
         collection.links << Occi::Core::Link.new
         expected=Hashie::Mash.new
-        expected["Category"] = "link;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/link/\""
+        expected["Category"] = "link;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/link/\";title=\"link\""
         expected["X-OCCI-Attribute"] = "occi.core.id=\"#{collection.links.first.id}\""
         expect(collection.to_header).to eql(expected)
       end
@@ -974,7 +986,7 @@ module Occi
         expected['c'] = 'c'
         expect(mash1).to eql expected
       end
-     
+
       it 'merges two mashes correctly with custom separator' do
         Occi::Collection.header_merge(mash1, second, ' : ')
 
@@ -984,7 +996,7 @@ module Occi
         expected['c'] = 'c'
         expect(mash1).to eql expected
       end
- 
+
     end
 
   end

data/spec/occi/core/entities_spec.rb

@@ -15,70 +15,86 @@ module Occi
         it 'is created empty' do
           expect(entities.count).to eq 0
         end
+
         it 'gets entity Nos. right, 1' do
           entities << entity1
           expect(entities.count).to eq 1
         end
+
         it 'gets entity Nos. right, 2' do
           entities << entity1
           entities << entity2
           expect(entities.count).to eq 2
         end
+
         it 'gets correctly-typed elements' do
           entities << entity1
           entities << entity2
           expect(entities.first).to be_an_instance_of(Occi::Core::Entity)
         end
+
       end
 
       context '#model' do
+
         it 'has no model by default' do
           expect(entities.model).to be nil
         end
+
         it 'can be assigned model' do
           modl = Occi::Model.new
           entities.model = modl
           expect(entities.model).to eql modl
         end
+
         it 'uses the assigned model for new members' do
           modl = Occi::Model.new
           entities.model = modl
           entities << entity1
           expect(entities.first.model).to eql modl
         end
+
         it 'uses the assigned model for existing members' do
           entities << entity1
           modl = Occi::Model.new
           entities.model = modl
           expect(entities.first.model).to eql modl
         end
+
         it 'does not use unassigned model' do
           modl = Occi::Model.new
           entities << entity1
           expect(entities.first.model).to_not eql modl
         end
+
       end
 
       context '#create' do
+
         it 'creates a new element' do
           entities.create
           expect(entities.first).to be_instance_of(Occi::Core::Entity)
         end
+
         it 'accepts argument' do
           entities.create 'http://example.com/testnamespace#test'
           expect(entities.first).to be_kind_of 'Com::Example::Testnamespace::Test'.constantize
         end
+
       end
 
       context '#join' do
+
         it 'joins elements correctly' do
           entities << entity1
           entities << entity2
           expect(entities.join('|')).to eq '/entity/e1testid|/entity2/e2testid'
         end
+
       end
 
       context '#as_json' do
+
         it 'renders elements with various attributes' do
           entity2.actions << testaction
           entities << entity1
@@ -90,6 +106,54 @@ module Occi
           expected << hash2
           expect(entities.as_json).to eql expected
         end
+
+      end
+
+      context '#check' do
+
+        let(:attr_w_defaults) do
+          { :type => 'string',
+            :pattern => '[adefltuv]+',
+            :default => 'defaultvalue',
+            :mutable => true }
+        end
+        let(:model) do
+          model = Occi::Model.new
+          model.kinds.first.attributes['string_attribute'] = attr_w_defaults
+          model
+        end
+        let(:entities_w_defaults) do
+          entities << Occi::Core::Entity.new
+          entities.model = model
+          entities
+        end
+        let(:entities_w_wrong_attrs) do
+          ent1 = Occi::Core::Entity.new
+          ent1.attributes['fake.attr.here'] = 1
+          entities << ent1
+          entities.model = model
+          entities
+        end
+
+        it 'raises an error on undeclared attributes' do
+          expect { entities_w_wrong_attrs.check }.to raise_error
+        end
+
+        it 'passes on an empty collection' do
+          expect { entities.check }.not_to raise_error
+          expect { entities.check(true) }.not_to raise_error
+        end
+
+        it 'does not set attribute defaults by default' do
+          entities_w_defaults.check
+          expect(entities_w_defaults.first.attributes['string_attribute']).to be_blank
+        end
+
+        it 'sets attributes default when requested' do
+          entities_w_defaults.check(true)
+          expect(entities_w_defaults.first.attributes['string_attribute']).to eq 'defaultvalue'
+        end
+
       end
     end
   end

data/spec/occi/core/entity_spec.rb

@@ -59,7 +59,7 @@ module Occi
       end
 
       context '#mixins' do
-        let(:mixin){ 'http://example.com/mynamespace#mymixin' }   
+        let(:mixin){ 'http://example.com/mynamespace#mymixin' }
 
         it "converts mixin type identifiers to objects if a mixin is added to the entities mixins" do
           entity.mixins << mixin
@@ -91,9 +91,9 @@ module Occi
             Occi::Settings['verify_attribute_pattern']=true
             expect{ entity.id = 'id with spaces' }.to raise_error Occi::Errors::AttributeTypeError
           end
-          
+
         end
-        
+
         context '#location' do
           it 'can be set and read' do
             entity.location = 'TestLoc'
@@ -150,7 +150,7 @@ module Occi
 
       context '#to_text' do
         it 'renders fresh instance in text correctly' do
-          expected = %Q|Category: entity;scheme="http://schemas.ogf.org/occi/core#";class="kind";location="/entity/"
+          expected = %Q|Category: entity;scheme="http://schemas.ogf.org/occi/core#";class="kind";location="/entity/";title="entity"
 X-OCCI-Attribute: occi.core.id="baf1"|
           expect(entity.to_text).to eq(expected)
         end
@@ -161,8 +161,8 @@ X-OCCI-Attribute: occi.core.id="baf1"|
           entity.location = '/TestLoc/1'
           entity.mixins <<  'http://example.com/mynamespace#mymixin'
 
-          expected = %Q|Category: entity;scheme="http://schemas.ogf.org/occi/core#";class="kind";location="/entity/"
-Category: mymixin;scheme="http://example.com/mynamespace#";class="mixin";location="/mixin/mymixin/"
+          expected = %Q|Category: entity;scheme="http://schemas.ogf.org/occi/core#";class="kind";location="/entity/";title="entity"
+Category: mymixin;scheme="http://example.com/mynamespace#";class="mixin";location="/mixin/mymixin/";title=""
 X-OCCI-Attribute: occi.core.id="baf1"
 X-OCCI-Attribute: occi.core.title="TestTitle"
 Link: </TestLoc/1?action=testaction>;rel="http://schemas.ogf.org/occi/core/entity/action#testaction"|
@@ -173,7 +173,7 @@ Link: </TestLoc/1?action=testaction>;rel="http://schemas.ogf.org/occi/core/entit
       context '#to_header' do
         it 'renders fresh instance in HTTP Header correctly' do
           expected = Hashie::Mash.new
-          expected['Category'] = 'entity;scheme="http://schemas.ogf.org/occi/core#";class="kind";location="/entity/"'
+          expected['Category'] = 'entity;scheme="http://schemas.ogf.org/occi/core#";class="kind";location="/entity/";title="entity"'
           expected['X-OCCI-Attribute'] = 'occi.core.id="baf1"'
 
           expect(entity.to_header).to eql(expected)
@@ -186,7 +186,7 @@ Link: </TestLoc/1?action=testaction>;rel="http://schemas.ogf.org/occi/core/entit
           entity.mixins <<  'http://example.com/mynamespace#mymixin'
 
           expected = Hashie::Mash.new
-          expected['Category'] = 'entity;scheme="http://schemas.ogf.org/occi/core#";class="kind";location="/entity/",mymixin;scheme="http://example.com/mynamespace#";class="mixin";location="/mixin/mymixin/"'
+          expected['Category'] = 'entity;scheme="http://schemas.ogf.org/occi/core#";class="kind";location="/entity/";title="entity",mymixin;scheme="http://example.com/mynamespace#";class="mixin";location="/mixin/mymixin/";title=""'
           expected['X-OCCI-Attribute'] = 'occi.core.id="baf1",occi.core.title="TestTitle"'
           expected['Link'] = '</TestLoc/1?action=testaction>;rel="http://schemas.ogf.org/occi/core/entity/action#testaction"'
 
@@ -245,9 +245,9 @@ Link: </TestLoc/1?action=testaction>;rel="http://schemas.ogf.org/occi/core/entit
           entity.model = model
           entity.mixins << mixin
           entity }
-          
-        
-        before(:each){ Occi::Settings['compatibility']=false 
+
+
+        before(:each){ Occi::Settings['compatibility']=false
                        Occi::Settings['verify_attribute_pattern']=true }
         after(:each) { Occi::Settings.reload! }
 

data/spec/occi/parser_spec.rb

@@ -39,25 +39,32 @@ module Occi
 
         context 'resources from OCCI messages with text/occi MIME type' do
           let(:rendered_collection){ collection.to_header }
+          let(:real_world_example_model) {
+            {"category"=>["entity;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/entity/\",resource;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/resource/\",link;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"kind\";location=\"/link/\",compute;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/compute/\",storage;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/storage/\",network;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/network/\",networkinterface;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/networkinterface/\",storagelink;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"kind\";location=\"/storagelink/\",console;scheme=\"http://schemas.ogf.org/occi/infrastructure/compute#\";class=\"kind\";location=\"/console/\",resource_tpl;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/resource_tpl/\",os_tpl;scheme=\"http://schemas.ogf.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/os_tpl/\",ipnetwork;scheme=\"http://schemas.ogf.org/occi/infrastructure/network#\";class=\"mixin\";location=\"/mixin/ipnetwork/\",ipnetworkinterface;scheme=\"http://schemas.ogf.org/occi/infrastructure/networkinterface#\";class=\"mixin\";location=\"/mixin/ipnetworkinterface/\",networkinterface;scheme=\"http://opennebula.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/networkinterface/\",compute;scheme=\"http://opennebula.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/compute/\",storage;scheme=\"http://opennebula.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/storage/\",public_key;scheme=\"http://schemas.openstack.org/instance/credentials#\";class=\"mixin\";location=\"/mixin/public_key/\",user_data;scheme=\"http://schemas.openstack.org/compute/instance#\";class=\"mixin\";location=\"/mixin/user_data/\",network;scheme=\"http://opennebula.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/network/\",storagelink;scheme=\"http://opennebula.org/occi/infrastructure#\";class=\"mixin\";location=\"/mixin/storagelink/\",uuid_monitoring_20;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_monitoring_20/\",uuid_egi_sl6goldenimage_cesnet_50;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_egi_sl6goldenimage_cesnet_50/\",uuid_generic_vm_54;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_generic_vm_54/\",uuid_octave_55;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_octave_55/\",uuid_r_56;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_r_56/\",uuid_egi_compss_cesnet_57;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_egi_compss_cesnet_57/\",uuid_esa_sl64_cesnet_58;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_esa_sl64_cesnet_58/\",uuid_generic_www_60;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_generic_www_60/\",uuid_egi_compss_62;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_egi_compss_62/\",uuid_egi_test_compss_69;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_egi_test_compss_69/\",uuid_genericcloud_debian_7_0_x86_64_0001_cloud_dukan_71;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_genericcloud_debian_7_0_x86_64_0001_cloud_dukan_71/\",uuid_genericcloud_ubuntu_12_04_lts_x86_64_0001_cloud_dukan_72;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_genericcloud_ubuntu_12_04_lts_x86_64_0001_cloud_dukan_72/\",uuid_genericcloud_scilinux_6_5_x86_64_0001_cloud_dukan_73;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_genericcloud_scilinux_6_5_x86_64_0001_cloud_dukan_73/\",uuid_egi_compss_debian_7_0_x86_64_0001_cloud_dukan_74;scheme=\"http://occi.localhost/occi/infrastructure/os_tpl#\";class=\"mixin\";location=\"/mixin/uuid_egi_compss_debian_7_0_x86_64_0001_cloud_dukan_74/\",extra_large;scheme=\"http://sitespecific.cesnet.cz/occi/infrastructure/resource_tpl#\";class=\"mixin\";location=\"/mixin/extra_large/\",medium;scheme=\"http://sitespecific.cesnet.cz/occi/infrastructure/resource_tpl#\";class=\"mixin\";location=\"/mixin/medium/\",small;scheme=\"http://sitespecific.cesnet.cz/occi/infrastructure/resource_tpl#\";class=\"mixin\";location=\"/mixin/small/\",large;scheme=\"http://sitespecific.cesnet.cz/occi/infrastructure/resource_tpl#\";class=\"mixin\";location=\"/mixin/large/\""]}
+          }
 
           it 'parses self-generated collection with resources' do
-            expect(Occi::Parser.parse('text/occi', '', false, Occi::Core::Resource, rendered_collection).to_header).to eql collection.to_header
+            expect(Occi::Parser.parse('text/occi', '', false, Occi::Core::Resource, rendered_collection).to_header).to eql rendered_collection
           end
 
           it 'parses self-generated collection with added attributes' do
             resource.id = UUIDTools::UUID.random_create.to_s
             resource.title = 'title'
-            expect(Occi::Parser.parse('text/occi', '', false, Occi::Core::Resource, rendered_collection).to_header).to eql collection.to_header
+            expect(Occi::Parser.parse('text/occi', '', false, Occi::Core::Resource, rendered_collection).to_header).to eql rendered_collection
           end
 
           it 'parses self-generated collection with added mixin' do
             resource.mixins << Occi::Core::Mixin.new
-            expect(Occi::Parser.parse('text/occi', '', false, Occi::Core::Resource, rendered_collection).to_header).to eql collection.to_header
+            expect(Occi::Parser.parse('text/occi', '', false, Occi::Core::Resource, rendered_collection).to_header).to eql rendered_collection
           end
 
           it 'parses self-generated collection with added link' do
             collection << link
-            expect(Occi::Parser.parse('text/occi', '', false, Occi::Core::Resource, rendered_collection).to_header).to eql collection.to_header
+            expect(Occi::Parser.parse('text/occi', '', false, Occi::Core::Resource, rendered_collection).to_header).to eql rendered_collection
+          end
+
+          it 'parses a real-world example of the OCCI model' do
+            expect(Occi::Parser.parse('text/occi', '', true, Occi::Core::Resource, real_world_example_model).to_header.to_hash).to eql({ 'Category' => real_world_example_model['category'].first })
           end
         end
 
@@ -161,13 +168,13 @@ module Occi
         locations_text = "http://example.com:8090/a/b/vm1\nhttp://example.com:8090/a/b/vm2"
         location = Occi::Parser.locations("text/uri-list", locations_text, {})
         expect(location).to eql expected
-      end      
+      end
 
       it 'parses multiple locations from plain text' do
         locations_text = "X-OCCI-Location: http://example.com:8090/a/b/vm1\nX-OCCI-Location: http://example.com:8090/a/b/vm2"
         location = Occi::Parser.locations("text/plain", locations_text, {})
         expect(location).to eql expected
-      end      
+      end
 
       it 'copes with unmeaningful input' do
         location = Occi::Parser.locations("nonexistent", "", {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.2.12
+  version: 4.2.13
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json