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

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

@@ -121,7 +121,7 @@ module Occi::Api::Client
       #
       # @param [String] resource type or type identifier
       # @param [Occi::Core::ActionInstance] type of action
-      # @return [String] resource location
+      # @return [Boolean] status
       def trigger(resource_type_identifier, action_instance)
         raise Occi::Api::Client::Errors::NotImplementedError, "#{__method__} is just a stub!"
       end

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

@@ -180,15 +180,20 @@ module Occi::Api::Client
 
     # @see Occi::Api::Client::ClientBase
     def trigger(resource_type_identifier, action_instance)
-      # TODO: not tested
       raise 'Resource not provided!' if resource_type_identifier.blank?
+      raise 'ActionInstance not provided!' if action_instance.blank?
 
-      #
+      # attempt to resolve shortened identifiers
       resource_type_identifier = get_resource_type_identifier(resource_type_identifier)
       path = path_for_kind_type_identifier(resource_type_identifier)
 
+      # prepare data
+      path = "#{path}?action=#{action_instance.action.term}"
+      collection = Occi::Collection.new
+      collection << action_instance
+
       # make the request
-      post path, action_instance
+      post path, collection
     end
 
     # @see Occi::Api::Client::ClientBase

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

@@ -17,7 +17,9 @@ module Occi::Api::Client
         # 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(',')
+          attributes = filter.entities.collect { |entity|
+            entity.attributes.combine.collect { |k, v| k + '=' + v }
+          }.join(',')
 
           headers = self.class.headers.clone
           headers['Content-Type'] = 'text/occi'
@@ -30,7 +32,7 @@ module Occi::Api::Client
         end
 
         response_msg = response_message response
-        raise "HTTP GET failed! #{response_msg}" unless response.code.between? 200, 300
+        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
@@ -44,8 +46,12 @@ module Occi::Api::Client
 
         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 "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
@@ -65,7 +71,7 @@ module Occi::Api::Client
       #
       # @param [String] path for the POST request
       # @param [Occi::Collection] resource data to be POSTed
-      # @return [String] URI location
+      # @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?
 
@@ -87,27 +93,9 @@ module Occi::Api::Client
         end
 
         response_msg = response_message(response)
+        raise "HTTP POST failed! #{response_msg}" unless response.code.between? 200, 201
 
-        case response.code
-        when 200
-          collection = Occi::Parser.parse(response.header["content-type"].split(";").first, response.body)
-
-          if collection.empty?
-            Occi::Parser.locations(response.header["content-type"].split(";").first, response.body, response.headers).first
-          else
-            collection.resources.first.location if collection.resources.first
-          end
-        when 201
-          # TODO: OCCI-OS hack, look for header Location instead of uri-list
-          # This should be probably implemented in Occi::Parser.locations
-          if response.header['location']
-            response.header['location']
-          else
-            Occi::Parser.locations(response.header["content-type"].split(";").first, response.body, response.headers).first
-          end
-        else
-          raise "HTTP POST failed! #{response_msg}"
-        end
+        collection.send(:standalone_action_instance?) ? post_action(response) : post_create(response)
       end
 
       # Performs PUT requests and parses responses to collections.
@@ -140,8 +128,7 @@ module Occi::Api::Client
 
         response_msg = response_message(response)
 
-        case response.code
-        when 200, 201
+        if response.code.between? 200, 201
           Occi::Parser.parse(response.header["content-type"].split(";").first, response.body)
         else
           raise "HTTP POST failed! #{response_msg}"
@@ -162,11 +149,46 @@ module Occi::Api::Client
         response = self.class.delete(path)
 
         response_msg = response_message(response)
-        raise "HTTP DELETE failed! #{response_msg}" unless response.code.between? 200, 300
+        raise "HTTP DELETE failed! #{response_msg}" unless response.code == 200
+
+        true
+      end
+
+      private
 
+      def post_action(response)
         true
       end
 
+      def post_create(response)
+        if response.code == 200
+          collection = Occi::Parser.parse(
+            response.header["content-type"].split(";").first,
+            response.body
+          )
+
+          if collection.empty?
+            Occi::Parser.locations(
+              response.header["content-type"].split(";").first,
+              response.body,
+              response.headers
+            ).first
+          else
+            raise "HTTP POST response does not " \
+                  "contain required resource rendering!" unless collection.resources.first
+            collection.resources.first.location
+          end
+        else
+          Occi::Parser.locations(
+            response.header["content-type"].split(";").first,
+            response.body,
+            response.headers
+          ).first
+        end
+      end
+
+      def post_update(response); end
+
     end
 
   end

data/lib/occi/api/version.rb

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

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: occi-api
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta.7
+  version: 4.2.0.beta.8
+  prerelease: 6
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,11 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-core
   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: httparty
   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: json
   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
@@ -138,25 +145,26 @@ files:
 homepage: https://github.com/gwdg/rOCCI-api
 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: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: OCCI development library providing a high-level API
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODNiNDZlNGY4NjZiY2VlMGM4Yjc3YTNhMjg1M2I2MDc2MWNlMDYyOA==
-  data.tar.gz: !binary |-
-    Y2JjMWI0NDQxZjYyYTU4MmNkNWZlZDhmZmUzMWVkYjU4MGExZTc2MA==
-SHA512:
-  metadata.gz: !binary |-
-    M2RjZjE1ZDcyNTc1MTgyNTk0NDdkYzNlZTI4OTM5NzI2ODJlMDMwNTE1OWRi
-    M2Y4Y2VmYmJlNjc2OWQ3NWU5Y2E5MTc3MGNiOTJlM2FiYzY0YTUzMWIzM2I2
-    M2M3NjEwYWVhZGVjM2Q2NjMxY2ViZDA3YzI2MmZhNzA3N2NlNGI=
-  data.tar.gz: !binary |-
-    NDMyM2YyNzMyYTFlYWMxOGFmMzNkNmIzYjZlZDFjY2VmZDAxNGI1MWFkZmYz
-    ZDg4YjIwMDg1OWE0YmI3YmMzMGY2OTU1OGFiZmMzOGE3YWU4ZmMwY2IyZGU1
-    OTg0MWFiYTE5MzM2ODIzNDVjNWY4Y2VhMjI5NDc1ZjZhYzNhYjc=