funnel_http 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca358cfbd282a397a1e8e4458f00c842deb22b8c3715a57bc26dfa171c0394f5
-  data.tar.gz: e730cb4d2cc871a82547b6008db1f919243e8102bdd28bfaa95b9838208c38a1
+  metadata.gz: 44a84685adf7f414a48d3b4db7a56192a6172874629529922b8bc937c5b0db9f
+  data.tar.gz: d0b7baca3c2947aa1b9b724915d598d9f702c6c7a45fcef1a0323fdae67cb845
 SHA512:
-  metadata.gz: 5b567c0a370a7cdba78948dcb7ab66b97192c9bc227dc2b5da3fc5234fc955cf6e35b22455322a79235fbda3fbe51822765706229c928c5998709aa1808a6bc8
-  data.tar.gz: e3d5993b8445e7385c51ad410aa4d2e703c9f397129ae01551f1cb3d31cf5dcbc94c713009f02bb980c0c8c53702bb3dc31504f9e03736da472a43ea606fde31
+  metadata.gz: 1e47ca273145f8a5cf96d357d128d9a208fb50d23c9315f43b3bda8698cf7bbf4ddb4bcf3148fd01fec82a5c8e91aea9808423b430d9a26cf81ae2d1962e9c67
+  data.tar.gz: 97d7ace5558bbd6e3f7e09901660e58db6e2dbe7fd57cc7b9a9777ea8915f2dc4d3db47517234ab7d625e15f2522fc0483ca975becde55b53bf80c2c80bde766

data/.golangci.yml

@@ -1,12 +1,9 @@
 linters-settings:
-  gofmt:
   revive:
     rules:
       - name: exported
         arguments:
           - disableStutteringCheck
-  testifylint:
-  wrapcheck:
 
 linters:
   enable:

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 ## [Unreleased]
-[full changelog](http://github.com/sue445/funnel_http/compare/v0.3.0...main)
+[full changelog](http://github.com/sue445/funnel_http/compare/v0.3.2...main)
+
+## [0.3.1](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
+  * https://github.com/sue445/funnel_http/pull/71
+
+## [0.3.1](https://github.com/sue445/funnel_http/releases/tag/v0.3.1) - 2025-03-12
+[full changelog](http://github.com/sue445/funnel_http/compare/v0.3.0...v0.3.1)
+
+* Diet gem
+  * https://github.com/sue445/funnel_http/pull/66
+* Tweak gem description
+  * https://github.com/sue445/funnel_http/pull/68
+* Update Go dependencies
 
 ## [0.3.0](https://github.com/sue445/funnel_http/releases/tag/v0.3.0) - 2025-01-12
 [full changelog](http://github.com/sue445/funnel_http/compare/v0.2.0...v0.3.0)

data/README.md

@@ -1,5 +1,5 @@
 # FunnelHttp
-Perform HTTP requests in parallel
+Perform HTTP requests in parallel with goroutine
 
 [![Gem Version](https://badge.fury.io/rb/funnel_http.svg)](https://badge.fury.io/rb/funnel_http)
 [![build](https://github.com/sue445/funnel_http/actions/workflows/build.yml/badge.svg)](https://github.com/sue445/funnel_http/actions/workflows/build.yml)

data/ext/funnel_http/go.mod

@@ -1,13 +1,15 @@
 module github.com/sue445/funnel_http
 
-go 1.23
+go 1.23.0
+
+toolchain go1.24.0
 
 require (
 	github.com/cockroachdb/errors v1.11.3
 	github.com/jarcoal/httpmock v1.3.1
-	github.com/ruby-go-gem/go-gem-wrapper v0.6.0
+	github.com/ruby-go-gem/go-gem-wrapper v0.7.2
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/sync v0.10.0
+	golang.org/x/sync v0.12.0
 )
 
 require (

data/ext/funnel_http/go.sum

@@ -34,10 +34,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/ruby-go-gem/go-gem-wrapper v0.5.1 h1:TFGH/eOJl0uYzYMwrcLbZxXNQiQbQjCq/VLXyRk1HRM=
-github.com/ruby-go-gem/go-gem-wrapper v0.5.1/go.mod h1:k2k+LziSCMxNYP4J9/9v90xdU6zlU1DJpJDTU6oJhHE=
-github.com/ruby-go-gem/go-gem-wrapper v0.6.0 h1:WFu2Cj/uzKAOemsrCo4P6vsdOgB5yesrrJtAqvLkAso=
-github.com/ruby-go-gem/go-gem-wrapper v0.6.0/go.mod h1:k2k+LziSCMxNYP4J9/9v90xdU6zlU1DJpJDTU6oJhHE=
+github.com/ruby-go-gem/go-gem-wrapper v0.7.2 h1:Hf7bA5TD/UjJTccTwsbBJWnjpBvcQWAzX50tv9++4+o=
+github.com/ruby-go-gem/go-gem-wrapper v0.7.2/go.mod h1:k2k+LziSCMxNYP4J9/9v90xdU6zlU1DJpJDTU6oJhHE=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -54,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.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
+golang.org/x/sync v0.12.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/lib/funnel_http/version.rb

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

data/rbs_collection.lock.yaml

@@ -2,9 +2,13 @@
 path: ".gem_rbs_collection"
 gems:
 - name: base64
-  version: '0'
+  version: '0.1'
   source:
-    type: stdlib
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: a8dd6bcebdae31ce6adc8887ef16c7ee6e1b9a6d
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 - name: cgi
   version: '0'
   source:
@@ -14,7 +18,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 7ff8cf6ab2759cb1d0fb2ca8d6c1f8ccab2c605c
+    revision: a8dd6bcebdae31ce6adc8887ef16c7ee6e1b9a6d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: fileutils
@@ -29,20 +33,12 @@ gems:
   version: '0'
   source:
     type: stdlib
-- name: parallel
-  version: '1.20'
-  source:
-    type: git
-    name: ruby/gem_rbs_collection
-    revision: 7ff8cf6ab2759cb1d0fb2ca8d6c1f8ccab2c605c
-    remote: https://github.com/ruby/gem_rbs_collection.git
-    repo_dir: gems
 - name: rack
   version: '2.2'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 7ff8cf6ab2759cb1d0fb2ca8d6c1f8ccab2c605c
+    revision: a8dd6bcebdae31ce6adc8887ef16c7ee6e1b9a6d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rake
@@ -50,7 +46,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 7ff8cf6ab2759cb1d0fb2ca8d6c1f8ccab2c605c
+    revision: a8dd6bcebdae31ce6adc8887ef16c7ee6e1b9a6d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: sinatra
@@ -58,7 +54,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 7ff8cf6ab2759cb1d0fb2ca8d6c1f8ccab2c605c
+    revision: a8dd6bcebdae31ce6adc8887ef16c7ee6e1b9a6d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: stringio

data/sig/funnel_http.rbs

@@ -19,7 +19,8 @@ module FunnelHttp
   type strict_request = {
     method: String,
     url: String,
-    header: strict_header
+    header: strict_header,
+    body: String?,
   }
 
   type response = {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: funnel_http
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - sue445
 bindir: exe
 cert_chain: []
-date: 2025-01-12 00:00:00.000000000 Z
+date: 2025-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: go_gem
@@ -177,21 +177,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: parallel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Perform HTTP requests in parallel
+description: Perform HTTP requests in parallel with goroutine
 email:
 - sue445@sue445.net
 executables: []
@@ -207,11 +193,6 @@ files:
 - README.md
 - Rakefile
 - Steepfile
-- benchmark/README.md
-- benchmark/benchmark.rb
-- benchmark/compose.yml
-- benchmark/html/index.html
-- benchmark/nginx.conf
 - ext/funnel_http/extconf.rb
 - ext/funnel_http/funnel_http.c
 - ext/funnel_http/funnel_http.go
@@ -219,7 +200,6 @@ files:
 - ext/funnel_http/go.mod
 - ext/funnel_http/go.sum
 - ext/funnel_http/run_requests.go
-- ext/funnel_http/run_requests_test.go
 - lib/funnel_http.rb
 - lib/funnel_http/client.rb
 - lib/funnel_http/ext.rb
@@ -254,5 +234,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.2
 specification_version: 4
-summary: Perform HTTP requests in parallel
+summary: Perform HTTP requests in parallel with goroutine
 test_files: []

data/benchmark/README.md

@@ -1,32 +0,0 @@
-# benchmark for funnel_http
-## Usage
-```bash
-docker compose up --build
-```
-
-```bash
-bundle exec ruby benchmark.rb
-```
-
-## Report
-```
-Warming up --------------------------------------
-FunnelHttp::Client#perform
-                         2.000 i/100ms
-Parallel with 4 processes
-                         1.000 i/100ms
-Parallel with 4 threads
-                         1.000 i/100ms
-Calculating -------------------------------------
-FunnelHttp::Client#perform
-                         21.816 (± 4.6%) i/s   (45.84 ms/i) -     44.000 in   2.026960s
-Parallel with 4 processes
-                         15.785 (± 6.3%) i/s   (63.35 ms/i) -     32.000 in   2.035628s
-Parallel with 4 threads
-                         18.570 (±10.8%) i/s   (53.85 ms/i) -     37.000 in   2.008485s
-
-Comparison:
-FunnelHttp::Client#perform:       21.8 i/s
-Parallel with 4 threads:       18.6 i/s - 1.17x  slower
-Parallel with 4 processes:       15.8 i/s - 1.38x  slower
-```

data/benchmark/benchmark.rb

@@ -1,61 +0,0 @@
-require "benchmark/ips"
-require "open-uri"
-require "parallel"
-require "etc"
-
-ROOT_DIR = File.expand_path("..", __dir__)
-
-TEST_SERVER_URL = ENV.fetch("TEST_SERVER_URL") { "http://localhost:8080/" }
-
-REQUEST_COUNT = 100
-
-BENCHMARK_CONCURRENCY = (ENV.fetch("BENCHMARK_CONCURRENCY") { 4 }).to_i
-
-# Build native extension before running benchmark
-Dir.chdir(ROOT_DIR) do
-  system("bundle config set --local path 'vendor/bundle'", exception: true)
-  system("bundle install", exception: true)
-  system("bundle exec rake clobber compile", exception: true)
-end
-
-require_relative "../lib/funnel_http"
-
-# Suppress Ractor warning
-$VERBOSE = nil
-
-system("go version", exception: true)
-
-requests = Array.new(REQUEST_COUNT, { method: :get, url: TEST_SERVER_URL })
-
-def fetch_server
-  URI.parse(TEST_SERVER_URL).open(open_timeout: 90, read_timeout: 90).read
-end
-
-Benchmark.ips do |x|
-  # x.config(warmup: 1, time: 2)
-
-  x.report("FunnelHttp::Client#perform") do
-    FunnelHttp::Client.new.perform(requests)
-  end
-
-  x.report("Parallel with #{BENCHMARK_CONCURRENCY} processes") do
-    Parallel.each(requests, in_processes: BENCHMARK_CONCURRENCY) do
-      fetch_server
-    end
-  end
-
-  x.report("Parallel with #{BENCHMARK_CONCURRENCY} threads") do
-    Parallel.each(requests, in_threads: BENCHMARK_CONCURRENCY) do
-      fetch_server
-    end
-  end
-
-  # FIXME: open-uri doesn't work in Ractor
-  # x.report("Parallel with Ractor") do
-  #   REQUEST_COUNT.times.map do
-  #     Ractor.new { URI.parse("http://localhost:8080/").read }
-  #   end.each(&:take)
-  # end
-
-  x.compare!
-end

data/benchmark/compose.yml

@@ -1,8 +0,0 @@
-services:
-  nginx:
-    image: nginx:latest
-    ports:
-      - "8080:80"
-    volumes:
-      - ./html:/usr/share/nginx/html
-      - ./nginx.conf:/etc/nginx/nginx.conf

data/benchmark/html/index.html

@@ -1,4 +0,0 @@
-<html>
-<head></head>
-<body>it works</body>
-</html>

data/benchmark/nginx.conf

@@ -1,25 +0,0 @@
-worker_processes auto;
-worker_rlimit_nofile 12288;
-
-events {
-  worker_connections 4096;
-}
-
-http {
-  include       mime.types;
-  default_type  application/octet-stream;
-
-  sendfile        on;
-  keepalive_timeout  65;
-  access_log  off;
-
-  server {
-    listen 80;
-    server_name localhost;
-
-    location / {
-      root /usr/share/nginx/html;
-      index index.html;
-    }
-  }
-}

data/ext/funnel_http/run_requests_test.go

@@ -1,204 +0,0 @@
-package main_test
-
-import (
-	"github.com/cockroachdb/errors"
-	"github.com/jarcoal/httpmock"
-	"github.com/stretchr/testify/assert"
-	"github.com/sue445/funnel_http"
-	"io"
-	"net/http"
-	"testing"
-)
-
-func TestRunRequests(t *testing.T) {
-	httpmock.Activate()
-	t.Cleanup(httpmock.DeactivateAndReset)
-
-	httpmock.RegisterResponder("GET", "http://example.com/1",
-		func(req *http.Request) (*http.Response, error) {
-			resp := httpmock.NewStringResponse(200, "GET http://example.com/1")
-
-			resp.Header.Set("Content-Type", "text/plain")
-
-			for key, values := range req.Header {
-				for _, value := range values {
-					resp.Header.Add(key, value)
-				}
-			}
-
-			return resp, nil
-		})
-
-	httpmock.RegisterResponder("GET", "http://example.com/2",
-		func(req *http.Request) (*http.Response, error) {
-			resp := httpmock.NewStringResponse(200, "GET http://example.com/2")
-
-			resp.Header.Set("Content-Type", "text/plain")
-
-			for key, values := range req.Header {
-				for _, value := range values {
-					resp.Header.Add(key, value)
-				}
-			}
-
-			return resp, nil
-		})
-
-	httpmock.RegisterResponder("POST", "http://example.com/1",
-		func(req *http.Request) (*http.Response, error) {
-			payload, err := io.ReadAll(req.Body)
-			if err != nil {
-				return nil, errors.WithStack(err)
-			}
-
-			resp := httpmock.NewStringResponse(200, string(payload))
-
-			resp.Header.Set("Content-Type", "text/plain")
-
-			for key, values := range req.Header {
-				for _, value := range values {
-					resp.Header.Add(key, value)
-				}
-			}
-
-			return resp, nil
-		})
-
-	tests := []struct {
-		name     string
-		requests []main.Request
-		expected []main.Response
-	}{
-		{
-			name: "GET 1 request",
-			requests: []main.Request{
-				{
-					Method: "GET",
-					URL:    "http://example.com/1",
-					Header: map[string][]string{
-						"X-My-Request-Header": {"a", "b"},
-					},
-				},
-			},
-			expected: []main.Response{
-				{
-					StatusCode: 200,
-					Body:       []byte("GET http://example.com/1"),
-					Header: map[string][]string{
-						"Content-Type":        {"text/plain"},
-						"X-My-Request-Header": {"a", "b"},
-					},
-				},
-			},
-		},
-		{
-			name: "GET multiple requests",
-			requests: []main.Request{
-				{
-					Method: "GET",
-					URL:    "http://example.com/1",
-					Header: map[string][]string{
-						"X-My-Request-Header": {"a", "b"},
-					},
-				},
-				{
-					Method: "GET",
-					URL:    "http://example.com/2",
-					Header: map[string][]string{
-						"X-My-Request-Header": {"c", "d"},
-					},
-				},
-			},
-			expected: []main.Response{
-				{
-					StatusCode: 200,
-					Body:       []byte("GET http://example.com/1"),
-					Header: map[string][]string{
-						"Content-Type":        {"text/plain"},
-						"X-My-Request-Header": {"a", "b"},
-					},
-				},
-				{
-					StatusCode: 200,
-					Body:       []byte("GET http://example.com/2"),
-					Header: map[string][]string{
-						"Content-Type":        {"text/plain"},
-						"X-My-Request-Header": {"c", "d"},
-					},
-				},
-			},
-		},
-		{
-			name: "POST 1 request",
-			requests: []main.Request{
-				{
-					Method: "POST",
-					URL:    "http://example.com/1",
-					Header: map[string][]string{
-						"X-My-Request-Header": {"a", "b"},
-					},
-					Body: []byte("111"),
-				},
-			},
-			expected: []main.Response{
-				{
-					StatusCode: 200,
-					Body:       []byte("111"),
-					Header: map[string][]string{
-						"Content-Type":        {"text/plain"},
-						"X-My-Request-Header": {"a", "b"},
-					},
-				},
-			},
-		},
-		{
-			name: "POST multiple requests",
-			requests: []main.Request{
-				{
-					Method: "POST",
-					URL:    "http://example.com/1",
-					Header: map[string][]string{
-						"X-My-Request-Header": {"a", "b"},
-					},
-					Body: []byte("111"),
-				},
-				{
-					Method: "POST",
-					URL:    "http://example.com/1",
-					Header: map[string][]string{
-						"X-My-Request-Header": {"c", "d"},
-					},
-					Body: []byte("222"),
-				},
-			},
-			expected: []main.Response{
-				{
-					StatusCode: 200,
-					Body:       []byte("111"),
-					Header: map[string][]string{
-						"Content-Type":        {"text/plain"},
-						"X-My-Request-Header": {"a", "b"},
-					},
-				},
-				{
-					StatusCode: 200,
-					Body:       []byte("222"),
-					Header: map[string][]string{
-						"Content-Type":        {"text/plain"},
-						"X-My-Request-Header": {"c", "d"},
-					},
-				},
-			},
-		},
-	}
-
-	httpClient := http.Client{}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			actual, err := main.RunRequests(&httpClient, tt.requests)
-			if assert.NoError(t, err) {
-				assert.Equal(t, tt.expected, actual)
-			}
-		})
-	}
-}