redfish_client 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2bb83aba67c60478769756f451642c1cee20e2a8
-  data.tar.gz: dd14b581e356f10253e9b0b9cd941d2162dd2540
+SHA256:
+  metadata.gz: 89fe47fe3e6d6e82a1c1fbce3a33e101ec9c0dc70b9e4725205c1e987c1f4b38
+  data.tar.gz: 823ea29d9a34c9a460c6a65b385714d08fa50caaeb829dfb7f1747af78389b63
 SHA512:
-  metadata.gz: 67444264c37cf0f05e00262c5b2f9270511809fac96ede321166de38cfe30ec174d879db42b5b2f32f553f0a6b26eff87a2cdbebbaf59ab895fc64fef0294b11
-  data.tar.gz: f24893766d33f32415205011f8b2f555b55f88cb6c6726202ca5849d0074b813006396a5ec6e58d11429db45aa2c8469f92f860b5fd2ae64facba50755fcc545
+  metadata.gz: 8699fd26e3c468d864132e5790ab6037d2ac6e767a38c96ee07a12c9edd29ba77aceb1937287f9bf877db0ccf23534d790bfe3aaa3ce1d87d63eb98e4f75d25d
+  data.tar.gz: 6538ec3de254d305b25fa076fb72d72866ec8162717c3cd1205f4c957d84b310a46b23490514e8b665acc121b6556e19b202261fc8f273d925c61ef99d5639e9

data/lib/redfish_client/connector.rb

@@ -29,6 +29,7 @@ module RedfishClient
     # Basic and token authentication header names
     BASIC_AUTH_HEADER = "Authorization"
     TOKEN_AUTH_HEADER = "X-Auth-Token"
+    LOCATION_HEADER   = "Location"
 
     # Create new connector.
     #
@@ -218,9 +219,21 @@ module RedfishClient
       r = @connection.request(params)
       raise_invalid_auth_error unless r.status == 201
 
-      token = r.data[:headers][TOKEN_AUTH_HEADER]
-      add_headers(TOKEN_AUTH_HEADER => token)
-      @session_oid = JSON.parse(r.data[:body])["@odata.id"]
+      body    = JSON.parse(r.data[:body])
+      headers = r.data[:headers]
+
+      add_headers(TOKEN_AUTH_HEADER => headers[TOKEN_AUTH_HEADER])
+      save_session_oid!(body, headers)
+    end
+
+    def save_session_oid!(body, headers)
+      @session_oid = body["@odata.id"] if body.key?("@odata.id")
+      return if @session_oid
+
+      return unless headers.key?(LOCATION_HEADER)
+
+      location = URI.parse(headers[LOCATION_HEADER])
+      @session_oid = [location.path, location.query].compact.join("?")
     end
 
     def basic_login

data/lib/redfish_client/response.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "uri"
+
 module RedfishClient
   # Response struct.
   #
@@ -20,13 +22,20 @@ module RedfishClient
     end
 
     def monitor
-      done? ? nil : headers["location"]
+      return nil if done?
+
+      uri = URI.parse(headers["location"])
+      [uri.path, uri.query].compact.join("?")
     end
 
     def to_h
       { "status" => status, "headers" => headers, "body" => body }
     end
 
+    def to_s
+      "Response[status=#{status}, headers=#{headers}, body='#{body}']"
+    end
+
     def self.from_hash(data)
       new(*data.values_at("status", "headers", "body"))
     end

data/lib/redfish_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RedfishClient
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/redfish_client.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = "~> 2.1"
 
-  spec.add_runtime_dependency "excon", "~> 0.60"
+  spec.add_runtime_dependency "excon", "~> 0.71"
   spec.add_runtime_dependency "server_sent_events", "~> 0.1"
 
   spec.add_development_dependency "rake", ">= 11.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redfish_client
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Tadej Borovšak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.60'
+        version: '0.71'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.60'
+        version: '0.71'
 - !ruby/object:Gem::Dependency
   name: server_sent_events
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Simple Redfish client library