sentofu 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec10af5cec1acf4c593f766637358a1cc323665bf65cde68c5c727c637582f7f
-  data.tar.gz: e75a6edec73c0c0faa5cc7e9a8657f9d348a25bbcc023d3422b4f62dd9e89a5e
+  metadata.gz: 6b7dc29a9728152c3aa6e84c7112e37743b19e5261ede35083a8937e92763376
+  data.tar.gz: '009438a0d7a8d47de159407759b396632292bd77457381cf52826bab414236c5'
 SHA512:
-  metadata.gz: 7e8145180ed891775ef9cf4358778091d18fe5f4199cf2c87a899de9ec14e5ab3a60d18cfa93314a3417660a3a2cb34757bedcaefc0d6b51f5da862659f9836a
-  data.tar.gz: 2f3a1bf05a54b680bdf6247ea2c9b72cac64a590586341476d9b90fe2c2b27986bbcd32d55f94e190fda85d13ffca4daa5a005930abc50e3f2855ea642b44ee0
+  metadata.gz: aeab8b37e947bd378312f9d6505501884b299e68600d314632729804d58c1fee6da15ebdfe0e9890b82ad21be15906faaa99bd2f173e16c0e037d3c8ed6d0784
+  data.tar.gz: 887c2f98f8b238157cef6fc711cced2634c51a26d096d34e5c4e645e10631719dcfbc19a488b5223c19263d7cd19322078c5b4452e402f2e91a507db7238942e

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 # CHANGELOG.md
 
 
+## sentofu 0.2.0  released 2019-05-29
+
+* Accept a directory for Sentofu.init(x)
+* Return a Hash error message on JSON parse error
+* Track request elapsed time
+
+
 ## sentofu 0.1.0  released 2019-05-23
 
 * Initial implementation

data/lib/sentofu/api.rb

@@ -49,9 +49,6 @@ module Sentofu
 
     def fetch(segment, point, index, query)
 
-#p [ :fetch, segment, '(point)', index, query ]
-#p path(segment)
-#pp point
       Thread.current.thread_variable_set(TVP + segment, index) if index
 
       q = rectify_query_parameters(point, query)
@@ -63,7 +60,7 @@ module Sentofu
 
       return query.merge(path: pa) if query[:debug]
 
-      JSON.parse(Sentofu::Http.get(pa, api.token).body)
+      Sentofu::Http.get_and_parse(pa, api.token)
     end
 
     def path
@@ -184,7 +181,7 @@ module Sentofu
 
       return params.merge(path: pa) if params[:debug]
 
-      JSON.parse(Sentofu::Http.get(pa, token).body)
+      Sentofu::Http.get_and_parse(pa, token)
     end
 
     def modified

data/lib/sentofu/http.rb

@@ -7,54 +7,67 @@ module Sentofu
 
       def fetch_token(credentials=nil)
 
-        u = URI(Sentofu.auth_uri)
-
         cs = narrow_credentials(credentials)
 
         a = Base64.encode64("#{cs.id}:#{cs.secret}").strip
-        #p a
 
-        req = Net::HTTP::Post.new(u.path)
+        req = Net::HTTP::Post.new(Sentofu.auth_uri)
         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)
 
-        res = make_http(u).request(req)
-
-        Sentofu::Token.new(res)
+        Sentofu::Token.new(request(Sentofu.auth_uri, req))
       end
 
       def get(uri, token=nil)
 
-        u = URI(uri)
+        request(uri, make_get_req(uri, token))
+      end
+
+      def request(uri, req)
+
+        u = uri.is_a?(String) ? URI(uri) : uri
+
+        t0 = monow
+
+        t = Net::HTTP.new(u.host, u.port)
+        t.use_ssl = (u.scheme == 'https')
+#t.set_debug_output($stdout) if u.to_s.match(/search/)
 
-#t0 = Time.now
-        res = make_http(u).request(make_get_req(u, token))
-        #def res.headers; r = {}; each_header { |k, v| r[k] = v }; r; end
-#puts "*** GET #{uri} took #{Time.now - t0}s"
+        res = t.request(req)
+
+        class << res; attr_accessor :_elapsed; end
+        res._elapsed = monow - t0
 
         res
       end
 
       def get_and_parse(uri, token=nil)
 
-        JSON.parse(get(uri, token).body)
-      end
+        res = get(uri, token)
+        r = JSON.parse(res.body)
+        r[:_elapsed] = res._elapsed
 
-      protected
+        r
 
-      def make_http(uri)
+      rescue JSON::ParserError => pe
 
-#p uri.to_s
-        t = Net::HTTP.new(uri.host, uri.port)
-        t.use_ssl = (uri.scheme == 'https')
-#t.set_debug_output($stdout) if uri.to_s.match(/search/)
+        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>')
 
-        t
+        h
       end
 
+      protected
+
+      def monow; Process.clock_gettime(Process::CLOCK_MONOTONIC); end
+
       def make_get_req(uri, token)
 
         req = Net::HTTP::Get.new(uri.to_s)
@@ -65,7 +78,6 @@ module Sentofu
         req.set_header('Accept', 'application/json')
 
         req.set_header('Authorization', token.header_value) if token
-#pp req.instance_variable_get(:@header)
 
         req
       end
@@ -93,6 +105,7 @@ module Sentofu
     def initialize(res)
 
       @h = JSON.parse(res.body)
+      @h[:_elapsed] = res._elapsed
       @expires_at = Time.now + @h['expires_in']
     end
 

data/lib/sentofu.rb

@@ -3,6 +3,7 @@ require 'json'
 require 'yaml'
 require 'time'
 require 'base64'
+require 'webrick' # for the http code to message mapping
 require 'ostruct'
 require 'net/http'
 
@@ -13,7 +14,7 @@ require 'sentofu/explo'
 
 module Sentofu
 
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 
   USER_AGENT =
     "Sentofu #{Sentofu::VERSION} - " +
@@ -31,6 +32,38 @@ module Sentofu
 
     def init(versions=%w[ common:1.0.0 company:1.0.0 markets:1.0.0 ])
 
+      if versions.is_a?(String) && File.directory?(versions)
+        init_from_dir(versions)
+      else
+        init_from_swagger(versions)
+      end
+    end
+
+    def credentials=(cs)
+
+      apis.each { |_, api| api.credentials = cs }
+    end
+
+    protected
+
+    def init_from_dir(dir)
+
+      paths = Dir[File.join(dir, 'api_*.yaml')]
+
+      fail RuntimeError.new("no api yaml files under #{dir.inspect}") \
+        if paths.empty?
+
+      paths.each do |path|
+
+        api_name = path.match(/api_([^_]+)_\d/)[1]
+        api_spec = YAML.load(File.read(path))
+
+        init_api(api_name, api_spec)
+      end
+    end
+
+    def init_from_swagger(versions)
+
       vers = split_versions(versions)
 
       vers << %w[ auth * ] unless vers.find { |n, _| n == 'auth' }
@@ -58,23 +91,21 @@ module Sentofu
         spec = Sentofu::Http.get_and_parse(u)
         spec[:meta] = meta
 
-        if api_name == 'auth'
-          @auth_uri = spec['servers'][0]['url'] + spec['paths'].keys.first
-        else
-          api = Sentofu::Api.new(api_name, spec)
-          Sentofu.define_singleton_method(api_name) { api }
-          @apis[api_name] = api
-        end
+        init_api(api_name, spec)
       end
     end
 
-    def credentials=(cs)
+    def init_api(name, spec)
 
-      apis.each { |_, api| api.credentials = cs }
+      if name == 'auth'
+        @auth_uri = spec['servers'][0]['url'] + spec['paths'].keys.first
+      else
+        api = Sentofu::Api.new(name, spec)
+        Sentofu.define_singleton_method(name) { api }
+        @apis[name] = api
+      end
     end
 
-    protected
-
     def split_versions(vs)
 
       case vs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentofu
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec