restool 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9ce87d4cd969d5298ee7c90baef25ac9f2f2c3b725e4ae241a1b00a1b46114b
-  data.tar.gz: 45766774466195ec86b84048d1aa659302d8cc4b50771a4a73c19246f15d4ec5
+  metadata.gz: 939d1069da8b669efb9bc394a55b641ac6ea7a759d0aecf0502d57fb00c26139
+  data.tar.gz: 2638de0068c9129d0aa752a79a94d680f857474f64da8da075c045c77bf245e6
 SHA512:
-  metadata.gz: f62e492a295bd06e4f8699b19f98d895a66f5fabfd286ac8c64bcc3907194bc3ea463eed3206ee96567fd2793221a295bee8af2cffefa6698e98fbf61acd6e76
-  data.tar.gz: 379a2006d01cbc9d35e08030f70e690414f77f9d8ce17fe6dc75a8d97a3493daf3b7153dc1d59cbd6b9a18b749accf5e85238ea2d1763bc2f62e97212e77d3ea
+  metadata.gz: 76e3401eced2a728940887af09ce40101bd7aaf460e019dc0d4dedc2f36106f6ba807a932fd68956bb62c283904b86919fc1e49c21b60ba8789d1c372b6d2729
+  data.tar.gz: 707282f1b15fda1d97b6a71da5bf429f3eab0969ffffa09a9f94beaa81b0a3d32807161273b9f1ed71cd7753c85d9110101ff8e6874405bdbdb2eecfa7523e27

data/lib/restool.rb

@@ -1,11 +1,12 @@
 require_relative 'restool/settings/loader'
 require_relative 'restool/service/restool_service'
 
+require_relative 'restool/mock/restool'
 
 module Restool
 
-  def self.create(service_name, &response_handler)
-    service_config = Restool::Settings::Loader.load(service_name)
+  def self.create(service_name, opts = {}, &response_handler)
+    service_config = Restool::Settings::Loader.load(service_name, opts)
 
     Restool::Service::RestoolService.new(service_config, response_handler)
   end

data/lib/restool/logger/request_logger.rb

@@ -0,0 +1,47 @@
+module Restool
+  class RequestLogger
+
+    def initialize(host, opts)
+      @host = host
+      @opts = opts
+    end
+
+    def log(request, &http_request)
+      log_request(request) if log?
+      response = http_request.call
+      log_response(response) if log?
+
+      response
+    end
+
+    def logger
+      @opts[:logger]
+    end
+
+    def log?
+      if @opts[:log] != nil
+        @opts[:log]
+      else
+        @opts[:logger] != nil
+      end
+    end
+
+    private
+
+    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) }
+    end
+
+    def log_response(response)
+      logger.info  { "Restool response (status #{response.code})" }
+      logger.debug { response.body }
+    end
+
+    def format_hash(headers)
+      headers.map { |key, value| "#{key}: #{value}" }.join(", ")
+    end
+  end
+end

data/lib/restool/mock/restool.rb

@@ -1,25 +1,32 @@
+require_relative '../settings/loader'
+
 module Restool
   module Mock
-    def self.create(service_name, &response_handler)
-      service_config = Restool::Settings::Loader.load(service_name)
-
-      # remote_client = Restool::Service::RemoteClient.new(service_config.host,
-      #                                                    service_config.verify_ssl,
-      #                                                    service_config.persistent,
-      #                                                    service_config.timeout)
+    def self.create(service_name, operation_responses)
+      @operation_responses = operation_responses
+      @service_config = Restool::Settings::Loader.load(service_name)
 
-      class FakeRemoteClient
-        def initialize
-        end
+      Service.new(@service_config, operation_responses)
+    end
 
-        def make_request(path, operation_method, params, headers, basic_auth)
+    private
 
-        end
+    class Service
+      def initialize(service_config, operation_responses)
+        @service_config = service_config
+        @operation_responses = operation_responses
       end
 
+      def method_missing(method, *args, &block)
+        if @service_config.operations.map(&:name).include?(method)
+          operation_response      = @operation_responses[method]
+          response_representation = @service_config.operation.response
+          representations         = @service_config.representations
 
-      remote_client = double(make_request)
-      Restool::Service::RestoolService.new(service_config, response_handler, remote_client)
+          Restool::Traversal::Converter.convert(operation_response, response_representation, representations)
+        end
+      end
     end
+
   end
 end

data/lib/restool/service/operation_request.rb

@@ -0,0 +1,15 @@
+module Restool
+  class OperationRequest
+
+    attr_accessor :http_request, :method, :path, :params, :headers
+
+    def initialize(http_request, method, path, params, headers)
+      @http_request = http_request
+      @method = method
+      @path = path
+      @params = params
+      @headers = headers
+    end
+
+  end
+end

data/lib/restool/service/remote_client.rb

@@ -1,12 +1,15 @@
 require 'persistent_http'
 
 require_relative 'request_utils'
+require_relative '../logger/request_logger'
 
 module Restool
   module Service
     class RemoteClient
 
-      def initialize(host, verify_ssl, persistent_connection, timeout)
+      def initialize(host, verify_ssl, persistent_connection, timeout, opts)
+        @request_logger = Restool::RequestLogger.new(host, opts)
+
         @connection = if persistent_connection
                         PersistentHTTP.new(
                           pool_size:    persistent_connection.pool_size,
@@ -21,27 +24,25 @@ module Restool
                       else
                         uri               = URI.parse(host)
                         http              = Net::HTTP.new(uri.host, uri.port)
-                        http.use_ssl      = ssl_implied?(uri)
+                        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)
+                        http.set_debug_output($stdout) if opts[:debug]
                         http
                       end
       end
 
       def make_request(path, method, request_params, headers, basic_auth)
-        request = RequestUtils.build_request(method, path, request_params, headers, basic_auth)
+        operation_request = RequestUtils.build_request(method, path, request_params, headers, basic_auth)
 
-        @connection.request(request)
+        @request_logger.log(operation_request) do
+          @connection.request(operation_request.http_request)
+        end
       end
 
       private
 
-      def ssl_implied?(uri)
-        uri.port == 443 || uri.scheme == 'https'
-      end
-
       def verify_ssl?(verify_ssl_setting)
         verify_ssl_setting ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
       end

data/lib/restool/service/request_utils.rb

@@ -1,3 +1,5 @@
+require_relative 'operation_request'
+
 module Restool
   module Service
     module RequestUtils
@@ -23,7 +25,7 @@ module Restool
 
         headers.each { |k, v| request[k] = v } if headers
 
-        request
+        OperationRequest.new(request, method, path, params, headers)
       end
 
       def self.build_base_request(method, path)

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.persistent, 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,19 +11,19 @@ module Restool
       DEFAULT_SSL_VERIFY = false
 
 
-      def self.load(service_name)
+      def self.load(service_name, opts)
         service_config = config['services'].detect do |service|
           service['name'] == service_name
         end
 
         raise "Service #{service_name} not found in configuration" unless service_config
 
-        build_service(service_config)
+        build_service(service_config, opts)
       end
 
       private
 
-      def self.build_service(service_config)
+      def self.build_service(service_config, opts)
         representations = if service_config['representations']
                             build_representations(service_config['representations'])
                           else
@@ -53,7 +53,8 @@ module Restool
           service_config['timeout'] || DEFAULT_TIMEOUT,
           representations,
           basic_auth,
-          service_config['ssl_verify'] || DEFAULT_SSL_VERIFY
+          service_config['ssl_verify'] || DEFAULT_SSL_VERIFY,
+          opts
         )
       end
 

data/lib/restool/settings/models.rb

@@ -4,7 +4,7 @@ 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)
+      Service = Struct.new(:name, :host, :operations, :persistent, :timeout, :representations, :basic_auth, :verify_ssl, :opts)
       Representation = Struct.new(:name, :fields)
       RepresentationField = Struct.new(:key, :metonym, :type)
       BasicAuthentication = Struct.new(:user, :password)

data/lib/restool/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restool
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Juan Andres Zeni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: persistent_http
@@ -33,8 +33,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/restool.rb
+- lib/restool/logger/request_logger.rb
 - lib/restool/mock/restool.rb
 - lib/restool/service/operation_definer.rb
+- lib/restool/service/operation_request.rb
 - lib/restool/service/remote_client.rb
 - lib/restool/service/remote_connector.rb
 - lib/restool/service/request_utils.rb