http-client-generator 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b600129f8608c32eb8ec71b131496d99ef2cb92ddc12a3de57fe1d2bf01543f
-  data.tar.gz: 01d432a7bdbafdacc67e8f987e40833ae9ba2765ca886b252936cf5e70d3e0ff
+  metadata.gz: a79ac045ef3e34aeced00d9fbf2a1dc132c12424be9c335dcc8a03a379160e40
+  data.tar.gz: 1015175bdfda809d286bc25d2fd4269a3587f74050cfa9acbd7c9d1db6d79f1c
 SHA512:
-  metadata.gz: 3fe35524255f3de8ee2d75a08b3085bdd45eccb305b787c138cd1d81ba528dc7b2ec35582256003cb10c34596a9cc79939eae74e668b4e57a9845d655e0567c8
-  data.tar.gz: 213d970e06a15368b92641aa69ff3333f00a09968829edbedea4ad3cbda5937b04cc0f0c480c321a10c34dc2a1a08d714a40d2346542fb5a5f5169dc08e73394
+  metadata.gz: bc6e8e971deaa16f72913ade71c827883a2cb6f3c8079100ea720b350b9d52449a4ec7b8c9bb5c6b1c14338e2cbf38c35b2beb826b7d5309c3c06789dbc6e0c0
+  data.tar.gz: 53efe1a4bb6626f3e9b86efe14d0afab08493bbea1caea3c093d2490276a5f888a713b2c2867c12aadc9917fe89a8616d4925b2b325928891ca45562d88a12c9

data/lib/http_client_generator/plugs/camelize_body.rb

@@ -3,6 +3,8 @@
 module HttpClientGenerator
   class Plugs
     class CamelizeBody
+      Plugs.register :camelize_body, self
+
       def call(req)
         body =
           if req.json? && req.body.is_a?(Hash)

data/lib/http_client_generator/plugs/encode_json_response.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module HttpClientGenerator
+  class Plugs
+    class EncodeJsonResponse
+      Plugs.register :encode_json_response, self
+
+      def call(request)
+        request.response_body = JSON.parse(request.response_body, symbolize_names: true)
+        request
+      rescue JSON::ParserError
+        request
+      end
+    end
+  end
+end
+

data/lib/http_client_generator/plugs/enforce_json_response.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module HttpClientGenerator
+  class Plugs
+    class EnforceJsonResponse
+      Plugs.register :enforce_json_response, self
+
+      def call(request)
+        request.response_body = JSON.parse(request.response_body, symbolize_names: true)
+        request
+      rescue JSON::ParserError => e
+        request.raise_error(e)
+      end
+    end
+  end
+end

data/lib/http_client_generator/plugs/set_header.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module HttpClientGenerator
+  class Plugs
+    class SetHeader
+      Plugs.register :set_header, self
+
+      def initialize(arg:, header:)
+        @arg = arg
+        @header = header
+      end
+
+      def call(req)
+        req.headers[header] = req.rest_args[arg]
+        req
+      end
+    end
+  end
+end

data/lib/http_client_generator/plugs/set_request_id.rb

@@ -5,12 +5,18 @@ require 'securerandom'
 module HttpClientGenerator
   class Plugs
     class SetRequestId
+      Plugs.register :set_request_id, self
+
       def initialize(header_name)
         @header_name = header_name
       end
 
       def call(req)
-        req.headers[@header_name] = req.rest_args[:request_id] || SecureRandom.uuid
+        request_id = req.rest_args[:request_id] || SecureRandom.uuid
+
+        req.headers[@header_name] = request_id
+        req.extra[:request_id] = request_id
+
         req
       end
     end

data/lib/http_client_generator/plugs/underscore_response.rb

@@ -3,6 +3,8 @@
 module HttpClientGenerator
   class Plugs
     class UnderscoreResponse
+      Plugs.register :underscore_response, self
+
       def call(req)
         return req unless req.response_body.is_a?(Hash)
 

data/lib/http_client_generator/request.rb

@@ -15,21 +15,28 @@ module HttpClientGenerator
       end
     end
 
-    attr_accessor :verb, :content_type, :url, :headers, :body, :rest_args, :response_body
+    attr_accessor :verb, :content_type, :url, :headers, :body, :rest_args, :response_body, :base, :extra
 
-    def initialize(verb:, content_type:, url:, body:, rest_args:)
+    def initialize(base:, verb:, content_type:, url:, body:, rest_args:)
+      @base = base
       @verb = verb
       @content_type = content_type
       @url = url
       @rest_args = rest_args
       @body = body
       @headers = {}
+      @extra = {}
     end
 
     def current_headers
       default_headers.merge(headers)
     end
 
+    def raise_error(e)
+      Sentry.capture_exception(e, extra: { request_id: extra[:request_id] }) if Object.const_defined?(:Sentry)
+      raise base::RequestError, e.message, e.backtrace, cause: nil
+    end
+
     private
 
     def default_headers

data/lib/http_client_generator/resource.rb

@@ -4,17 +4,18 @@ require 'http'
 
 module HttpClientGenerator
   class Resource
-    attr_reader :verb, :content_type, :name, :req_plugs, :resp_plugs
+    attr_reader :verb, :content_type, :name, :req_plugs, :resp_plugs, :base
 
-    def initialize(verb:, content_type:, name:, req_plugs:, resp_plugs:)
+    def initialize(verb:, content_type:, name:, base:, req_plugs:, resp_plugs:)
       @verb = verb
+      @base = base
       @content_type = content_type
       @name = name
       @req_plugs = req_plugs
       @resp_plugs = resp_plugs
     end
 
-    def perform_request(url_helper, base, url_options, body, rest_args)
+    def perform_request(url_helper, url_options, body, rest_args)
       request = prepare_request(url_helper, url_options, body, rest_args)
 
       request_attributes = [request.verb, request.url]
@@ -28,7 +29,7 @@ module HttpClientGenerator
 
       process_response(request)
     rescue HTTP::Error => e
-      raise base::RequestError, e.message, e.backtrace, cause: nil
+      request.raise_error(e)
     end
 
     private
@@ -37,20 +38,13 @@ module HttpClientGenerator
       url = url_helper.public_send(:"#{name}", url_options)
 
       request = Request.new(
-        verb: verb, url: url, content_type: content_type, body: body, rest_args: rest_args
+        verb: verb, url: url, content_type: content_type, body: body, rest_args: rest_args, base: base
       )
 
       req_plugs.reduce(request) { |req, plug| plug.call(req) }
     end
 
     def process_response(request)
-      request.response_body =
-        begin
-          request.response_body = JSON.parse(request.response_body, symbolize_names: true)
-        rescue JSON::ParserError
-          request.response_body
-        end
-
       resp_plugs.reduce(request) { |req, plug| plug.call(req) }
 
       request.response_body

data/lib/http_client_generator/resources_definition.rb

@@ -10,7 +10,8 @@ module HttpClientGenerator
 
     HTTP_VERBS = %i[get post put patch].freeze
 
-    def initialize(req_plugs = [], resp_plugs = [])
+    def initialize(base, req_plugs = [], resp_plugs = [])
+      @base = base
       @resources = []
       @req_plugs = req_plugs
       @resp_plugs = resp_plugs
@@ -23,38 +24,39 @@ module HttpClientGenerator
     end
 
     def req_plug(plug, *args, **kwargs)
-      @req_plugs <<
-        if plug.respond_to?(:call)
-          plug
-        elsif plug.respond_to?(:new)
-          plug.new(*args, **kwargs)
-        else
-          Plugs.read(plug).new(*args, **kwargs)
-        end
+      @req_plugs << build_plug(plug, *args, **kwargs)
     end
 
     def resp_plug(plug, *args, **kwargs)
-      @resp_plugs <<
-        if plug.respond_to?(:call)
-          plug
-        elsif plug.respond_to?(:new)
-          plug.new(*args, **kwargs)
-        else
-          Plugs.read(plug).new(*args, **kwargs)
-        end
+      @resp_plugs << build_plug(plug, *args, **kwargs)
     end
 
     def namespace(_name, &block)
-      namespaced_definition = ResourcesDefinition.new(req_plugs, resp_plugs)
+      namespaced_definition = ResourcesDefinition.new(base, @req_plugs, resp_plugs)
       namespaced_definition.instance_eval(&block)
       @resources << namespaced_definition.resources
     end
 
     private
 
+    def build_plug(plug, *args, **kwargs)
+      if plug.respond_to?(:call)
+        plug
+      elsif plug.respond_to?(:new)
+        plug.new(*args, **kwargs)
+      else
+        Plugs.read(plug).new(*args, **kwargs)
+      end
+    end
+
     def build_resource(verb, name, options)
       Resource.new(
-        verb: verb, name: name, req_plugs: @req_plugs, resp_plugs: @resp_plugs, **with_defaults(options)
+        verb: verb,
+        name: name,
+        base: @base,
+        req_plugs: @req_plugs,
+        resp_plugs: @resp_plugs,
+        **with_defaults(options)
       )
     end
 

data/lib/http_client_generator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HttpClientGenerator
-  VERSION = '0.1.11'
+  VERSION = '0.1.13'
 end

data/lib/http_client_generator.rb

@@ -4,11 +4,9 @@ require 'zeitwerk'
 
 Zeitwerk::Loader.for_gem.setup
 
-module HttpClientGenerator
-  Plugs.register :camelize_body, HttpClientGenerator::Plugs::CamelizeBody
-  Plugs.register :underscore_response, HttpClientGenerator::Plugs::UnderscoreResponse
-  Plugs.register :set_request_id, HttpClientGenerator::Plugs::SetRequestId
+Dir["#{__dir__}/http_client_generator/plugs/*.rb"].each { |f| require f }
 
+module HttpClientGenerator
   def self.included(base)
     super
 
@@ -22,7 +20,7 @@ module HttpClientGenerator
   end
 
   def resources(&block)
-    resources_definition = ResourcesDefinition.new
+    resources_definition = ResourcesDefinition.new(self)
     resources_definition.instance_eval(&block)
     resources = resources_definition.resources
 
@@ -30,7 +28,7 @@ module HttpClientGenerator
       method_name = :"#{resource.name}_#{resource.verb}"
 
       define_singleton_method(method_name) do |url_options = {}, body: nil, **rest_args|
-        resource.perform_request(@url_helper, @base, url_options, body, rest_args)
+        resource.perform_request(@url_helper, url_options, body, rest_args)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http-client-generator
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.13
 platform: ruby
 authors:
 - Pavel Egorov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-21 00:00:00.000000000 Z
+date: 2024-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -49,6 +49,9 @@ files:
 - lib/http_client_generator.rb
 - lib/http_client_generator/plugs.rb
 - lib/http_client_generator/plugs/camelize_body.rb
+- lib/http_client_generator/plugs/encode_json_response.rb
+- lib/http_client_generator/plugs/enforce_json_response.rb
+- lib/http_client_generator/plugs/set_header.rb
 - lib/http_client_generator/plugs/set_request_id.rb
 - lib/http_client_generator/plugs/underscore_response.rb
 - lib/http_client_generator/request.rb