request-builder 0.1.111 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0aac9f219c56f616535a5bfc7a4bd5c5f3582b14cf073222072163df5854567e
-  data.tar.gz: 781222b721bec58b7176c748b534cc6a056028e4ec311939c894659fa0d5c490
+  metadata.gz: 5cf3a97fe30fcae542fe7408baeb64a43e780756289223976cb2dec000fe7f55
+  data.tar.gz: c14f4e0302f6b9cdd7dfee85c9cc8a2fdc02e8dbe15d8602ee7d63523abbaa26
 SHA512:
-  metadata.gz: 8e88f125fdc7c80476816ffadbe2c53682ee744566c28e84aceeb1f9c012cc83d0076e91b7888173a512dc60ebfc6de0d6dcf83de4815301b6c7e9013cea1ce4
-  data.tar.gz: 52211f5fd41ef89cde1275a238dda030bde4873d433c77e97dc8238b0d7aa3deb8f00d1d4fa832658068a93eaab4e62b5f2858e93e5beca771f61e98c629bf75
+  metadata.gz: bab01b5e370fa9bc933f885444c6d1a70dca7e67d3b587690f4fa28e69ad1e60f1e6ee7d2ef8dced6b0ac4c7853e41c1531c38545e64d111fd44492d8fc2fd36
+  data.tar.gz: 88397b03a03cc68e9294588360ff1a9c2a5c125d7d778c1747228576937e47c903053416e261dc8a4c5f2851ac01b0e0329be1bc8fb139aaedeac1ff233310c8

data/lib/request/builder/dsl.rb

@@ -11,16 +11,16 @@ module Request
       end
 
       module ClassMethods
-        def config
-          @config ||= RequestConfig.new
+        def config(conf=nil)
+          @config ||= conf.deep_dup || RequestConfig.new
         end
 
         def configure(conf = nil, &block)
-          @config = conf.dup if conf
+          config(conf)
 
           config.instance_eval(&block) if block
         end
       end
     end
   end
-end
+end

data/lib/request/builder/request_config.rb

@@ -5,14 +5,13 @@ module Request
 
       delegate_missing_to :context
 
-      attrs = [:host, :path, :method, :request_middleware, :response_middleware, :adapter, :logger, :timeout]
+      attrs = [:params, :callbacks, :headers, :body, :host, :path, :method, :request_middleware, :response_middleware, :adapter, :logger, :timeout]
 
-      attr_reader :context, :body_conf, :headers_conf, :params_conf, :callbacks_conf, :stubs
-      attr_writer *attrs, :stubs
-
-      alias callbacks callbacks_conf
+      attr_reader :context, :stubs
+      attr_writer *attrs, :stubs, :context
 
       def initialize
+        @body = nil
         @host = nil
         @path = '/'
         @method = :get
@@ -22,11 +21,8 @@ module Request
         @stubs = Faraday::Adapter::Test::Stubs.new
         @logger = nil
         @timeout = 30
-        @body_conf = RequestConfig::Body.new
-        @headers_conf = RequestConfig::Headers.new
-        @params_conf = RequestConfig::Params.new
-        @callbacks_conf = RequestConfig::Callbacks.new
         @response_schema = Dry::Schema.Params
+        @context = nil
       end
 
       attrs.each do |attr|
@@ -41,10 +37,22 @@ module Request
 
       [:before_validate].each do |name|
         define_method name do |&block|
-          callbacks.send(name, &block)
+          callbacks[name] = block
         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)
@@ -65,36 +73,32 @@ module Request
         end
       end
 
-      def body(&block)
-        return body_conf.set(&block) if block_given?
-
-        body_conf.to_h
-      end
-
-      def headers(&block)
-        headers_conf.instance_eval(&block) if block_given?
-
-        headers_conf
-      end
-
       def header(key, value = nil, &block)
-        headers_conf.header(key, value, &block)
-      end
-
-      def params(&block)
-        params_conf.instance_eval(&block) if block_given?
-
-        params_conf
+        if value.nil? && block.nil?
+          value_with_context(headers[key])
+        else
+          headers[key] = block || value
+        end
       end
 
       def param(key, value = nil, &block)
-        params_conf.param(key, value, &block)
+        if value.nil? && block.nil?
+          value_with_context(params[key])
+        else
+          params[key] = block || value
+        end
       end
 
-      def context=(context)
-        @context = context
+      def each_header
+        headers.each do |key, value|
+          yield key, value_with_context(value)
+        end
+      end
 
-        [body_conf, headers_conf, params_conf, callbacks_conf].each { |cnf| cnf.context = context }
+      def each_param
+        params.each do |key, value|
+          yield key, value_with_context(value)
+        end
       end
 
       def [] property

data/lib/request/builder/value_with_context.rb

@@ -5,7 +5,7 @@ module Request
         return obj unless obj.is_a?(Proc)
 
         case obj.arity
-        when 1, -1, -2 then instance_exec(@context, &obj)
+        when 1, -1, -2 then instance_exec(self, &obj)
         else instance_exec(&obj)
         end
       end

data/lib/request/builder/version.rb

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

data/lib/request/builder.rb

@@ -6,11 +6,6 @@ require "active_support/core_ext/module/delegation"
 require_relative "builder/version"
 require_relative "builder/value_with_context"
 require_relative "builder/request_config"
-require_relative "builder/request_config/base"
-require_relative "builder/request_config/body"
-require_relative "builder/request_config/params"
-require_relative "builder/request_config/headers"
-require_relative "builder/request_config/callbacks"
 require_relative "builder/result"
 require_relative "builder/dsl"
 require_relative "builder/connection"
@@ -64,11 +59,11 @@ module Request
       @response = connection.send(config.method.downcase, config.path) do |req|
         req.options.timeout = config.timeout
 
-        config.params.each do |key, value|
+        config.each_param do |key, value|
           req.params[key] = value
         end
 
-        config.headers.each do |key, value|
+        config.each_header do |key, value|
           req.headers[key] = value
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: request-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.111
+  version: 0.2.0
 platform: ruby
 authors:
 - Anton Kostyuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-04 00:00:00.000000000 Z
+date: 2022-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -127,11 +127,6 @@ files:
 - lib/request/builder/connection.rb
 - lib/request/builder/dsl.rb
 - lib/request/builder/request_config.rb
-- lib/request/builder/request_config/base.rb
-- lib/request/builder/request_config/body.rb
-- lib/request/builder/request_config/callbacks.rb
-- lib/request/builder/request_config/headers.rb
-- lib/request/builder/request_config/params.rb
 - lib/request/builder/result.rb
 - lib/request/builder/value_with_context.rb
 - lib/request/builder/version.rb

data/lib/request/builder/request_config/base.rb

@@ -1,37 +0,0 @@
-module Request
-  module Builder
-    class RequestConfig::Base
-      include ValueWithContext
-
-      attr_accessor :context
-      attr_reader :store
-
-      delegate_missing_to :context
-
-      def initialize(context = nil)
-        @context = context
-      end
-
-      def each(&block)
-        raise NotImplementedError unless store.is_a?(Enumerable)
-
-        store.each do |value|
-          value[1] = value_with_context(value[1])
-          block.call(value)
-        end
-      end
-
-      def [] key
-        raise NotImplementedError unless store.is_a?(Enumerable)
-
-        value_with_context(store[key])
-      end
-
-      private
-
-      def store
-        raise NotImplementedError
-      end
-    end
-  end
-end

data/lib/request/builder/request_config/body.rb

@@ -1,21 +0,0 @@
-module Request
-  module Builder
-    class RequestConfig::Body < Request::Builder::RequestConfig::Base
-      def set(&block)
-        raise ArgumentError, 'You must provide a block' unless block_given?
-
-        @store = block
-      end
-
-      def to_h
-        value_with_context(store)
-      end
-
-      private
-
-      def store
-        @store ||= nil
-      end
-    end
-  end
-end

data/lib/request/builder/request_config/callbacks.rb

@@ -1,29 +0,0 @@
-module Request
-  module Builder
-    class RequestConfig::Callbacks < Request::Builder::RequestConfig::Base
-      [:before_validate].each do |name|
-        define_method name do |&block|
-          raise ArgumentError, 'You must provide a block' unless block
-
-          store[name] = block
-        end
-      end
-
-      def each(&block)
-        store.each do |value|
-          block.call(value)
-        end
-      end
-
-      def [] key
-        store[key]
-      end
-
-      private
-
-      def store
-        @store ||= HashWithIndifferentAccess.new
-      end
-    end
-  end
-end

data/lib/request/builder/request_config/headers.rb

@@ -1,17 +0,0 @@
-module Request
-  module Builder
-    class RequestConfig::Headers < Request::Builder::RequestConfig::Base
-      def header(key, value = nil, &block)
-        raise ArgumentError, 'Must provide a value or block' if !value && !block
-
-        store[key] = block || value
-      end
-
-      private
-
-      def store
-        @store ||= HashWithIndifferentAccess.new
-      end
-    end
-  end
-end

data/lib/request/builder/request_config/params.rb

@@ -1,17 +0,0 @@
-module Request
-  module Builder
-    class RequestConfig::Params < Request::Builder::RequestConfig::Base
-      def param(key, value = nil, &block)
-        raise ArgumentError, 'Must provide a value or block' if !value && !block
-
-        store[key] = block || value
-      end
-
-      private
-
-      def store
-        @store ||= HashWithIndifferentAccess.new
-      end
-    end
-  end
-end