sentofu 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bfeac4aee97cd064de1a051ec2ffc4ff787c55f76b9f6f0c8431eedf83dc857
-  data.tar.gz: a74eec29f3a08cc9d61b5815711f451b32beb403a394547d0311595accff5eac
+  metadata.gz: a22c27c7dbd12ccf93283de4c58bb65497a17638d013929ad1557a91c1dfac2b
+  data.tar.gz: 037d542183584b6ced637afafbae8fc98febf971413dc5846fbff6fbbd44cad5
 SHA512:
-  metadata.gz: dcee31d91fa32a28bcbb62b32528b1c02be05faedf5c8bb83edc430f7856922f6cd457b237a57ea410e475aaa58c958aca8367e917fea5084698e0923e4f4d59
-  data.tar.gz: 99772453343ee48ae33ec348454b32c62cf47d4499edff0b577f7e4f59fbfb01eaa1bb7b6057977265a1122bf5621f1dbd33fc0a36b2979164c7c7c5a1d62253
+  metadata.gz: 23f8ed539f585372700227f4f42b947166d55f47b80ad180fb08e6ccc7eeeb1dd0a2e1031b1dea9915b8583b79ee63b7380e113c090d93b95c1910804bea7a23
+  data.tar.gz: e6526c9c327d68c8b27e0b8ad8b1c7bd02d8a8a66c9f7cd5936622a342efcd8bc7733df572ee0c4229530fed8480062f876f3796249032f15d068032fc2e60d4

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # CHANGELOG.md
 
 
+## sentofu 0.5.5  released 2020-09-25
+
+* Report _uri and _proxy along _headers in response
+
+
 ## sentofu 0.5.4  released 2020-06-03
 
 * Prevent failure on missing GET parameters list

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2019-2020, John Mettraux, jmettraux+flor@gmail.com
+Copyright (c) 2019-2020, John Mettraux, jmettraux@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/sentofu.rb

@@ -15,7 +15,7 @@ require 'sentofu/explo'
 
 module Sentofu
 
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
 
   USER_AGENT =
     "Sentofu #{Sentofu::VERSION} - " +

data/lib/sentofu/api.rb

@@ -147,7 +147,7 @@ module Sentofu
     def initialize(name, spec)
 
       u = spec['servers'].first['url'] rescue nil
-      unless u.is_a?(String) && u.match(/\Ahttps?:\/\//)
+      unless u.is_a?(String) && u.match?(/\Ahttps?:\/\//)
 #p name; pp spec; p u
         c = spec['code'] rescue -1
         m = spec['message'] rescue '(no message)'

data/lib/sentofu/explo.rb

@@ -33,10 +33,19 @@ module Sentofu
       puts
 
       list_apis.each do |h|
-        n = h['n']; n = "auth" if n.match(/auth/i)
+
+        n =
+          case nn = h['n']
+          when /auth/i then 'auth'
+          when /ESG Score API/ then 'escore'
+          else nn
+          end
+
         fn = "api_#{n}_#{h['v']}.yaml"
+
         res = Sentofu::Http.get(h['u'] + '/swagger.yaml')
         File.open(fn, 'wb') { |f| f.write(res.body) }
+
         puts "  wrote #{fn}"
       end
     end

data/lib/sentofu/http.rb

@@ -66,18 +66,20 @@ module Sentofu
         t0 = monow
 
         http = make_net_http(u)
-#t.set_debug_output($stdout) if u.to_s.match(/search/)
+#t.set_debug_output($stdout) if u.to_s.match?(/search/)
 
         res = http.request(req)
 
-        fail "request returned a #{res.class} and not a Net::HTTPResponse" \
-          unless res.is_a?(Net::HTTPResponse)
-
         class << res
-          attr_accessor :_elapsed
+          attr_accessor :_uri, :_elapsed, :_proxy
           def _headers; each_header.inject({}) { |h, (k, v)| h[k] = v; h }; end
         end
+        res._uri = uri.to_s
         res._elapsed = monow - t0
+        res._proxy = detail_proxy(http)
+
+        fail "request returned a #{res.class} and not a Net::HTTPResponse" \
+          unless res.is_a?(Net::HTTPResponse)
 
         res
       end
@@ -87,12 +89,14 @@ module Sentofu
         res = get(uri, token)
 
         fail 'something went wrong' \
-          unless res.header['content-type'].match(/^application\/json(;|$)/)
+          unless res.header['content-type'].match?(/^application\/json(;|$)/)
 
         JSON.parse(res.body)
           .merge!(
+            _uri: res._uri,
             _headers: res._headers,
-            _elapsed: res._elapsed)
+            _elapsed: res._elapsed,
+            _proxy: res._proxy)
 
       rescue => err
 
@@ -139,6 +143,17 @@ module Sentofu
 
         OpenStruct.new(YAML.load(File.read(fname)))
       end
+
+      def detail_proxy(http)
+
+        if http.proxy_address
+          { address: http.proxy_address,
+            port: http.proxy_port,
+            user: http.proxy_user }
+        else
+          nil
+        end
+      end
     end
   end
 
@@ -148,7 +163,19 @@ module Sentofu
 
       @h = JSON.parse(res.body)
       @h[:_elapsed] = res._elapsed
-      @expires_at = Time.now + @h['expires_in']
+      @h[:_proxy] = res._proxy
+
+      @expires_at = @h['expires_in'] ? Time.now + @h['expires_in'] : 0
+    end
+
+    def errors
+
+      @h['errors'] || []
+    end
+
+    def sound?
+
+      errors.empty?
     end
 
     def not_expired?
@@ -158,7 +185,7 @@ module Sentofu
 
     def header_value
 
-      'Bearer ' + @h['access_token']
+      "Bearer #{@h['access_token'] || 'SENTOFU_INVALID_TOKEN_:-('}"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentofu
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Ruby client to some of the 1.0.0 Sentifi.com APIs