request-builder 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ef65f89b3f06c126d7607aac92943b498c8f039d90f3c08edcd1b7d0487b88a
-  data.tar.gz: d7f48ebb1fff73fe3f80b6bb50ac23a1a744bcbb76078d1afb964f5b33540cf8
+  metadata.gz: d96e607c780a2bf0f4b9a76576137b973ba71daa719b17838836a9890fece4c4
+  data.tar.gz: 696d365b78f1a133f40d5bc784e96a1e2d86a1a49f8f42eb7ba4f23379bd9473
 SHA512:
-  metadata.gz: 976ed740ebb730981e5f301e6562d00d54eaa2cb874e384840ee53845699f5871eb4ee3b725d0d5da3213d6ff2a17f6d2d10070e7223920d4a9368c4c3a90c44
-  data.tar.gz: '08423c1ccd725ec0e7069d94cb03cf66f5635f5ee6656204e71c3cbe3a1925e815a786a19293cc9f062159e4b366ce17cbe2ee169c36a993ce5a0aae53c3d8cf'
+  metadata.gz: bf03752615829aa961327be7a13a8c56662e3796ec0fe4b565495c873ffa8f2eb31229d740475930ef3bbe69e9f345c695c3fa37f31236bef9cfbc4d5cd62856
+  data.tar.gz: 074b41b7a673cb4687f6c6a3331162d33159b5a30cde121b4921f41c7433eb6a9f2bea945188a2830df5281eb7111bc47e19e82aee3a822fe30224538a688198

data/README.md

@@ -45,7 +45,7 @@ class MyApiClient
       # this allows you to use object variables or configuration variables 
       param 'param1', &:my_option
       param 'param2', -> { "#{my_option}" }
-      param 'param3' { my_option }
+      param('param3') { my_option }
       param 'param4' 'string'
     end
   

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,28 +5,24 @@ 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
         @request_middleware = :json
         @response_middleware = :json
-        @adapter = :net_http
+        @adapter = Request::Builder.default_adapter
         @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.1"
+    VERSION = "0.1.2"
   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"
@@ -25,8 +20,8 @@ module Request
 
       class << base
         alias_method :__new, :new
-        def new(*args)
-          e = __new(*args)
+        def new(*args, **kwargs)
+          e = __new(*args, **kwargs)
           e.send(:set_config_context)
           e
         end
@@ -34,12 +29,18 @@ module Request
     end
 
     module ClassMethods
-      def call(**args)
-        new(**args).call
+      def call(*args, **kwargs)
+        new(*args, **kwargs).call
       end
       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
@@ -58,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.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Anton Kostyuk
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-17 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
@@ -142,7 +137,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/RainbowPonny/ruby-request-builder
   source_code_uri: https://github.com/RainbowPonny/ruby-request-builder
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,8 +152,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Ruby Request DSL
 test_files: []

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