funnel_http 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c83aef0664b9cea7f66a26b5ef09fd175a9c3ee84163d778b80dc57caab7ad60
-  data.tar.gz: 7086e25c3a318ae33b59e6524b05ea03ff32c742e242ddde32b449d5e9668dca
+  metadata.gz: ca358cfbd282a397a1e8e4458f00c842deb22b8c3715a57bc26dfa171c0394f5
+  data.tar.gz: e730cb4d2cc871a82547b6008db1f919243e8102bdd28bfaa95b9838208c38a1
 SHA512:
-  metadata.gz: 81fd96f70a60b533d9dc41a41204544b8aa36e57e3464861a933dfc43632d55402543530f8f78e2ab7be9e600bd7f4d7ff6471816a2a01c6edb442eb1713d8b2
-  data.tar.gz: 97cfe3cd7a61a84772b1059b1100d4391439ea362bd27c090efb3264d4d63d0b21ea7e37b587a73db3a9363a3709e9d14f78edbb115ab95c814deb6eb3fa3343
+  metadata.gz: 5b567c0a370a7cdba78948dcb7ab66b97192c9bc227dc2b5da3fc5234fc955cf6e35b22455322a79235fbda3fbe51822765706229c928c5998709aa1808a6bc8
+  data.tar.gz: e3d5993b8445e7385c51ad410aa4d2e703c9f397129ae01551f1cb3d31cf5dcbc94c713009f02bb980c0c8c53702bb3dc31504f9e03736da472a43ea606fde31

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
-[full changelog](http://github.com/sue445/funnel_http/compare/v0.2.0...main)
+[full changelog](http://github.com/sue445/funnel_http/compare/v0.3.0...main)
+
+## [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)
+
+* Support request body
+  * https://github.com/sue445/funnel_http/pull/51
 
 ## [0.2.0](https://github.com/sue445/funnel_http/releases/tag/v0.2.0) - 2025-01-07
 [full changelog](http://github.com/sue445/funnel_http/compare/v0.1.0...v0.2.0)

data/README.md

@@ -45,12 +45,24 @@ requests = [
       "X-Multiple-Values" => ["1st value", "2nd value"],
     },
   },
+
+  # with request body
+  {
+    method: :post,
+    uri: "https://example.com/api/user",
+    header: {
+      "Authorization" => "Bearer xxxxxxxx",
+      "Content-Type" => "application/json",
+    },
+    body: '{"name": "sue445"}',
+  },
 ]
 
 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"]} }
 # ]
 ```
 

data/ext/funnel_http/funnel_http.go

@@ -26,6 +26,7 @@ func rb_funnel_http_run_requests(self C.VALUE, rbAry C.VALUE) C.VALUE {
 			Method: getRbHashValueAsString(rbHash, "method"),
 			URL:    getRbHashValueAsString(rbHash, "url"),
 			Header: getRbHashValueAsMap(rbHash, "header"),
+			Body:   getRbHashValueAsBytes(rbHash, "body"),
 		}
 		requests = append(requests, req)
 	}
@@ -111,6 +112,22 @@ func getRbHashValueAsString(rbHash ruby.VALUE, key string) string {
 	return ruby.Value2String(value)
 }
 
+func getRbHashValueAsBytes(rbHash ruby.VALUE, key string) []byte {
+	value := ruby.RbHashAref(rbHash, ruby.RbToSymbol(ruby.String2Value(key)))
+
+	if value == ruby.Qnil() {
+		return []byte{}
+	}
+
+	length := ruby.RSTRING_LENINT(value)
+	if length == 0 {
+		return []byte{}
+	}
+
+	char := ruby.RSTRING_PTR(value)
+	return C.GoBytes(unsafe.Pointer(char), C.int(length))
+}
+
 func getRbHashValueAsMap(rbHash ruby.VALUE, key string) map[string][]string {
 	rbHashValue := ruby.RbHashAref(rbHash, ruby.RbToSymbol(ruby.String2Value(key)))
 	rbKeys := ruby.CallFunction(rbHashValue, "keys")

data/ext/funnel_http/run_requests.go

@@ -13,6 +13,7 @@ type Request struct {
 	Method string
 	URL    string
 	Header map[string][]string
+	Body   []byte
 }
 
 // Response is proxy between CRuby and Go
@@ -33,8 +34,7 @@ func RunRequests(httpClient *http.Client, requests []Request) ([]Response, error
 		request := request
 
 		g.Go(func() error {
-			var body []byte
-			httpReq, err := http.NewRequest(request.Method, request.URL, bytes.NewBuffer(body))
+			httpReq, err := http.NewRequest(request.Method, request.URL, bytes.NewBuffer(request.Body))
 			if err != nil {
 				return errors.WithStack(err)
 			}

data/ext/funnel_http/run_requests_test.go

@@ -1,9 +1,11 @@
 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"
 )
@@ -42,13 +44,33 @@ func TestRunRequests(t *testing.T) {
 			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: "1 request",
+			name: "GET 1 request",
 			requests: []main.Request{
 				{
 					Method: "GET",
@@ -70,7 +92,7 @@ func TestRunRequests(t *testing.T) {
 			},
 		},
 		{
-			name: "multiple requests",
+			name: "GET multiple requests",
 			requests: []main.Request{
 				{
 					Method: "GET",
@@ -106,6 +128,68 @@ func TestRunRequests(t *testing.T) {
 				},
 			},
 		},
+		{
+			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{}

data/lib/funnel_http/client.rb

@@ -27,12 +27,14 @@ module FunnelHttp
     #   @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 [Integer] `:status_code`
@@ -78,6 +80,7 @@ module FunnelHttp
           url: request[:url].to_s,
           method: request[:method].to_s.upcase,
           header: normalize_header(request[:header]),
+          body: request[:body].freeze,
         }
       end
     end

data/lib/funnel_http/version.rb

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

data/sig/funnel_http.rbs

@@ -10,7 +10,8 @@ module FunnelHttp
   type fuzzy_request = {
     method: String | Symbol,
     url: String,
-    header: fuzzy_header?
+    header: fuzzy_header?,
+    body: String?,
   }
 
   type strict_header = Hash[String, Array[String]]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: funnel_http
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - sue445
 bindir: exe
 cert_chain: []
-date: 2025-01-07 00:00:00.000000000 Z
+date: 2025-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: go_gem