sentofu 0.4.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8c4c056b7bcf92527c718a23d6f1d416c37f4858a027c3d8ce325eff3f4250d
-  data.tar.gz: 51bdebdfcca2fbf71807081eabdefce06d42cbfe4544bf2826fc395971ceb4dd
+  metadata.gz: 4bfeac4aee97cd064de1a051ec2ffc4ff787c55f76b9f6f0c8431eedf83dc857
+  data.tar.gz: a74eec29f3a08cc9d61b5815711f451b32beb403a394547d0311595accff5eac
 SHA512:
-  metadata.gz: a130e083a690df006ef1875cbd4fc2538cf6b519275a2f7727ad2f24c3ea1c66e977cbd94731d70830075c8a9056858298fc3e3c79cae6eb14b1fab5c8ee7d9b
-  data.tar.gz: 1860fa18f41ef466094440bbda7845bf713c28e81230f1716325daceeed5322e1a38a692d244c81789f02850883656950a30a62b2043a99a2dea10aad44fd429
+  metadata.gz: dcee31d91fa32a28bcbb62b32528b1c02be05faedf5c8bb83edc430f7856922f6cd457b237a57ea410e475aaa58c958aca8367e917fea5084698e0923e4f4d59
+  data.tar.gz: 99772453343ee48ae33ec348454b32c62cf47d4499edff0b577f7e4f59fbfb01eaa1bb7b6057977265a1122bf5621f1dbd33fc0a36b2979164c7c7c5a1d62253

data/CHANGELOG.md

@@ -2,6 +2,32 @@
 # CHANGELOG.md
 
 
+## 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
+* Revise error handling
+
+
+## sentofu 0.5.0  released 2019-08-02
+
+* Introduce Sentofu.ssl_verify_mode attr accessor
+
+
 ## sentofu 0.4.2  released 2019-07-28
 
 * Fix HTTP proxy determination code

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2019-2019, John Mettraux, jmettraux+flor@gmail.com
+Copyright (c) 2019-2020, John Mettraux, jmettraux+flor@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

@@ -5,6 +5,7 @@ require 'time'
 require 'base64'
 require 'webrick' # for the http code to message mapping
 require 'ostruct'
+require 'openssl'
 require 'net/http'
 
 require 'sentofu/http'
@@ -14,7 +15,7 @@ require 'sentofu/explo'
 
 module Sentofu
 
-  VERSION = '0.4.2'
+  VERSION = '0.5.4'
 
   USER_AGENT =
     "Sentofu #{Sentofu::VERSION} - " +
@@ -24,11 +25,12 @@ module Sentofu
 
   @auth_uri = nil
   @apis = {}
+  @ssl_verify_mode = OpenSSL::SSL::VERIFY_PEER
 
   class << self
 
     attr_reader :auth_uri, :apis
-    attr_accessor :user_agent
+    attr_accessor :user_agent, :ssl_verify_mode
 
     def init(versions=%w[ common:1.0.0 company:1.0.0 markets:1.0.0 ])
 

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/http.rb

@@ -51,7 +51,10 @@ module Sentofu
         # Nota Bene:
         # even if ENV['sentofu_http_proxy'], ENV['http_proxy'] could kick in
 
-        http.use_ssl = (uri.scheme == 'https')
+        if uri.scheme == 'https'
+          http.use_ssl = true
+          http.verify_mode = Sentofu.ssl_verify_mode
+        end
 
         http
       end
@@ -67,7 +70,13 @@ module Sentofu
 
         res = http.request(req)
 
-        class << res; attr_accessor :_elapsed; end
+        fail "request returned a #{res.class} and not a Net::HTTPResponse" \
+          unless res.is_a?(Net::HTTPResponse)
+
+        class << res
+          attr_accessor :_elapsed
+          def _headers; each_header.inject({}) { |h, (k, v)| h[k] = v; h }; end
+        end
         res._elapsed = monow - t0
 
         res
@@ -76,21 +85,25 @@ module Sentofu
       def get_and_parse(uri, token=nil)
 
         res = get(uri, token)
-        r = JSON.parse(res.body)
-        r[:_elapsed] = res._elapsed
 
-        r
+        fail 'something went wrong' \
+          unless res.header['content-type'].match(/^application\/json(;|$)/)
 
-      rescue JSON::ParserError => pe
+        JSON.parse(res.body)
+          .merge!(
+            _headers: res._headers,
+            _elapsed: res._elapsed)
 
-        h = {}
-        h[:code] = res.code.to_i
-        h[:message] = WEBrick::HTTPStatus.reason_phrase(res.code)
-        h[:error_class] = pe.class.to_s
-        h[:error_message] = pe.message
-        h[:body] = res.body unless res.body.index('</html>')
+      rescue => err
 
-        h
+        { uri: uri,
+          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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentofu
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.4
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-27 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -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.1.4
 signing_key: 
 specification_version: 4
 summary: A Ruby client to some of the 1.0.0 Sentifi.com APIs