files

Author: leonovk

.gitignore

@@ -1,2 +1,3 @@
 .ruby-version
 test/examples/private_examples
+.byebug_history

.rubocop.yml

@@ -10,3 +10,6 @@ Gemspec/RequireMFA:
 
 Gemspec/RequiredRubyVersion:
   Enabled: false
+
+Style/AndOr:
+  Enabled: false

Gemfile

@@ -14,5 +14,6 @@ end
 group :test do
   gem 'minitest', '~> 5.22', '>= 5.22.3'
   gem 'minitest-reporters', '~> 1.6', '>= 1.6.1'
+  gem 'mocha', '~> 2.2'
   gem 'webmock', '~> 3.23'
 end

Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    yarh (0.1.4)
+    yarh (0.1.5)
       faraday (~> 2.9)
+      faraday-multipart (~> 1.0, >= 1.0.4)
       thor (~> 1.3)
 
 GEM
@@ -20,6 +21,8 @@ GEM
       rexml
     faraday (2.9.0)
       faraday-net_http (>= 2.0, < 3.2)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (3.1.0)
       net-http
     hashdiff (1.1.0)
@@ -31,6 +34,9 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
+    mocha (2.2.0)
+      ruby2_keywords (>= 0.0.5)
+    multipart-post (2.4.0)
     net-http (0.4.1)
       uri
     parallel (1.24.0)
@@ -60,6 +66,7 @@ GEM
       rubocop (>= 1.61, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
     thor (1.3.1)
     unicode-display_width (2.5.0)
     uri (0.13.0)
@@ -76,6 +83,7 @@ DEPENDENCIES
   byebug (~> 11.1, >= 11.1.3)
   minitest (~> 5.22, >= 5.22.3)
   minitest-reporters (~> 1.6, >= 1.6.1)
+  mocha (~> 2.2)
   rake (~> 13.2, >= 13.2.1)
   rubocop (~> 1.63, >= 1.63.4)
   rubocop-minitest (~> 0.35.0)

lib/yarh/cli.rb

@@ -13,7 +13,7 @@ class CLI < Thor
 
     desc '-r PATH', 'execute requests from file'
     def run_requests(path)
-      Yarh.run_requests(path)
+      puts Yarh.run_requests(path)
     end
 
     desc 'version', 'show Yarh version'

lib/yarh/request_body.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'faraday'
+require 'faraday/multipart'
+
+module Yarh
+  # Class for creating request bodies
+  class RequestBody
+    def initialize(body)
+      @body_data = body
+      @result_body = {}
+    end
+
+    def create
+      body_data.each do |key, value|
+        if value.is_a?(Hash)
+          prepare_value(key, value)
+        else
+          @result_body[key] = value
+        end
+      end
+
+      @result_body
+    end
+
+    private
+
+    attr_reader :body_data
+
+    # NOTE: Currently the method is used for parsing files
+    def prepare_value(key, value)
+      if value['path'] and value['file_type']
+        file = Faraday::UploadIO.new(value['path'], value['file_type'])
+        @result_body[key] = file
+      else
+        @result_body[key] = value
+      end
+    end
+  end
+end

lib/yarh/request_builder.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 require 'faraday'
+require 'faraday/multipart'
 require 'json'
 require_relative 'errors/wrong_data_error'
+require_relative 'request_body'
 
 module Yarh
   # Сlass builds a request from hash parameters and executes the request
@@ -15,17 +17,29 @@ def initialize(data)
     end
 
     def request
-      raise Errors::WrongDataError if method.nil? || url.nil?
+      validate_before_request
 
-      conn = Faraday.new(url: url)
-
-      @response = send_request(conn)
+      @response = send_request(build_conncetion)
     end
 
     private
 
     attr_reader :data
 
+    def validate_before_request
+      raise Errors::WrongDataError if method.nil? or url.nil?
+    end
+
+    def build_conncetion
+      if multipart?
+        Faraday.new(url: url) do |request|
+          request.request :multipart
+        end
+      else
+        Faraday.new(url: url)
+      end
+    end
+
     def send_request(faraday_connection)
       faraday_connection.send(method) do |req|
         build_headers(req, data['headers'])
@@ -35,33 +49,25 @@ def send_request(faraday_connection)
       end
     end
 
-    def method
-      return unless data['method']
-
-      data['method'].downcase.to_sym
-    end
-
-    def url
-      data['url']
-    end
+    # TODO: optimize this method in the future
+    def body
+      return @body unless @body.nil?
+      return unless data['body']
 
-    def params
-      data['params']
-    end
+      body = RequestBody.new(data['body']).create
 
-    def timeout
-      data['timeout']
+      @body = if application_json?
+                body.to_json
+              else
+                body
+              end
     end
 
-    # TODO: optimize this method in the future
-    def body
-      return unless data['body']
+    def multipart?
+      return false unless data['headers']
+      return false unless data['headers']['Content-Type']
 
-      if application_json?
-        data['body'].to_json
-      else
-        data['body']
-      end
+      data['headers']['Content-Type'] == 'multipart/form-data'
     end
 
     def application_json?
@@ -82,5 +88,23 @@ def build_headers(req, headers)
     def stringify_keys(data)
       data.is_a?(Hash) ? data.to_h { |k, v| [k.to_s, stringify_keys(v)] } : data
     end
+
+    def method
+      return unless data['method']
+
+      data['method'].downcase.to_sym
+    end
+
+    def url
+      data['url']
+    end
+
+    def params
+      data['params']
+    end
+
+    def timeout
+      data['timeout']
+    end
   end
 end

lib/yarh/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yarh
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

test.txt

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require_relative '../../test_helper'
+
+module Yarh
+  class RequestBodyTest < Minitest::Test
+    def test_when_simple_body
+      body = {
+        key1: 'value1',
+        key2: 'value2'
+      }
+
+      result = RequestBody.new(body).create
+
+      assert_equal body, result
+    end
+
+    def test_when_body_include_hash # rubocop:disable Metrics/MethodLength
+      body = {
+        key1: 'value1',
+        key2: 'value2',
+        key3: {
+          'path' => 'path',
+          'file_type' => 'type'
+        }
+      }
+
+      expected_body = {
+        key1: 'value1',
+        key2: 'value2',
+        key3: 123
+      }
+      Faraday::UploadIO.expects(:new).with('path', 'type').returns(123)
+      result = RequestBody.new(body).create
+
+      assert_equal expected_body, result
+    end
+
+    def test_when_no_path
+      body = {
+        key1: 'value1',
+        key2: 'value2',
+        key3: {
+          'file_type' => 'type'
+        }
+      }
+
+      result = RequestBody.new(body).create
+
+      assert_equal body, result
+    end
+
+    def test_when_no_file_type
+      body = {
+        key1: 'value1',
+        key2: 'value2',
+        key3: {
+          'path' => 'path'
+        }
+      }
+
+      result = RequestBody.new(body).create
+
+      assert_equal body, result
+    end
+  end
+end

test/lib/yarh/request_body_test.rb

@@ -5,6 +5,7 @@
 require 'minitest/reporters'
 require 'webmock/minitest'
 require 'json'
+require 'mocha/minitest'
 require_relative '../lib/yarh'
 require_relative '../lib/yarh/version'
 

test/test_helper.rb

@@ -20,5 +20,6 @@ Gem::Specification.new do |s|
   s.metadata['source_code_uri'] = s.homepage
   s.metadata['documentation_uri'] = s.homepage
   s.add_dependency 'faraday', '~> 2.9'
+  s.add_dependency 'faraday-multipart', '~> 1.0', '>= 1.0.4'
   s.add_dependency 'thor', '~> 1.3'
 end