yarh 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be06fa99910b08969531006fb8437dd82770a62fdd4d7d428d9d10599c33786e
-  data.tar.gz: 9ced27dcff33621e24ac55aa181af3cadfbbcd32255c3184ac2e73bf44dbecfa
+  metadata.gz: 230590cd46a0d3c0a79928ad65f90a980ff736e25ab71be810f0e525de707263
+  data.tar.gz: 186debbf786606aec63b311290a2c605102a178a275d406182901aabfabdc1a2
 SHA512:
-  metadata.gz: c6e28d50e58caadd9fe64e15f20fa4d001648af8c8bfebd200f0361c163032774171997060af51a8c6b3f0970c0450dfdc1e4d08d6e8acd51eb70f4a9748fc11
-  data.tar.gz: 78f9bf12359dde945a9dcb969224a5321020a43cddaa07bdae549d3cb870d77cbc6a08212f4028c31bbc20302dff49a1cae9980db7a9dcaa56d1e1057bcc54ae
+  metadata.gz: a7760c56390192b0076fc1edc1ca62d66b21f5b75e304d9d3dbd25a6e82d9d0a5bd8a9c7dff01c25bf1fc8e79d956c2437281893137336655109a3b3f583b3a9
+  data.tar.gz: 7f71b503a8958a6cba8b0b1adfc11cd581c3f3b03bcd7d3e9a4cdb3eb38219b31840bb74778cc67181579603058b0ccf7af75f8d10f3826148215142df47d259

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_builder.rb

@@ -2,36 +2,85 @@
 
 require 'faraday'
 require 'json'
+require_relative 'errors/wrong_data_error'
 
 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'])
+      raise Errors::WrongDataError if method.nil? || url.nil?
 
-      response = conn.send(data['method'].downcase.to_sym) do |req|
-        build_headers(req, data['headers'])
-        req.body = data['body'].to_json
-      end
+      conn = Faraday.new(url: url)
 
-      @response = response
+      @response = send_request(conn)
     end
 
     private
 
     attr_reader :data
 
+    def send_request(faraday_connection)
+      faraday_connection.send(method) do |req|
+        build_headers(req, data['headers'])
+        req.body = body if body
+        req.params = params if params
+        req.options.timeout timeout if timeout
+      end
+    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
+
+    # TODO: optimize this method in the future
+    def body
+      return unless data['body']
+
+      if application_json?
+        data['body'].to_json
+      else
+        data['body']
+      end
+    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
   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.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yarh
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Kirill Leonov
@@ -48,6 +48,8 @@ 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_builder.rb
 - lib/yarh/request_runner.rb
 - lib/yarh/version.rb