restool 0.1.6 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 939d1069da8b669efb9bc394a55b641ac6ea7a759d0aecf0502d57fb00c26139
-  data.tar.gz: 2638de0068c9129d0aa752a79a94d680f857474f64da8da075c045c77bf245e6
+  metadata.gz: cbb07cae8d7353e4589d17790d5703c80bbf7279c93044602705281af6cbaafd
+  data.tar.gz: 61ec6541cf4cafbf66b83fa223eb1092677ae0c2b90ba10ecee3dd99bca143ed
 SHA512:
-  metadata.gz: 76e3401eced2a728940887af09ce40101bd7aaf460e019dc0d4dedc2f36106f6ba807a932fd68956bb62c283904b86919fc1e49c21b60ba8789d1c372b6d2729
-  data.tar.gz: 707282f1b15fda1d97b6a71da5bf429f3eab0969ffffa09a9f94beaa81b0a3d32807161273b9f1ed71cd7753c85d9110101ff8e6874405bdbdb2eecfa7523e27
+  metadata.gz: dfc5f9475718070390a2f240b3187389924396e1dfce1f29b17a995bf0cc1337031dc233ba72747bf72ee6ce72502a06449802d5b23f4cd7fb86efd7e37c463c
+  data.tar.gz: ee162222b723ad377ed4669dcbf1f6275ba46be10d65ee6c5c6de09a54b0cd91dcc7be281fc6f132d7f823551e7fcdd29a79c69210ce9007d0c4d3810a5f23d2

data/lib/restool.rb

@@ -1,8 +1,6 @@
 require_relative 'restool/settings/loader'
 require_relative 'restool/service/restool_service'
 
-require_relative 'restool/mock/restool'
-
 module Restool
 
   def self.create(service_name, opts = {}, &response_handler)

data/lib/restool/logger/request_logger.rb

@@ -12,6 +12,10 @@ module Restool
       log_response(response) if log?
 
       response
+    rescue StandardError => e
+      log_error(e) if log?
+
+      raise
     end
 
     def logger
@@ -31,15 +35,19 @@ module Restool
     def log_request(request)
       logger.info  { "Restool Service #{@host}" }
       logger.info  { "#{request.method.upcase} #{request.path}" }
-      logger.info  { format_hash(request.headers) }
-      logger.debug { format_hash(request.params) }
+      logger.info  { "Headers: { #{format_hash(request.headers)} }" }
+      logger.debug { "Params: { #{format_hash(request.params)} }" }
     end
 
     def log_response(response)
-      logger.info  { "Restool response (status #{response.code})" }
+      logger.info  { "Restool response (status #{response.code}):" }
       logger.debug { response.body }
     end
 
+    def log_error(error)
+      logger.error { "Restool error: #{error}" }
+    end
+
     def format_hash(headers)
       headers.map { |key, value| "#{key}: #{value}" }.join(", ")
     end

data/lib/restool/service/remote_client.rb

@@ -1,5 +1,5 @@
-require 'persistent_http'
-
+require "net/http"
+require "net/https"
 require_relative 'request_utils'
 require_relative '../logger/request_logger'
 
@@ -7,30 +7,9 @@ module Restool
   module Service
     class RemoteClient
 
-      def initialize(host, verify_ssl, persistent_connection, timeout, opts)
+      def initialize(host, verify_ssl, timeout, opts)
         @request_logger = Restool::RequestLogger.new(host, opts)
-
-        @connection = if persistent_connection
-                        PersistentHTTP.new(
-                          pool_size:    persistent_connection.pool_size,
-                          pool_timeout: timeout,
-                          warn_timeout: persistent_connection.warn_timeout,
-                          force_retry:  persistent_connection.force_retry,
-                          url:          host,
-                          read_timeout: timeout,
-                          open_timeout: timeout,
-                          verify_mode: verify_ssl?(verify_ssl)
-                        )
-                      else
-                        uri               = URI.parse(host)
-                        http              = Net::HTTP.new(uri.host, uri.port)
-                        http.use_ssl      = uri.is_a?(URI::HTTPS)
-                        http.verify_mode  = verify_ssl?(verify_ssl)
-                        http.read_timeout = timeout
-                        http.open_timeout = timeout
-                        http.set_debug_output($stdout) if opts[:debug]
-                        http
-                      end
+        @connection = build_connection(host, verify_ssl, timeout, opts)
       end
 
       def make_request(path, method, request_params, headers, basic_auth)
@@ -43,6 +22,20 @@ module Restool
 
       private
 
+      def build_connection(host, verify_ssl, timeout, opts)
+        uri = URI.parse(host)
+
+        connection = Net::HTTP.new(uri.host, uri.port)
+
+        connection.use_ssl      = uri.is_a?(URI::HTTPS)
+        connection.verify_mode  = verify_ssl?(verify_ssl)
+        connection.read_timeout = timeout
+        connection.open_timeout = timeout
+        connection.set_debug_output($stdout) if opts[:debug]
+
+        connection
+      end
+
       def verify_ssl?(verify_ssl_setting)
         verify_ssl_setting ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
       end

data/lib/restool/service/restool_service.rb

@@ -11,7 +11,7 @@ module Restool
         @service_config = service_config
         @response_handler = response_handler
         @remote_client = Restool::Service::RemoteClient.new(service_config.host, service_config.verify_ssl,
-                                                            service_config.persistent, service_config.timeout, service_config.opts)
+                                                            service_config.timeout, service_config.opts)
 
         define_operations(
           @service_config, method(:make_request), method(:make_request_with_uri_params)

data/lib/restool/settings/loader.rb

@@ -11,14 +11,16 @@ module Restool
       DEFAULT_SSL_VERIFY = false
 
 
-      def self.load(service_name, opts)
+      def self.load(service_name, opts = {})
         service_config = config['services'].detect do |service|
-          service['name'] == service_name
+          service['name'] == service_name.to_s
         end
 
         raise "Service #{service_name} not found in configuration" unless service_config
 
-        build_service(service_config, opts)
+        @service ||= build_service(service_config, opts)
+
+        @service
       end
 
       private
@@ -30,18 +32,9 @@ module Restool
                             []
                           end
 
-        basic_auth = service_config['basic_auth'] || service_config['basic_authentication']
+        basic_auth = opts['basic_auth'] || opts['basic_authentication'] || service_config['basic_auth'] || service_config['basic_authentication']
         basic_auth = BasicAuthentication.new(basic_auth['user'], basic_auth['password']) if basic_auth
 
-        persistent_connection = service_config['persistent']
-        persistent_connection = if persistent_connection
-                                  PersistentConnection.new(
-                                    persistent_connection['pool_size'],
-                                    persistent_connection['warn_timeout'],
-                                    persistent_connection['force_retry'],
-                                  )
-                                end
-
         # Support host + common path in url config, e.g. api.com/v2/
         paths_prefix_in_host = URI(service_config['url']).path
 
@@ -49,7 +42,6 @@ module Restool
           service_config['name'],
           service_config['url'],
           service_config['operations'].map { |operation| build_operation(operation, paths_prefix_in_host) },
-          persistent_connection,
           service_config['timeout'] || DEFAULT_TIMEOUT,
           representations,
           basic_auth,

data/lib/restool/settings/models.rb

@@ -4,11 +4,10 @@ module Restool
 
       Operation = Struct.new(:name, :path, :method, :uri_params, :response)
       OperationResponse = Struct.new(:fields)
-      Service = Struct.new(:name, :host, :operations, :persistent, :timeout, :representations, :basic_auth, :verify_ssl, :opts)
+      Service = Struct.new(:name, :host, :operations, :timeout, :representations, :basic_auth, :verify_ssl, :opts)
       Representation = Struct.new(:name, :fields)
       RepresentationField = Struct.new(:key, :metonym, :type)
       BasicAuthentication = Struct.new(:user, :password)
-      PersistentConnection = Struct.new(:respool_size, :want_timeout, :force_retry)
       OperationResponsField = RepresentationField
 
     end

data/lib/restool/version.rb

@@ -1,3 +1,4 @@
 module Restool
-  VERSION = '0.1.6'
+  VERSION = '1.0.4'
 end
+

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: restool
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 1.0.4
 platform: ruby
 authors:
 - Juan Andres Zeni
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: persistent_http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
+date: 2020-11-29 00:00:00.000000000 Z
+dependencies: []
 description: Make HTTP requests and handle its responses using simple method calls.
   Restool turns your HTTP API and its responses into Ruby interfaces.
 email:
@@ -51,7 +37,7 @@ homepage: https://github.com/jzeni/restool
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -66,8 +52,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.2.0.rc.1
+signing_key:
 specification_version: 4
 summary: Turn your API and its responses into Ruby interfaces.
 test_files: []