occi-core 4.2.4 → 4.2.5

data/.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - ruby-head
   - jruby-19mode
   - jruby-head
@@ -25,13 +26,19 @@ matrix:
       jdk: openjdk7
     - rvm: 2.0.0
       jdk: oraclejdk7
+    - rvm: 2.1.0
+      jdk: openjdk7
+    - rvm: 2.1.0
+      jdk: oraclejdk7
     - rvm: ruby-head
       jdk: openjdk7
     - rvm: ruby-head
       jdk: oraclejdk7
+  fast_finish: true
 
 branches:
   only:
     - master
     - 4.0.x
     - 4.1.x
+    - 4.2.x

data/lib/occi/collection.rb

@@ -18,14 +18,14 @@ module Occi
       @resources = Occi::Core::Resources.new
       @links = Occi::Core::Links.new
 
-      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, 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.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
+      @action = Occi::Core::ActionInstance.new(collection.action.action, collection.action.attributes) if collection.action
+
+      self.model = model if model
     end
 
     def <<(object)
@@ -35,6 +35,8 @@ module Occi
       self.resources << object if object.kind_of? Occi::Core::Resource
       self.links << object if object.kind_of? Occi::Core::Link
 
+      self.action = object if object.kind_of? Occi::Core::ActionInstance
+
       self
     end
 
@@ -52,18 +54,18 @@ module Occi
     # @return [Occi::Core::Model]
     def model=(model)
       @model = model
+
       @kinds.model = model
       @mixins.model = model
       @actions.model = model
       @resources.model = model
       @links.model = model
+
+      @action.model = model if @action
     end
 
     def check
-      @resources.check
-      @links.check
-      # TODO: check action instance format, should check be applicable?
-      #@action.check
+      @resources.check && @links.check && (@action ? @action.check : true)
     end
 
     # @param [Occi::Collection] other_collection
@@ -104,11 +106,13 @@ module Occi
       collection.actions.replace other_collection.actions.select { |action| get_by_id(action.type_identifier) }
       collection.resources.replace other_collection.resources.select { |resource| get_by_id(resource.id) }
       collection.links.replace other_collection.links.select { |link| get_by_id(link.id) }
+
       if collection.action == other_collection.action
         collection.action = other_collection.action
       else
         collection.action = nil
       end
+
       collection
     end
 
@@ -148,6 +152,8 @@ module Occi
 
     # @return [Hashie::Mash] json representation
     def as_json(options = {})
+      return @action.as_json if standalone_action_instance?
+
       collection = Hashie::Mash.new
       collection.kinds = @kinds.collect { |kind| kind.as_json } if @kinds.any?
       collection.mixins = @mixins.collect { |mixin| mixin.as_json } if @mixins.any?
@@ -167,7 +173,6 @@ module Occi
       end
       collection.links = lnks.collect { |link| link.as_json } if lnks.to_a.any?
 
-      collection.action = @action.as_json if @action
       collection
     end
 

data/lib/occi/core/action_instance.rb

@@ -14,20 +14,22 @@ module Occi
       self.action = Occi::Core::Action.new scheme='http://schemas.ogf.org/occi/core#',
                                            term='action_instance',
                                            title='action',
-                                           attributes=self.attributes
+                                           attributes=Occi::Core::Attributes.new(self.attributes)
 
       def initialize(action = self.action, attributes=self.attributes)
         raise ArgumentError, 'action cannot be nil' unless action
-        raise ArgumentError, 'attributes cannot be nil' unless attributes
-        raise ArgumentError, 'attributes must respond to #convert' unless attributes.respond_to? :convert
 
         if action.kind_of? String
           scheme, term = action.split '#'
           action = Occi::Core::Action.new(scheme, term)
         end
-
         @action = action
-        @attributes = Occi::Core::Attributes.new(attributes)
+
+        if attributes.kind_of? Occi::Core::Attributes
+          @attributes = attributes.convert
+        else
+          @attributes = Occi::Core::Attributes.new(attributes || {})
+        end
       end
 
       # @param [Hash] options
@@ -75,6 +77,12 @@ module Occi
         action.nil? || action.empty?
       end
 
+      # @return [Bool] Result of the validation process
+      def check
+        # TODO: impl check for ActionInstance attributes
+        true
+      end
+
     end
   end
 end

data/lib/occi/core/attributes.rb

@@ -288,7 +288,7 @@ module Occi
           raise Occi::Errors::AttributeTypeError,
                 "Value #{value.to_s} does not match pattern #{pattern}" unless value.to_s.match "^#{pattern}$"
         else
-          Occi::Log.warn "[#{self.class}] Skipping pattern checks on attributes, turn off " \
+          Occi::Log.debug "[#{self.class}] Skipping pattern checks on attributes, turn off " \
                          "the compatibility mode and enable the attribute pattern check in settings!"
         end
       end
@@ -337,7 +337,7 @@ module Occi
                       "Attribute #{key} with value #{attributes[key]} does not " \
                       "match pattern #{definitions[key].pattern}" unless attributes[key].to_s.match "^#{definitions[key].pattern}$"
               else
-                Occi::Log.warn "[#{self.class}] [#{key}] Skipping pattern checks on attributes, turn off " \
+                Occi::Log.debug "[#{self.class}] [#{key}] Skipping pattern checks on attributes, turn off " \
                                "the compatibility mode and enable the attribute pattern check in settings!"
               end
             end

data/lib/occi/core/entity.rb

@@ -160,10 +160,11 @@ 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 # XXX: Needs error type
+        raise ArgumentError, 'No model has been assigned to this entity' unless @model
  
         kind = @model.get_by_id(@kind.to_s)
-        raise Occi::Errors::KindNotDefinedError, "Kind not found for entity #{self.to_s}!" unless kind # XXX: Needs error type
+        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

data/lib/occi/core/mixin.rb

@@ -4,12 +4,14 @@ module Occi
 
       attr_accessor :entities, :depends, :actions, :location, :applies
 
-      # @param [String ] scheme
+      # @param [String] scheme
       # @param [String] term
       # @param [String] title
       # @param [Occi::Core::Attributes,Hash,NilClass] attributes
-      # @param [Occi::Core::Categories,Hash,NilClass] related
+      # @param [Occi::Core::Categories,Hash,NilClass] depends
       # @param [Occi::Core::Actions,Hash,NilClass] actions
+      # @param [String] location
+      # @param [Occi::Core::Kinds, NilClass] applies
       def initialize(scheme='http://schemas.ogf.org/occi/core#',
           term='mixin',
           title=nil,

data/lib/occi/infrastructure/os_tpl.rb

@@ -10,9 +10,10 @@ module Occi
                                          term='os_tpl',
                                          title='operating system template',
                                          attributes=Occi::Core::Attributes.new(self.attributes),
-                                         related=Occi::Core::Categories.new << Occi::Infrastructure::Compute.kind,
+                                         dependencies=Occi::Core::Dependencies.new,
                                          actions=Occi::Core::Actions.new,
-                                         location='/mixin/os_tpl/'
+                                         location='/mixin/os_tpl/',
+                                         applies=Occi::Core::Kinds.new << Occi::Infrastructure::Compute.kind
     end
 
   end

data/lib/occi/infrastructure/resource_tpl.rb

@@ -10,9 +10,10 @@ module Occi
                                          term='resource_tpl',
                                          title='resource template',
                                          attributes=Occi::Core::Attributes.new(self.attributes),
-                                         related=Occi::Core::Categories.new << Occi::Infrastructure::Compute.kind,
+                                         dependencies=Occi::Core::Dependencies.new,
                                          actions=Occi::Core::Actions.new,
-                                         location='/mixin/resource_tpl/'
+                                         location='/mixin/resource_tpl/',
+                                         applies=Occi::Core::Kinds.new << Occi::Infrastructure::Compute.kind
     end
 
   end

data/lib/occi/model.rb

@@ -14,7 +14,7 @@ module Occi
 
     # register Occi Core categories enitity, resource and link
     def register_core
-      Occi::Log.info "[#{self.class}] Registering OCCI Core categories enitity, resource and link"
+      Occi::Log.debug "[#{self.class}] Registering OCCI Core categories enitity, resource and link"
       register Occi::Core::Entity.kind
       register Occi::Core::Resource.kind
       register Occi::Core::Link.kind
@@ -22,7 +22,7 @@ module Occi
 
     # register Occi Infrastructure categories
     def register_infrastructure
-      Occi::Log.info "[#{self.class}] Registering OCCI Infrastructure categories"
+      Occi::Log.debug "[#{self.class}] Registering OCCI Infrastructure categories"
       Occi::Infrastructure.categories.each { |category| register category }
     end
 
@@ -32,7 +32,7 @@ module Occi
     #  recursively searched for files with the extension .json .
     # @param [Sting] scheme_base_url base location for provider specific extensions of the OCCI model
     def register_files(path, scheme_base_url='http://localhost')
-      Occi::Log.info "[#{self.class}] Initializing OCCI Model from #{path}"
+      Occi::Log.debug "[#{self.class}] Initializing OCCI Model from #{path}"
       raise ArgumentError, "Directory \"#{path}\" does not exist" unless File.directory?(path)
       Dir.glob(path + '/**/*.json').each do |file|
         collection = Occi::Collection.new(JSON.parse(File.read(file)))

data/lib/occi/parser.rb

@@ -22,7 +22,7 @@ module Occi
         collection = parse_headers(header, category, entity_type)
 
         Occi::Log.debug "[#{self}] Parsing #{media_type} from body"
-        coll_body = parse_body(media_type, body, category, entity_type)
+        coll_body = parse_body(media_type, body || '', category, entity_type)
         collection.merge! coll_body if coll_body && !coll_body.empty?
 
         collection
@@ -62,6 +62,9 @@ module Occi
           elsif entity_type == Occi::Core::Link
             Occi::Log.debug "[#{self}] Parsing a link from headers"
             collection = Occi::Parser::Text.link(header)
+          elsif entity_type == Occi::Core::ActionInstance
+            Occi::Log.debug "[#{self}] Parsing an action instance from headers"
+            collection = Occi::Parser::Text.action(header)
           else
             raise Occi::Errors::ParserTypeError, "Entity type '#{entity_type}' not supported"
           end
@@ -98,12 +101,14 @@ module Occi
 
       def parse_body_plain(body, category, entity_type)
         if category
-          collection = Occi::Parser::Text.categories body.split "\n"
+          collection = Occi::Parser::Text.categories body.split("\n")
         else
           if entity_type == Occi::Core::Resource
-            collection = Occi::Parser::Text.resource body.split "\n"
+            collection = Occi::Parser::Text.resource body.split("\n")
           elsif entity_type == Occi::Core::Link
-            collection = Occi::Parser::Text.link body.split "\n"
+            collection = Occi::Parser::Text.link body.split("\n")
+          elsif entity_type == Occi::Core::ActionInstance
+            collection = Occi::Parser::Text.action body.split("\n")
           else
             raise Occi::Errors::ParserTypeError, "Entity type #{entity_type} not supported"
           end

data/lib/occi/parser/json.rb

@@ -11,6 +11,8 @@ module Occi
           Occi::Log.error "[#{self}] Failed to parse JSON input: #{perr.message}"
           raise Occi::Errors::ParserInputError, perr.message
         end
+
+        hash = { :action => hash } if hash && hash.action
         collection = Occi::Collection.new(hash)
 
         if collection.resources.size == 1 && collection.links.size > 0

data/lib/occi/parser/text.rb

@@ -101,7 +101,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}" unless match
 
           term = match[:term].downcase
           scheme = match[:scheme]
@@ -148,7 +148,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}" unless match
 
           value = match[:string] if match[:string]
 
@@ -167,7 +167,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}" unless match
 
           target = match[:uri]
           rel = match[:rel]
@@ -201,11 +201,38 @@ 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}" unless match
 
           match[:location]
         end
 
+        def action(lines)
+          Occi::Log.debug "[#{self}] Parsing through Occi::Parser::Text.action"
+          collection = Occi::Collection.new
+          action_instance = nil
+
+          block = Proc.new { |line|
+            line.strip!
+
+            case line
+            when /^Category:/
+              action_instance = Occi::Core::ActionInstance.new
+              action_instance.action = category(line)
+            when /^X-OCCI-Attribute:/
+              raise Occi::Errors::ParserInputError,
+                    "Line #{line.inspect} arrived out of order!" unless action_instance
+              action_instance.attributes.merge! attribute(line)
+            end
+          }
+          lines.respond_to?(:each) ? lines.each(&block) : lines.each_line(&block)
+
+          unless action_instance.blank?
+            collection << action_instance
+          end
+
+          collection
+        end
+
       end
 
     end

data/lib/occi/version.rb

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

data/spec/occi/collection_spec.rb

@@ -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\":{\"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}\"}]}"
+        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) 
@@ -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\":{\"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\":{}}]}"
+        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) 

data/spec/occi/core/action_instance_spec.rb

@@ -40,28 +40,28 @@ module Occi
           expect { Occi::Core::ActionInstance.new nil }.to raise_error(ArgumentError)
         end
 
-        it 'fails without attributes' do
-          expect { Occi::Core::ActionInstance.new action, nil }.to raise_error(ArgumentError)
+        it 'does not fail without attributes' do
+          expect { Occi::Core::ActionInstance.new action, nil }.not_to raise_error(ArgumentError)
         end
 
-        it 'with an Occi::Core::Action instance' do
+        it 'does not fail with an Occi::Core::Action instance' do
           expect { Occi::Core::ActionInstance.new action }.not_to raise_error
         end
 
-        it 'with a valid action type identifier' do
+        it 'does not fail with a valid action type identifier' do
           expect { Occi::Core::ActionInstance.new action_string }.not_to raise_error
         end
 
-        it 'with an invalid action type identifier' do
+        it 'fails with an invalid action type identifier' do
           expect { Occi::Core::ActionInstance.new action_string_invalid }.to raise_error(ArgumentError)
         end
 
-        it 'with an Occi::Core::Attributes instance' do
+        it 'does not fail with an Occi::Core::Attributes instance' do
           expect { Occi::Core::ActionInstance.new action, attributes }.not_to raise_error
         end
 
-        it 'with un-convertable attribute values' do
-          expect { Occi::Core::ActionInstance.new action, attributes_unconvertable}.to raise_error(ArgumentError)
+        it 'does not fail with un-convertable attribute values' do
+          expect { Occi::Core::ActionInstance.new action, attributes_unconvertable}.not_to raise_error(ArgumentError)
         end
       end
 
@@ -93,7 +93,7 @@ module Occi
         it 'renders to text w/ an attribute' do
           expected = %Q|Category: action;scheme="http://schemas.ogf.org/occi/core#";class="action"
 X-OCCI-Attribute: occi.core.title="test"|
-          expect(Occi::Core::ActionInstance.new(action, attributes_one).to_text).to eq(expected)
+          expect(Occi::Core::ActionInstance.new(action, attributes_one.to_hash).to_text).to eq(expected)
         end
 
         it 'renders to text w/ attributes' do
@@ -101,12 +101,12 @@ X-OCCI-Attribute: occi.core.title="test"|
 X-OCCI-Attribute: occi.core.title="test"
 X-OCCI-Attribute: occi.core.id="1"
 X-OCCI-Attribute: org.opennebula.network.id=1|
-          expect(Occi::Core::ActionInstance.new(action, attributes_multi).to_text).to eq(expected)
+          expect(Occi::Core::ActionInstance.new(action, attributes_multi.to_hash).to_text).to eq(expected)
         end
 
         it 'renders to text w/ a nil attribute' do
           expected = "Category: action;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"action\""
-          expect(Occi::Core::ActionInstance.new(action, attributes_wnil).to_text).to eq(expected)
+          expect(Occi::Core::ActionInstance.new(action, attributes_wnil.to_hash).to_text).to eq(expected)
         end
       end
 
@@ -121,7 +121,7 @@ X-OCCI-Attribute: org.opennebula.network.id=1|
             "Category" => "action;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"action\"",
             "X-OCCI-Attribute" => "occi.core.title=\"test\""
           }
-          expect(Occi::Core::ActionInstance.new(action, attributes_one).to_header).to eq(expected)
+          expect(Occi::Core::ActionInstance.new(action, attributes_one.to_hash).to_header).to eq(expected)
         end
 
         it 'renders to hash w/ attributes' do
@@ -129,12 +129,12 @@ X-OCCI-Attribute: org.opennebula.network.id=1|
             "Category" => "action;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"action\"",
             "X-OCCI-Attribute" => "occi.core.title=\"test\",occi.core.id=\"1\",org.opennebula.network.id=1"
           }
-          expect(Occi::Core::ActionInstance.new(action, attributes_multi).to_header).to eq(expected)
+          expect(Occi::Core::ActionInstance.new(action, attributes_multi.to_hash).to_header).to eq(expected)
         end
 
         it 'renders to hash w/ a nil attribute' do
           expected = {"Category" => "action;scheme=\"http://schemas.ogf.org/occi/core#\";class=\"action\""}
-          expect(Occi::Core::ActionInstance.new(action, attributes_wnil).to_header).to eq(expected)
+          expect(Occi::Core::ActionInstance.new(action, attributes_wnil.to_hash).to_header).to eq(expected)
         end
       end
 
@@ -176,7 +176,7 @@ X-OCCI-Attribute: org.opennebula.network.id=1|
           expected.action = "http://schemas.ogf.org/occi/core#action"
           expected.attributes = {"occi" => {"core" => {"title" => "test"}}}
 
-          expect(Occi::Core::ActionInstance.new(action, attributes_one).as_json).to eq(expected)
+          expect(Occi::Core::ActionInstance.new(action, attributes_one.to_hash).as_json).to eq(expected)
         end
 
         it 'renders to Hashie::Mash w/ attributes' do
@@ -187,7 +187,7 @@ X-OCCI-Attribute: org.opennebula.network.id=1|
             "org" => {"opennebula" => {"network" => {"id" => 1}}}
           }
 
-          expect(Occi::Core::ActionInstance.new(action, attributes_multi).as_json).to eq(expected)
+          expect(Occi::Core::ActionInstance.new(action, attributes_multi.to_hash).as_json).to eq(expected)
         end
       end
 

data/spec/occi/parser_spec.rb

@@ -170,7 +170,7 @@ module Occi
 
       it 'fails gracefully for unknown entity type' do
         resource_string = File.open("spec/occi/parser/text_samples/occi_network_rocci_server.text", "rb").read
-        expect{ Occi::Parser.parse('text/plain', resource_string, false, Occi::Core::ActionInstance) }.to raise_error(Occi::Errors::ParserTypeError)
+        expect{ Occi::Parser.parse('text/plain', resource_string, false, Occi::Core::Action) }.to raise_error(Occi::Errors::ParserTypeError)
       end
     end
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.2.4
+  version: 4.2.5
+  prerelease: 
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,11 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,6 +24,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -29,6 +32,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -36,6 +40,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -43,6 +48,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -50,6 +56,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -57,6 +64,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -64,6 +72,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -71,6 +80,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,6 +88,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -85,6 +96,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: settingslogic
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -92,6 +104,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -245,25 +258,29 @@ files:
 homepage: https://github.com/gwdg/rOCCI-core
 licenses:
 - Apache License, Version 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1899763597318893191
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: OCCI toolkit
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDU3NTg4MzhjZGYyMGI0N2Y3M2ViYmRmMTA2ZWI5OWY3YjYwMzcxZA==
-  data.tar.gz: !binary |-
-    OGRmNTk3NmIwZGUwNWQ3ZTlhN2Y4YjA4NDU4MzJkMmIxZDg4NDExMA==
-SHA512:
-  metadata.gz: !binary |-
-    N2E0MTUzMTlmZDlhYzZjYzZjOGZmYjgxNjZlZmY5NzA4NDk5ZmMyOWY0ZmJm
-    ODlkMzJlM2IyN2IzMjI1ODI3NDdjYWI3YTI5OWY0Y2QxYzdjZWUyYTgyN2Uz
-    MmQ4YTU1ZWFhNDlhN2IzNjUwYmRkZDJjZDUxYjRjYmVjZDg3OWM=
-  data.tar.gz: !binary |-
-    ZWNlMTdkYWYwMmNiNzZiZjRjYTExOTFjYzA1OTg2ODgyZjQ0M2UyZDk4Y2Q3
-    ZDg4MmJiYjFjYmU3YWIwYzcyOTdmNDIwOGM4YjNlMmYxNjBhODMwZTczOTI1
-    ZWJkN2EzMzUwZDJiMjBkZWFmM2ZiYjk0MjFmYmNkYTJkMjZkYTI=