my_api_client 0.13.0 → 0.14.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e287e051f0699595e499150dd4e4c303e00a82f951ffc86b13afde142a3720e
-  data.tar.gz: 7725d581e64d01683a636f56e86d217010d536f827023d691faca3b5cbbe2264
+  metadata.gz: d52de78feca8df4a1daac75f796382190d0f383c5f0e379111544d18ae863627
+  data.tar.gz: 76fd03b48893738aa1a1953592c877eba6dd43a6b9c4066a197453f9425ecfa7
 SHA512:
-  metadata.gz: c37ce83c7a27302b8e890087251c67b955e8398b95d08a78b47447401cf0b3332b9bcd66c0e46e4e578a5a51e80f0a4a5fcea576c69fd8d29be8fa5c1c670720
-  data.tar.gz: 9a42a194c50def52f2aca6f9c54aac80dd7e4191114aa24fef543f81fab235417b3ec1f86ff2f960cd77cd1ff17188df5c073a4574df80fed9963375060058ce
+  metadata.gz: 95069064c4d7e6f31abbe302db40d11f574726c11631513d3e40b3fd158e77e95ab81079d0fd4033833aac826722455938fc69605acbee0c2ecb58b11a3c949f
+  data.tar.gz: 2c5fceee08ba837afb4901feca3d531e09c8a5d4c2ba6756b2eddd9f185050686e1eed304e077f82aa2f4aa85fe1cb723c17ec7de32470210fc1347cc94ea5fa

data/.circleci/config.yml

@@ -5,7 +5,7 @@
 version: 2.1
 
 orbs:
-  ruby-orbs: sue445/ruby-orbs@1.4.5
+  ruby-orbs: sue445/ruby-orbs@1.6.0
   code-climate: rvla/code-climate@0.0.2
 
 references:

data/.dependabot/config.yml

@@ -0,0 +1,16 @@
+version: 1
+update_configs:
+  - package_manager: "ruby:bundler"
+    directory: "/"
+    update_schedule: "daily"
+    default_reviewers:
+      - "ryz310"
+    default_labels:
+      - "dependabot"
+    automerged_updates:
+      - match:
+          dependency_type: "development"
+          update_type: "all"
+      - match:
+          dependency_type: "production"
+          update_type: "semver:patch"

data/.rubocop.yml

@@ -7,11 +7,10 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   TargetRubyVersion: 2.4
 
-Metrics/AbcSize:
-  Max: 20
+Layout/LineLength:
+  Max: 100
 
 Metrics/BlockLength:
-  Max: 50
   Exclude:
     - 'my_api_client.gemspec'
     - 'lib/my_api_client/rspec/matchers/**/*'
@@ -20,15 +19,10 @@ Metrics/BlockLength:
 Metrics/MethodLength:
   Max: 15
 
-Metrics/LineLength:
-  Max: 100
-
 Naming/AccessorMethodName:
-  Enabled: false
-
-Style/ClassAndModuleChildren:
   Exclude:
-    - 'spec/**/*'
+    - spec/dummy_app/api_clients/example_api_client.rb
+    - spec/lib/my_api_client/rspec/matchers/be_handled_as_an_error_spec.rb
 
 Style/TrailingCommaInArrayLiteral:
   EnforcedStyleForMultiline: comma

data/.rubocop_todo.yml

@@ -1,17 +1,7 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-01-08 23:41:00 +0000 using RuboCop version 0.79.0.
+# on 2020-02-21 23:30:47 +0000 using RuboCop version 0.80.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 18
-RSpec/LeakyConstantDeclaration:
-  Exclude:
-    - 'spec/lib/my_api_client/base_spec.rb'
-    - 'spec/lib/my_api_client/config_spec.rb'
-    - 'spec/lib/my_api_client/error_handling_spec.rb'
-    - 'spec/lib/my_api_client/exceptions_spec.rb'
-    - 'spec/lib/my_api_client/request_spec.rb'
-    - 'spec/lib/my_api_client/rspec/stub_spec.rb'

data/CHANGELOG.md

@@ -1,5 +1,83 @@
 # Change log
 
+## v0.14.0.pre (Feb 23, 2020)
+
+### Refactoring
+
+* [#179](https://github.com/ryz310/my_api_client/pull/179) Change the "with" option structure ([@ryz310](https://github.com/ryz310))
+* [#206](https://github.com/ryz310/my_api_client/pull/206) Rebuild api request processing ([@ryz310](https://github.com/ryz310))
+* [#207](https://github.com/ryz310/my_api_client/pull/207) Fix offending codes ([@ryz310](https://github.com/ryz310))
+
+### Breaking Change
+
+* [#196](https://github.com/ryz310/my_api_client/pull/196) Change the request structure ([@ryz310](https://github.com/ryz310))
+
+> ### logging
+>
+> **before**
+>
+> ```
+> I, [2020-02-02T15:26:53.788092 #93220]  INFO -- : API request `GET https://api.esa.io/v1/teams/feedforce/posts`: "Start"
+> I, [2020-02-02T15:26:55.760452 #93220]  INFO -- : API request `GET https://api.esa.io/v1/teams/feedforce/posts`: "Duration 1.97186 sec"
+> I, [2020-02-02T15:26:55.760739 #93220]  INFO -- : API request `GET https://api.esa.io/v1/teams/feedforce/posts`: "Success (200)"
+> ```
+>
+> **after**
+>
+> Shows URL with query strings.
+>
+> ```
+> I, [2020-02-02T15:20:47.471040 #90870]  INFO -- : API request `GET https://api.esa.io/v1/teams/feedforce/posts?page=1&per_page=100&q=user%3Aryosuke_sato+category%3Aunsorted`: "Start"
+> I, [2020-02-02T15:20:49.516099 #90870]  INFO -- : API request `GET https://api.esa.io/v1/teams/feedforce/posts?page=1&per_page=100&q=user%3Aryosuke_sato+category%3Aunsorted`: "Duration 2.034907 sec"
+> I, [2020-02-02T15:20:49.516391 #90870]  INFO -- : API request `GET https://api.esa.io/v1/teams/feedforce/posts?page=1&per_page=100&q=user%3Aryosuke_sato+category%3Aunsorted`: "Success (200)"
+> ```
+>
+> ### MyApiClient::Params::Request
+>
+> **before**
+>
+> ```rb
+> request_params.metadata # =>
+> # {
+> #   line: 'GET path/to/resource',
+> #   headers: { 'Content-Type': 'application/json; charset=utf-8' },
+> #   query: { key: 'value' }
+> # }
+> ```
+>
+> **after**
+>
+> The `#metadata` does not include `query` key and then includes full URL into `line` value.
+>
+> ```rb
+> request_params.metadata # =>
+> # {
+> #   line: 'GET https://example.com/path/to/resource?key=value',
+> #   headers: { 'Content-Type': 'application/json; charset=utf-8' }
+> # }
+> ```
+
+### Rubocop Challenge
+
+* [#205](https://github.com/ryz310/my_api_client/pull/205) Re-generate .rubocop_todo.yml with RuboCop v0.80.0 ([@ryz310](https://github.com/ryz310))
+
+### Dependabot
+
+* [#190](https://github.com/ryz310/my_api_client/pull/190) Add a config file of the dependabot ([@ryz310](https://github.com/ryz310))
+* [#183](https://github.com/ryz310/my_api_client/pull/183) Bump pry-byebug from 3.7.0 to 3.8.0 ([@ryz310](https://github.com/ryz310))
+* [#194](https://github.com/ryz310/my_api_client/pull/194) Bump bugsnag from 6.12.2 to 6.13.0 ([@ryz310](https://github.com/ryz310))
+* [#197](https://github.com/ryz310/my_api_client/pull/197) Bump webmock from 3.8.0 to 3.8.1 ([@ryz310](https://github.com/ryz310))
+* [#199](https://github.com/ryz310/my_api_client/pull/199) Bump webmock from 3.8.1 to 3.8.2 ([@ryz310](https://github.com/ryz310))
+
+### Renovate
+
+* [#193](https://github.com/ryz310/my_api_client/pull/193) Change renovate automerge setting ([@ryz310](https://github.com/ryz310))
+* [#189](https://github.com/ryz310/my_api_client/pull/189) Update the renovate settings ([@ryz310](https://github.com/ryz310))
+* [#184](https://github.com/ryz310/my_api_client/pull/184) Update ruby-orbs orb to v1.5.1 ([@ryz310](https://github.com/ryz310))
+* [#185](https://github.com/ryz310/my_api_client/pull/185) Update ruby-orbs orb to v1.5.4 ([@ryz310](https://github.com/ryz310))
+* [#187](https://github.com/ryz310/my_api_client/pull/187) Update ruby-orbs orb to v1.5.6 ([@ryz310](https://github.com/ryz310))
+* [#192](https://github.com/ryz310/my_api_client/pull/192) Update ruby-orbs orb to v1.6.0 ([@ryz310](https://github.com/ryz310))
+
 ## v0.13.0 (Jan 21, 2020)
 
 ### Feature

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    my_api_client (0.13.0)
+    my_api_client (0.14.0.pre)
       activesupport (>= 4.2.0)
       faraday (>= 0.17.1)
       jsonpath
@@ -18,11 +18,11 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.0)
-    bugsnag (6.12.2)
+    bugsnag (6.13.0)
       concurrent-ruby (~> 1.0)
-    byebug (11.1.0)
+    byebug (11.1.1)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
@@ -47,12 +47,13 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
+    pry-byebug (3.8.0)
       byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (4.0.3)
     rainbow (3.0.0)
     rake (13.0.1)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -68,16 +69,17 @@ GEM
     rspec-support (3.9.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.79.0)
+    rubocop (0.80.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     rubocop-performance (1.5.2)
       rubocop (>= 0.71.0)
-    rubocop-rspec (1.37.1)
+    rubocop-rspec (1.38.1)
       rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
     safe_yaml (1.0.5)
@@ -94,7 +96,7 @@ GEM
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.1)
-    webmock (3.8.0)
+    webmock (3.8.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -115,7 +117,7 @@ DEPENDENCIES
   rubocop
   rubocop-performance
   rubocop-rspec
-  simplecov
+  simplecov (= 0.17.1)
   webmock
   yard
 

data/README.jp.md

@@ -105,7 +105,7 @@ class ExampleApiClient < MyApiClient::Base
   private
 
   # @param params [MyApiClient::Params::Params] HTTP req and res params
-  # @param logger [MyApiClient::Logger] Logger for a request processing
+  # @param logger [MyApiClient::Request::Logger] Logger for a request processing
   def my_error_handling(params, logger)
     logger.warn "Response Body: #{params.response.body.inspect}"
     raise MyApiClient::ClientError, params
@@ -163,7 +163,7 @@ error_handling json: { '$.errors.code': 10..19 }, with: :my_error_handling
 
 ```ruby
 # @param params [MyApiClient::Params::Params] HTTP req and res params
-# @param logger [MyApiClient::Logger] Logger for a request processing
+# @param logger [MyApiClient::Request::Logger] Logger for a request processing
 def my_error_handling(params, logger)
   logger.warn "Response Body: #{params.response.body.inspect}"
   raise MyApiClient::ClientError, params

data/lib/my_api_client.rb

@@ -11,10 +11,11 @@ require 'my_api_client/service_abstract'
 require 'my_api_client/version'
 require 'my_api_client/config'
 require 'my_api_client/error_handling/generator'
-require 'my_api_client/error_handling/process_retry_option'
+require 'my_api_client/error_handling/retry_option_processor'
 require 'my_api_client/error_handling'
 require 'my_api_client/exceptions'
-require 'my_api_client/logger'
+require 'my_api_client/request/logger'
+require 'my_api_client/request/executor'
 require 'my_api_client/errors'
 require 'my_api_client/params/params'
 require 'my_api_client/params/request'

data/lib/my_api_client/base.rb

@@ -21,23 +21,5 @@ module MyApiClient
     # NOTE: This class **MUST NOT** implement #initialize method. Because it
     #       will become constraint that need call #super in the #initialize at
     #       definition of the child classes.
-
-    HTTP_METHODS = %i[get post patch delete].freeze
-
-    HTTP_METHODS.each do |http_method|
-      class_eval <<~METHOD, __FILE__, __LINE__ + 1
-        # Description of ##{http_method}
-        #
-        # @param pathname [String]
-        # @param headers [Hash, nil]
-        # @param query [Hash, nil]
-        # @param body [Hash, nil]
-        # @return [Sawyer::Resouce] description_of_returned_object
-        def #{http_method}(pathname, headers: nil, query: nil, body: nil)
-          _request :#{http_method}, pathname, headers, query, body, logger
-        end
-      METHOD
-    end
-    alias put patch
   end
 end

data/lib/my_api_client/config.rb

@@ -16,34 +16,5 @@ module MyApiClient
         METHOD
       end
     end
-
-    # Extracts schema and hostname from endpoint
-    #
-    # @example Extracts schema and hostname from 'https://example.com/path/to/api'
-    #   schema_and_hostname # => 'https://example.com'
-    # @return [String] description_of_returned_object
-    def schema_and_hostname
-      if _uri.default_port == _uri.port
-        "#{_uri.scheme}://#{_uri.host}"
-      else
-        "#{_uri.scheme}://#{_uri.host}:#{_uri.port}"
-      end
-    end
-
-    # Extracts pathname from endpoint
-    #
-    # @example Extracts pathname from 'https://example.com/path/to/api'
-    #   common_path # => 'path/to/api'
-    # @return [String] The pathanem
-    def common_path
-      _uri.path
-    end
-
-    private
-
-    # @return [URI] Returns a memoized URI instance
-    def _uri
-      @_uri ||= URI.parse(endpoint)
-    end
   end
 end

data/lib/my_api_client/error_handling.rb

@@ -40,30 +40,20 @@ module MyApiClient
       # @option retry [TrueClass, Hash]
       #   If the error detected, retries the API request. Requires `raise` option.
       #   You can set `true` or `retry_on` options (`wait` and `attempts`).
-      # @yield [MyApiClient::Params::Params, MyApiClient::Logger]
+      # @yield [MyApiClient::Params::Params, MyApiClient::Request::Logger]
       #   Executes the block when error detected.
       #   Forbid to be used with the` retry` option.
       def error_handling(**options, &block)
         options[:block] = block
-        retry_options = ProcessRetryOption.call(error_handling_options: options)
+        retry_options = RetryOptionProcessor.call(error_handling_options: options)
         retry_on(options[:raise], **retry_options) if retry_options
 
-        temp = error_handlers.dup
-        temp << ->(response) { Generator.call(**options.merge(response: response)) }
-        self.error_handlers = temp
+        new_error_handlers = error_handlers.dup
+        new_error_handlers << lambda { |instance, response|
+          Generator.call(**options.merge(instance: instance, response: response))
+        }
+        self.error_handlers = new_error_handlers
       end
     end
-
-    # The error handlers defined later takes precedence
-    #
-    # @param response [Sawyer::Response] describe_params_here
-    # @return [Proc, Symbol, nil] description_of_returned_object
-    def error_handling(response)
-      error_handlers.reverse_each do |error_handler|
-        result = error_handler.call(response)
-        return result unless result.nil?
-      end
-      nil
-    end
   end
 end

data/lib/my_api_client/error_handling/generator.rb

@@ -4,10 +4,12 @@ module MyApiClient
   module ErrorHandling
     # Generates an error handler proc (or symbol)
     class Generator < ServiceAbstract
-      ARGUMENTS = %i[response status_code json with raise block].freeze
+      ARGUMENTS = %i[instance response status_code json with raise block].freeze
 
       # @param options [Hash]
       #   Options for this generator
+      # @option instance [MyApiClient::Base]
+      #   The API client class.
       # @option response [Sawyer::Response]
       #   The target of verifying
       # @option status_code [String, Range, Integer, Regexp]
@@ -22,9 +24,7 @@ module MyApiClient
       # @option block [Proc]
       #   Executes the block when error detected
       # @return [Proc]
-      #   Returns value as `Proc` if given `raise` or `block` option
-      # @return [Symbol]
-      #   Returns value as `Symbol` if given `with` option
+      #   Returns value as `Proc`.
       def initialize(**options)
         options[:raise] ||= MyApiClient::Error
         verify_and_set_arguments(**options)
@@ -38,10 +38,14 @@ module MyApiClient
         return unless match?(_status_code, _response.status)
         return unless match_all?(_json, _response.body)
 
+        generate_error_handler
+      end
+
+      def generate_error_handler
         if _block
           ->(params, logger) { _block.call(params, logger) }
         elsif _with
-          _with
+          ->(params, logger) { _instance.send(_with, params, logger) }
         else
           ->(params, _) { raise _raise, params }
         end

data/lib/my_api_client/error_handling/{process_retry_option.rb → retry_option_processor.rb}

@@ -3,7 +3,7 @@
 module MyApiClient
   module ErrorHandling
     # Processes the `retry` option.
-    class ProcessRetryOption < ServiceAbstract
+    class RetryOptionProcessor < ServiceAbstract
       # @param error_handling_options [Hash]
       #   Options for the retry.
       # @option raise [MyApiClient::Error]

data/lib/my_api_client/params/request.rb

@@ -4,20 +4,18 @@ module MyApiClient
   module Params
     # Description of Params
     class Request
-      attr_reader :method, :pathname, :headers, :query, :body
+      attr_reader :method, :uri, :headers, :body
 
       # Description of #initialize
       #
       # @param method [Symbol] describe_method_here
-      # @param pathname [String] describe_pathname_here
+      # @param uri [URI] describe_uri_here
       # @param headers [Hash, nil] describe_headers_here
-      # @param query [Hash, nil] describe_query_here
       # @param body [Hash, nil] describe_body_here
-      def initialize(method, pathname, headers, query, body)
+      def initialize(method, uri, headers, body)
         @method = method
-        @pathname = pathname
+        @uri = uri
         @headers = headers
-        @query = query
         @body = body
       end
 
@@ -25,7 +23,7 @@ module MyApiClient
       #
       # @return [Array<Object>] Arguments for Sawyer::Agent#call
       def to_sawyer_args
-        [method, pathname, body, { headers: headers, query: query }]
+        [method, uri.to_s, body, { headers: headers }]
       end
 
       # Generate metadata for bugsnag.
@@ -34,9 +32,8 @@ module MyApiClient
       # @return [Hash] Metadata for bugsnag
       def metadata
         {
-          line: "#{method.upcase} #{pathname}",
+          line: "#{method.upcase} #{uri}",
           headers: headers,
-          query: query,
           body: body,
         }.compact
       end
@@ -46,7 +43,7 @@ module MyApiClient
       #
       # @return [String] Contents as string
       def inspect
-        { method: method, pathname: pathname, headers: headers, query: query, body: body }.inspect
+        { method: method, uri: uri.to_s, headers: headers, body: body }.inspect
       end
     end
   end

data/lib/my_api_client/request.rb

@@ -3,85 +3,68 @@
 module MyApiClient
   # Description of Request
   module Request
-    # Description of #_request
-    #
-    # @param http_method [Symbol] describe_http_method_here
-    # @param pathname [String] describe_pathname_here
-    # @param headers [Hash, nil] describe_headers_here
-    # @param query [Hash, nil] describe_query_here
-    # @param body [Hash, nil] describe_body_here
-    # @param logger [::Logger] describe_logger_here
-    # @return [Sawyer::Resource] description_of_returned_object
-    # rubocop:disable Metrics/ParameterLists
-    def _request(http_method, pathname, headers, query, body, logger)
-      processed_path = [common_path, pathname].join('/').gsub('//', '/')
-      request_params = Params::Request.new(http_method, processed_path, headers, query, body)
-      agent # Initializes for faraday
-      request_logger = Logger.new(logger, faraday, http_method, processed_path)
-      call(:_execute, request_params, request_logger)
-    end
-    # rubocop:enable Metrics/ParameterLists
-
-    private
+    HTTP_METHODS = %i[get post patch delete].freeze
 
-    # Description of #agent
-    #
-    # @return [Sawyer::Agent] description_of_returned_object
-    def agent
-      @agent ||= Sawyer::Agent.new(schema_and_hostname, faraday: faraday)
+    HTTP_METHODS.each do |http_method|
+      class_eval <<~METHOD, __FILE__, __LINE__ + 1
+        # Executes HTTP request with #{http_method.upcase} method
+        #
+        # @param pathname [String]
+        #   Pathname of the request target URL.
+        #   It's joined with the defined `endpoint`.
+        # @param headers [Hash, nil]
+        #   Request headers.
+        # @param query [Hash, nil]
+        #   Query string.
+        # @param body [Hash, nil]
+        #   Request body. You should not specify it when use GET method.
+        # @return [Sawyer::Resouce]
+        #   Response body instance.
+        def #{http_method}(pathname, headers: nil, query: nil, body: nil)
+          query_strings = query.present? ? '?' + query&.to_query : ''
+          uri = URI.join(File.join(endpoint, pathname), query_strings)
+          response = call(:_request, :#{http_method}, uri, headers, body)
+          response.data
+        end
+      METHOD
     end
+    alias put patch
 
-    # Description of #faraday
-    #
-    # @return [Faraday::Connection] description_of_returned_object
-    def faraday
-      @faraday ||=
-        Faraday.new(
-          nil,
-          request: {
-            timeout: (http_read_timeout if respond_to?(:http_read_timeout)),
-            open_timeout: (http_open_timeout if respond_to?(:http_open_timeout)),
-          }.compact
-        )
-    end
+    private
 
-    # Description of #_execute
+    # Executes HTTP request.
     #
-    # @param request_params [MyApiClient::Params::Request] describe_request_params_here
-    # @param request_logger [MyApiClient::Logger] describe_request_logger_here
-    # @return [Sawyer::Resource] description_of_returned_object
-    # @raise [MyApiClient::Error]
-    def _execute(request_params, request_logger)
-      request_logger.info('Start')
-      response = agent.call(*request_params.to_sawyer_args)
-      request_logger.info("Duration #{response.timing} sec")
-      params = Params::Params.new(request_params, response)
-      _verify(params, request_logger)
-    rescue *NETWORK_ERRORS => e
-      params ||= Params::Params.new(request_params, nil)
-      request_logger.error("Network Error (#{e.message})")
-      raise MyApiClient::NetworkError.new(params, e)
-    rescue MyApiClient::Error => e
-      request_logger.warn("Failure (#{response.status})")
-      raise e
-    else
-      request_logger.info("Success (#{response.status})")
-      response.data
+    # @param http_method [Symbol]
+    #   HTTP method. e.g. `:get`, `:post`, `:patch` and `:delete`.
+    # @param uri [URI]
+    #   Request target URI including query strings.
+    # @param headers [Hash, nil]
+    #   Request headers.
+    # @param body [Hash, nil]
+    #   Request body.
+    # @return [Sawyer::Response]
+    #   Response instance.
+    def _request(http_method, uri, headers, body)
+      request_params = Params::Request.new(http_method, uri, headers, body)
+      request_logger = Logger.new(logger, http_method, uri)
+      Executor.call(
+        instance: self,
+        request_params: request_params,
+        request_logger: request_logger,
+        faraday_options: faraday_options
+      )
     end
 
-    # Description of #_verify
+    # Generates options for the faraday instance.
     #
-    # @param params [MyApiClient::Params::Params] describe_params_here
-    # @param request_logger [MyApiClient::Logger] describe_request_logger_here
-    # @return [nil] description_of_returned_object
-    # @raise [MyApiClient::Error]
-    def _verify(params, request_logger)
-      case error_handler = error_handling(params.response)
-      when Proc
-        error_handler.call(params, request_logger)
-      when Symbol
-        send(error_handler, params, request_logger)
-      end
+    # @return [Hash] Generated options.
+    def faraday_options
+      {
+        request: {
+          timeout: (http_read_timeout if respond_to?(:http_read_timeout)),
+          open_timeout: (http_open_timeout if respond_to?(:http_open_timeout)),
+        }.compact,
+      }
     end
   end
 end

data/lib/my_api_client/request/executor.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+module MyApiClient
+  module Request
+    # Executes HTTP request with specified parameters.
+    class Executor < ServiceAbstract
+      # @param instance [MyApiClient::Base]
+      #   The my_api_client instance.
+      #   The instance method will be called on error handling.
+      # @param request_params [MyApiClient::Params::Request]
+      #   Request parameter instance.
+      # @param request_logger [MyApiClient::Logger]
+      #   Request logger instance.
+      # @param faraday_options [Hash]
+      #   Options for the faraday instance. Mainly used for timeout settings.
+      # @return [Sawyer::Response]
+      #   Response instance.
+      # @raise [MyApiClient::Error]
+      #   Raises on invalid response or network errors.
+      def initialize(instance:, request_params:, request_logger:, faraday_options:)
+        @instance = instance
+        @request_params = request_params
+        @request_logger = request_logger
+        faraday = Faraday.new(nil, faraday_options)
+        @agent = Sawyer::Agent.new('', faraday: faraday)
+      end
+
+      private
+
+      attr_reader :instance, :request_params, :request_logger, :agent
+
+      def call
+        request_logger.info('Start')
+        response = api_request
+        request_logger.info("Duration #{response.timing} sec")
+        verify(response)
+      rescue MyApiClient::Error => e
+        request_logger.warn("Failure (#{e.message})")
+        raise
+      else
+        request_logger.info("Success (#{response.status})")
+        response
+      end
+
+      # Executes HTTP request to the API.
+      #
+      # @return [Sawyer::Response]
+      #   Response instance.
+      # @raise [MyApiClient::NetworkError]
+      #   Raises on any network errors.
+      def api_request
+        agent.call(*request_params.to_sawyer_args)
+      rescue *NETWORK_ERRORS => e
+        params = Params::Params.new(request_params, nil)
+        raise MyApiClient::NetworkError.new(params, e)
+      end
+
+      # Verifies the response.
+      #
+      # @param response_params [Sawyer::Response]
+      #   The target response.
+      # @return [nil]
+      #   Returns nil when a valid response.
+      # @raise [MyApiClient::Error]
+      #   Raises on any invalid response.
+      def verify(response_params)
+        params = Params::Params.new(request_params, response_params)
+        find_error_handler(response_params)&.call(params, request_logger)
+      end
+
+      # Executes response verifyment. If an invalid response is detected, return
+      # the error handler procedure. The error handlers defined later takes precedence.
+      #
+      # @param response_params [Sawyer::Response]
+      #   The target response.
+      # @return [nil]
+      #   Returns nil when a valid response.
+      # @return [Proc]
+      #   Returns Proc when a invalid response.
+      def find_error_handler(response_params)
+        instance.error_handlers.reverse_each do |error_handler|
+          result = error_handler.call(instance, response_params)
+          return result unless result.nil?
+        end
+        nil
+      end
+    end
+  end
+end

data/lib/my_api_client/request/logger.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module MyApiClient
+  module Request
+    # Description of Logger
+    class Logger
+      attr_reader :logger, :method, :uri
+
+      LOG_LEVEL = %i[debug info warn error fatal].freeze
+
+      # Description of #initialize
+      #
+      # @param logger [::Logger] describe_logger_here
+      # @param method [String] HTTP method
+      # @param uri [URI] Target URI
+      def initialize(logger, method, uri)
+        @logger = logger
+        @method = method.to_s.upcase
+        @uri = uri
+      end
+
+      LOG_LEVEL.each do |level|
+        class_eval <<~METHOD, __FILE__, __LINE__ + 1
+          def #{level}(message)
+            logger.#{level}(format(message))
+          end
+        METHOD
+      end
+
+      private
+
+      def format(message)
+        "API request `#{method} #{uri}`: \"#{message}\""
+      end
+    end
+  end
+end

data/lib/my_api_client/rspec/matcher_helper.rb

@@ -4,8 +4,8 @@ module MyApiClient
   # Helper module for rspec custom matcher
   module MatcherHelper
     def disable_logging
-      logger = instance_double(MyApiClient::Logger, info: nil, warn: nil)
-      allow(MyApiClient::Logger).to receive(:new).and_return(logger)
+      logger = instance_double(MyApiClient::Request::Logger, info: nil, warn: nil)
+      allow(MyApiClient::Request::Logger).to receive(:new).and_return(logger)
     end
 
     def dummy_response(status: 200, headers: {}, body: nil)

data/lib/my_api_client/rspec/matchers/be_handled_as_an_error.rb

@@ -45,6 +45,7 @@ RSpec::Matchers.define :be_handled_as_an_error do |expected_error_class|
 
   attr_reader :sawyer
 
+  # rubocop:disable Metrics/AbcSize
   def init
     disable_logging
     response = dummy_response(
@@ -56,6 +57,7 @@ RSpec::Matchers.define :be_handled_as_an_error do |expected_error_class|
     allow(Sawyer::Agent).to receive(:new).and_return(sawyer)
     allow(MyApiClient::Sleeper).to receive(:call)
   end
+  # rubocop:enable Metrics/AbcSize
 
   def set_validation_for_retry_count
     return if retry_count.nil?

data/lib/my_api_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MyApiClient
-  VERSION = '0.13.0'
+  VERSION = '0.14.0.pre'
 end

data/my_api_client.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov', '0.17.1'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'yard'
 end

data/renovate.json

@@ -1,5 +1,21 @@
 {
   "extends": [
     "config:base"
+  ],
+  "packageRules": [
+    {
+      "updateTypes": ["major"],
+      "labels": ["renovate", "major"]
+    },
+    {
+      "updateTypes": ["minor"],
+      "labels": ["renovate", "minor", "auto merge"],
+      "automerge": true
+    },
+    {
+      "updateTypes": ["patch"],
+      "labels": ["renovate", "patch", "auto merge"],
+      "automerge": true
+    }
   ]
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_api_client
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0.pre
 platform: ruby
 authors:
 - ryz310
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -182,16 +182,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -228,6 +228,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".dependabot/config.yml"
 - ".envrc.skeleton"
 - ".gem_comet.yml"
 - ".gitignore"
@@ -262,14 +263,15 @@ files:
 - lib/my_api_client/config.rb
 - lib/my_api_client/error_handling.rb
 - lib/my_api_client/error_handling/generator.rb
-- lib/my_api_client/error_handling/process_retry_option.rb
+- lib/my_api_client/error_handling/retry_option_processor.rb
 - lib/my_api_client/errors.rb
 - lib/my_api_client/exceptions.rb
 - lib/my_api_client/integrations/bugsnag.rb
-- lib/my_api_client/logger.rb
 - lib/my_api_client/params/params.rb
 - lib/my_api_client/params/request.rb
 - lib/my_api_client/request.rb
+- lib/my_api_client/request/executor.rb
+- lib/my_api_client/request/logger.rb
 - lib/my_api_client/rspec.rb
 - lib/my_api_client/rspec/matcher_helper.rb
 - lib/my_api_client/rspec/matchers/be_handled_as_an_error.rb
@@ -295,9 +297,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.2
 signing_key: 

data/lib/my_api_client/logger.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-module MyApiClient
-  # Description of Logger
-  class Logger
-    attr_reader :logger, :method, :pathname
-
-    LOG_LEVEL = %i[debug info warn error fatal].freeze
-
-    # Description of #initialize
-    #
-    # @param logger [::Logger] describe_logger_here
-    # @param faraday [Faraday::Connection] describe_faraday_here
-    # @param method [String] HTTP method
-    # @param pathname [String] The path name
-    def initialize(logger, faraday, method, pathname)
-      @logger = logger
-      @method = method.to_s.upcase
-      @pathname = faraday.build_exclusive_url(pathname)
-    end
-
-    LOG_LEVEL.each do |level|
-      class_eval <<~METHOD, __FILE__, __LINE__ + 1
-        def #{level}(message)
-          logger.#{level}(format(message))
-        end
-      METHOD
-    end
-
-    private
-
-    def format(message)
-      "API request `#{method} #{pathname}`: \"#{message}\""
-    end
-  end
-end