occi-api 4.2.0.beta.8 → 4.2.0.beta.9

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,10 +26,15 @@ 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:

data/lib/occi/api/client/authn_utils.rb

@@ -18,8 +18,8 @@ module Occi::Api::Client
     #    AuthnUtils.extract_pem_from_pkcs12 "~/.globus/usercert.p12", "123456"
     #      # => #<String>
     #
-    # @param [String] Path to a PKCS#12 file with credentials
-    # @param [String] Password needed to unlock the PKCS#12 file
+    # @param path_to_p12_file [String] Path to a PKCS#12 file with credentials
+    # @param p12_password [String] Password needed to unlock the PKCS#12 file
     # @return [String] Decrypted credentials in a PEM formatted string
     def self.extract_pem_from_pkcs12(path_to_p12_file, p12_password)
       # decode certificate and its private key
@@ -80,7 +80,7 @@ module Occi::Api::Client
     #    AuthnUtils.certs_to_file_ary "~/.globus/usercert.pem"
     #      # => [#<String>, #<String>, ...]
     #
-    # @param [String] Path to a PEM file containing certificates
+    # @param ca_file [String] Path to a PEM file containing certificates
     # @return [Array<String>] An array of read certificates
     def self.certs_to_file_ary(ca_file)
       # TODO: read and separate multiple certificates

data/lib/occi/api/client/base/action_methods.rb

@@ -0,0 +1,62 @@
+module Occi::Api::Client
+  module Base
+
+    module ActionMethods
+
+      # Retrieves all available action types.
+      #
+      # @example
+      #    client.get_action_types # => [ "stop", "start", "up", "down" ]
+      #
+      # @return [Array<String>] list of available action types in a human-readable format
+      def get_action_types
+        @model.actions.to_a.collect { |action| action.term }
+      end
+
+      # Retrieves all available action type identifiers.
+      #
+      # @example
+      #    client.get_action_type_identifiers
+      #    # => [ "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#suspend" ]
+      #
+      # @return [Array<String>] list of available action type identifiers
+      def get_action_type_identifiers
+        @model.actions.to_a.collect { |action| action.type_identifier }
+      end
+
+      # Retrieves available action type identifier for the given action type.
+      #
+      # @example
+      #    client.get_action_type_identifier("start")
+      #     # => 'http://schemas.ogf.org/occi/infrastructure/compute/action#start'
+      #    client.get_action_type_identifier("start", "compute")
+      #     # => 'http://schemas.ogf.org/occi/infrastructure/compute/action#start'
+      #    client.get_action_type_identifier("start", "storage")
+      #     # => nil
+      #
+      # @param type [String] short action type
+      # @param for_kind_w_term [String] kind the action belongs to (e.g. "compute", "network", ...)
+      # @return [String, nil] action type identifier for the given action type
+      def get_action_type_identifier(type, for_kind_w_term = nil)
+        return type if (type =~ URI::ABS_URI) || (type && type.start_with?('/'))
+
+        acts = @model.actions.to_a.select { |k| k.term == type }
+        tis = acts.collect { |c| c.type_identifier }
+        tis.uniq!
+
+        tis.keep_if { |ti| ti.include? "/#{for_kind_w_term}/" } unless for_kind_w_term.blank?
+
+        if tis.length > 1
+          raise Occi::Api::Client::Errors::AmbiguousNameError,
+                "Category type #{type.inspect} is ambiguous, use a type identifier!"
+        end
+
+        tis.first
+      end
+
+    end
+
+  end
+end

data/lib/occi/api/client/base/category_methods.rb

@@ -32,6 +32,7 @@ module Occi::Api::Client
       #    client.get_category_type_identifier("compute")
       #     # => 'http://schemas.ogf.org/occi/infrastructure#compute'
       #
+      # @param type [String] short category type
       # @return [String, nil] category type identifier for the given category type
       def get_category_type_identifier(type)
         return type if (type =~ URI::ABS_URI) || (type && type.start_with?('/'))

data/lib/occi/api/client/base/entity_methods.rb

@@ -12,7 +12,7 @@ module Occi::Api::Client
       #   client.get_resource "http://schemas.ogf.org/occi/infrastructure#network"
       #    # => Occi::Core::Resource
       #
-      # @param [String] resource name or resource identifier
+      # @param resource_type [String] resource name or resource identifier
       # @return [Occi::Core::Resource] new resource instance
       def get_resource(resource_type)
         Occi::Log.debug("Instantiating #{resource_type.inspect}")
@@ -56,6 +56,7 @@ module Occi::Api::Client
       #    client.get_entity_type_identifier("compute")
       #     # => 'http://schemas.ogf.org/occi/infrastructure#compute'
       #
+      # @param type [String] short entity type
       # @return [String, nil] entity type identifier for the given entity type
       def get_entity_type_identifier(type)
         return type if (type =~ URI::ABS_URI) || (type && type.start_with?('/'))
@@ -103,6 +104,7 @@ module Occi::Api::Client
       #    client.get_resource_type_identifier("compute")
       #     # => 'http://schemas.ogf.org/occi/infrastructure#compute'
       #
+      # @param type [String] short resource type
       # @return [String, nil] resource type identifier for the given resource type
       def get_resource_type_identifier(type)
         return type if (type =~ URI::ABS_URI) || (type && type.start_with?('/'))
@@ -149,6 +151,7 @@ module Occi::Api::Client
       #    client.get_link_type_identifier("storagelink")
       #     # => 'http://schemas.ogf.org/occi/infrastructure#storagelink'
       #
+      # @param type [String] short link type
       # @return [String, nil] link type identifier for the given link type
       def get_link_type_identifier(type)
         return type if (type =~ URI::ABS_URI) || (type && type.start_with?('/'))

data/lib/occi/api/client/base/helpers.rb

@@ -11,7 +11,7 @@ module Occi::Api::Client
       #    path_for_kind_type_identifier "http://localhost:3300/compute/35ad4f45gsf-gsfg524s6gsfg-sfgsf4gsfg"
       #     # => "/compute/35ad4f45gsf-gsfg524s6gsfg-sfgsf4gsfg"
       #
-      # @param [String] kind type identifier
+      # @param kind_type_identifier [String] kind type identifier
       # @return [String] 
       def path_for_kind_type_identifier(kind_type_identifier)
         raise ArgumentError,
@@ -45,7 +45,7 @@ module Occi::Api::Client
       #    path_for_instance Occi::Infrastructure::Storagelink.new
       #     # => "/link/storagelink/35ad4f45gsf-gsfg524s6gsfg-sfgsf4gsfg"
       #
-      # @param [Object] instance
+      # @param instance [Object] instance
       # @return [String] path for the given instance
       def path_for_instance(instance)
         unless instance.respond_to?(:location)
@@ -72,7 +72,7 @@ module Occi::Api::Client
       #    sanitize_instance_link "/compute/35ad4f45gsf-gsfg524s6gsfg-sfgsf4gsfg"
       #     # => "/compute/35ad4f45gsf-gsfg524s6gsfg-sfgsf4gsfg"
       #
-      # @param [String] string containing the full instance link
+      # @param instance_link [String] string containing the full instance link
       # @return [String] extracted path, with a leading slash
       def sanitize_instance_link(instance_link)
         # everything starting with '/' is considered to be a resource path

data/lib/occi/api/client/base/kind_methods.rb

@@ -10,7 +10,7 @@ module Occi::Api::Client
       #    # => [ "http://schemas.ogf.org/occi/infrastructure#network",
       #    #      "http://schemas.ogf.org/occi/infrastructure#ipnetwork" ]
       #
-      # @param [String] type identifier
+      # @param type_identifier [String] type identifier
       # @return [Array<String>] list of available kind type identifiers related to
       #                         the given type identifier
       def get_kind_type_identifiers_related_to(type_identifier)
@@ -48,6 +48,7 @@ module Occi::Api::Client
       #    client.get_kind_type_identifier("compute")
       #     # => 'http://schemas.ogf.org/occi/infrastructure#compute'
       #
+      # @param type [String] short kind type
       # @return [String, nil] kind type identifier for the given kind type
       def get_kind_type_identifier(type)
         return type if (type =~ URI::ABS_URI) || (type && type.start_with?('/'))

data/lib/occi/api/client/base/mixin_methods.rb

@@ -15,9 +15,9 @@ module Occi::Api::Client
       #     # => "http://my.occi.service/occi/infrastructure/resource_tpl#large"
       #    client.get_mixin "debian6", "resource_tpl" # => nil
       #
-      # @param [String] name of the mixin
-      # @param [String] type of the mixin
-      # @param [Boolean] should we describe the mixin or return its link?
+      # @param name [String] name of the mixin
+      # @param type [String] type of the mixin
+      # @param describe [Boolean] should we describe the mixin or return its link?
       # @return [String, Occi::Core::Mixin, nil] link, mixin description or nothing found
       def get_mixin(name, type = nil, describe = false)
         # TODO: mixin fix
@@ -41,8 +41,8 @@ module Occi::Api::Client
       #     # => #<Occi::Core::Mixin>
       #    client.describe_mixin "debian6", "resource_tpl" # => nil
       #
-      # @param [String] name of the mixin
-      # @param [String] type of the mixin
+      # @param name [String] name of the mixin
+      # @param type [String] type of the mixin
       # @return [Occi::Core::Mixin, nil] mixin description or nothing found
       def describe_mixin(name, type = nil)
         mixins = get_mixins(type)
@@ -54,8 +54,8 @@ module Occi::Api::Client
       # Looks up a mixin with a specific type, will return
       # mixin's full description.
       #
-      # @param [String] name of the mixin
-      # @param [String] type of the mixin
+      # @param name [String] name of the mixin
+      # @param type [String] type of the mixin
       # @return [Occi::Core::Mixin] mixin description
       def describe_mixin_w_type(name, type)
         describe_mixin(name, type)
@@ -65,7 +65,7 @@ module Occi::Api::Client
       # return mixin's full description. Returns always the
       # first match found, search will start in os_tpl.
       #
-      # @param [String] name of the mixin
+      # @param name [String] name of the mixin
       # @return [Occi::Core::Mixin] mixin description
       def describe_mixin_wo_type(name)
         describe_mixin(name, nil)
@@ -83,8 +83,8 @@ module Occi::Api::Client
       #     # => "http://my.occi.service/occi/infrastructure/resource_tpl#large"
       #    client.list_mixin "debian6", "resource_tpl" # => nil
       #
-      # @param [String] name of the mixin
-      # @param [String] type of the mixin
+      # @param name [String] name of the mixin
+      # @param type [String] type of the mixin
       # @return [String, nil] link or nothing found
       def list_mixin(name, type = nil)
         mixin = describe_mixin(name, type)
@@ -103,8 +103,8 @@ module Occi::Api::Client
       #    client.get_mixins "resource_tpl"
       #     # => #<Occi::Core::Mixins>
       #
-      # @param [String] type of mixins
-      # @param [Boolean] include type itself as a mixin
+      # @param type [String] type of mixins
+      # @param include_self [Boolean] include type itself as a mixin
       # @return [Occi::Core::Mixins] collection of available mixins
       def get_mixins(type = nil, include_self = false)
         unless type.blank?
@@ -145,8 +145,8 @@ module Occi::Api::Client
       #    client.list_mixins "resource_tpl"
       #     # => #<Array<String>>
       #
-      # @param [String] type of mixins
-      # @param [Boolean] include type itself as a mixin
+      # @param type [String] type of mixins
+      # @param include_self [Boolean] include type itself as a mixin
       # @return [Array<String>] collection of available mixin identifiers
       def list_mixins(type = nil, include_self = false)
         mixins = get_mixins(type, include_self)
@@ -182,6 +182,7 @@ module Occi::Api::Client
       #    client.get_mixin_type_identifier("os_tpl")
       #     # => 'http://schemas.ogf.org/occi/infrastructure#os_tpl'
       #
+      # @param type [String] short mixin type
       # @return [String, nil] mixin type identifier for the given mixin type
       def get_mixin_type_identifier(type)
         return type if (type =~ URI::ABS_URI) || (type && type.start_with?('/'))

data/lib/occi/api/client/base/protected_helpers.rb

@@ -9,7 +9,7 @@ module Occi::Api::Client
       # @example
       #    get_logger { :out => STDERR, :level => Occi::Log::WARN, :logger => nil }
       #
-      # @param [Hash] logger options
+      # @param log_options [Hash] logger options
       # @return [Occi::Log] instance of the logger
       def get_logger(log_options)
         unless log_options[:logger].kind_of?(Occi::Log)
@@ -28,7 +28,7 @@ module Occi::Api::Client
       # @example
       #    get_endpoint_uri "http://localhost:3300" # => #<URI::*>
       #
-      # @param [String] endpoint URI in a non-canonical string
+      # @param endpoint [String] endpoint URI in a non-canonical string
       # @return [URI] canonical endpoint URI
       def get_endpoint_uri(endpoint)
         unless endpoint =~ URI::ABS_URI
@@ -48,7 +48,7 @@ module Occi::Api::Client
       #    model_collection = get('/-/')
       #    get_model model_collection # => #<Occi::Model>
       #
-      # @param [Occi::Collection] parsed representation of server's model
+      # @param model_collection [Occi::Collection] parsed representation of server's model
       # @return [Occi::Model] Model instance
       def get_model(model_collection)
         # build model

data/lib/occi/api/client/base/protected_stubs.rb

@@ -13,8 +13,8 @@ module Occi::Api::Client
       #    get_auth { :type => "x509", :user_cert => "~/cert.pem",
       #                  :user_cert_password => "321", :ca_path => nil }
       #
-      # @param [Hash] authentication options
-      # @param [Boolean] allow fallback-only options
+      # @param auth_options [Hash] authentication options
+      # @param fallback [Boolean] allow fallback-only options
       # @return [Hash] transformed hash with authN information
       def get_auth(auth_options, fallback = false)
         raise Occi::Api::Client::Errors::NotImplementedError, "#{__method__} is just a stub!"
@@ -33,6 +33,7 @@ module Occi::Api::Client
       # @example
       #    get_media_type # => 'application/occi+json'
       #
+      # @param force_type [String] type to be forcibly chosen
       # @return [String] chosen media type
       def get_media_type(force_type = nil)
         raise Occi::Api::Client::Errors::NotImplementedError, "#{__method__} is just a stub!"

data/lib/occi/api/client/base/stubs.rb

@@ -18,7 +18,7 @@ module Occi::Api::Client
       #    client.list "http://schemas.ogf.org/occi/infrastructure#compute"
       #     # => [ "http://localhost:3300/compute/jh425jhj3h413-7dj29d7djd9e3-djh2jh4j4j" ]
       #
-      # @param [String] resource type identifier or just type name
+      # @param resource_type_identifier [String] resource type identifier or just type name
       # @return [Array<String>] list of links
       def list(resource_type_identifier=nil)
         raise Occi::Api::Client::Errors::NotImplementedError, "#{__method__} is just a stub!"
@@ -39,7 +39,7 @@ module Occi::Api::Client
       #    client.describe "http://localhost:3300/compute/j5hk1234jk2524-2j3j2k34jjh234-adfaf1234"
       #     # => #<Occi::Core::Resources>
       #
-      # @param [String] resource type identifier, type name or resource location
+      # @param resource_type_identifier [String] resource type identifier, type name or resource location
       # @return [Occi::Core::Resources] list of resource descriptions
       def describe(resource_type_identifier=nil)
         raise Occi::Api::Client::Errors::NotImplementedError, "#{__method__} is just a stub!"
@@ -58,7 +58,7 @@ module Occi::Api::Client
       #
       #    client.create res # => "http://localhost:3300/compute/df7698...f987fa"
       #
-      # @param [Occi::Core::Entity] resource to be created on the server
+      # @param entity [Occi::Core::Entity] resource to be created on the server
       # @return [String] URI of the new resource
       def create(entity)
         raise Occi::Api::Client::Errors::NotImplementedError, "#{__method__} is just a stub!"
@@ -70,7 +70,7 @@ module Occi::Api::Client
       # @example
       #    client.deploy "~/MyVMs/rOcciVM.ovf" # => "http://localhost:3300/compute/343423...42njhdafa"
       #
-      # @param [String] location of an OVF/OVA file
+      # @param location [String] location of an OVF/OVA file
       # @return [String] URI of the new resource
       def deploy(location)
         raise Occi::Api::Client::Errors::NotImplementedError, "#{__method__} is just a stub!"
@@ -82,7 +82,7 @@ module Occi::Api::Client
       # @example
       #    client.deploy_ovf "OVF DESCRIPTOR HERE" # => "http://localhost:3300/compute/343423...42njhdafa"
       #
-      # @param [String] OVF descriptor (e.g., already read from a file or generated)
+      # @param descriptor [String] OVF descriptor (e.g., already read from a file or generated)
       # @return [String] URI of the new resource
       def deploy_ovf(descriptor)
         raise Occi::Api::Client::Errors::NotImplementedError, "#{__method__} is just a stub!"
@@ -94,7 +94,7 @@ module Occi::Api::Client
       # @example
       #    client.deploy_ova "OVA DESCRIPTOR HERE" # => "http://localhost:3300/compute/343423...42njhdafa"
       #
-      # @param [String] OVA descriptor (e.g., already read from a file or generated)
+      # @param descriptor [String] OVA descriptor (e.g., already read from a file or generated)
       # @return [String] URI of the new resource
       def deploy_ova(descriptor)
         raise Occi::Api::Client::Errors::NotImplementedError, "#{__method__} is just a stub!"
@@ -108,7 +108,7 @@ module Occi::Api::Client
       #    client.delete "http://schemas.ogf.org/occi/infrastructure#compute" # => true
       #    client.delete "http://localhost:3300/compute/245j42594...98s9df8s9f" # => true
       #
-      # @param [String] resource type identifier, type name or location
+      # @param resource_type_identifier [String] resource type identifier, type name or location
       # @return [Boolean] status
       def delete(resource_type_identifier)
         raise Occi::Api::Client::Errors::NotImplementedError, "#{__method__} is just a stub!"
@@ -119,8 +119,8 @@ module Occi::Api::Client
       # @example
       #    TODO: add examples
       #
-      # @param [String] resource type or type identifier
-      # @param [Occi::Core::ActionInstance] type of action
+      # @param resource_type_identifier [String] resource type or type identifier
+      # @param action_instance [Occi::Core::ActionInstance] type of action
       # @return [Boolean] status
       def trigger(resource_type_identifier, action_instance)
         raise Occi::Api::Client::Errors::NotImplementedError, "#{__method__} is just a stub!"

data/lib/occi/api/client/client_base.rb

@@ -53,7 +53,7 @@ module Occi::Api::Client
     # @example
     #    client.connect # => true
     #
-    # @param [Boolean] force re-connect on already connected client
+    # @param force [Boolean] force re-connect on already connected client
     # @return [Boolean] true on successful connect
     def connect(force = false)
       raise "Client already connected!" if @connected && !force
@@ -63,6 +63,9 @@ module Occi::Api::Client
     # include stuff
     include Occi::Api::Client::Base::Stubs
 
+    # include action-related stuff
+    include Occi::Api::Client::Base::ActionMethods
+
     # include category-related stuff
     include Occi::Api::Client::Base::CategoryMethods
 

data/lib/occi/api/client/client_http.rb

@@ -34,7 +34,7 @@ module Occi::Api::Client
     #
     #    Occi::Api::Client::ClientHttp.new options # => #<Occi::Api::Client::ClientHttp>
     #
-    # @param [Hash] options, for available options and defaults see examples
+    # @param options [Hash] options, for available options and defaults see examples
     # @return [Occi::Api::Client::ClientHttp] client instance
     def initialize(options = {})
       super options

data/lib/occi/api/client/http/code_helpers.rb

@@ -52,7 +52,7 @@ module Occi::Api::Client
       # @example
       #    reason_phrase(500) # => "Internal Server Error"
       #
-      # @param [Integer] HTTP response code
+      # @param code [Integer] HTTP response code
       # @return [String] human-readable phrase
       def reason_phrase(code)
         HTTP_CODES[code.to_s]

data/lib/occi/api/client/http/helpers.rb

@@ -86,7 +86,7 @@ module Occi::Api::Client
       #    response_message self.class.delete(path)
       #     # =>  'HTTP Response status: [200] OK'
       #
-      # @param [HTTParty::Response] HTTParty response object
+      # @param response [HTTParty::Response] HTTParty response object
       # @return [String] message
       def response_message(response)
         @last_response = response

data/lib/occi/api/client/http/party_wrappers.rb

@@ -10,51 +10,28 @@ module Occi::Api::Client
       #    get "/compute/" # => #<Occi::Collection>
       #    get "/compute/fs65g4fs6g-sf54g54gsf-aa12faddf52" # => #<Occi::Collection>
       #
-      # @param [String] path for the GET request
-      # @param [Occi::Collection] collection of filters
+      # @param path [String] path for the GET request
+      # @param filter [Occi::Collection] collection of filters
       # @return [Occi::Collection] parsed result of the request
       def get(path='/', filter=nil)
+        raise ArgumentError, "Path is a required argument!" if path.blank?
+
         # apply filters if present
-        response = if filter
-          categories = filter.categories.collect { |category| category.to_text }.join(',')
-          attributes = filter.entities.collect { |entity|
-            entity.attributes.combine.collect { |k, v| k + '=' + v }
-          }.join(',')
+        headers = self.class.headers.clone
+        unless filter.blank?
+          categories = filter.categories.to_a.collect { |category| category.to_string_short }.join(',')
+          attributes = filter.entities.to_a.collect { |entity| entity.attributes.to_header }.join(',')
 
-          headers = self.class.headers.clone
           headers['Content-Type'] = 'text/occi'
           headers['Category'] = categories unless categories.empty?
-          headers['X-OCCI-Attributes'] = attributes unless attributes.empty?
-
-          self.class.get(path, :headers => headers)
-        else
-          self.class.get(path)
+          headers['X-OCCI-Attribute'] = attributes unless attributes.empty?
         end
 
+        response = self.class.get(path, :headers => headers)
         response_msg = response_message response
         raise "HTTP GET failed! #{response_msg}" unless response.code == 200
 
-        Occi::Log.debug "Response location: #{path.inspect}"
-        kind = @model.get_by_location(path) if @model
-
-        Occi::Log.debug "Response kind: #{kind.inspect}"
-
-        entity_type = nil
-        if kind && kind.related_to?(Occi::Core::Link)
-          entity_type = Occi::Core::Link
-        end
-
-        entity_type = Occi::Core::Resource unless entity_type
-
-        Occi::Log.debug "Parser call: #{response.content_type} #{path.include?('/-/')} " \
-                        "#{entity_type} #{response.headers.inspect}"
-        collection = Occi::Parser.parse(
-          response.content_type, response.body,
-          path.include?('/-/'), entity_type, response.headers
-        )
-
-        Occi::Log.debug "Parsed collection: empty? #{collection.empty?}"
-        collection
+        get_process_response(path, response)
       end
 
       # Performs POST requests and returns URI locations. Resource data must be provided
@@ -69,29 +46,14 @@ module Occi::Api::Client
       #    post "/network/", collection # => "http://localhost:3300/network/23sf4g65as-asdgsg2-sdfgsf2g"
       #    post "/storage/", collection # => "http://localhost:3300/storage/23sf4g65as-asdgsg2-sdfgsf2g"
       #
-      # @param [String] path for the POST request
-      # @param [Occi::Collection] resource data to be POSTed
+      # @param path [String] path for the POST request
+      # @param collection [Occi::Collection] resource data to be POSTed
       # @return [Occi::Collection, String, Boolean] Collection, URI location or action result (if ActionInstance is passed)
       def post(path, collection)
         raise ArgumentError, "Path is a required argument!" if path.blank?
+        raise ArgumentError, "Collection is a required argument!" if collection.blank?
 
-        headers = self.class.headers.clone
-        headers['Content-Type'] = @media_type
-
-        response = case @media_type
-        when 'application/occi+json'
-          self.class.post(path,
-                          :body => collection.to_json,
-                          :headers => headers)
-        when 'text/occi'
-          self.class.post(path,
-                          :headers => collection.to_header.merge(headers))
-        else
-          self.class.post(path,
-                          :body => collection.to_text,
-                          :headers => headers)
-        end
-
+        response = send_coll_request(path, collection)
         response_msg = response_message(response)
         raise "HTTP POST failed! #{response_msg}" unless response.code.between? 200, 201
 
@@ -103,33 +65,18 @@ module Occi::Api::Client
       # @example
       #    TODO: add examples
       #
-      # @param [String] path for the PUT request
-      # @param [Occi::Collection] resource data to send
+      # @param path [String] path for the PUT request
+      # @param collection [Occi::Collection] resource data to send
       # @return [Occi::Collection] parsed result of the request
       def put(path, collection)
         raise ArgumentError, "Path is a required argument!" if path.blank?
+        raise ArgumentError, "Collection is a required argument!" if collection.blank?
 
-        headers = self.class.headers.clone
-        headers['Content-Type'] = @media_type
-
-        response = case @media_type
-        when 'application/occi+json'
-          self.class.post(path,
-                          :body => collection.to_json,
-                          :headers => headers)
-        when 'text/occi'
-          self.class.post(path,
-                          :headers => collection.to_header.merge(headers))
-        else
-          self.class.post(path,
-                          :body => collection.to_text,
-                          :headers => headers)
-        end
-
+        response = send_coll_request(path, collection, :put)
         response_msg = response_message(response)
 
         if response.code.between? 200, 201
-          Occi::Parser.parse(response.header["content-type"].split(";").first, response.body)
+          Occi::Parser.parse(response.header["content-type"], response.body)
         else
           raise "HTTP POST failed! #{response_msg}"
         end
@@ -140,8 +87,8 @@ module Occi::Api::Client
       # @example
       #    del "/compute/65sf4g65sf4g-sf6g54sf5g-sfgsf32g3" # => true
       #
-      # @param [String] path for the DELETE request
-      # @param [Occi::Collection] collection of filters (currently NOT used)
+      # @param path [String] path for the DELETE request
+      # @param filter [Occi::Collection] collection of filters (currently NOT used)
       # @return [Boolean] status
       def del(path, filter=nil)
         raise ArgumentError, "Path is a required argument!" if path.blank?
@@ -156,6 +103,54 @@ module Occi::Api::Client
 
       private
 
+      def get_process_response(path, response)
+        Occi::Log.debug "Response from location: #{path.inspect}"
+        kind = @model.get_by_location(path) if @model
+
+        Occi::Log.debug "Response should contain kind: #{kind.inspect}"
+        entity_type = nil
+        if kind && kind.related_to?(Occi::Core::Link)
+          entity_type = Occi::Core::Link
+        end
+        entity_type = Occi::Core::Resource unless entity_type
+
+        Occi::Log.debug "Parser call: #{response.content_type} #{path.include?('/-/')} " \
+                        "#{entity_type} #{response.headers.inspect}"
+        collection = Occi::Parser.parse(
+          response.content_type, response.body,
+          path.include?('/-/'), entity_type, response.headers
+        )
+
+        Occi::Log.debug "Parsed collection: empty? #{collection.empty?}"
+        collection
+      end
+
+      def send_coll_request(path, collection, type = :post)
+        type ||= :post
+        raise ArgumentError, "Unsupported send " \
+                             "type #{type.to_s.inspect}!" unless [:post, :put].include?(type)
+
+        headers = self.class.headers.clone
+        headers['Content-Type'] = @media_type
+
+        case @media_type
+        when 'application/occi+json'
+          self.class.send type,
+                          path,
+                          :body => collection.to_json,
+                          :headers => headers
+        when 'text/occi'
+          self.class.send type,
+                          path,
+                          :headers => collection.to_header.merge(headers)
+        else
+          self.class.send type,
+                          path,
+                          :body => collection.to_text,
+                          :headers => headers
+        end
+      end
+
       def post_action(response)
         true
       end
@@ -163,13 +158,13 @@ module Occi::Api::Client
       def post_create(response)
         if response.code == 200
           collection = Occi::Parser.parse(
-            response.header["content-type"].split(";").first,
+            response.header["content-type"],
             response.body
           )
 
           if collection.empty?
             Occi::Parser.locations(
-              response.header["content-type"].split(";").first,
+              response.header["content-type"],
               response.body,
               response.headers
             ).first
@@ -180,15 +175,13 @@ module Occi::Api::Client
           end
         else
           Occi::Parser.locations(
-            response.header["content-type"].split(";").first,
+            response.header["content-type"],
             response.body,
             response.headers
           ).first
         end
       end
 
-      def post_update(response); end
-
     end
 
   end

data/lib/occi/api/dsl/type_methods.rb

@@ -37,6 +37,21 @@ module Occi::Api::Dsl
       @client.get_category_type_identifiers
     end
 
+    def action_types
+      check
+      @client.get_action_types
+    end
+
+    def action_type_identifier(*args)
+      check
+      @client.get_action_type_identifier(*args)
+    end
+
+    def action_type_identifiers
+      check
+      @client.get_action_type_identifiers
+    end
+
     def resource_types
       check
       @client.get_resource_types

data/lib/occi/api/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Api
-    VERSION = "4.2.0.beta.8" unless defined?(::Occi::Api::VERSION)
+    VERSION = "4.2.0.beta.9" unless defined?(::Occi::Api::VERSION)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-api
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta.8
+  version: 4.2.0.beta.9
   prerelease: 6
 platform: ruby
 authors:
@@ -84,6 +84,7 @@ files:
 - examples/x509auth_example.rb
 - lib/occi-api.rb
 - lib/occi/api/client/authn_utils.rb
+- lib/occi/api/client/base/action_methods.rb
 - lib/occi/api/client/base/category_methods.rb
 - lib/occi/api/client/base/entity_methods.rb
 - lib/occi/api/client/base/helpers.rb