request-builder 0.1.2 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d96e607c780a2bf0f4b9a76576137b973ba71daa719b17838836a9890fece4c4
-  data.tar.gz: 696d365b78f1a133f40d5bc784e96a1e2d86a1a49f8f42eb7ba4f23379bd9473
+  metadata.gz: e7de0e8574474d4faaab1875af8c7a6300a59b4c1ce50e4759a2cd3dad57ec8d
+  data.tar.gz: 78339277c6d7f8350c8c9a1ef46fe323be17aa50c432cd2066cbbc13bf509899
 SHA512:
-  metadata.gz: bf03752615829aa961327be7a13a8c56662e3796ec0fe4b565495c873ffa8f2eb31229d740475930ef3bbe69e9f345c695c3fa37f31236bef9cfbc4d5cd62856
-  data.tar.gz: 074b41b7a673cb4687f6c6a3331162d33159b5a30cde121b4921f41c7433eb6a9f2bea945188a2830df5281eb7111bc47e19e82aee3a822fe30224538a688198
+  metadata.gz: 619bb65f75be72e79b0ae9edc545e31aca08d29acae094763d4f492ed84b26d353544ada9056b597cf199ed2b510fbe27efc3d09f579616c4dbc0492cd7ccc10
+  data.tar.gz: 8caef78820ca8117b3f095f3e91a61db1048a96c5d90ba93ae41c04e16dd3099e44cef87ce19cab4feccc67a9187d733be42c36ae93451b5bae670bf3605aaec

data/lib/request/builder/dsl.rb

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

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

@@ -0,0 +1,37 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,29 @@
+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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,17 @@
+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

data/lib/request/builder/request_config.rb

@@ -5,24 +5,28 @@ module Request
 
       delegate_missing_to :context
 
-      attrs = [:params, :callbacks, :headers, :body, :host, :path, :method, :request_middleware, :response_middleware, :adapter, :logger, :timeout]
+      attrs = [:host, :path, :method, :request_middleware, :response_middleware, :adapter, :logger, :timeout]
 
-      attr_reader :context, :stubs
-      attr_writer *attrs, :stubs, :context
+      attr_reader :context, :body_conf, :headers_conf, :params_conf, :callbacks_conf, :stubs
+      attr_writer *attrs, :stubs
+
+      alias callbacks callbacks_conf
 
       def initialize
-        @body = nil
         @host = nil
         @path = '/'
         @method = :get
         @request_middleware = :json
         @response_middleware = :json
-        @adapter = Request::Builder.default_adapter
+        @adapter = :net_http
         @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|
@@ -37,22 +41,10 @@ module Request
 
       [:before_validate].each do |name|
         define_method name do |&block|
-          callbacks[name] = block
+          callbacks.send(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)
@@ -73,32 +65,36 @@ 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)
-        if value.nil? && block.nil?
-          value_with_context(headers[key])
-        else
-          headers[key] = block || value
-        end
+        headers_conf.header(key, value, &block)
       end
 
-      def param(key, value = nil, &block)
-        if value.nil? && block.nil?
-          value_with_context(params[key])
-        else
-          params[key] = block || value
-        end
+      def params(&block)
+        params_conf.instance_eval(&block) if block_given?
+
+        params_conf
       end
 
-      def each_header
-        headers.each do |key, value|
-          yield key, value_with_context(value)
-        end
+      def param(key, value = nil, &block)
+        params_conf.param(key, value, &block)
       end
 
-      def each_param
-        params.each do |key, value|
-          yield key, value_with_context(value)
-        end
+      def context=(context)
+        @context = context
+
+        [body_conf, headers_conf, params_conf, callbacks_conf].each { |cnf| cnf.context = context }
       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(self, &obj)
+        when 1, -1, -2 then instance_exec(@context, &obj)
         else instance_exec(&obj)
         end
       end

data/lib/request/builder/version.rb

@@ -1,5 +1,5 @@
 module Request
   module Builder
-    VERSION = "0.1.2"
+    VERSION = "0.1.11"
   end
 end

data/lib/request/builder.rb

@@ -6,6 +6,11 @@ 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"
@@ -35,12 +40,6 @@ module Request
       alias perform call
     end
 
-    def self.default_adapter(adapter = nil)
-      @default_adapter = adapter if adapter
-
-      @default_adapter || :net_http
-    end
-
     def call
       do_request
       result
@@ -59,11 +58,11 @@ module Request
       @response = connection.send(config.method.downcase, config.path) do |req|
         req.options.timeout = config.timeout
 
-        config.each_param do |key, value|
+        config.params.each do |key, value|
           req.params[key] = value
         end
 
-        config.each_header do |key, value|
+        config.headers.each 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.2
+  version: 0.1.11
 platform: ruby
 authors:
 - Anton Kostyuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-17 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -127,6 +127,11 @@ 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