occi-api 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: c35477a7a236472b0e8688d4e1707917b6233219
-  data.tar.gz: 24870c6344ce4b5b2e1626d0ca0100e299ec7d17
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTdmMWQ2ZjBlNWE0NzE0MTc0OTYxMDY2NGM0MTUwOTZmMGIyM2M3Mw==
+  data.tar.gz: !binary |-
+    NmVhNWMyNjNhMmE0OTlkYmM1MzNmZjFlZGM5MGVhY2FjNmY1MzM1OA==
 SHA512:
-  metadata.gz: 9af9cf21a3aac55d6ad3cc6b2641be65173db39eb1a14653fcb88035f25cca66d4d62c3ddbb96fa1fe89e298f82c2d814d671ec0a2b1e078bc980de9c0ffe96a
-  data.tar.gz: 4ed4f07f440648c707c74b401def3d86dc74071bbcce163b6c7098792426a27120f816df8690d611635eb94a990b4393f62fc1cf15bf7375e02a8ae35ec414bf
+  metadata.gz: !binary |-
+    YjE1OTg0YzNkZjEzMTU4ODc2MDlmNzgwNmJmZmQ3YjFmMWRkZTU1NTc0NGM2
+    ZTg3ZTgzN2Y2ZDZiYTQ4MDY5ZWU1MTQ1MmNmMGJmNmRkYWY3NzNjYjI5NjJl
+    MGQ1NzM2NzU5OWVlYzM5ZjZkYmQ2YjY2Mjk5NDNiM2EzYTg5ODA=
+  data.tar.gz: !binary |-
+    NmUyYjZlNjhjNGY3MTI4OGVjZWIzOWRiZDc1Mjk5MzRjMTljM2UzNWEyMmI0
+    NDNlYmI0MjQ3NmE0MTcyZGU1MjM5Y2U2NWUzNzhkZjk4NDllYjdkMWIzMDI4
+    NDZkODAzZDk0YmM5YzUzNmI2ZmRkMjljY2UxN2M1NTUwNDYyZTk=

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

@@ -40,7 +40,7 @@ module Occi::Api::Client
       #     # => #<Occi::Core::Resources>
       #
       # @param resource_type_identifier [String] resource type identifier, type name or resource location
-      # @return [Occi::Core::Resources] list of resource descriptions
+      # @return [Occi::Core::Resources, Occi::Core::Links] list of resource or link descriptions
       def describe(resource_type_identifier=nil)
         raise Occi::Api::Client::Errors::NotImplementedError, "#{__method__} is just a stub!"
       end

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

@@ -104,7 +104,12 @@ module Occi::Api::Client
         descriptions.merge! get(path)
       end
 
-      descriptions.resources
+      # decide what to return, in case of mixed collections prefer resources
+      if descriptions.resources.empty?
+        descriptions.links
+      else
+        descriptions.resources
+      end
     end
 
     # @see Occi::Api::Client::ClientBase

data/lib/occi/api/client/http/authn_plugins/keystone.rb

@@ -48,7 +48,7 @@ module Occi::Api::Client
           raise ::Occi::Api::Client::Errors::AuthnError,
                 "Unable to get Keystone's URL from the response!" unless match && match[2]
 
-          @keystone_url = match[2].chomp('/')
+          @keystone_url = match[2].chomp('/').chomp('/v2.0')
         end
 
         def set_auth_token(tenant = nil)

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

@@ -107,12 +107,12 @@ module Occi::Api::Client
         Occi::Api::Log.debug "Response from location: #{path.inspect}"
         kind = @model.get_by_location(path) if @model
 
-        Occi::Api::Log.debug "Response should contain kind: #{kind.inspect}"
-        entity_type = nil
-        if kind && kind.related_to?(Occi::Core::Link)
-          entity_type = Occi::Core::Link
+        Occi::Api::Log.debug "Response should contain kind: #{kind ? kind.type_identifier.inspect : 'none'}"
+        entity_type = if kind && kind.related_to?(Occi::Core::Link.kind)
+          Occi::Core::Link
+        else
+          Occi::Core::Resource
         end
-        entity_type = Occi::Core::Resource unless entity_type
 
         Occi::Api::Log.debug "Parser call: #{response.content_type.inspect} #{path.include?('/-/')} " \
                         "#{entity_type} #{response.headers.inspect}"

data/lib/occi/api/version.rb

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

data/occi-api.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec}/*`.split("\n")
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'occi-core', '~> 4.2.10'
+  gem.add_dependency 'occi-core', '~> 4.2.11'
   gem.add_dependency 'httparty'
   gem.add_dependency 'json'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-api
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-core
@@ -18,40 +18,40 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.10
+        version: 4.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.10
+        version: 4.2.11
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem provides ready-to-use client classes to simplify the integration
@@ -209,12 +209,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []