request-builder 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cf3a97fe30fcae542fe7408baeb64a43e780756289223976cb2dec000fe7f55
-  data.tar.gz: c14f4e0302f6b9cdd7dfee85c9cc8a2fdc02e8dbe15d8602ee7d63523abbaa26
+  metadata.gz: 8ecb2f6a3eab486b8d0a96687110aa4a97fd594c320da5ffb321d1faee2953f1
+  data.tar.gz: c10cdeaf0c5249dbec557e630b43ab04ca24ee65c88bf035a58418d5e19ea917
 SHA512:
-  metadata.gz: bab01b5e370fa9bc933f885444c6d1a70dca7e67d3b587690f4fa28e69ad1e60f1e6ee7d2ef8dced6b0ac4c7853e41c1531c38545e64d111fd44492d8fc2fd36
-  data.tar.gz: 88397b03a03cc68e9294588360ff1a9c2a5c125d7d778c1747228576937e47c903053416e261dc8a4c5f2851ac01b0e0329be1bc8fb139aaedeac1ff233310c8
+  metadata.gz: 37f6ff2f9f349ddb3a6502e9a8a0755b0c1d0848c800d5613ee19c84d8386eb2ba2b7668a7bcd7c2a8093368274af9b849682f34a2f09f32486ec01ef866a28c
+  data.tar.gz: 968768c2d2f2f18b6989602b49a7ff1da0cf8d8705d0d60c4f3098b02d9582b32307baef47d6cb569d5970c4c53f9f877e8ff84b050d9d8abdb25a765b078315

data/lib/request/builder/connection.rb

@@ -1,5 +1,4 @@
 require "faraday"
-require "faraday_middleware"
 
 module Request
   module Builder

data/lib/request/builder/dsl.rb

@@ -12,7 +12,7 @@ module Request
 
       module ClassMethods
         def config(conf=nil)
-          @config ||= conf.deep_dup || RequestConfig.new
+          @config ||= conf&.deep_dup || RequestConfig.new
         end
 
         def configure(conf = nil, &block)

data/lib/request/builder/request_config.rb

@@ -10,19 +10,23 @@ module Request
       attr_reader :context, :stubs
       attr_writer *attrs, :stubs, :context
 
-      def initialize
-        @body = nil
-        @host = nil
-        @path = '/'
-        @method = :get
-        @request_middleware = :json
-        @response_middleware = :json
-        @adapter = Request::Builder.default_adapter
-        @stubs = Faraday::Adapter::Test::Stubs.new
-        @logger = nil
-        @timeout = 30
-        @response_schema = Dry::Schema.Params
+      def initialize(**params)
+        @body = params[:body]
+        @host = params[:host]
+        @path = params[:path] || '/'
+        @method = params[:method] ||:get
+        @request_middleware = params[:request_middleware] || :json
+        @response_middleware = params[:response_middleware] || :json
+        @adapter = params[:adapter] || Request::Builder.default_adapter
+        @stubs = params[:stubs] || Faraday::Adapter::Test::Stubs.new
+        @logger = params[:logger]
+        @timeout = params[:timeout] || 30
+        @response_schema = params[:response_schema] || Dry::Schema.Params
         @context = nil
+        @body = params[:body]
+        @params = params[:params] || HashWithIndifferentAccess.new
+        @headers = params[:headers] || HashWithIndifferentAccess.new
+        @callbacks = params[:callbacks] || HashWithIndifferentAccess.new
       end
 
       attrs.each do |attr|
@@ -41,18 +45,6 @@ module Request
         end
       end
 
-      def headers
-        @headers ||= HashWithIndifferentAccess.new
-      end
-
-      def params
-        @params ||= HashWithIndifferentAccess.new
-      end
-
-      def callbacks
-        @callbacks ||= HashWithIndifferentAccess.new
-      end
-
       def stubs(value = nil, &block)
         if block_given?
           @stubs.instance_eval(&block)
@@ -105,6 +97,26 @@ module Request
         instance_variable_get("@#{property}".to_sym)
       end
 
+      def dup
+        Request::Builder::RequestConfig.new(
+          body: @body.dup,
+          host: @host.dup,
+          path: @path.dup,
+          method: @method,
+          request_middleware: @request_middleware,
+          response_middleware: @response_middleware,
+          adapter: @adapter,
+          stubs: @stubs,
+          logger: @logger,
+          timeout: @timeout,
+          response_schema: @response_schema,
+          body: @body.dup,
+          params: @params.dup,
+          headers: @headers.dup,
+          callbacks: @callbacks.dup
+        )
+      end
+
       Module.new do
         singleton_class.send :define_method, :included do |host_class|
           host_class.extend class_methods

data/lib/request/builder/result.rb

@@ -12,7 +12,7 @@ module Request
         @response = response
         @context = context
         @before_validate = config.callbacks[:before_validate]
-        @body = @before_validate ? @before_validate.call(response.body.to_h) : response.body.to_h
+        @body = @before_validate ? @before_validate.call(response.body) : response.body
       end
 
       def success?

data/lib/request/builder/version.rb

@@ -1,5 +1,5 @@
 module Request
   module Builder
-    VERSION = "0.2.0"
+    VERSION = "0.2.2"
   end
 end

data/request-builder.gemspec

@@ -23,8 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables   = []
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday", "~> 1.7.1"
-  spec.add_dependency "faraday_middleware", "~> 1.2.0"
+  spec.add_dependency "faraday", "~> 2.2.0"
   spec.add_dependency "dry-schema", "~> 1.9"
   spec.add_dependency "dry-initializer", "~> 3.0"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: request-builder
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Anton Kostyuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-17 00:00:00.000000000 Z
+date: 2023-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: dry-schema
   requirement: !ruby/object:Gem::Requirement