http_parser.rb 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afdb28464ccb0f753a1d66be02b667683d6aadfe31fe03a88f889252b457761d
-  data.tar.gz: 6041b3dc3f212160ae00b72b193e4620c5facd59096a28b122c0ef5a901dc80b
+  metadata.gz: 7fb5f5d030bfee30671d56b87acf02da0839051af33452843cef949f11dc5f14
+  data.tar.gz: d232aab15c4758a799a6cf9c59d315ecbd814259aba71bcc609728b651841e1b
 SHA512:
-  metadata.gz: 41249c628f931cd9721e32bd378a44b8e49b25706b491ae3761d641e55bac1205afe9d3d02d88d5b4f3161adee4a65416c5eec2a51fcacad1b050d6f6d2637fc
-  data.tar.gz: ae5718390cce25d2ee7fcbaf923fac015189079b64ea2f37759c41ee2e7f2714dafaf6bf37ed6434f540e82e87c6a13723e226ac27000d1f0e2d7b2681643514
+  metadata.gz: 263ea218dabc076ae0b10b8ed63d1383263a11d7c9d42539fd0e0349e78ffc9fb38a9e731f76d83367d1354e5b0c4d345d79b79be7d87327012d39a879a3f62d
+  data.tar.gz: b8118b7aa966b1be6b315c956afe8d55d633e5f5dfa8fc9a3f28e53b1b31d7d32624c905de208b29804336afe9f4ae64f52b29615c84846bbf44e326b6a60f66

data/.github/workflows/linux.yml

@@ -8,11 +8,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.7', '3.0' ]
+        ruby: [ '3.1', '3.2', '3.3', '3.4', 'head' ]
         os: [ 'ubuntu-latest' ]
     name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/.github/workflows/windows.yml

@@ -8,11 +8,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.7', '3.0' ]
+        ruby: [ '3.1', '3.2', '3.3', '3.4', 'head' ]
         os: [ 'windows-latest' ]
     name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/Rakefile

@@ -1,7 +1,8 @@
-# load tasks
 require 'bundler/gem_tasks'
-Dir['tasks/*.rake'].sort.each { |f| load f }
 
 # default task
 task :compile => :submodules
 task :default => [:compile, :spec]
+
+# load tasks
+Dir['tasks/*.rake'].sort.each { |f| load f }

data/ext/ruby_http_parser/ext_help.h

@@ -2,7 +2,12 @@
 #define ext_help_h
 
 #define RAISE_NOT_NULL(T) if(T == NULL) rb_raise(rb_eArgError, "NULL found for " # T " when shouldn't be.");
-#define DATA_GET(from,type,name) Data_Get_Struct(from,type,name); RAISE_NOT_NULL(name);
+#ifdef TypedData_Get_Struct
+#define DATA_GET_STRUCT(from,type,name) TypedData_Get_Struct(from,type,&type##_type,name)
+#else
+#define DATA_GET_STRUCT(from,type,name) Data_Get_Struct(from,type,name)
+#endif
+#define DATA_GET(from,type,name) DATA_GET_STRUCT(from,type,name); RAISE_NOT_NULL(name);
 #define REQUIRE_TYPE(V, T) if(TYPE(V) != T) rb_raise(rb_eTypeError, "Wrong argument type for " # V " required " # T);
 
 /* for compatibility with Ruby 1.8.5, which doesn't declare RSTRING_PTR */

data/ext/ruby_http_parser/org/ruby_http_parser/RubyHttpParser.java

@@ -8,6 +8,9 @@ import http_parser.lolevel.HTTPDataCallback;
 import http_parser.lolevel.ParserSettings;
 
 import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.jcodings.Encoding;
 import org.jcodings.specific.UTF8Encoding;
@@ -64,7 +67,6 @@ public class RubyHttpParser extends RubyObject {
   private IRubyObject on_body;
   private IRubyObject on_message_complete;
 
-  private IRubyObject status;
   private IRubyObject requestUrl;
   private IRubyObject requestPath;
   private IRubyObject queryString;
@@ -82,6 +84,10 @@ public class RubyHttpParser extends RubyObject {
 
   private static final Encoding UTF8 = UTF8Encoding.INSTANCE;
 
+  private static final List<String> VALUE_TYPES = new ArrayList<String>(
+    Arrays.asList("mixed", "arrays", "strings")
+  );
+
   public RubyHttpParser(final Ruby runtime, RubyClass clazz) {
     super(runtime, clazz);
 
@@ -107,18 +113,6 @@ public class RubyHttpParser extends RubyObject {
   private void initSettings() {
     this.settings = new ParserSettings();
 
-    this.settings.on_status = new HTTPDataCallback() {
-      public int cb(http_parser.lolevel.HTTPParser p, ByteBuffer buf, int pos, int len) {
-        byte[] data = fetchBytes(buf, pos, len);
-        if (runtime.is1_9() || runtime.is2_0()) {
-          ((RubyString) status).cat(data, 0, data.length, UTF8);
-        } else {
-          ((RubyString) status).cat(data);
-        }
-        return 0;
-      }
-    };
-
     this.settings.on_url = new HTTPDataCallback() {
       public int cb(http_parser.lolevel.HTTPParser p, ByteBuffer buf, int pos, int len) {
         byte[] data = fetchBytes(buf, pos, len);
@@ -215,14 +209,12 @@ public class RubyHttpParser extends RubyObject {
         headers = new RubyHash(runtime);
 
         if (runtime.is1_9() || runtime.is2_0()) {
-          status = RubyString.newEmptyString(runtime, UTF8);
           requestUrl = RubyString.newEmptyString(runtime, UTF8);
           requestPath = RubyString.newEmptyString(runtime, UTF8);
           queryString = RubyString.newEmptyString(runtime, UTF8);
           fragment = RubyString.newEmptyString(runtime, UTF8);
           upgradeData = RubyString.newEmptyString(runtime, UTF8);
         } else {
-          status = RubyString.newEmptyString(runtime);
           requestUrl = RubyString.newEmptyString(runtime);
           requestPath = RubyString.newEmptyString(runtime);
           queryString = RubyString.newEmptyString(runtime);
@@ -324,8 +316,7 @@ public class RubyHttpParser extends RubyObject {
     this.parser = new HTTPParser();
     this.parser.HTTP_PARSER_STRICT = true;
     this.headers = null;
-    
-    this.status = runtime.getNil();
+
     this.requestUrl = runtime.getNil();
     this.requestPath = runtime.getNil();
     this.queryString = runtime.getNil();
@@ -462,11 +453,6 @@ public class RubyHttpParser extends RubyObject {
     return headers == null ? runtime.getNil() : headers;
   }
 
-  @JRubyMethod(name = "status")
-  public IRubyObject getStatus() {
-    return status == null ? runtime.getNil() : status;
-  }
-
   @JRubyMethod(name = "request_url")
   public IRubyObject getRequestUrl() {
     return requestUrl == null ? runtime.getNil() : requestUrl;
@@ -495,7 +481,7 @@ public class RubyHttpParser extends RubyObject {
   @JRubyMethod(name = "header_value_type=")
   public IRubyObject set_header_value_type(IRubyObject val) {
     String valString = val.toString();
-    if (valString != "mixed" && valString != "arrays" && valString != "strings") {
+    if (!VALUE_TYPES.contains(valString)) {
       throw runtime.newArgumentError("Invalid header value type");
     }
     header_value_type = val;

data/ext/ruby_http_parser/ruby_http_parser.c

@@ -81,6 +81,14 @@ void ParserWrapper_free(void *data) {
   }
 }
 
+static const rb_data_type_t ParserWrapper_type = {
+  "ParserWrapper",
+  {
+    ParserWrapper_mark,
+    ParserWrapper_free,
+  },
+};
+
 static VALUE cParser;
 static VALUE cRequestParser;
 static VALUE cResponseParser;
@@ -293,7 +301,7 @@ VALUE Parser_alloc_by_type(VALUE klass, enum ryah_http_parser_type type) {
 
   ParserWrapper_init(wrapper);
 
-  return Data_Wrap_Struct(klass, ParserWrapper_mark, ParserWrapper_free, wrapper);
+  return TypedData_Wrap_Struct(klass, &ParserWrapper_type, wrapper);
 }
 
 VALUE Parser_alloc(VALUE klass) {
@@ -316,7 +324,17 @@ VALUE Parser_initialize(int argc, VALUE *argv, VALUE self) {
   ParserWrapper *wrapper = NULL;
   DATA_GET(self, ParserWrapper, wrapper);
 
-  wrapper->header_value_type = rb_iv_get(CLASS_OF(self), "@default_header_value_type");
+  VALUE default_header_value_type = Qnil;
+
+  if (argc > 0 && RB_TYPE_P(argv[argc-1], T_HASH)) {
+    ID keyword_ids[1];
+    keyword_ids[0] = rb_intern("default_header_value_type");
+    rb_get_kwargs(argv[argc-1], keyword_ids, 0, 1, &default_header_value_type);
+    if (default_header_value_type == Qundef) {
+      default_header_value_type = Qnil;
+    }
+    --argc;
+  }
 
   if (argc == 1) {
     wrapper->callback_object = argv[0];
@@ -324,7 +342,13 @@ VALUE Parser_initialize(int argc, VALUE *argv, VALUE self) {
 
   if (argc == 2) {
     wrapper->callback_object = argv[0];
-    wrapper->header_value_type = argv[1];
+    default_header_value_type = argv[1];
+  }
+
+  if (default_header_value_type == Qnil) {
+    wrapper->header_value_type = rb_iv_get(CLASS_OF(self), "@default_header_value_type");
+  } else {
+    wrapper->header_value_type = default_header_value_type;
   }
 
   return self;
@@ -489,6 +513,10 @@ VALUE Parser_reset(VALUE self) {
 }
 
 void Init_ruby_http_parser() {
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+  rb_ext_ractor_safe(true);
+#endif
+
   VALUE mHTTP = rb_define_module("HTTP");
   cParser = rb_define_class_under(mHTTP, "Parser", rb_cObject);
   cRequestParser = rb_define_class_under(mHTTP, "RequestParser", cParser);

data/http_parser.rb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "http_parser.rb"
-  s.version = "0.7.0"
+  s.version = "0.8.1"
   s.summary = "Simple callback-based HTTP request/response parser"
   s.description = "Ruby bindings to https://github.com/joyent/http-parser and https://github.com/http-parser/http-parser.java"
 
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
 
   s.homepage = "https://github.com/tmm1/http_parser.rb"
-  s.files = `git ls-files`.split("\n") + Dir['ext/ruby_http_parser/vendor/**/*']
+  s.files = `git ls-files`.split("\n").grep_v(%r{spec/}) + Dir['ext/ruby_http_parser/vendor/**/*']
 
   s.require_paths = ["lib"]
   s.extensions    = ["ext/ruby_http_parser/extconf.rb"]

data/tasks/compile.rake

@@ -34,7 +34,7 @@ RUBY_VERSION =~ /(\\d+.\\d+)/
 require "\#{$1}/ruby_http_parser"
     eoruby
   end
-  at_exit{ FileUtils.rm t.name if File.exists?(t.name) }
+  at_exit{ FileUtils.rm t.name if File.exist?(t.name) }
 end
 
 if Rake::Task.task_defined?(:cross)

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http_parser.rb
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Marc-Andre Cournoyer
 - Aman Gupta
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -182,10 +181,6 @@ files:
 - http_parser.rb.gemspec
 - lib/http/parser.rb
 - lib/http_parser.rb
-- spec/parser_spec.rb
-- spec/spec_helper.rb
-- spec/support/requests.json
-- spec/support/responses.json
 - tasks/compile.rake
 - tasks/fixtures.rake
 - tasks/spec.rake
@@ -194,7 +189,6 @@ homepage: https://github.com/tmm1/http_parser.rb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -209,8 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Simple callback-based HTTP request/response parser
 test_files: []