sentofu 0.5.1 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68e190d7c3fe485d068af8a08d0fc2186a5f88a88190dcc7a847502f8be41c43
-  data.tar.gz: 1f78480b5d3d29d2c427b1834eead05e825457afe644c6e5f9fba880d4c34b00
+  metadata.gz: 1a51d89ce6f0bf66e8ec77a7e1ffb77f785cd79b76d6187e8acd57bbeb271d92
+  data.tar.gz: 53a52a093fa0814e93af8a853d28a4bf8148778425f9a1b4ea6d05b5cf8dbc06
 SHA512:
-  metadata.gz: 855aa75755835c002c54c99e6d6bd5bbc49d82a03181296029da3c8a27a437afdd05b40ddd88a8a69756f2ec9c7885eb703301b15857959fbd6143ff61b9d303
-  data.tar.gz: a79ae6b30586c97d5f3781e4ea27a28cf406df24da887717812b674e949cc5f489abc2f71048322eb46e23d377846b6bf0f860ec2b2687bd5b13154c4d416037
+  metadata.gz: 8f0caad70ab9b00ef1cb6f922b8ea31084fe348c5a3dea244b6b85dc18a3f723ece8024c41581049d4566a376a1b98e7f12a77be0c57bb8d5f65aadacda7b164
+  data.tar.gz: 86cabc05c6d18492acd8bbe0c38deb66a3255e50c08f2817f48759816ac9fa0fde87a003e49b6d42d08d2789953a9d841abd8549d32a63a23204b5ec51e0168d

data/CHANGELOG.md

@@ -2,6 +2,31 @@
 # CHANGELOG.md
 
 
+## sentofu 0.5.6  released 2020-09-28
+
+* Report _code along _headers in response
+
+
+## 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
+
+
+## sentofu 0.5.3  released 2019-11-07
+
+* Tighten request error interception
+
+
+## sentofu 0.5.2  released 2019-09-27
+
+* Tighten request error interception
+
+
 ## sentofu 0.5.1  released 2019-09-10
 
 * Keep track of :_headers in result hashes

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2019-2019, 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/Makefile

@@ -31,7 +31,7 @@ build: gemspec_validate
 	mv $(NAME)-$(VERSION).gem pkg/
 
 push: build
-	gem push pkg/$(NAME)-$(VERSION).gem
+	gem push --otp "$(OTP)" pkg/$(NAME)-$(VERSION).gem
 
 spec:
 	bundle exec rspec

data/lib/sentofu.rb

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

data/lib/sentofu/api.rb

@@ -102,7 +102,7 @@ module Sentofu
             end
           h }
 
-      point['get']['parameters']
+      (point['get']['parameters'] || [])
         .each { |par|
 
           next if par['in'] != 'query'
@@ -146,7 +146,15 @@ module Sentofu
 
     def initialize(name, spec)
 
-      super(nil, spec['servers'].first['url'])
+      u = spec['servers'].first['url'] rescue nil
+      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)'
+        fail "cannot setup #{name.inspect} API - HTTP #{c} - #{m.inspect}"
+      end
+
+      super(nil, u)
 
       @name = name
       @spec = spec

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,15 +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)
 
         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
@@ -84,23 +89,26 @@ 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)
+            _code: res.code.to_i,
+            _elapsed: res._elapsed,
+            _proxy: res._proxy)
 
-      rescue => e
+      rescue => err
 
         { uri: uri,
-          code: res.code.to_i,
-          headers: res._headers,
-          message: WEBrick::HTTPStatus.reason_phrase(res.code),
-          error_class: e.class.to_s,
-          error_message: e.message,
-          error_trace: e.backtrace,
-          body: (res.body.index('</html>') ? '<html>' : res.body) }
+          code: (res.code.to_i rescue nil),
+          headers: (res._headers rescue nil),
+          message: (WEBrick::HTTPStatus.reason_phrase(res.code) rescue nil),
+          error_class: err.class.to_s,
+          error_message: err.message,
+          error_trace: err.backtrace,
+          body: ((res.body.index('</html>') ? '<html>' : res.body) rescue nil) }
       end
 
       protected
@@ -136,6 +144,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
 
@@ -145,7 +164,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?
@@ -155,7 +186,7 @@ module Sentofu
 
     def header_value
 
-      'Bearer ' + @h['access_token']
+      "Bearer #{@h['access_token'] || 'SENTOFU_INVALID_TOKEN_:-('}"
     end
   end
 end

data/sentofu.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.authors = [ 'John Mettraux' ]
   s.email = [ 'jmettraux@gmail.com' ]
-  s.homepage = 'http://github.com/jmettraux/sentofu'
+  s.homepage = 'https://github.com/jmettraux/sentofu'
   s.license = 'MIT'
   s.summary = 'A Ruby client to some of the 1.0.0 Sentifi.com APIs'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentofu
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.6
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-10 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -40,15 +40,15 @@ files:
 - lib/sentofu/explo.rb
 - lib/sentofu/http.rb
 - sentofu.gemspec
-homepage: http://github.com/jmettraux/sentofu
+homepage: https://github.com/jmettraux/sentofu
 licenses:
 - MIT
 metadata:
-  changelog_uri: http://github.com/jmettraux/sentofu/blob/master/CHANGELOG.md
-  documentation_uri: http://github.com/jmettraux/sentofu
-  bug_tracker_uri: http://github.com/jmettraux/sentofu/issues
-  homepage_uri: http://github.com/jmettraux/sentofu
-  source_code_uri: http://github.com/jmettraux/sentofu
+  changelog_uri: https://github.com/jmettraux/sentofu/blob/master/CHANGELOG.md
+  documentation_uri: https://github.com/jmettraux/sentofu
+  bug_tracker_uri: https://github.com/jmettraux/sentofu/issues
+  homepage_uri: https://github.com/jmettraux/sentofu
+  source_code_uri: https://github.com/jmettraux/sentofu
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -64,8 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Ruby client to some of the 1.0.0 Sentifi.com APIs