occi-api 4.2.1 → 4.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +5 -13
  2. data/lib/occi/api/client/client_http.rb +12 -5
  3. data/lib/occi/api/version.rb +1 -1
  4. data/occi-api.gemspec +1 -1
  5. metadata +9 -9
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- MTdmMWQ2ZjBlNWE0NzE0MTc0OTYxMDY2NGM0MTUwOTZmMGIyM2M3Mw==
5
- data.tar.gz: !binary |-
6
- NmVhNWMyNjNhMmE0OTlkYmM1MzNmZjFlZGM5MGVhY2FjNmY1MzM1OA==
2
+ SHA1:
3
+ metadata.gz: 52a78b315630f4bda6985d01bb8cd7a10eac0120
4
+ data.tar.gz: b2e22f0647b41cee6b6b5ff3195cc47ea7ea563c
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- YjE1OTg0YzNkZjEzMTU4ODc2MDlmNzgwNmJmZmQ3YjFmMWRkZTU1NTc0NGM2
10
- ZTg3ZTgzN2Y2ZDZiYTQ4MDY5ZWU1MTQ1MmNmMGJmNmRkYWY3NzNjYjI5NjJl
11
- MGQ1NzM2NzU5OWVlYzM5ZjZkYmQ2YjY2Mjk5NDNiM2EzYTg5ODA=
12
- data.tar.gz: !binary |-
13
- NmUyYjZlNjhjNGY3MTI4OGVjZWIzOWRiZDc1Mjk5MzRjMTljM2UzNWEyMmI0
14
- NDNlYmI0MjQ3NmE0MTcyZGU1MjM5Y2U2NWUzNzhkZjk4NDllYjdkMWIzMDI4
15
- NDZkODAzZDk0YmM5YzUzNmI2ZmRkMjljY2UxN2M1NTUwNDYyZTk=
6
+ metadata.gz: d9a8d71c622cf0b1b387aa8f5e797d781f9301b871d684f32f81242e3a50ddfb8a52083ad88300db0762ba07d5b68c3798655a4133dfc77ad0b421522d0188e4
7
+ data.tar.gz: 86357068fa3f351e0f933dd4accf53149e88b7d4c5f6c7e8017da6564a992e683a9ed561e705dc7f824c9e9553858527b10d77517221f8544feaddada5eb8a82
data/lib/occi/api/client/client_http.rb CHANGED
@@ -91,12 +91,19 @@ module Occi::Api::Client
91
91
  elsif @model.get_by_id(resource_type_identifier)
92
92
  # we got type identifier
93
93
  # get all available resources of this type
94
- locations = list(resource_type_identifier)
95
94
 
96
- # make the requests
97
- locations.each do |location|
98
- path = sanitize_instance_link(location)
99
- descriptions.merge! get(path)
95
+ if @media_type == 'application/occi+json'
96
+ # all at once
97
+ descriptions = get(path_for_kind_type_identifier(resource_type_identifier))
98
+ else
99
+ # one resource at a time
100
+ locations = list(resource_type_identifier)
101
+
102
+ # make the requests
103
+ locations.each do |location|
104
+ path = sanitize_instance_link(location)
105
+ descriptions.merge! get(path)
106
+ end
100
107
  end
101
108
  else
102
109
  # this is a link of a specific resource (absolute or relative)
data/lib/occi/api/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Occi
2
2
  module Api
3
- VERSION = "4.2.1" unless defined?(::Occi::Api::VERSION)
3
+ VERSION = "4.2.2" unless defined?(::Occi::Api::VERSION)
4
4
  end
5
5
  end
data/occi-api.gemspec CHANGED
@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
18
18
  gem.test_files = `git ls-files -- {test,spec}/*`.split("\n")
19
19
  gem.require_paths = ["lib"]
20
20
 
21
- gem.add_dependency 'occi-core', '~> 4.2.11'
21
+ gem.add_dependency 'occi-core', '~> 4.2.12'
22
22
  gem.add_dependency 'httparty'
23
23
  gem.add_dependency 'json'
24
24
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: occi-api
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.1
4
+ version: 4.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Florian Feldhaus
@@ -18,40 +18,40 @@ dependencies:
18
18
  requirements:
19
19
  - - ~>
20
20
  - !ruby/object:Gem::Version
21
- version: 4.2.11
21
+ version: 4.2.12
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
26
  - - ~>
27
27
  - !ruby/object:Gem::Version
28
- version: 4.2.11
28
+ version: 4.2.12
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: httparty
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
- - - ! '>='
33
+ - - '>='
34
34
  - !ruby/object:Gem::Version
35
35
  version: '0'
36
36
  type: :runtime
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
- - - ! '>='
40
+ - - '>='
41
41
  - !ruby/object:Gem::Version
42
42
  version: '0'
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: json
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
- - - ! '>='
47
+ - - '>='
48
48
  - !ruby/object:Gem::Version
49
49
  version: '0'
50
50
  type: :runtime
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
- - - ! '>='
54
+ - - '>='
55
55
  - !ruby/object:Gem::Version
56
56
  version: '0'
57
57
  description: This gem provides ready-to-use client classes to simplify the integration
@@ -209,12 +209,12 @@ require_paths:
209
209
  - lib
210
210
  required_ruby_version: !ruby/object:Gem::Requirement
211
211
  requirements:
212
- - - ! '>='
212
+ - - '>='
213
213
  - !ruby/object:Gem::Version
214
214
  version: 1.9.3
215
215
  required_rubygems_version: !ruby/object:Gem::Requirement
216
216
  requirements:
217
- - - ! '>='
217
+ - - '>='
218
218
  - !ruby/object:Gem::Version
219
219
  version: '0'
220
220
  requirements: []