sentofu 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a51d89ce6f0bf66e8ec77a7e1ffb77f785cd79b76d6187e8acd57bbeb271d92
-  data.tar.gz: 53a52a093fa0814e93af8a853d28a4bf8148778425f9a1b4ea6d05b5cf8dbc06
+  metadata.gz: 6561d6b8cc61b7109c2025d15f6d5753906840f7f0bdf0dd0790498afcf74a1b
+  data.tar.gz: e5da524f149e0dbd50e51c4690e8ab753cab0b4eecf12a053612732bbc8a0a6b
 SHA512:
-  metadata.gz: 8f0caad70ab9b00ef1cb6f922b8ea31084fe348c5a3dea244b6b85dc18a3f723ece8024c41581049d4566a376a1b98e7f12a77be0c57bb8d5f65aadacda7b164
-  data.tar.gz: 86cabc05c6d18492acd8bbe0c38deb66a3255e50c08f2817f48759816ac9fa0fde87a003e49b6d42d08d2789953a9d841abd8549d32a63a23204b5ec51e0168d
+  metadata.gz: b990aeecef8189eb352b359a7aeb83904c68acda461cba81f17ac2a2c520dce414850309ee5c0ffaa96a71f33cfdb23a3763e01f5b755d039d01a8d490723fb1
+  data.tar.gz: 6b91e650302caf66fb3d3b665b0d0d1b01912a61b9ed2ea35e78186b5b038c63462e641b4d0f7024cf7a93b578f0b1a479de80eaa4e0803cd4f17d81a5b59c9f

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # CHANGELOG.md
 
 
+## sentofu 0.6.0  released 2021-01-05
+
+* Make error messages more informative
+* Stop passing the full URI to GET and POST
+
+
 ## sentofu 0.5.6  released 2020-09-28
 
 * Report _code along _headers in response

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2019-2020, John Mettraux, jmettraux@gmail.com
+Copyright (c) 2019-2021, 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.6'
+  VERSION = '0.6.0'
 
   USER_AGENT =
     "Sentofu #{Sentofu::VERSION} - " +

data/lib/sentofu/http.rb

@@ -13,19 +13,23 @@ module Sentofu
 
         a = Base64.encode64("#{cs.id}:#{cs.secret}").strip
 
-        req = Net::HTTP::Post.new(Sentofu.auth_uri)
+        u = URI(Sentofu.auth_uri)
+
+        req = Net::HTTP::Post.new(u.path)
         req.add_field('Content-Type', 'application/json')
         req.add_field('Authorization', a)
 
         req.body = JSON.dump(
           grant_type: 'password', username: cs.user, password: cs.pass)
 
-        Sentofu::Token.new(request(Sentofu.auth_uri, req))
+        Sentofu::Token.new(request(u, req))
       end
 
       def get(uri, token=nil)
 
-        request(uri, make_get_req(uri, token))
+        u = URI(uri)
+
+        request(u, make_get_req(u, token))
       end
 
       def make_net_http(uri)
@@ -61,12 +65,10 @@ module Sentofu
 
       def request(uri, req)
 
-        u = uri.is_a?(String) ? URI(uri) : uri
-
         t0 = monow
 
-        http = make_net_http(u)
-#t.set_debug_output($stdout) if u.to_s.match?(/search/)
+        http = make_net_http(uri)
+#http.set_debug_output($stderr)
 
         res = http.request(req)
 
@@ -88,12 +90,14 @@ module Sentofu
 
         res = get(uri, token)
 
-        fail 'something went wrong' \
-          unless res.header['content-type'].match?(/^application\/json(;|$)/)
+        fail(
+          "#{WEBrick::HTTPStatus.reason_phrase(res.code) rescue ''} - " +
+          "#{res._uri.to_s}"
+        ) unless res.header['content-type'].match?(/^application\/json(;|$)/)
 
         JSON.parse(res.body)
           .merge!(
-            _uri: res._uri,
+            _uri: res._uri.to_s,
             _headers: res._headers,
             _code: res.code.to_i,
             _elapsed: res._elapsed,
@@ -101,7 +105,7 @@ module Sentofu
 
       rescue => err
 
-        { uri: uri,
+        { uri: uri.to_s,
           code: (res.code.to_i rescue nil),
           headers: (res._headers rescue nil),
           message: (WEBrick::HTTPStatus.reason_phrase(res.code) rescue nil),
@@ -117,7 +121,10 @@ module Sentofu
 
       def make_get_req(uri, token)
 
-        req = Net::HTTP::Get.new(uri.to_s)
+        u = [ uri.path, uri.query ].compact.join('?')
+        u = '/' if u.length < 1
+
+        req = Net::HTTP::Get.new(u)
         req.instance_eval { @header.clear }
         def req.set_header(k, v); @header[k] = [ v ]; end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentofu
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec