rest_api_builder 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a164d75c362c383c5fb6c093f936cae3859143a5bffd3e59d833adcf686a7875
-  data.tar.gz: 3a7cb13ef985522132219e0d753c2a04867792325ac38927c48d737198e9360d
+  metadata.gz: 7ca6b82ae8dc6fab46c1804dfe8b7a48a5082fada32c6aad18ec4834953e1b06
+  data.tar.gz: c9f328a5da83137dc49772eed5e37e5b8647e26195488279d105891fed5c1704
 SHA512:
-  metadata.gz: e708b1b6b6635db0840387320699b0ada62547e0f408d68ac484249da8cf4c92766f3dd6dac372f041db6e3bcc5ca658f822dbf6caa4f4bf7416da56f773d4c6
-  data.tar.gz: 5641d558c45f78b10422b253e49f7b0737d840f0d7dbb28c5386a49c6435d2e5fa08d6f0ae22463f6df872f9e42cb2164bd502613c4e1713635619ec3fa34403
+  metadata.gz: '07918f30ca0bfa5303987f446d0022099084a1cf3ebf47a202aa573b517fa230dbef62502d4645a813a9d174d5647b404c0687a388141c214b6c1ae6aee13b91'
+  data.tar.gz: adf81df2acb76b6b81673a833ebb813ff6715d5ec3bfcef4c6d5237ace09f465cd4c1231425faff0ea8c4d20a9ca6815b27a22d0dd0a5eec7c074d75a6f51c78

data/lib/rest_api_builder.rb

@@ -1 +1,21 @@
+require 'forwardable'
 require 'rest_api_builder/request'
+require 'rest_api_builder/request_options'
+require 'rest_api_builder/response_handler'
+
+module RestAPIBuilder
+  extend Forwardable
+
+  def_delegator :request_options, :compose, :compose_request_options
+  def_delegator :request_options, :compose_json, :compose_json_request_options
+
+  def_delegators :response_handler, :handle_response, :handle_json_response, :handle_response_error
+
+  def request_options
+    RequestOptions.new
+  end
+
+  def response_handler
+    ResponseHandler.new
+  end
+end

data/lib/rest_api_builder/request.rb

@@ -1,11 +1,7 @@
 require 'rest-client'
-require 'rest_api_builder/url_helper'
-require 'rest_api_builder/rest_client_response_parser'
 
 module RestAPIBuilder
   class RequestSingleton
-    include RestAPIBuilder::UrlHelper
-
     def json_execute(headers: {}, body: nil, **options)
       headers = headers.merge(content_type: :json)
       body &&= JSON.generate(body)
@@ -24,31 +20,24 @@ module RestAPIBuilder
       raw_response: false,
       rest_client_options: {}
     )
-      if method == :get && body
-        raise ArgumentError, 'GET requests do not support body'
-      end
-
-      response_parser = RestAPIBuilder::RestClientResponseParser.new(
-        logger: logger,
-        parse_json: parse_json,
-        raw_response: raw_response
+      options = RequestOptions.new.compose(
+        base_url: base_url,
+        method: method,
+        body: body,
+        headers: headers,
+        query: query,
+        path: path
       )
-      headers = headers.merge(params: query) if query
 
-      begin
-        response = RestClient::Request.execute(
-          method: method,
-          url: full_url(base_url, path),
-          payload: body,
-          headers: headers,
-          log: logger,
-          **rest_client_options
-        )
-        response_parser.parse_response(response, success: true)
-      rescue RestClient::RequestFailed => e
-        raise e unless e.response
+      response_handler = ResponseHandler.new
+      execute_request = proc { RestClient::Request.execute(**options, log: logger, **rest_client_options) }
 
-        response_parser.parse_response(e.response, success: false)
+      if parse_json
+        response_handler.handle_json_response(logger: logger, &execute_request)
+      elsif raw_response
+        response_handler.handle_response_error(&execute_request)
+      else
+        response_handler.handle_response(logger: logger, &execute_request)
       end
     end
   end

data/lib/rest_api_builder/request_options.rb

@@ -0,0 +1,33 @@
+require 'rest_api_builder/url_helper'
+
+module RestAPIBuilder
+  class RequestOptions
+    include RestAPIBuilder::UrlHelper
+
+    def compose(base_url:, method:, path: nil, body: nil, headers: {}, query: nil)
+      if method == :get && body
+        raise ArgumentError, 'GET requests do not support body'
+      end
+
+      headers = headers.merge(params: query) if query
+
+      {
+        method: method,
+        url: full_url(base_url, path),
+        payload: body,
+        headers: headers
+      }
+    end
+
+    def compose_json(**options)
+      result = compose(**options)
+      headers = result[:headers]
+      payload = result[:payload]
+
+      result.merge(
+        headers: headers.merge(content_type: :json),
+        payload: payload && JSON.generate(payload)
+      )
+    end
+  end
+end

data/lib/rest_api_builder/response_handler.rb

@@ -0,0 +1,44 @@
+module RestAPIBuilder
+  class ResponseHandler
+    def handle_json_response(**options, &block)
+      result = handle_response(**options, &block)
+      result.merge(body: parse_json(result[:body]))
+    end
+
+    def handle_response(logger: nil, &block)
+      result = parse_response(**handle_response_error(&block))
+      maybe_log_result(result, logger: logger)
+      result
+    end
+
+    def handle_response_error
+      response = yield
+      { raw_response: response, success: true }
+    rescue RestClient::RequestFailed => e
+      raise e unless e.response
+
+      { raw_response: e.response, success: false }
+    end
+
+    private
+
+    def parse_response(raw_response:, success:)
+      {
+        success: success,
+        status: raw_response.code,
+        body: raw_response.body,
+        headers: raw_response.headers
+      }
+    end
+
+    def maybe_log_result(result, logger:)
+      logger && logger << "# => Response: #{result}\n"
+    end
+
+    def parse_json(json)
+      JSON.parse(json)
+    rescue JSON::ParserError
+      json
+    end
+  end
+end

data/rest_api_builder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'rest_api_builder'
-  s.version     = '0.0.4'
+  s.version     = '0.0.5'
   s.summary     = "A simple wrapper for rest-client"
   s.description = "A simple wrapper for rest-client aiming to make creation and testing of API clients easier."
   s.authors     = ["Alexey D"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest_api_builder
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Alexey D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-27 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -63,7 +63,8 @@ files:
 - README.md
 - lib/rest_api_builder.rb
 - lib/rest_api_builder/request.rb
-- lib/rest_api_builder/rest_client_response_parser.rb
+- lib/rest_api_builder/request_options.rb
+- lib/rest_api_builder/response_handler.rb
 - lib/rest_api_builder/url_helper.rb
 - lib/rest_api_builder/webmock_request_expectations.rb
 - rest_api_builder.gemspec

data/lib/rest_api_builder/rest_client_response_parser.rb

@@ -1,39 +0,0 @@
-require 'json'
-
-module RestAPIBuilder
-  class RestClientResponseParser
-    def initialize(logger:, parse_json:, raw_response:)
-      @logger = logger
-      @parse_json = parse_json
-      @raw_response = raw_response
-    end
-
-    def parse_response(response, success:)
-      return { success: success, raw_response: response } if @raw_response
-
-      body = @parse_json ? parse_json(response.body) : response.body
-
-      result = {
-        success: success,
-        status: response.code,
-        body: body,
-        headers: response.headers
-      }
-      maybe_log_result(result)
-
-      result
-    end
-
-    private
-
-    def parse_json(json)
-      JSON.parse(json)
-    rescue JSON::ParserError
-      json
-    end
-
-    def maybe_log_result(result)
-      @logger && @logger << "# => Response: #{result}\n"
-    end
-  end
-end