funnel_http 0.3.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44a84685adf7f414a48d3b4db7a56192a6172874629529922b8bc937c5b0db9f
-  data.tar.gz: d0b7baca3c2947aa1b9b724915d598d9f702c6c7a45fcef1a0323fdae67cb845
+  metadata.gz: a8e58f7f5762729ef1447c52424e00f63abbad0e57bff3d627e1257045c44da5
+  data.tar.gz: 960f3a22cfaa73eef6afabfb1758b38b0feb715e4485c73cecf3374ee5b4be83
 SHA512:
-  metadata.gz: 1e47ca273145f8a5cf96d357d128d9a208fb50d23c9315f43b3bda8698cf7bbf4ddb4bcf3148fd01fec82a5c8e91aea9808423b430d9a26cf81ae2d1962e9c67
-  data.tar.gz: 97d7ace5558bbd6e3f7e09901660e58db6e2dbe7fd57cc7b9a9777ea8915f2dc4d3db47517234ab7d625e15f2522fc0483ca975becde55b53bf80c2c80bde766
+  metadata.gz: 802019c07462641eba8b376ca087bbfbb6210ab5cc40bf239a2a7f4234bdf5787d5448e61090a4d58e12383b19ad177e0b99cffef7262ebb50874d54e721bf3d
+  data.tar.gz: ffbd6c6b3b29176a13686a0e4d91de7268f0cf4663f1f47fa080b38ca8a7cbe9223de47116da84e94ecb1560cb8c59f150f787705bfc063604c7a715e96cce68

data/.golangci.yml

@@ -1,18 +1,31 @@
-linters-settings:
-  revive:
-    rules:
-      - name: exported
-        arguments:
-          - disableStutteringCheck
-
+version: "2"
 linters:
   enable:
-    - gofmt
     - revive
     - testifylint
     - wrapcheck
-
-issues:
-  include:
-    - EXC0012 # EXC0012 revive: Annoying issue about not having a comment. The rare codebase has such comments
-    - EXC0014 # EXC0014 revive: Annoying issue about not having a comment. The rare codebase has such comments
+  settings:
+    revive:
+      rules:
+        - name: exported
+          arguments:
+            - disableStutteringCheck
+  exclusions:
+    generated: lax
+    presets:
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

data/CHANGELOG.md

@@ -1,7 +1,20 @@
 ## [Unreleased]
-[full changelog](http://github.com/sue445/funnel_http/compare/v0.3.2...main)
+[full changelog](http://github.com/sue445/funnel_http/compare/v0.5.0...main)
 
-## [0.3.1](https://github.com/sue445/funnel_http/releases/tag/v0.3.2) - 2025-03-22
+## [0.5.0](https://github.com/sue445/funnel_http/releases/tag/v0.5.0) - 2025-04-14
+[full changelog](http://github.com/sue445/funnel_http/compare/v0.4.0...v0.5.0)
+
+* Impl `FunnelHttp::Client#perform!`
+  * https://github.com/sue445/funnel_http/pull/81
+
+## [0.4.0](https://github.com/sue445/funnel_http/releases/tag/v0.4.0) - 2025-04-13
+[full changelog](http://github.com/sue445/funnel_http/compare/v0.3.2...v0.4.0)
+
+* Add request url to response
+  * https://github.com/sue445/funnel_http/pull/80
+* Update Go dependencies
+
+## [0.3.2](https://github.com/sue445/funnel_http/releases/tag/v0.3.2) - 2025-03-22
 [full changelog](http://github.com/sue445/funnel_http/compare/v0.3.1...v0.3.2)
 
 * Fix `Ruby::BlockBodyTypeMismatch` in rbs

data/README.md

@@ -33,13 +33,13 @@ client = FunnelHttp::Client.new
 requests = [
   {
     method: :get,
-    uri: "https://example.com/api/user/1",
+    url: "https://example.com/api/user/1",
   },
 
   # with request header
-  { 
-    method: :get, 
-    uri: "https://example.com/api/user/2", 
+  {
+    method: :get,
+    url: "https://example.com/api/user/2",
     header: {
       "Authorization" => "Bearer xxxxxxxx",
       "X-Multiple-Values" => ["1st value", "2nd value"],
@@ -49,7 +49,7 @@ requests = [
   # with request body
   {
     method: :post,
-    uri: "https://example.com/api/user",
+    url: "https://example.com/api/user",
     header: {
       "Authorization" => "Bearer xxxxxxxx",
       "Content-Type" => "application/json",
@@ -60,10 +60,13 @@ requests = [
 
 responses = client.perform(requests)
 # => [
-#   { status_code: 200, body: "Response of /api/user/1", header: { "Content-Type" => ["text/plain;charset=utf-8"]} }
-#   { status_code: 200, body: "Response of /api/user/2", header: { "Content-Type" => ["text/plain;charset=utf-8"]} }
-#   { status_code: 200, body: "Response of /api/user", header: { "Content-Type" => ["text/plain;charset=utf-8"]} }
+#   { url: "https://example.com/api/user/1", status_code: 200, body: "Response of /api/user/1", header: { "Content-Type" => ["text/plain;charset=utf-8"]} }
+#   { url: "https://example.com/api/user/2", status_code: 200, body: "Response of /api/user/2", header: { "Content-Type" => ["text/plain;charset=utf-8"]} }
+#   { url: "https://example.com/api/user", status_code: 200, body: "Response of /api/user", header: { "Content-Type" => ["text/plain;charset=utf-8"]} }
 # ]
+
+# `#perform!` raise errors when http requests returns error status code (4xx, 5xx)
+responses = client.perform!(requests)
 ```
 
 ## Customize

data/ext/funnel_http/funnel_http.go

@@ -44,6 +44,7 @@ func rb_funnel_http_run_requests(self C.VALUE, rbAry C.VALUE) C.VALUE {
 
 		ruby.RbHashAset(rbHash, ruby.RbId2Sym(ruby.RbIntern("status_code")), ruby.INT2NUM(response.StatusCode))
 		ruby.RbHashAset(rbHash, ruby.RbId2Sym(ruby.RbIntern("body")), ruby.String2Value(string(response.Body)))
+		ruby.RbHashAset(rbHash, ruby.RbId2Sym(ruby.RbIntern("url")), ruby.String2Value(string(response.URL)))
 
 		rbHashHeader := ruby.RbHashNew()
 		ruby.RbGcRegisterAddress(&rbHashHeader)

data/ext/funnel_http/go.mod

@@ -6,10 +6,10 @@ toolchain go1.24.0
 
 require (
 	github.com/cockroachdb/errors v1.11.3
-	github.com/jarcoal/httpmock v1.3.1
+	github.com/jarcoal/httpmock v1.4.0
 	github.com/ruby-go-gem/go-gem-wrapper v0.7.2
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/sync v0.12.0
+	golang.org/x/sync v0.13.0
 )
 
 require (

data/ext/funnel_http/go.sum

@@ -15,16 +15,16 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/jarcoal/httpmock v1.3.1 h1:iUx3whfZWVf3jT01hQTO/Eo5sAYtB2/rqaUuOtpInww=
-github.com/jarcoal/httpmock v1.3.1/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg=
+github.com/jarcoal/httpmock v1.4.0 h1:BvhqnH0JAYbNudL2GMJKgOHe2CtKlzJ/5rWKyp+hc2k=
+github.com/jarcoal/httpmock v1.4.0/go.mod h1:ftW1xULwo+j0R0JJkJIIi7UKigZUXCLLanykgjwBXL0=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/maxatome/go-testdeep v1.12.0 h1:Ql7Go8Tg0C1D/uMMX59LAoYK7LffeJQ6X2T04nTH68g=
-github.com/maxatome/go-testdeep v1.12.0/go.mod h1:lPZc/HAcJMP92l7yI6TRz1aZN5URwUBUAfUNvrclaNM=
+github.com/maxatome/go-testdeep v1.14.0 h1:rRlLv1+kI8eOI3OaBXZwb3O7xY3exRzdW5QyX48g9wI=
+github.com/maxatome/go-testdeep v1.14.0/go.mod h1:lPZc/HAcJMP92l7yI6TRz1aZN5URwUBUAfUNvrclaNM=
 github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
 github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
@@ -52,8 +52,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
-golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
+golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

data/ext/funnel_http/run_requests.go

@@ -18,6 +18,7 @@ type Request struct {
 
 // Response is proxy between CRuby and Go
 type Response struct {
+	URL        string
 	StatusCode int
 	Header     map[string][]string
 	Body       []byte
@@ -58,6 +59,7 @@ func RunRequests(httpClient *http.Client, requests []Request) ([]Response, error
 				return errors.WithStack(err)
 			}
 
+			responses[i].URL = request.URL
 			responses[i].Body = buf
 			responses[i].Header = map[string][]string{}
 

data/lib/funnel_http/client.rb

@@ -37,13 +37,50 @@ module FunnelHttp
     #   @option request :body [String, nil] Request body
     #
     # @return [Array<Hash<Symbol => Object>>] `Array` of following `Hash`
+    # @return [String] `:url` Request url
     # @return [Integer] `:status_code`
     # @return [String] `:body` Response body
     # @return [Hash{String => Array<String>}] `:header` Response header
+    #
+    # @note `#perform` doesn't raise errors when http requests returns error status code (4xx, 5xx)
     def perform(requests)
       ext_client.run_requests(normalize_requests(requests))
     end
 
+    # perform HTTP requests in parallel
+    #
+    # @overload perform(requests)
+    #   @param requests [Array<Hash{Symbol => Object}>] `Array` of following `Hash`
+    #   @option requests :method [String, Symbol] **[required]** Request method (e.g. `:get`, `"POST"`)
+    #   @option requests :url [String] **[required]** Request url
+    #   @option requests :header [Hash{String => String, Array<String>}, nil] Request header
+    #   @option requests :body [String, nil] Request body
+    #
+    # @overload perform(request)
+    #   @param request [Hash{Symbol => Object}]
+    #   @option request :method [String, Symbol] **[required]** Request method (e.g. `:get`, `"POST"`)
+    #   @option request :url [String] **[required]** Request url
+    #   @option request :header [Hash{String => String, Array<String>}, nil] Request header
+    #   @option request :body [String, nil] Request body
+    #
+    # @return [Array<Hash<Symbol => Object>>] `Array` of following `Hash`
+    # @return [String] `:url` Request url
+    # @return [Integer] `:status_code`
+    # @return [String] `:body` Response body
+    # @return [Hash{String => Array<String>}] `:header` Response header
+    #
+    # @raise [FunnelHttp::HttpAggregateError] 1+ errors returned out of multiple requests
+    #
+    # @note `#perform!` raise errors when http requests returns error status code (4xx, 5xx)
+    def perform!(requests)
+      responses = perform(requests)
+
+      error_responses = responses.select { |res| res[:status_code] >= 400 }
+      raise HttpAggregateError, error_responses unless error_responses.empty?
+
+      responses
+    end
+
     # @overload normalize_requests(requests)
     #   @param requests [Array<Hash{Symbol => Object}>] `Array` of following `Hash`
     #   @option requests :method [String, Symbol]  **[required]** Request method (e.g. `:get`, `"POST"`)

data/lib/funnel_http/errors.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module FunnelHttp
+  class Error < StandardError; end
+
+  # Aggregates multiple http errors
+  class HttpAggregateError < Error
+    # @!attribute [r] error_responses
+    #   @return [Array<Hash<Symbol => Object>>] `Array` of following `Hash`
+    #   @return [String] `:url` Request url
+    #   @return [Integer] `:status_code`
+    #   @return [String] `:body` Response body
+    #   @return [Hash{String => Array<String>}] `:header` Response header
+    attr_reader :error_responses
+
+    # @param error_responses [Array<Hash<Symbol => Object>>]
+    def initialize(error_responses)
+      @error_responses = error_responses
+      super(HttpAggregateError.generate_error_message(error_responses))
+    end
+
+    # Generate error message for `StandardError#initialize`
+    #
+    # @param error_responses [Array<Hash<Symbol => Object>>]
+    #
+    # @return [String]
+    def self.generate_error_message(error_responses)
+      error_responses.map { |res| "#{res[:url]} (#{res[:status_code]} error)" }.join(", ")
+    end
+  end
+end

data/lib/funnel_http/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FunnelHttp
-  VERSION = "0.3.2"
+  VERSION = "0.5.0"
 end

data/lib/funnel_http.rb

@@ -3,11 +3,10 @@
 require_relative "funnel_http/version"
 require_relative "funnel_http/client"
 require_relative "funnel_http/ext"
+require_relative "funnel_http/errors"
 require_relative "funnel_http/funnel_http"
 
 module FunnelHttp
-  class Error < StandardError; end
-
   USER_AGENT = "funnel_http/#{FunnelHttp::VERSION} (+https://github.com/sue445/funnel_http)"
 
   # Your code goes here...

data/rbs_collection.lock.yaml

@@ -6,7 +6,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: a8dd6bcebdae31ce6adc8887ef16c7ee6e1b9a6d
+    revision: cefa5dea1094880e2386c6d296c743d10eb0cf9d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: cgi
@@ -18,7 +18,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: a8dd6bcebdae31ce6adc8887ef16c7ee6e1b9a6d
+    revision: cefa5dea1094880e2386c6d296c743d10eb0cf9d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: fileutils
@@ -38,7 +38,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: a8dd6bcebdae31ce6adc8887ef16c7ee6e1b9a6d
+    revision: cefa5dea1094880e2386c6d296c743d10eb0cf9d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rake
@@ -46,7 +46,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: a8dd6bcebdae31ce6adc8887ef16c7ee6e1b9a6d
+    revision: cefa5dea1094880e2386c6d296c743d10eb0cf9d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: sinatra
@@ -54,7 +54,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: a8dd6bcebdae31ce6adc8887ef16c7ee6e1b9a6d
+    revision: cefa5dea1094880e2386c6d296c743d10eb0cf9d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: stringio

data/sig/funnel_http/client.rbs

@@ -10,6 +10,8 @@ module FunnelHttp
 
     def perform: (fuzzy_request | Array[fuzzy_request] requests) -> Array[response]
 
+    def perform!: (fuzzy_request | Array[fuzzy_request] requests) -> Array[response]
+
     def normalize_requests: (fuzzy_request | Array[fuzzy_request] arg) -> Array[strict_request]
 
     private

data/sig/funnel_http/errors.rbs

@@ -0,0 +1,14 @@
+module FunnelHttp
+  class Error < StandardError
+  end
+
+  class HttpAggregateError < Error
+    @error_responses: Array[response]
+
+    attr_accessor error_responses: Array[response]
+
+    def initialize: (Array[response] error_responses) -> void
+
+    def self.generate_error_message: (Array[response] error_responses) -> String
+  end
+end

data/sig/funnel_http.rbs

@@ -2,9 +2,6 @@ module FunnelHttp
   VERSION: String
   USER_AGENT: String
 
-  class Error < StandardError
-  end
-
   type fuzzy_header = Hash[String, String | Array[String]]
 
   type fuzzy_request = {
@@ -24,6 +21,7 @@ module FunnelHttp
   }
 
   type response = {
+    url: String,
     status_code: Integer,
     body: String,
     header: strict_header

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: funnel_http
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.0
 platform: ruby
 authors:
 - sue445
 bindir: exe
 cert_chain: []
-date: 2025-03-21 00:00:00.000000000 Z
+date: 2025-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: go_gem
@@ -202,12 +202,14 @@ files:
 - ext/funnel_http/run_requests.go
 - lib/funnel_http.rb
 - lib/funnel_http/client.rb
+- lib/funnel_http/errors.rb
 - lib/funnel_http/ext.rb
 - lib/funnel_http/version.rb
 - rbs_collection.lock.yaml
 - rbs_collection.yaml
 - sig/funnel_http.rbs
 - sig/funnel_http/client.rbs
+- sig/funnel_http/errors.rbs
 - sig/funnel_http/ext.rbs
 homepage: https://github.com/sue445/funnel_http
 licenses: