occi-core 4.0.0.alpha.3 → 4.0.0.alpha.4

data/README.md

@@ -14,8 +14,7 @@ Ruby
 
 The following setup is recommended
 
-* usage of the Ruby Version Manager
-* Ruby 1.9.3
+* Ruby 1.9.3+
 * RubyGems installed
 
 The following libraries / packages may be required to use rOCCI
@@ -51,10 +50,15 @@ To build and install the bleeding edge version from master
     git clone git://github.com/gwdg/rOCCI-core.git
     cd rOCCI-core
     rvm install ruby-1.9.3
-    rvm --create --ruby-version use 1.9.3@rOCCI-core
+    gem install bundler
     bundle install
     rake test
 
+Documentation
+-------------
+
+[Code documentation can be found on RubyDoc.info](rubydoc.info/github/gwdg/rOCCI-core).
+
 Usage
 -----
 #### Logging
@@ -114,12 +118,12 @@ Currently only the following entries of OVF files are parsed
 * Disk in the DiskSection
 * Network in the NetworkSection
 * In the VirutalSystemSection:
-** Info
-** in the VirtualHardwareSection the items regarding
-*** Processor
-*** Memory
-*** Ethernet Adapter
-*** Parallel port
+    * Info
+    * in the VirtualHardwareSection the items regarding
+        * Processor
+        * Memory
+        * Ethernet Adapter
+        * Parallel port
 
 ### Using the OCCI model
 
@@ -128,6 +132,15 @@ The occi-core gem includes all OCCI Core classes necessary to handly arbitrary O
 Changelog
 ---------
 
+### Version 4.0
+* introduced compatibility mode (for OCCI-OS, on by default)
+* introduced new attribute handling for resources
+* completely rewrote OCCI parser
+* improved action and mixin handling
+* aligned with latest draft of OCCI Core and OCCI JSON specification
+* split the code into rOCCI-core, rOCCI-api and rOCCI-cli
+* internal changes, refactoring and some bugfixes
+
 ### Version 3.1
 * added basic OS Keystone support
 * added support for PKCS12 credentials for X.509 authN

data/lib/occi/core/category.rb

@@ -6,18 +6,15 @@ module Occi
 
       attr_accessor :scheme, :term, :title, :attributes, :model
 
-      def self.categories
-        self.mixins + self.actions << self.kind
-      end
-
-      # @param [String ] scheme
-      # @param [String] term
-      # @param [String] title
-      # @param [Hash] attributes
+      # @param scheme [String] The categorisation scheme.
+      # @param term [String] Unique identifier of the Category instance within the categorisation scheme.
+      # @param title [String] The display name of an instance.
+      # @param attributes [Occi::Core::Attributes,Hash] Set of Attribute instances.
       def initialize(scheme='http://schemas.ogf.org/occi/core#',
           term='category',
           title=nil,
           attributes=Occi::Core::Attributes.new)
+        scheme += '#' unless scheme.end_with? '#'
         @scheme = scheme
         @term = term
         @title = title
@@ -29,138 +26,54 @@ module Occi
         end
       end
 
-
-      # @param [String] scheme
-      # @param [String] term
-      # @param [Array] related
-      # @return [Class] ruby class with scheme as namespace, term as name and related kind as super class
-      def self.get_class(scheme, term, related=['http://schemas.ogf.org/occi/core#entity'])
-        related = related.to_a.flatten
-        scheme += '#' unless scheme.end_with? '#'
-
-        if related.first.to_s == 'http://schemas.ogf.org/occi/core#entity' or related.first.nil?
-          parent = Occi::Core::Entity
-        elsif related.first.kind_of? Occi::Core::Kind
-          parent = related.first.entity_type
-        elsif related.first.kind_of? Occi::Core::Mixin
-          parent = related.first.class
-        else
-          related_scheme, related_term = related.first.to_s.split '#'
-          parent = self.get_class related_scheme, related_term
-        end
-
-        uri = URI.parse(scheme)
-
-        namespace = if uri.host == 'schemas.ogf.org'
-                      uri.path.reverse.chomp('/').reverse.split('/')
-                    else
-                      uri.host.split('.').reverse + uri.path.reverse.chomp('/').reverse.split('/')
-                    end
-
-        namespace = namespace.inject(Object) do |mod, name|
-          if mod.constants.collect { |sym| sym.to_s }.include? name.capitalize
-            mod.const_get name.capitalize
-          else
-            mod.const_set name.capitalize, Module.new
-          end
-        end
-
-        class_name = self.sanitize_term_before_classify(term).classify
-        if namespace.const_defined? class_name
-          klass = namespace.const_get class_name
-          return klass.mixin if klass.respond_to? :mixin
-          unless klass.ancestors.include? Occi::Core::Entity or klass.ancestors.include? Occi::Core::Category
-            raise "OCCI Kind with type identifier #{scheme + term} could not be created as the corresponding class #{klass.to_s} already exists and is not derived from Occi::Core::Entity"
-          end
-        else
-          klass = namespace.const_set class_name, Class.new(parent)
-          klass.kind = Occi::Core::Kind.new scheme, term, nil, {}, related unless parent.ancestors.include? Occi::Core::Category
-        end
-
-        klass
-      end
-
-      # @param [Occi::Model] model
-      def model=(model)
-        @related.model=model if @related
-      end
-
-      # @return [String] Type identifier of the category
+      # @return [String] Type identifier of the Category.
       def type_identifier
-        @scheme + @term
+        self.scheme + self.term
       end
 
-      # check if category is related to another category
-      # a category is related to another category
-      # if it is included in @related or
-      # if it is the category itself
-      #
-      # @param [String, Category] category Related Category or its type identifier
-      # @return [true,false] true if category is related to category_id else false
-      def related_to?(category)
-        if @related
-          self.related.each do |cat|
-            return true if cat.to_s == category.to_s
-          end
-          return true if self.to_s == category.to_s
-        end
-        false
-      end
-
-      # @param [Hash] options
-      # @return [Hashie::Mash] json representation
+      # @param options [Hash]
+      # @return [Hashie::Mash] JSON representation of Category.
       def as_json(options={})
         category = Hashie::Mash.new
-        category.scheme = @scheme if @scheme
-        category.term = @term if @term
-        category.title = @title if @title
-        category.attributes = @attributes if @attributes.any?
+        category.scheme = self.scheme
+        category.term = self.term
+        category.title = self.title if self.title
+        category.attributes = self.attributes if self.attributes.any?
         category
       end
 
-      # @return [String] short text representation of the category
+      # @return [String] Short text representation of the Category.
       def to_string_short
-        @term + ';scheme=' + @scheme.inspect + ';class=' + self.class.name.demodulize.downcase.inspect
+        self.term + ';scheme=' + self.scheme.inspect + ';class=' + self.class.name.demodulize.downcase.inspect
       end
 
-      # @return [String] full text representation of the category
+      # @return [String] Full text representation of the Category.
       def to_string
         string = self.to_string_short
-        string << ';title=' + @title.inspect if @title
+        string << ';title=' + self.title.inspect if self.title
         string
       end
 
-      # @return [String] text representation
+      # @return [String] Text representation of the Category.
       def to_text
         'Category: ' + self.to_string
       end
 
-      # @return [Hash] hash containing the HTTP headers of the text/occi rendering
+      # @return [Hash] Hash containing the HTTP headers of the text/occi rendering.
       def to_header
         {:Category => self.to_string}
       end
 
-      # @return [NilClass] category itself does not have a location
+      # @return [NilClass] Returns nil as Category itself does not have a location.
       def location
         nil # not implemented
       end
 
+      # @return [String] Type Identififier of the Category.
       def to_s
         self.type_identifier
       end
 
-      private
-
-      # Relaxed parser rules require additional checks on terms.
-      # TODO: a better solution?
-      # TODO: check for more characters
-      def self.sanitize_term_before_classify(term)
-        sanitized = term.downcase.gsub(/[\s\(\)\.\{\}\-;,\\\/\?\!\|\*\<\>]/, '_').gsub(/_+/, '_').chomp('_').reverse.chomp('_').reverse
-        sanitized = "uuid_#{sanitized}" if sanitized.match(/^[0-9]/)
-
-        sanitized
-      end
-
     end
   end
 end

data/lib/occi/core/dependencies.rb

@@ -0,0 +1,7 @@
+module Occi
+  module Core
+    class Dependencies < Occi::Core::Mixins
+
+    end
+  end
+end

data/lib/occi/core/kind.rb

@@ -2,43 +2,110 @@ module Occi
   module Core
     class Kind < Occi::Core::Category
 
-      attr_accessor :entities, :related, :actions, :location
-
-      # @param [String ] scheme
-      # @param [String] term
-      # @param [String] title
-      # @param [Hash] attributes
-      # @param [Array] related
-      # @param [Array] actions
+      attr_accessor :entities, :parent, :actions, :location
+
+      # @param scheme [String ] The categorisation scheme.
+      # @param term [String] Unique identifier of the Kind instance within the categorisation scheme.
+      # @param title [String] The display name of an instance.
+      # @param parent [Occi::Core::Kind,String] Another Kind instance which this Kind relates to.
+      # @param actions [Occi::Core::Actions,Array] Set of Action instances defined by the Kind instance.
+      # @param location [String] Location of the Kind instance.
       def initialize(scheme='http://schemas.ogf.org/occi/core#',
           term='kind',
           title=nil,
           attributes=Occi::Core::Attributes.new,
-          related=Occi::Core::Related.new,
+          parent=nil,
           actions=Occi::Core::Actions.new,
           location=nil)
         super(scheme, term, title, attributes)
-        @related = Occi::Core::Related.new(related)
+        @parent = [parent].flatten.first
         @actions = Occi::Core::Actions.new(actions)
         @entities = Occi::Core::Entities.new
         location.blank? ? @location = '/' + term + '/' : @location = location
       end
 
+      # @param scheme [String] The categorisation scheme.
+      # @param term [String] Unique identifier of the Category instance within the categorisation scheme.
+      # @param parent [Array] Another Kind instance which this Kind relates to.
+      # @return [Class] Ruby class with scheme as namespace, term as name and parent kind as super class.
+      def self.get_class(scheme, term, parent=Occi::Core::Entity.kind)
+        parent ||= Occi::Core::Entity.kind
+        if parent.kind_of? Array
+          parent = parent.first
+        end
+        if parent.to_s == 'http://schemas.ogf.org/occi/core#entity'
+          parent = Occi::Core::Entity.kind
+        elsif parent.kind_of? Occi::Core::Kind
+          parent = parent
+        else
+          parent = self.get_class(*parent.to_s.split('#')).kind
+        end
+
+        unless scheme.end_with? '#'
+          scheme += '#'
+        end
+
+        uri = URI.parse(scheme)
+
+        if uri.host == 'schemas.ogf.org'
+          namespace = uri.path.reverse.chomp('/').reverse.split('/')
+        else
+          namespace = uri.host.split('.').reverse + uri.path.reverse.chomp('/').reverse.split('/')
+        end
+        namespace.inject(Object) do |mod, name|
+          if mod.constants.collect { |sym| sym.to_s }.include? name.capitalize
+            namespace = mod.const_get name.capitalize
+          else
+            namespace = mod.const_set name.capitalize, Module.new
+          end
+        end
+
+        class_name = self.sanitize_term_before_classify(term).classify
+        if namespace.const_defined? class_name
+          klass = namespace.const_get class_name
+          unless klass.ancestors.include? Occi::Core::Entity
+            raise "OCCI Kind with type identifier #{scheme + term} could not be created as the corresponding class #{klass.to_s} already exists and is not derived from Occi::Core::Entity"
+          end
+        else
+          klass = namespace.const_set class_name, Class.new(parent.entity_type)
+          klass.kind = Occi::Core::Kind.new scheme=scheme,
+                                            term=term,
+                                            title=nil,
+                                            attributes={},
+                                            parent=parent
+        end
+
+        klass
+      end
+
+      # Check if this Kind instance is related to another Kind instance.
+      #
+      # @param kind [Occi::Core::Kind, String] Kind or Type Identifier of a Kind where relation should be checked.
+      # @return [true,false]
+      def related_to?(kind)
+        self.parent.to_s == kind.to_s or self.to_s == kind.to_s
+      end
+
       def entity_type
-        self.class.get_class @scheme, @term, @related
+        self.class.get_class self.scheme, self.term, self.parent
       end
 
       def location
         @location.clone
       end
 
+      def related
+        [self.parent]
+      end
+
       # @param [Hash] options
       # @return [Hashie::Mash] json representation
       def as_json(options={})
         kind = Hashie::Mash.new
-        kind.related = @related.join(' ').split(' ') if @related.any?
-        kind.actions = @actions.join(' ').split(' ') if @actions.any?
-        kind.location = @location if @location
+        kind.parent = self.parent.to_s if self.parent
+        kind.related = self.related.join(' ').split(' ') if self.related.any?
+        kind.actions = self.actions.join(' ').split(' ') if self.actions.any?
+        kind.location = self.location if self.location
         kind.merge! super
         kind
       end
@@ -46,13 +113,25 @@ module Occi
       # @return [String] string representation of the kind
       def to_string
         string = super
-        string << ';rel=' + @related.join(' ').inspect if @related.any?
+        string << ';rel=' + self.related.first.to_s.inspect if self.related.any?
         string << ';location=' + self.location.inspect
-        string << ';attributes=' + @attributes.names.keys.join(' ').inspect if @attributes.any?
-        string << ';actions=' + @actions.join(' ').inspect if @actions.any?
+        string << ';attributes=' + self.attributes.names.keys.join(' ').inspect if self.attributes.any?
+        string << ';actions=' + self.actions.join(' ').inspect if self.actions.any?
         string
       end
 
+      private
+
+      # Relaxed parser rules require additional checks on terms.
+      # TODO: a better solution?
+      # TODO: check for more characters
+      def self.sanitize_term_before_classify(term)
+        sanitized = term.downcase.gsub(/[\s\(\)\.\{\}\-;,\\\/\?\!\|\*\<\>]/, '_').gsub(/_+/, '_').chomp('_').reverse.chomp('_').reverse
+        sanitized = "uuid_#{sanitized}" if sanitized.match(/^[0-9]/)
+
+        sanitized
+      end
+
     end
   end
 end

data/lib/occi/core/kinds.rb

@@ -11,7 +11,7 @@ module Occi
           scheme, term = category.split '#'
           scheme       += '#'
 
-          klass    = Occi::Core::Category.get_class scheme, term, [Occi::Core::Kind.new]
+          klass    = Occi::Core::Kind.get_class scheme, term, [Occi::Core::Kind.new]
           category = klass.kind
         end
         category

data/lib/occi/core/link.rb

@@ -11,7 +11,7 @@ module Occi
                                        term='link',
                                        title='link',
                                        attributes=self.attributes,
-                                       related=Occi::Core::Related.new << Occi::Core::Entity.kind
+                                       parent=Occi::Core::Entity.kind
 
       # @param [String] kind
       # @param [String] mixins
@@ -23,7 +23,7 @@ module Occi
       def initialize(kind=self.kind, mixins=[], attributes={}, actions=[], rel=Occi::Core::Link.type_identifier, target=nil, source=nil, location=nil)
         super(kind, mixins, attributes, actions, location)
         scheme, term = rel.to_s.split('#')
-        @rel = Occi::Core::Category.get_class(scheme, term).kind if scheme && term
+        @rel = Occi::Core::Kind.get_class(scheme, term).kind if scheme && term
         @source = source if source
         @target = target
       end

data/lib/occi/core/mixin.rb

@@ -2,7 +2,7 @@ module Occi
   module Core
     class Mixin < Occi::Core::Category
 
-      attr_accessor :entities, :related, :actions, :location
+      attr_accessor :entities, :depends, :actions, :location, :applies
 
       # @param [String ] scheme
       # @param [String] term
@@ -14,28 +14,44 @@ module Occi
           term='mixin',
           title=nil,
           attributes=Occi::Core::Attributes.new,
-          related=Occi::Core::Related.new,
+          depends=Occi::Core::Dependencies.new,
           actions=Occi::Core::Actions.new,
-          location='')
+          location='',
+          applies=Occi::Core::Kinds.new)
 
         super(scheme, term, title, attributes)
-        @related  = Occi::Core::Related.new(related)
-        @actions  = Occi::Core::Actions.new(actions)
+        @depends = Occi::Core::Dependencies.new depends
+        @actions = Occi::Core::Actions.new actions
         @entities = Occi::Core::Entities.new
         location.blank? ? @location = '/mixins/' + term + '/' : @location = location
+        @applies = Occi::Core::Kinds.new applies
+      end
+
+      # Check if this Mixin instance is related to another Mixin instance.
+      #
+      # @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
       end
 
       def location
         @location.clone
       end
 
+      def related
+        self.depends + self.applies
+      end
+
       # @param [Hash] options
       # @return [Hashie::Mash] json representation
-      def as_json(options={ })
+      def as_json(options={})
         mixin = Hashie::Mash.new
-        mixin.related = @related.join(' ').split(' ') if @related.any?
-        mixin.actions = @actions if @actions.any?
-        mixin.location = @location if @location
+        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.actions = self.actions if self.actions.any?
+        mixin.location = self.location if self.location
         mixin.merge! super
         mixin
       end
@@ -43,10 +59,10 @@ module Occi
       # @return [String] text representation
       def to_string
         string = super
-        string << ';rel=' + @related.join(' ').inspect if @related.any?
+        string << ';rel=' + self.related.join(' ').inspect if self.related.any?
         string << ';location=' + self.location.inspect
-        string << ';attributes=' + @attributes.names.keys.join(' ').inspect if @attributes.any?
-        string << ';actions=' + @actions.join(' ').inspect if @actions.any?
+        string << ';attributes=' + self.attributes.names.keys.join(' ').inspect if self.attributes.any?
+        string << ';actions=' + self.actions.join(' ').inspect if self.actions.any?
         string
       end
 

data/lib/occi/core/mixins.rb

@@ -26,15 +26,8 @@ module Occi
       # TODO: fix mixin conversion
       def convert(mixin)
         mixin = super mixin
-
         if mixin.kind_of? String
-          scheme, term = mixin.split '#'
-          scheme += '#'
-
-          mixin = Occi::Core::Category.get_class scheme, term, [Occi::Core::Mixin.new]
-          if mixin.respond_to? :new
-            mixin = mixin.new(scheme, term)
-          end
+          mixin = Occi::Core::Mixin.new *mixin.split('#')
         end
         mixin
       end

data/lib/occi/core/resource.rb

@@ -12,7 +12,7 @@ module Occi
                                        term='resource',
                                        title='resource',
                                        attributes=self.attributes,
-                                       related=Occi::Core::Related.new << Occi::Core::Entity.kind
+                                       parent=Occi::Core::Entity.kind
 
       # @param [String] kind
       # @param [Array] mixins

data/lib/occi/core.rb

@@ -2,11 +2,11 @@ require 'occi/core/properties'
 require 'occi/core/attributes'
 require 'occi/core/category'
 require 'occi/core/categories'
-require 'occi/core/related'
 require 'occi/core/kind'
 require 'occi/core/kinds'
 require 'occi/core/mixin'
 require 'occi/core/mixins'
+require 'occi/core/dependencies'
 require 'occi/core/action'
 require 'occi/core/action_instance'
 require 'occi/core/actions'

data/lib/occi/infrastructure/compute.rb

@@ -45,7 +45,7 @@ module Occi
                                        term='compute',
                                        title = 'compute resource',
                                        attributes=self.attributes,
-                                       related=Occi::Core::Related.new << Occi::Core::Resource.kind,
+                                       parent=Occi::Core::Resource.kind,
                                        actions = self.actions,
                                        location = '/compute/'
 

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

@@ -17,9 +17,10 @@ module Occi
                                            term='ipnetwork',
                                            title='IP network mixin',
                                            attributes=self.attributes,
-                                           related=Occi::Core::Related.new << Occi::Infrastructure::Network.kind,
+                                           dependencies=Occi::Core::Dependencies.new,
                                            actions=Occi::Core::Actions.new,
-                                           location='/mixins/ipnetwork/'
+                                           location='/mixins/ipnetwork/',
+                                           applies=Occi::Core::Kinds.new << Occi::Infrastructure::Network.kind
 
       end
     end

data/lib/occi/infrastructure/network.rb

@@ -25,7 +25,7 @@ module Occi
                                        term='network',
                                        title = 'network resource',
                                        attributes=self.attributes,
-                                       related=Occi::Core::Related.new << Occi::Core::Resource.kind,
+                                       parent=Occi::Core::Resource.kind,
                                        actions = self.actions,
                                        location = '/network/'
 

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

@@ -17,9 +17,10 @@ module Occi
                                            term='ipnetworkinterface',
                                            title='IP network interface mixin',
                                            attributes=self.attributes,
-                                           related=Occi::Core::Related.new << Occi::Infrastructure::Networkinterface.kind,
+                                           dependencies=Occi::Core::Dependencies.new,
                                            actions=Occi::Core::Actions.new,
-                                           location='/mixins/ipnetworkinterface/'
+                                           location='/mixins/ipnetworkinterface/',
+                                           applies=Occi::Core::Kinds.new << Occi::Infrastructure::Network.kind
 
       end
     end

data/lib/occi/infrastructure/networkinterface.rb

@@ -23,7 +23,7 @@ module Occi
                                        term='networkinterface',
                                        title = 'networkinterface link',
                                        attributes = self.attributes,
-                                       related = Occi::Core::Related.new << Occi::Core::Link.kind,
+                                       parent = Occi::Core::Link.kind,
                                        actions = self.actions,
                                        location = '/networkinterface/'
 

data/lib/occi/infrastructure/storage.rb

@@ -36,7 +36,7 @@ module Occi
                                        term='storage',
                                        title = 'storage resource',
                                        attributes = self.attributes,
-                                       related = Occi::Core::Related.new << Occi::Core::Resource.kind,
+                                       parent=Occi::Core::Resource.kind,
                                        actions = self.actions,
                                        location = '/storage/'
 

data/lib/occi/infrastructure/storagelink.rb

@@ -22,7 +22,7 @@ module Occi
                                        term='storagelink',
                                        title = 'storage link',
                                        attributes = self.attributes,
-                                       related = Occi::Core::Related.new << Occi::Core::Link.kind,
+                                       parent=Occi::Core::Link.kind,
                                        actions = self.actions,
                                        location = '/storagelink/'
 

data/lib/occi/parser/json.rb

@@ -6,8 +6,8 @@ module Occi
       def self.collection(string)
         collection = Occi::Collection.new
         hash = Hashie::Mash.new(JSON.parse(string))
-        collection.kinds.merge hash.kinds.collect { |kind| Occi::Core::Kind.new(kind.scheme, kind.term, kind.title, kind.attributes, kind.related, kind.actions) } if hash.kinds
-        collection.mixins.merge hash.mixins.collect { |mixin| Occi::Core::Mixin.new(mixin.scheme, mixin.term, mixin.title, mixin.attributes, mixin.related, mixin.actions) } if hash.mixins
+        collection.kinds.merge hash.kinds.collect { |kind| Occi::Core::Kind.new(kind.scheme, kind.term, kind.title, kind.attributes, kind.parent ||= kind.related, kind.actions) } if hash.kinds
+        collection.mixins.merge hash.mixins.collect { |mixin| Occi::Core::Mixin.new(mixin.scheme, mixin.term, mixin.title, mixin.attributes, mixin.depends ||= mixin.related, mixin.actions, mixin.applies) } if hash.mixins
         collection.actions.merge hash.actions.collect { |action| Occi::Core::Action.new(action.scheme, action.term, action.title, action.attributes) } if hash.actions
         collection.resources.merge hash.resources.collect { |resource| Occi::Core::Resource.new(resource.kind, resource.mixins, resource.attributes, resource.actions, resource.links) } if hash.resources
         collection.links.merge hash.links.collect { |link| Occi::Core::Link.new(link.kind, link.mixins, link.attributes, [], nil, link.target) } if hash.links

data/lib/occi/version.rb

@@ -1,3 +1,3 @@
 module Occi
-  VERSION = "4.0.0.alpha.3" unless defined?(::Occi::VERSION)
+  VERSION = "4.0.0.alpha.4" unless defined?(::Occi::VERSION)
 end

data/spec/occi/core/category_spec.rb

@@ -2,33 +2,35 @@ module Occi
   module Core
     describe Category do
 
-      it "gets OCCI Resource class by term and scheme" do
-        scheme = 'http://schemas.ogf.org/occi/core'
-        term   = 'resource'
-        klass  = Occi::Core::Category.get_class scheme, term
-        klass.should be Occi::Core::Resource
-        klass.superclass.should be Occi::Core::Entity
-      end
+      describe '.new' do
 
-      it "gets non predefined OCCI class by term, scheme and related class" do
-        scheme  = 'http://example.com/occi'
-        term    = 'test'
-        related = ['http://schemas.ogf.org/occi/core#resource']
-        klass   = Occi::Core::Category.get_class scheme, term, related
-        klass.should be Com::Example::Occi::Test
-        klass.superclass.should be Occi::Core::Resource
-      end
+        it 'instantiates a new Category' do
+          category = Category.new
+          category.scheme.should == 'http://schemas.ogf.org/occi/core#'
+          category.term.should == 'category'
+          category.title.should be_nil
+          category.attributes.should be_kind_of Occi::Core::Attributes
+          category.attributes.should be_empty
+        end
+
+        it 'instantiates a new Category and ensures that the scheme ends with a #' do
+          category = Category.new *'http://schemas.ogf.org/occi/core#category'.split('#')
+          category.scheme.should == 'http://schemas.ogf.org/occi/core#'
+          category.term.should == 'category'
+          category.title.should be_nil
+          category.attributes.should be_kind_of Occi::Core::Attributes
+          category.attributes.should be_empty
+        end
 
-      it "does not get OCCI class by term and scheme if it relates to existing class not derived from OCCI Entity" do
-        scheme  = 'http://hashie/'
-        term    = 'mash'
-        related = ['http://schemas.ogf.org/occi/core#resource']
-        expect { Occi::Core::Category.get_class scheme, term, related }.to raise_error
       end
 
-      it "checks if the category is related to another category" do
-        category = Occi::Core::Resource.kind
-        category.related_to?(Occi::Core::Entity.kind).should be true
+      describe '#type_identifier' do
+
+        it 'returns the type identifier of the category' do
+          category = Category.new
+          category.type_identifier.should == 'http://schemas.ogf.org/occi/core#category'
+        end
+
       end
 
       # rendering

data/spec/occi/core/kind_spec.rb

@@ -0,0 +1,44 @@
+module Occi
+  module Core
+    describe Kind do
+
+      describe '#get_class' do
+
+        it 'gets OCCI Resource class by term and scheme' do
+          scheme = 'http://schemas.ogf.org/occi/core'
+          term = 'resource'
+          klass = Occi::Core::Kind.get_class scheme, term
+          klass.should be Occi::Core::Resource
+          klass.superclass.should be Occi::Core::Entity
+        end
+
+        it 'gets non predefined OCCI class by term, scheme and related class' do
+          scheme = 'http://example.com/occi'
+          term = 'test'
+          related = ['http://schemas.ogf.org/occi/core#resource']
+          klass = Occi::Core::Kind.get_class scheme, term, related
+          klass.should be Com::Example::Occi::Test
+          klass.superclass.should be Occi::Core::Resource
+        end
+
+        it 'does not get OCCI class by term and scheme if it relates to existing class not derived from OCCI Entity' do
+          scheme = 'http://hashie/'
+          term = 'mash'
+          related = ['http://schemas.ogf.org/occi/core#resource']
+          expect { Occi::Core::Kind.get_class scheme, term, related }.to raise_error
+        end
+
+      end
+
+      describe '#related_to?' do
+
+        it 'checks if the kind is related to another kind' do
+          kind = Occi::Core::Resource.kind
+          kind.related_to?(Occi::Core::Entity.kind).should be true
+        end
+
+      end
+
+    end
+  end
+end

data/spec/occi/model_spec.rb

@@ -39,8 +39,9 @@ module Occi
       network = Occi::Infrastructure::Network.kind
       collection = model.get(network)
       collection.kind_of? Occi::Collection
+      collection.kinds.should have(1).kind
       collection.kinds.first.should == network
-      collection.mixins.first.should == Occi::Infrastructure::Network::Ipnetwork.mixin
+      collection.mixins.should be_empty
       collection.actions.should be_empty
       collection.resources.should be_empty
       collection.links.should be_empty

data/spec/occi/parser/text_spec.rb

@@ -21,8 +21,8 @@ module Occi
           category.attributes['a-1'].class.should eq Occi::Core::Attributes
           category.attributes['a-1']['a'].class.should eq Occi::Core::Attributes
           category.attributes['a-1']['a']['b'].class.should eq Occi::Core::Properties
-          category.actions.to_a.first.to_s.should eq 'http://a.a/a1#a1'
-          category.actions.to_a.last.to_s.should eq 'http://a.b1/b1#b2'
+          category.actions.to_a.any? {|action| action.to_s == 'http://a.a/a1#a1'}.should be_true
+          category.actions.to_a.any? {|action| action.to_s == 'http://a.b1/b1#b2'}.should be_true
         end
 
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha.3
+  version: 4.0.0.alpha.4
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -236,6 +236,7 @@ files:
 - lib/occi/core/attributes.rb
 - lib/occi/core/categories.rb
 - lib/occi/core/category.rb
+- lib/occi/core/dependencies.rb
 - lib/occi/core/entities.rb
 - lib/occi/core/entity.rb
 - lib/occi/core/kind.rb
@@ -245,7 +246,6 @@ files:
 - lib/occi/core/mixin.rb
 - lib/occi/core/mixins.rb
 - lib/occi/core/properties.rb
-- lib/occi/core/related.rb
 - lib/occi/core/resource.rb
 - lib/occi/core/resources.rb
 - lib/occi/helpers/inspect.rb
@@ -276,6 +276,7 @@ files:
 - spec/occi/core/categories_spec.rb
 - spec/occi/core/category_spec.rb
 - spec/occi/core/entity_spec.rb
+- spec/occi/core/kind_spec.rb
 - spec/occi/core/resource_spec.rb
 - spec/occi/infrastructure/compute_spec.rb
 - spec/occi/log_spec.rb

data/lib/occi/core/related.rb

@@ -1,7 +0,0 @@
-module Occi
-  module Core
-    class Related < Occi::Core::Categories
-
-    end
-  end
-end