occi-core 4.2.1 → 4.2.2

data/lib/occi/collection.rb

@@ -20,11 +20,11 @@ module Occi
 
       self.model = model if model
 
-      @kinds.merge collection.kinds.to_a.collect { |kind| Occi::Core::Kind.new(kind.scheme, kind.term, kind.title, kind.attributes, kind.related, kind.actions) }
-      @mixins.merge collection.mixins.to_a.collect { |mixin| Occi::Core::Mixin.new(mixin.scheme, mixin.term, mixin.title, mixin.attributes, mixin.related, mixin.actions) }
+      @kinds.merge collection.kinds.to_a.collect { |kind| Occi::Core::Kind.new(kind.scheme, kind.term, kind.title, kind.attributes, kind.related, kind.actions, kind.location) }
+      @mixins.merge collection.mixins.to_a.collect { |mixin| Occi::Core::Mixin.new(mixin.scheme, mixin.term, mixin.title, mixin.attributes, mixin.depends, mixin.actions, mixin.location, mixin.applies) }
       @actions.merge collection.actions.to_a.collect { |action| Occi::Core::Action.new(action.scheme, action.term, action.title, action.attributes) }
-      @resources.merge collection.resources.to_a.collect { |resource| Occi::Core::Resource.new(resource.kind, resource.mixins, resource.attributes, resource.links) }
-      @links.merge collection.links.to_a.collect { |link| Occi::Core::Link.new(link.kind, link.mixins, link.attributes) }
+      @resources.merge collection.resources.to_a.collect { |resource| Occi::Core::Resource.new(resource.kind, resource.mixins, resource.attributes, resource.actions, resource.links, resource.location) }
+      @links.merge collection.links.to_a.collect { |link| Occi::Core::Link.new(link.kind, link.mixins, link.attributes, link.actions, link.rel, link.target, link.source, link.location) }
       @action = Occi::Core::ActionInstance.new(collection.action) if collection.action
     end
 

data/lib/occi/core/attributes.rb

@@ -101,9 +101,10 @@ module Occi
         attributes = Occi::Core::Attributes.new
         hash.each_pair do |key, value|
           if Occi::Core::Properties.contains_props?(value)
+            value = value.to_hash if value.kind_of?(Hashie::Mash)
             attributes[key] = Occi::Core::Properties.new(value)
           else
-            attributes[key] = self.parse_properties(attributes[key])
+            attributes[key] = self.parse_properties(value)
           end
         end
 

data/lib/occi/core/category.rb

@@ -14,9 +14,8 @@ module Occi
       def initialize(scheme='http://schemas.ogf.org/occi/core#',
           term='category',
           title=nil,
-          attributes=Occi::Core::Attributes.new)
-        raise ArgumentError, 'scheme and term cannot be nil' unless scheme && term
-        raise ArgumentError, 'scheme and term cannot be empty' if scheme.empty? || term.empty?
+          attributes=nil)
+        raise ArgumentError, 'Scheme and term cannot be empty' if scheme.blank? || term.blank?
         attributes ||= Occi::Core::Attributes.new
 
         scheme << '#' unless scheme.end_with? '#'

data/lib/occi/core/mixin.rb

@@ -23,7 +23,7 @@ module Occi
         @depends = Occi::Core::Dependencies.new depends
         @actions = Occi::Core::Actions.new actions
         @entities = Occi::Core::Entities.new
-        location.blank? ? @location = "/mixins/#{term}/" : @location = location
+        @location = location.blank? ? "/mixin/#{term}/" : location
         @applies = Occi::Core::Kinds.new applies
       end
 
@@ -32,7 +32,7 @@ module Occi
       # @param kind [Occi::Core::Mixin, String] Mixin or Type Identifier of a Mixin where relation should be checked.
       # @return [true,false]
       def related_to?(mixin)
-        self.depends.any? { |dependency| dependency.to_s == mixin.to_s } or self.to_s == mixin.to_s
+        self.to_s == mixin.to_s || self.related.include?(mixin.to_s)
       end
 
       def location
@@ -40,16 +40,16 @@ module Occi
       end
 
       def related
-        self.depends + self.applies
+        self.depends.to_a.concat(self.applies.to_a).uniq
       end
 
       # @param [Hash] options
       # @return [Hashie::Mash] json representation
       def as_json(options={})
         mixin = Hashie::Mash.new
-        mixin.dependencies = self.depends.join(' ').split(' ') if self.depends.any?
-        mixin.applies = self.applies.join(' ').split(' ') if self.applies.any?
-        mixin.related = self.related.join(' ').split(' ') if self.related.any?
+        mixin.depends = self.depends.to_a.collect { |m| m.type_identifier } if self.depends.any?
+        mixin.applies = self.applies.to_a.collect { |m| m.type_identifier } if self.applies.any?
+        mixin.related = self.related.to_a.collect { |m| m.type_identifier } if self.related.any?
         mixin.actions = self.actions if self.actions.any?
         mixin.location = self.location if self.location
         mixin.merge! super

data/lib/occi/core/properties.rb

@@ -12,7 +12,7 @@ module Occi
       alias_method :mutable?, :mutable
 
       # Types supported in properties, and their mapping to Ruby Classes
-      SUPPORTED_TYPES = Hash.new
+      SUPPORTED_TYPES = {}
       SUPPORTED_TYPES["string"]  =  [ String ]
       SUPPORTED_TYPES["number"]  =  [ Numeric ]
       SUPPORTED_TYPES["boolean"] =  [ TrueClass, FalseClass ]
@@ -23,13 +23,10 @@ module Occi
         raise ArgumentError, 'Source_hash must not be a Hashie::Mash instance!' if source_hash.kind_of?(Hashie::Mash)
         source_hash = Occi::Core::Properties.normalize_props(source_hash)
 
-        self.type = source_hash[:type] ||= 'string'
-        raise Occi::Errors::AttributePropertyTypeError,
-              "Type \"#{self.type}\" unsupported in properties. " \
-              "Supported types are: #{Properties.supported_type_names}." unless SUPPORTED_TYPES.key?(self.type)
-        self.required = source_hash[:required] = source_hash[:required].nil? ? false : source_hash[:required]
-        self.mutable = source_hash[:mutable] = source_hash[:mutable].nil? ? false : source_hash[:mutable]
-        self.pattern = source_hash[:pattern] ||= '.*'
+        self.type = source_hash[:type] || 'string'
+        self.required = source_hash[:required].nil? ? false : source_hash[:required]
+        self.mutable = source_hash[:mutable].nil? ? false : source_hash[:mutable]
+        self.pattern = source_hash[:pattern] || '.*'
         self.description = source_hash[:description]
         self.default = source_hash[:default]
       end
@@ -44,16 +41,13 @@ module Occi
 
       # @param value [Object] Object whose class will be checked against definition
       def check_value_for_type(value, key_name = nil)
-        raise Occi::Errors::AttributePropertyTypeError,
-              "Property type #{@type} for #{key_name.inspect} is not one of the allowed " \
-              "types: #{Properties.supported_type_names}" unless SUPPORTED_TYPES.key?(@type)
         raise Occi::Errors::AttributeTypeError,
               "Attribute value #{value} for #{key_name.inspect} is class #{value.class.name}. " \
               "It does not match attribute property type #{@type}" unless SUPPORTED_TYPES[@type].any? { |klasse| value.kind_of?(klasse) }
       end
 
       def to_hash
-        as_json.to_hash
+        as_json
       end
 
       def to_json(*a)
@@ -61,13 +55,14 @@ module Occi
       end
 
       def as_json(options={})
-        hash = Hashie::Mash.new
-        hash.default = self.default if self.default
-        hash.type = self.type if self.type
-        hash.required = self.required unless self.required.nil?
-        hash.mutable = self.mutable unless self.mutable.nil?
-        hash.pattern = self.pattern if self.pattern
-        hash.description = self.description if self.description
+        hash = {}
+
+        hash["default"] = self.default if self.default
+        hash["type"] = self.type if self.type
+        hash["required"] = self.required unless self.required.nil?
+        hash["mutable"] = self.mutable unless self.mutable.nil?
+        hash["pattern"] = self.pattern if self.pattern
+        hash["description"] = self.description if self.description
 
         hash
       end

data/lib/occi/infrastructure/compute.rb

@@ -46,9 +46,9 @@ module Occi
       self.kind = Occi::Core::Kind.new scheme='http://schemas.ogf.org/occi/infrastructure#',
                                        term='compute',
                                        title = 'compute resource',
-                                       attributes=self.attributes,
+                                       attributes=Occi::Core::Attributes.new(self.attributes),
                                        parent=Occi::Core::Resource.kind,
-                                       actions = self.actions,
+                                       actions = Occi::Core::Actions.new(self.actions),
                                        location = '/compute/'
 
       require 'occi/infrastructure/resource_tpl'

data/lib/occi/infrastructure/network.rb

@@ -25,9 +25,9 @@ module Occi
       self.kind = Occi::Core::Kind.new scheme='http://schemas.ogf.org/occi/infrastructure#',
                                        term='network',
                                        title = 'network resource',
-                                       attributes=self.attributes,
+                                       attributes=Occi::Core::Attributes.new(self.attributes),
                                        parent=Occi::Core::Resource.kind,
-                                       actions = self.actions,
+                                       actions = Occi::Core::Actions.new(self.actions),
                                        location = '/network/'
 
       require 'occi/infrastructure/network/ipnetwork'

data/lib/occi/infrastructure/network/ipnetwork.rb

@@ -16,13 +16,13 @@ module Occi
         self.mixin = Occi::Core::Mixin.new scheme='http://schemas.ogf.org/occi/infrastructure/network#',
                                            term='ipnetwork',
                                            title='IP network mixin',
-                                           attributes=self.attributes,
+                                           attributes=Occi::Core::Attributes.new(self.attributes),
                                            dependencies=Occi::Core::Dependencies.new,
                                            actions=Occi::Core::Actions.new,
-                                           location='/mixins/ipnetwork/',
+                                           location='/mixin/ipnetwork/',
                                            applies=Occi::Core::Kinds.new << Occi::Infrastructure::Network.kind
 
       end
     end
   end
-end
+end

data/lib/occi/infrastructure/networkinterface.rb

@@ -22,10 +22,10 @@ module Occi
       self.kind = Occi::Core::Kind.new scheme='http://schemas.ogf.org/occi/infrastructure#',
                                        term='networkinterface',
                                        title = 'networkinterface link',
-                                       attributes = self.attributes,
+                                       attributes = Occi::Core::Attributes.new(self.attributes),
                                        parent = Occi::Core::Link.kind,
-                                       actions = self.actions,
-                                       location = '/networkinterface/'
+                                       actions = Occi::Core::Actions.new(self.actions),
+                                       location = '/link/networkinterface/'
 
       require 'occi/infrastructure/networkinterface/ipnetworkinterface'
       self.mixins = Occi::Core::Mixins.new << Occi::Infrastructure::Networkinterface::Ipnetworkinterface.mixin
@@ -99,4 +99,4 @@ module Occi
 
     end
   end
-end
+end

data/lib/occi/infrastructure/networkinterface/ipnetworkinterface.rb

@@ -16,13 +16,13 @@ module Occi
         self.mixin = Occi::Core::Mixin.new scheme='http://schemas.ogf.org/occi/infrastructure/networkinterface#',
                                            term='ipnetworkinterface',
                                            title='IP network interface mixin',
-                                           attributes=self.attributes,
+                                           attributes=Occi::Core::Attributes.new(self.attributes),
                                            dependencies=Occi::Core::Dependencies.new,
                                            actions=Occi::Core::Actions.new,
-                                           location='/mixins/ipnetworkinterface/',
+                                           location='/mixin/ipnetworkinterface/',
                                            applies=Occi::Core::Kinds.new << Occi::Infrastructure::Network.kind
 
       end
     end
   end
-end
+end

data/lib/occi/infrastructure/os_tpl.rb

@@ -9,11 +9,11 @@ module Occi
       self.mixin = Occi::Core::Mixin.new scheme='http://schemas.ogf.org/occi/infrastructure#',
                                          term='os_tpl',
                                          title='operating system template',
-                                         attributes=self.attributes,
+                                         attributes=Occi::Core::Attributes.new(self.attributes),
                                          related=Occi::Core::Categories.new << Occi::Infrastructure::Compute.kind,
                                          actions=Occi::Core::Actions.new,
-                                         location='/mixins/os_tpl/'
+                                         location='/mixin/os_tpl/'
     end
 
   end
-end
+end

data/lib/occi/infrastructure/resource_tpl.rb

@@ -9,11 +9,11 @@ module Occi
       self.mixin = Occi::Core::Mixin.new scheme='http://schemas.ogf.org/occi/infrastructure#',
                                          term='resource_tpl',
                                          title='resource template',
-                                         attributes=self.attributes,
+                                         attributes=Occi::Core::Attributes.new(self.attributes),
                                          related=Occi::Core::Categories.new << Occi::Infrastructure::Compute.kind,
                                          actions=Occi::Core::Actions.new,
-                                         location='/mixins/resource_tpl/'
+                                         location='/mixin/resource_tpl/'
     end
 
   end
-end
+end

data/lib/occi/infrastructure/storage.rb

@@ -36,9 +36,9 @@ module Occi
       self.kind = Occi::Core::Kind.new scheme='http://schemas.ogf.org/occi/infrastructure#',
                                        term='storage',
                                        title = 'storage resource',
-                                       attributes = self.attributes,
+                                       attributes = Occi::Core::Attributes.new(self.attributes),
                                        parent=Occi::Core::Resource.kind,
-                                       actions = self.actions,
+                                       actions = Occi::Core::Actions.new(self.actions),
                                        location = '/storage/'
 
       def size

data/lib/occi/infrastructure/storagelink.rb

@@ -21,10 +21,10 @@ module Occi
       self.kind = Occi::Core::Kind.new scheme='http://schemas.ogf.org/occi/infrastructure#',
                                        term='storagelink',
                                        title = 'storage link',
-                                       attributes = self.attributes,
+                                       attributes = Occi::Core::Attributes.new(self.attributes),
                                        parent=Occi::Core::Link.kind,
-                                       actions = self.actions,
-                                       location = '/storagelink/'
+                                       actions = Occi::Core::Actions.new(self.actions),
+                                       location = '/link/storagelink/'
 
 
       def deviceid
@@ -53,4 +53,4 @@ module Occi
 
     end
   end
-end
+end

data/lib/occi/version.rb

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

data/spec/occi/collection_spec.rb

@@ -720,7 +720,7 @@ module Occi
 
       context '#get_by_location' do
         it 'finds category by location' do
-          expect(collection.get_by_location("/mixins/my_mixin/")).to eql collection.mixins.first
+          expect(collection.get_by_location("/mixin/my_mixin/")).to eql collection.mixins.first
         end
 
         it 'fails gracefully' do
@@ -775,7 +775,7 @@ module Occi
         collection.action = Occi::Core::ActionInstance.new
         collection.resources << Occi::Core::Resource.new
         collection.links << Occi::Core::Link.new
-        expected = "{\"action\":{\"action\":\"http://schemas.ogf.org/occi/core#action_instance\",\"attributes\":{}},\"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\":{\"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\":\"/mixins/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}\"}]}"
+        expected = "{\"action\":{\"action\":\"http://schemas.ogf.org/occi/core#action_instance\",\"attributes\":{}},\"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) 
@@ -794,7 +794,7 @@ module Occi
         collection.actions << "http://schemas.ogf.org/occi/infrastructure/compute/action#start"
         collection.action = Occi::Core::ActionInstance.new
         collection.links << Occi::Core::Link.new
-        expected = "{\"action\":{\"action\":\"http://schemas.ogf.org/occi/core#action_instance\",\"attributes\":{}},\"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\":{\"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\":\"/mixins/my_mixin/\",\"scheme\":\"http://example.com/occi/tags#\",\"term\":\"my_mixin\",\"attributes\":{}}]}"
+        expected = "{\"action\":{\"action\":\"http://schemas.ogf.org/occi/core#action_instance\",\"attributes\":{}},\"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) 
@@ -811,7 +811,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 occi.core.title occi.core.summary occi.compute.architecture occi.compute.cores occi.compute.hostname occi.compute.memory occi.compute.speed occi.compute.state\";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=\"/mixins/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\"\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 occi.core.title occi.core.summary occi.compute.architecture occi.compute.cores occi.compute.hostname occi.compute.memory occi.compute.speed occi.compute.state\";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\"\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
 
@@ -828,7 +828,7 @@ module Occi
 
       it 'renders text correctly, mixins only' do
         collection.mixins << "http://example.com/occi/tags#my_mixin"
-        expected = "Category: my_mixin;scheme=\"http://example.com/occi/tags#\";class=\"mixin\";location=\"/mixins/my_mixin/\"\n"
+        expected = "Category: my_mixin;scheme=\"http://example.com/occi/tags#\";class=\"mixin\";location=\"/mixin/my_mixin/\"\n"
         expect(collection.to_text).to eql(expected)
       end
 

data/spec/occi/core/properties_spec.rb

@@ -95,6 +95,8 @@ module Occi
         context '#to_hash' do
           it 'makes a correct rendering' do
             expected = Hash.new
+
+            expected["default"] = "defaultvalue"
             expected["description"] = "Required string value"
             expected["mutable"] = true
             expected["pattern"] = "[adefltuv]+"
@@ -108,6 +110,8 @@ module Occi
         context '#as_json' do
           it 'makes a correct rendering' do
             expected = Hash.new
+
+            expected["default"] = "defaultvalue"
             expected["description"] = "Required string value"
             expected["mutable"] = true
             expected["pattern"] = "[adefltuv]+"
@@ -132,7 +136,7 @@ module Occi
 
         context '#to_json' do
           it 'makes a correct rendering' do
-            expected = '{"type":"string","required":true,"mutable":true,"pattern":"[adefltuv]+","description":"Required string value"}'
+            expected = '{"default":"defaultvalue","type":"string","required":true,"mutable":true,"pattern":"[adefltuv]+","description":"Required string value"}'
             expect(properties.to_json).to eql expected
           end
         end

data/spec/occi/model_spec.rb

@@ -245,19 +245,12 @@ module Occi
         end
       end
 
-      context 'for inexistent directory' do
+      context 'for nonexistent directory' do
         it 'fails gracefully' do
           model = Occi::Model.new
           expect{ model.register_files('this/directory/does/not/exist') }.to raise_exception(ArgumentError)
         end
       end
-
-      context 'for invalid input' do
-        it 'fails gracefully' do
-          model = Occi::Model.new
-          expect{ model.register_files('spec/occi') }.to raise_exception(ArgumentError)
-        end
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2013-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -276,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 499425288869008081
+      hash: 118686830744215401
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25