yarh 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be06fa99910b08969531006fb8437dd82770a62fdd4d7d428d9d10599c33786e
-  data.tar.gz: 9ced27dcff33621e24ac55aa181af3cadfbbcd32255c3184ac2e73bf44dbecfa
+  metadata.gz: ccc0f9e05c055b534d819db730c43b205e5cbf7ce29335b56cfffd30b22a762d
+  data.tar.gz: 8e186cd5a51ef030e034356e2f05c5409bdb37c76a7127602daae0bdc2d1ecdc
 SHA512:
-  metadata.gz: c6e28d50e58caadd9fe64e15f20fa4d001648af8c8bfebd200f0361c163032774171997060af51a8c6b3f0970c0450dfdc1e4d08d6e8acd51eb70f4a9748fc11
-  data.tar.gz: 78f9bf12359dde945a9dcb969224a5321020a43cddaa07bdae549d3cb870d77cbc6a08212f4028c31bbc20302dff49a1cae9980db7a9dcaa56d1e1057bcc54ae
+  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/errors/base_error.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Yarh
+  module Errors
+    class BaseError < StandardError
+    end
+  end
+end

data/lib/yarh/errors/wrong_data_error.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require_relative 'base_error'
+
+module Yarh
+  module Errors
+    # wrong data error
+    class WrongDataError < BaseError
+      def message
+        'Incorrect request data sent'
+      end
+    end
+  end
+end

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,37 +1,110 @@
 # frozen_string_literal: true
 
 require 'faraday'
+require 'faraday/multipart'
 require 'json'
+require_relative 'errors/wrong_data_error'
+require_relative 'request_body'
 
 module Yarh
-  # RequestBuilder
+  # Сlass builds a request from hash parameters and executes the request
   class RequestBuilder
     attr_reader :response
 
     def initialize(data)
-      @data = data
+      @data = stringify_keys(data)
       @response = nil
     end
 
     def request
-      conn = Faraday.new(url: data['url'])
+      validate_before_request
 
-      response = conn.send(data['method'].downcase.to_sym) do |req|
+      @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'])
-        req.body = data['body'].to_json
+        req.body = body if body
+        req.params = params if params
+        req.options.timeout timeout if timeout
       end
+    end
 
-      @response = response
+    # TODO: optimize this method in the future
+    def body
+      return @body unless @body.nil?
+      return unless data['body']
+
+      body = RequestBody.new(data['body']).create
+
+      @body = if application_json?
+                body.to_json
+              else
+                body
+              end
     end
 
-    private
+    def multipart?
+      return false unless data['headers']
+      return false unless data['headers']['Content-Type']
 
-    attr_reader :data
+      data['headers']['Content-Type'] == 'multipart/form-data'
+    end
+
+    def application_json?
+      return false unless data['headers']
+      return false unless data['headers']['Content-Type']
+
+      data['headers']['Content-Type'] == 'application/json'
+    end
 
     def build_headers(req, headers)
+      return unless headers
+
       headers.each do |header, value|
         req.headers[header] = value
       end
     end
+
+    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/request_runner.rb

@@ -10,17 +10,23 @@ module Yarh
 
     def initialize(path)
       @path = path
+      @responses = {}
     end
 
     def run
-      parsed_yaml.each_value do |data|
+      parsed_yaml.each do |request_name, data|
         request = RequestBuilder.new(data)
         request.request
+        responses[request_name] = request.response
       end
+
+      responses
     end
 
     private
 
+    attr_reader :responses
+
     def parsed_yaml
       @parsed_yaml ||= YamlParser.parse(path)
     end

data/lib/yarh/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yarh
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  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
@@ -48,6 +68,9 @@ files:
 - exe/yarh
 - lib/yarh.rb
 - 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