occi-api 4.2.1 → 4.2.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTdmMWQ2ZjBlNWE0NzE0MTc0OTYxMDY2NGM0MTUwOTZmMGIyM2M3Mw==
-  data.tar.gz: !binary |-
-    NmVhNWMyNjNhMmE0OTlkYmM1MzNmZjFlZGM5MGVhY2FjNmY1MzM1OA==
+SHA1:
+  metadata.gz: 52a78b315630f4bda6985d01bb8cd7a10eac0120
+  data.tar.gz: b2e22f0647b41cee6b6b5ff3195cc47ea7ea563c
 SHA512:
-  metadata.gz: !binary |-
-    YjE1OTg0YzNkZjEzMTU4ODc2MDlmNzgwNmJmZmQ3YjFmMWRkZTU1NTc0NGM2
-    ZTg3ZTgzN2Y2ZDZiYTQ4MDY5ZWU1MTQ1MmNmMGJmNmRkYWY3NzNjYjI5NjJl
-    MGQ1NzM2NzU5OWVlYzM5ZjZkYmQ2YjY2Mjk5NDNiM2EzYTg5ODA=
-  data.tar.gz: !binary |-
-    NmUyYjZlNjhjNGY3MTI4OGVjZWIzOWRiZDc1Mjk5MzRjMTljM2UzNWEyMmI0
-    NDNlYmI0MjQ3NmE0MTcyZGU1MjM5Y2U2NWUzNzhkZjk4NDllYjdkMWIzMDI4
-    NDZkODAzZDk0YmM5YzUzNmI2ZmRkMjljY2UxN2M1NTUwNDYyZTk=
+  metadata.gz: d9a8d71c622cf0b1b387aa8f5e797d781f9301b871d684f32f81242e3a50ddfb8a52083ad88300db0762ba07d5b68c3798655a4133dfc77ad0b421522d0188e4
+  data.tar.gz: 86357068fa3f351e0f933dd4accf53149e88b7d4c5f6c7e8017da6564a992e683a9ed561e705dc7f824c9e9553858527b10d77517221f8544feaddada5eb8a82

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

@@ -91,12 +91,19 @@ module Occi::Api::Client
       elsif @model.get_by_id(resource_type_identifier)
         # we got type identifier
         # get all available resources of this type
-        locations = list(resource_type_identifier)
 
-        # make the requests
-        locations.each do |location|
-          path = sanitize_instance_link(location)
-          descriptions.merge! get(path)
+        if @media_type == 'application/occi+json'
+          # all at once
+          descriptions = get(path_for_kind_type_identifier(resource_type_identifier))
+        else
+          # one resource at a time
+          locations = list(resource_type_identifier)
+
+          # make the requests
+          locations.each do |location|
+            path = sanitize_instance_link(location)
+            descriptions.merge! get(path)
+          end
         end
       else
         # this is a link of a specific resource (absolute or relative)

data/lib/occi/api/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Api
-    VERSION = "4.2.1" unless defined?(::Occi::Api::VERSION)
+    VERSION = "4.2.2" 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.11'
+  gem.add_dependency 'occi-core', '~> 4.2.12'
   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.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -18,40 +18,40 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.11
+        version: 4.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.11
+        version: 4.2.12
 - !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: []