yarh 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 230590cd46a0d3c0a79928ad65f90a980ff736e25ab71be810f0e525de707263
-  data.tar.gz: 186debbf786606aec63b311290a2c605102a178a275d406182901aabfabdc1a2
+  metadata.gz: ccc0f9e05c055b534d819db730c43b205e5cbf7ce29335b56cfffd30b22a762d
+  data.tar.gz: 8e186cd5a51ef030e034356e2f05c5409bdb37c76a7127602daae0bdc2d1ecdc
 SHA512:
-  metadata.gz: a7760c56390192b0076fc1edc1ca62d66b21f5b75e304d9d3dbd25a6e82d9d0a5bd8a9c7dff01c25bf1fc8e79d956c2437281893137336655109a3b3f583b3a9
-  data.tar.gz: 7f71b503a8958a6cba8b0b1adfc11cd581c3f3b03bcd7d3e9a4cdb3eb38219b31840bb74778cc67181579603058b0ccf7af75f8d10f3826148215142df47d259
+  metadata.gz: 714c8cfc0a05190ca5fe32ec686a8f40939f6a8d6c3df42acb832fd2ab2c52af84fbefae1dcb7c3a5af59676258f32dc377a2c671663e3dbbf4e353874903293
+  data.tar.gz: e5c4df5ffca9162840c87c7c96dfc954be513827049e3aa804ad51357f45916a85471629270001e874b66dc696e384fa0904087f582abf595788994adcd1312d

data/lib/yarh/cli.rb

@@ -13,7 +13,7 @@ module Yarh
 
     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'

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

data/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 @@ module Yarh
     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 @@ module Yarh
       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 @@ module Yarh
     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

data/lib/yarh/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yarh
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Kirill Leonov
@@ -24,6 +24,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: faraday-multipart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -50,6 +70,7 @@ files:
 - lib/yarh/cli.rb
 - lib/yarh/errors/base_error.rb
 - lib/yarh/errors/wrong_data_error.rb
+- lib/yarh/request_body.rb
 - lib/yarh/request_builder.rb
 - lib/yarh/request_runner.rb
 - lib/yarh/version.rb