ruby-curl 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13f93a17df3585dd60eebdd91ebd2595a3278b3076a86eadc9324ddb3c952d73
-  data.tar.gz: 950c69c1206777280e5baea3eedf80df8d5ca2c54852b9d4e57ae8ecaecb15ea
+  metadata.gz: db064c18f442a946d1a99c455d2b838e133cb9acbc103f0eeb0a9588d1ebfff1
+  data.tar.gz: 7e603e2b87f653d7c8cc3be86f63325586fea95b8d5c522b493cd34956d5afec
 SHA512:
-  metadata.gz: 0b75b69a4b95aeec5d42d29f196162fde96ea0ba647bce18626f96b9c6545dfa97e4c3de7609c818a48508533c575deda4da870120a8dccdb8ac237cff2ffefa
-  data.tar.gz: 0e39eb0dca94ba1101a21a126dae4d94419dd890d6e1fc627234c5f93a8c6e4ecc95199fac0056f5e6dbdb5e2b590f8c43ae82f496a5c2d9dffdc0ba2d98af11
+  metadata.gz: 3dd4cc7dfedc122584dd9f09e3c58ec6b9e6c936879b4c689b3b24f8a11b5eed2ecb818a29be083b3a605454f5ed06520d1be840cb855708d21963ef9def1ca0
+  data.tar.gz: 814b67e4949cc544ee11ed05d2c96e049c1738e310469e9912e03fa40b80a59309468b4bfd9ad2102b82ee8bff754629d113a0b2a0f63144c336ed301f720f96

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec :name => 'ruby-curl'

data/README.md

@@ -10,9 +10,9 @@ Ruby-curl aims to be a true libcurl binding for Ruby. Currently, ruby-curl offer
 # Requirements
 
 ```
-Ruby 1.9.3 or higher
+Ruby 2.7 or higher
 
-Libcurl 7.19.0 or higher
+Libcurl 7.28.0 or higher
 ```
 
 

data/ext/curl.c

@@ -3,10 +3,11 @@
 VALUE rb_mCurl;
 
 void Init_curl() {
-	VALUE rb_mOpt, rb_mInfo, rb_mProxy, rb_mAuth, rb_mProto, rb_mError;
+	VALUE rb_mOpt, rb_mMOpt, rb_mInfo, rb_mProxy, rb_mAuth, rb_mProto, rb_mError;
 
 	rb_mCurl = rb_define_module("Curl");
 	rb_mOpt = rb_define_module_under(rb_mCurl, "Opt");
+	rb_mMOpt = rb_define_module_under(rb_mCurl, "MOpt");
 	rb_mInfo = rb_define_module_under(rb_mCurl, "Info");
 	rb_mProxy = rb_define_module_under(rb_mCurl, "Proxy");
 	rb_mAuth = rb_define_module_under(rb_mCurl, "Auth");
@@ -15,6 +16,8 @@ void Init_curl() {
 
 	curl_global_init(CURL_GLOBAL_ALL);
 
+	rb_define_const(rb_mCurl, "LIBCURL_VERSION", rb_str_new_cstr(curl_version()));
+
 	/* Curl constants */
 	RB_DEFINE_M_CURL_CONST("HTTP_VERSION_NONE", CURL_HTTP_VERSION_NONE);
 	RB_DEFINE_M_CURL_CONST("HTTP_VERSION_1_0", CURL_HTTP_VERSION_1_0);
@@ -222,6 +225,10 @@ void Init_curl() {
 	RB_DEFINE_M_OPT_CONST("PROXYHEADER", CURLOPT_PROXYHEADER);
 #endif
 
+	/* Curl::MOpt constants */
+	RB_DEFINE_M_MOPT_CONST("MAXCONNECTS", CURLMOPT_MAXCONNECTS);
+	RB_DEFINE_M_MOPT_CONST("PIPELINING", CURLMOPT_PIPELINING);
+
 	/* Curl::Info constants */
 	RB_DEFINE_M_INFO_CONST("EFFECTIVE_URL", CURLINFO_EFFECTIVE_URL);
 	RB_DEFINE_M_INFO_CONST("FILETIME", CURLINFO_FILETIME);
@@ -391,4 +398,5 @@ void Init_curl() {
 	RB_DEFINE_M_ERROR_CONST("HTTP2_STREAM", CURLE_HTTP2_STREAM);
 
 	Init_easy();
+	Init_multi();
 }

data/ext/curl.h

@@ -12,6 +12,9 @@
 #define RB_DEFINE_M_OPT_CONST(name, curl_opt_name) \
 	rb_define_const(rb_mOpt, name, LONG2NUM(curl_opt_name))
 
+#define RB_DEFINE_M_MOPT_CONST(name, curl_mopt_name) \
+	rb_define_const(rb_mMOpt, name, LONG2NUM(curl_mopt_name))
+
 #define RB_DEFINE_M_INFO_CONST(name, curl_info_name) \
 	rb_define_const(rb_mInfo, name, LONG2NUM(curl_info_name))
 

data/ext/easy.c

@@ -58,6 +58,9 @@ void rb_curl_free(rb_curl_easy *rb_ch) {
 	curl_slist_free_all(rb_ch->curl_http200aliases_slist);
 	curl_slist_free_all(rb_ch->curl_hosts_slist);
 	curl_slist_free_all(rb_ch->curl_headers_slist);
+	free(rb_ch->write_function);
+	free(rb_ch->write_header_function);
+	free(rb_ch->read_function);
 	free(rb_ch);
 }
 
@@ -438,27 +441,39 @@ static VALUE rb_curl_easy_setopt(VALUE self, VALUE opt, VALUE val) {
 			c_err_code = curl_easy_setopt(rb_ch->ch, option, NIL_P(val) ? NULL : StringValueCStr(val));
 			break;
 		case CURLOPT_WRITEFUNCTION:
-			rb_ch->write_function = NIL_P(val) ? NULL : rb_normalized_str(val);
-			curl_easy_setopt(rb_ch->ch, CURLOPT_WRITEDATA, rb_ch);
-			c_err_code = curl_easy_setopt(rb_ch->ch, CURLOPT_WRITEFUNCTION, rb_curl_write);
+			if (NIL_P(val)) {
+				c_err_code = curl_easy_setopt(rb_ch->ch, CURLOPT_WRITEFUNCTION, NULL);
+			} else {
+				rb_ch->write_function = strdup(rb_normalized_str(val));
+				curl_easy_setopt(rb_ch->ch, CURLOPT_WRITEDATA, rb_ch);
+				c_err_code = curl_easy_setopt(rb_ch->ch, CURLOPT_WRITEFUNCTION, rb_curl_write);
+			}
 			break;
 		case CURLOPT_WRITEDATA:
 			rb_ch->write_data = val;
 			c_err_code = curl_easy_setopt(rb_ch->ch, CURLOPT_WRITEDATA, rb_ch);
 			break;
 		case CURLOPT_HEADERFUNCTION:
-			rb_ch->write_header_function = NIL_P(val) ? NULL : rb_normalized_str(val);
-			curl_easy_setopt(rb_ch->ch, CURLOPT_HEADERDATA, rb_ch);
-			c_err_code = curl_easy_setopt(rb_ch->ch, CURLOPT_HEADERFUNCTION, rb_curl_write_header);
+			if (NIL_P(val)) {
+				c_err_code = curl_easy_setopt(rb_ch->ch, CURLOPT_HEADERFUNCTION, NULL);
+			} else {
+				rb_ch->write_header_function = strdup(rb_normalized_str(val));
+				curl_easy_setopt(rb_ch->ch, CURLOPT_HEADERDATA, rb_ch);
+				c_err_code = curl_easy_setopt(rb_ch->ch, CURLOPT_HEADERFUNCTION, rb_curl_write_header);
+			}
 			break;
 		case CURLOPT_HEADERDATA:
 			rb_ch->write_header_data = val;
 			c_err_code = curl_easy_setopt(rb_ch->ch, CURLOPT_HEADERDATA, rb_ch);
 			break;
 		case CURLOPT_READFUNCTION:
-			rb_ch->read_function = NIL_P(val) ? NULL : rb_normalized_str(val);
-			curl_easy_setopt(rb_ch->ch, CURLOPT_READDATA, rb_ch);
-			c_err_code = curl_easy_setopt(rb_ch->ch, CURLOPT_READFUNCTION, rb_curl_read);
+			if (NIL_P(val)) {
+				c_err_code = curl_easy_setopt(rb_ch->ch, CURLOPT_READFUNCTION, NULL);
+			} else {
+				rb_ch->read_function = strdup(rb_normalized_str(val));
+				curl_easy_setopt(rb_ch->ch, CURLOPT_READDATA, rb_ch);
+				c_err_code = curl_easy_setopt(rb_ch->ch, CURLOPT_READFUNCTION, rb_curl_read);
+			}
 			break;
 		case CURLOPT_READDATA:
 			rb_ch->read_data = val;

data/ext/multi.c

@@ -0,0 +1,133 @@
+#include "easy.h"
+#include "multi.h"
+
+extern VALUE rb_mCurl;
+
+VALUE rb_cMulti;
+
+static VALUE rb_curl_multi_strerror(VALUE self, VALUE errornum) {
+	const char *error_str;
+
+	error_str = curl_multi_strerror(NUM2LONG(errornum));
+
+	return rb_str_new2(error_str);
+}
+
+void rb_curl_multi_mark(rb_curl_multi *rb_cmh) {
+	rb_gc_mark(rb_cmh->self);
+}
+
+void rb_curl_multi_free(rb_curl_multi *rb_cmh) {
+	free(rb_cmh);
+}
+
+static void rb_curl_multi_zero_state(rb_curl_multi *rb_cmh) {
+	rb_cmh->cmh = NULL;
+}
+
+static CURLMcode rb_curl_multi_add_handle(VALUE self, VALUE easy) {
+  CURLMcode cm_err_code;
+  rb_curl_easy *rb_ch;
+  rb_curl_multi *rb_cmh;
+
+  Data_Get_Struct(self, rb_curl_multi, rb_cmh);
+  Data_Get_Struct(easy, rb_curl_easy, rb_ch);
+
+  cm_err_code = curl_multi_add_handle(rb_cmh->cmh, rb_ch->ch);
+
+  return LONG2NUM(cm_err_code);
+}
+
+static CURLMcode rb_curl_multi_remove_handle(VALUE self, VALUE easy) {
+  CURLMcode cm_err_code;
+  rb_curl_easy *rb_ch;
+  rb_curl_multi *rb_cmh;
+
+  Data_Get_Struct(self, rb_curl_multi, rb_cmh);
+  Data_Get_Struct(easy, rb_curl_easy, rb_ch);
+
+  cm_err_code = curl_multi_remove_handle(rb_cmh->cmh, rb_ch->ch);
+
+  return LONG2NUM(cm_err_code);
+}
+
+static CURLMcode rb_curl_multi_cleanup(VALUE self) {
+  CURLMcode cm_err_code;
+  rb_curl_multi *rb_cmh;
+
+  Data_Get_Struct(self, rb_curl_multi, rb_cmh);
+
+  cm_err_code = curl_multi_cleanup(rb_cmh->cmh);
+
+  return LONG2NUM(cm_err_code);
+}
+
+static VALUE rb_curl_multi_setopt(VALUE self, VALUE opt, VALUE val) {
+	CURLMcode cm_err_code;
+	rb_curl_multi *rb_cmh;
+	long option = NUM2LONG(opt);
+
+	Data_Get_Struct(self, rb_curl_multi, rb_cmh);
+
+	switch (option) {
+		case CURLMOPT_MAXCONNECTS:
+		case CURLMOPT_PIPELINING:
+			cm_err_code = curl_multi_setopt(rb_cmh->cmh, option, NUM2LONG(val));
+			break;
+		default:
+			rb_raise(rb_eTypeError, "Unsupported option.");
+	}
+
+	return LONG2NUM(cm_err_code);
+}
+
+static VALUE rb_curl_multi_perform(VALUE self) {
+	rb_curl_multi *rb_cmh;
+	int running_handles;
+
+	Data_Get_Struct(self, rb_curl_multi, rb_cmh);
+
+	do {
+		curl_multi_perform(rb_cmh->cmh, &running_handles);
+
+		curl_multi_wait(rb_cmh->cmh, NULL, 0, 100000, NULL);
+	} while (running_handles);
+
+	return LONG2NUM(0);
+}
+
+static VALUE rb_curl_multi_allocate(VALUE klass) {
+	rb_curl_multi *rb_cmh;
+
+	rb_cmh = ALLOC(rb_curl_multi);
+	rb_curl_multi_zero_state(rb_cmh);
+
+	return Data_Wrap_Struct(klass, rb_curl_multi_mark, rb_curl_multi_free, rb_cmh);
+}
+
+static VALUE rb_curl_multi_initialize(int argc, VALUE *argv, VALUE self) {
+	rb_curl_multi *rb_cmh;
+
+	Data_Get_Struct(self, rb_curl_multi, rb_cmh);
+
+	rb_cmh->cmh = curl_multi_init();
+	if (!rb_cmh->cmh) {
+		rb_raise(rb_eRuntimeError, "Failed to initialize multi handle");
+	}
+
+	rb_cmh->self = self;
+
+	return self;
+}
+
+void Init_multi() {
+	rb_cMulti = rb_define_class_under(rb_mCurl, "Multi", rb_cObject);
+	rb_define_alloc_func(rb_cMulti, rb_curl_multi_allocate);
+	rb_define_singleton_method(rb_cMulti, "strerror", rb_curl_multi_strerror, 1);
+	rb_define_method(rb_cMulti, "initialize", rb_curl_multi_initialize, -1);
+	rb_define_method(rb_cMulti, "setopt", rb_curl_multi_setopt, 2);
+	rb_define_method(rb_cMulti, "add_handle", rb_curl_multi_add_handle, 1);
+	rb_define_method(rb_cMulti, "remove_handle", rb_curl_multi_remove_handle, 1);
+	rb_define_method(rb_cMulti, "perform", rb_curl_multi_perform, 0);
+	rb_define_method(rb_cMulti, "cleanup", rb_curl_multi_cleanup, 0);
+}

data/ext/multi.h

@@ -0,0 +1,18 @@
+#ifndef RUBY_CURL_MULTI_H
+#define RUBY_CURL_MULTI_H
+
+#include <ruby.h>
+#include <curl/curl.h>
+#include <curl/easy.h>
+#include <curl/multi.h>
+
+typedef struct {
+	CURLM *cmh;
+	VALUE self;
+} rb_curl_multi;
+
+extern VALUE rb_cMulti;
+
+extern void Init_multi();
+
+#endif

data/lib/ruby-curl/version.rb

@@ -1,3 +1,3 @@
 module Curl
-	VERSION = '1.0.2'
+	VERSION = '2.0.0'
 end

data/ruby-curl.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.email       = ["vijayrepomailzbox@gmail.com", "singhshivam.172@gmail.com"]
   spec.homepage    = "https://github.com/vijayrsv/ruby-curl"
   spec.license     = "MIT"
-	spec.required_ruby_version = ">= 1.9.3"
+  spec.required_ruby_version = ">= 2.7"
 
 	# Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -33,4 +33,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
+
+  spec.add_dependency "stringio", "~> 3.0", ">= 3.0.8"
+
+  spec.requirements << "libcurl, >= 7.28.0"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ruby-curl
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Vijayakumar Ramachandran
 - Shivam Singh
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2023-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,6 +39,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: stringio
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.8
 description: True Ruby binding for cURL.
 email:
 - vijayrepomailzbox@gmail.com
@@ -48,6 +68,7 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
+- Gemfile
 - LICENSE.txt
 - README.md
 - ext/curl.c
@@ -55,6 +76,8 @@ files:
 - ext/easy.c
 - ext/easy.h
 - ext/extconf.rb
+- ext/multi.c
+- ext/multi.h
 - lib/ruby-curl.rb
 - lib/ruby-curl/version.rb
 - ruby-curl.gemspec
@@ -63,7 +86,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -71,16 +94,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+requirements:
+- libcurl, >= 7.28.0
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: ''
 test_files: []