redfish_client 0.5.0 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 845f7a73083c73f8fe2ce79f8968332dd605aa87
-  data.tar.gz: 5e1e8056e6618c11428e0907050ef874242b78d3
+SHA256:
+  metadata.gz: 685c1b4535b5934f7683db9bdb964e5961962c9d85fc3d83ef5c97051568d58b
+  data.tar.gz: f60cc0d54626c4ab2c55f84e2179a507ff95d8732a40d99bb300bde7666f40f2
 SHA512:
-  metadata.gz: f2957a2b7baf789ef346b22e74e7cddb0894704eb30ae225ac4cd17cf95adf4e7f93d619859d2b3fb41c240bf2f34f1ffe09e2c3bc33110f11129d2664e19ca4
-  data.tar.gz: b3d582a79ce5a8bfe435d5d08d63977414c426a00b68cd1ac02555297c0000480a2dc6bdb1c6027e17585858304633f031d46e31a52f04f9f4d4ab2b346cc7b9
+  metadata.gz: f5b8378d17b32e736e1007c51a3e22a5ad746e816acdb5e586cf91552c07ca5153a5140923a70ae8364c7b7435fb84b9010756157269e2d88d053b692dd055b3
+  data.tar.gz: 5711720aa89461803460a09d323d043505ee54b6cef50183abddb336364f5145a030c6e0050723c22d85e706476e0a49c5f55a357a613a800c55b0e05be62e3d

data/.github/workflows/ci.yml

@@ -0,0 +1,21 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone repo
+        uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake

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.
     #
@@ -82,13 +83,11 @@ module RedfishClient
     # @param data [Hash] data to be sent over the socket
     # @return [Response] response object
     def request(method, path, data = nil)
-      params = prepare_request_params(method, path, data)
-      r = @connection.request(params)
-      if r.status == 401
-        login
-        r = @connection.request(params)
+      return @cache[path] if method == :get && @cache[path]
+
+      do_request(method, path, data).tap do |r|
+        @cache[path] = r if method == :get && r.status == 200
       end
-      Response.new(r.status, downcase_headers(r.data[:headers]), r.data[:body])
     end
 
     # Issue GET request to service.
@@ -100,9 +99,7 @@ module RedfishClient
     # @param path [String] path to the resource, relative to the base url
     # @return [Response] response object
     def get(path)
-      return @cache[path] if @cache[path]
-
-      request(:get, path).tap { |r| @cache[path] = r if r.status == 200 }
+      request(:get, path)
     end
 
     # Issue POST requests to the service.
@@ -188,6 +185,16 @@ module RedfishClient
 
     private
 
+    def do_request(method, path, data)
+      params = prepare_request_params(method, path, data)
+      r = @connection.request(params)
+      if r.status == 401
+        login
+        r = @connection.request(params)
+      end
+      Response.new(r.status, downcase_headers(r.data[:headers]), r.data[:body])
+    end
+
     def downcase_headers(headers)
       headers.each_with_object({}) { |(k, v), obj| obj[k.downcase] = v }
     end
@@ -212,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.0"
+  VERSION = "0.5.4"
 end

data/redfish_client.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["tadej.borovsak@xlab.si"]
 
   spec.summary       = "Simple Redfish client library"
-  spec.homepage      = "https://github.com/xlab-si/redfish-client-ruby"
+  spec.homepage      = "https://github.com/xlab-steampunk/redfish-client-ruby"
   spec.license       = "Apache-2.0"
 
   if spec.respond_to?(:metadata)
@@ -27,9 +27,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = "~> 2.1"
+  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.0
+  version: 0.5.4
 platform: ruby
 authors:
 - Tadej Borovšak
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-06-03 00:00:00.000000000 Z
+date: 2021-08-25 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
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - tadej.borovsak@xlab.si
 executables: []
@@ -144,11 +144,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".simplecov"
-- ".travis.yml"
 - ".yardopts"
 - Gemfile
 - README.md
@@ -164,18 +164,18 @@ files:
 - lib/redfish_client/root.rb
 - lib/redfish_client/version.rb
 - redfish_client.gemspec
-homepage: https://github.com/xlab-si/redfish-client-ruby
+homepage: https://github.com/xlab-steampunk/redfish-client-ruby
 licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -184,9 +184,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Simple Redfish client library
 test_files: []

data/.travis.yml

@@ -1,31 +0,0 @@
-language: ruby
-cache: bundler
-
-rvm:
-- 2.4.3
-
-env:
-  global:
-    - CC_TEST_REPORTER_ID=64aae57d1a096aebb16347cbc64d418352f3ec38ebbe4d002bc84c2ceda837b3
-
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
-
-branches:
-  only:
-    - master
-    - /^\d+\.\d+(\.\d+)?(-\S*)?$/
-
-deploy:
-  provider: rubygems
-  api_key:
-    secure: NdOd7EA9XQZNbnkzLFNXeJcOoaTi93uuwzjADS+fxFJ2HYGJs/T+gi98f742Oj4j187lBQjwICkdduGQjVn3BA/8YZD7sOkdywDSELupTjJmugf/hks6MiKJ0fex5GmHwspjZ7P+9iLPXGcaYWbGamWlSDL+Z/79s4bi8b5sBVwJ01YnIJvFn32/I5vPFwbwUzvH0n3HAjYHZ/kpZ122Zp/DhSpGam2azWF0Tynu7RNMsQrGamAH0mC1DzAscSD6VTyMcSMkD6XUr3GX7w7yvVO0qo7e6EcjrsJKMRC8/s2C/SWQ4pRDAldhQpd4C7/QSaHE0mmQcEYi2qsBmrbFb7cAfRmS5BKn8LSv7YPVH0VFl3fwYAycwqA068TZ68t99YPw7uVcJpDOWBODCQWA1wgV1tXHop7CJOcQW4MoXzyaRbbpF+6lyxXEgTz8Me8zEucMsHWzS9dI1E5x/bWl3TgEM9n+/G6BAcBj/mZv/dxC6H7kWp0ubKw0bRsdET/YmG53vxISaFbnLxNhsHzeE2mFeF+JL7a1amlC4aTiSBnxDgRzDdnoo42Hu8SUg/mp0xLjyoTME1w1zaB+GvmWCdrpkLQL2kNDgQUvBfOp+Zqfb37tKgc15zb7v2sru5acixkSG9UVElleDW8K4R1QcqXwLxCYccCi/ExVR1zSvSM=
-  gem: redfish_client
-  on:
-    tags: true
-    repo: xlab-si/redfish-client-ruby