restool 0.1.7 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8884c65d25f91aa18d296327b22f20287e665ad32d7b444f84c8517fd5c28a5c
-  data.tar.gz: c9bd6cb9b5cc008fd86c1941540a81444ed6c8ecabd54e2deb0c1e9311f66489
+  metadata.gz: b50f0e2b71d71c4cc51b17cca04939e16bbae2aa1c8ad30332d9ec93bfe8d2a3
+  data.tar.gz: f854bbe253e0b519df1d4fbc8354bef2a1905bb8ef2410f16fcb3d783cc65079
 SHA512:
-  metadata.gz: d3821a5e5911717c333324b288bba77c9dbc0636e06b094c608fd012361e3b68ebcfc5a63fb4ad8917d59619728de6ce18041d53b798596f3645456f4446bce6
-  data.tar.gz: bbd00d59894db403fc0e833cc04720d1a3a66d08c33b4a3e6f988c305bbbccb44dac221119db86e609934d64ffab8e6ffe9e67affe448842b783a2e278c4c562
+  metadata.gz: ac1c66d272cb7bd3c76f9697f0d8f8b1d5095e29202275b625b0e811155e1d24f2f411ff2d419008fb894e3b005377a5d9e000b75d32618c55636887f5888bd4
+  data.tar.gz: 53cffe026ac8a0134b5e6e3d46c5d2f3a3ec99c50d1583d6af4b79bbcbc3701f1778d4a94a6a079cd61f0981704a21b26bf59d925c65096d08fe3ba54085b83f

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/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

@@ -13,7 +13,7 @@ module Restool
 
       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
@@ -30,18 +30,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 +40,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,3 @@
 module Restool
-  VERSION = '0.1.7'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: restool
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 1.0.1
 platform: ruby
 authors:
 - Juan Andres Zeni
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: persistent_http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2020-09-13 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
@@ -67,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.1
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Turn your API and its responses into Ruby interfaces.
 test_files: []