http_parser.rb 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afdb28464ccb0f753a1d66be02b667683d6aadfe31fe03a88f889252b457761d
-  data.tar.gz: 6041b3dc3f212160ae00b72b193e4620c5facd59096a28b122c0ef5a901dc80b
+  metadata.gz: cb02853976523252e0d5f36af3ba83b363010d4c163d9a4951b419054e7486ae
+  data.tar.gz: 3b7ac3ea5df5866582e0f68653d205764498e60e01835d2e19661cf4e1089d1b
 SHA512:
-  metadata.gz: 41249c628f931cd9721e32bd378a44b8e49b25706b491ae3761d641e55bac1205afe9d3d02d88d5b4f3161adee4a65416c5eec2a51fcacad1b050d6f6d2637fc
-  data.tar.gz: ae5718390cce25d2ee7fcbaf923fac015189079b64ea2f37759c41ee2e7f2714dafaf6bf37ed6434f540e82e87c6a13723e226ac27000d1f0e2d7b2681643514
+  metadata.gz: 67516e3f1024e4bbf8dd00ae441646d53ca279313683b6f8da24668901c59b364608ecd9c69dab63709d9f89245ddc5363e0865f294a5af9d8e0b39d4712328f
+  data.tar.gz: 505a790706bc8f84404c2c6dd7e2b0025d591ca30311ca93d4eda4cf58a274c105acf68ed029ce96e38b04b040b86d4e953cf944a80a1e66a72f2a737d8cbfba

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/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

@@ -316,7 +316,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 +334,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 +505,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.0"
   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"
 

data/spec/parser_spec.rb

@@ -31,6 +31,25 @@ describe HTTP::Parser do
     expect(@parser.header_value_type).to eq(:mixed)
   end
 
+  it "should be able to run in non-main ractors" do
+    skip unless Kernel.const_defined?(:Ractor)
+    default_header_value_type = HTTP::Parser.default_header_value_type
+    r = Ractor.new(default_header_value_type) { |type|
+      parser = HTTP::Parser.new(default_header_value_type: type)
+      done = false
+      parser.on_message_complete = proc {
+        done = true
+      }
+      parser <<
+        "GET /ractor HTTP/1.1\r\n" +
+        "Content-Length: 5\r\n" +
+        "\r\n" +
+        "World"
+      done
+    }
+    expect(r.take).to be true
+  end
+
   it "should allow us to set the header value type" do
     [:mixed, :arrays, :strings].each do |type|
       @parser.header_value_type = type
@@ -38,6 +57,9 @@ describe HTTP::Parser do
 
       parser_tmp = HTTP::Parser.new(nil, type)
       expect(parser_tmp.header_value_type).to eq(type)
+
+      parser_tmp2 = HTTP::Parser.new(default_header_value_type: type)
+      expect(parser_tmp2.header_value_type).to eq(type)
     end
   end
 
@@ -384,10 +406,15 @@ describe HTTP::Parser do
         expect(@parser.send("http_minor")).to eq(test["http_minor"])
 
         if test['type'] == 'HTTP_REQUEST'
-          expect(@parser.send("request_url")).to eq(test["request_url"].force_encoding(Encoding::BINARY))
+          if defined?(JRUBY_VERSION)
+            expect(@parser.send("request_url")).to eq(test["request_url"])
+          else
+            # It's created by rb_str_new(), so that encoding is Encoding::ASCII_8BIT a.k.a Encoding::BINARY
+            expect(@parser.send("request_url")).to eq(test["request_url"].force_encoding(Encoding::ASCII_8BIT))
+          end
         else
           expect(@parser.send("status_code")).to eq(test["status_code"])
-          expect(@parser.send("status")).to eq(test["status"].force_encoding(Encoding::BINARY))
+          expect(@parser.send("status")).to eq(test["status"].force_encoding(Encoding::ASCII_8BIT)) if !defined?(JRUBY_VERSION)
         end
 
         expect(@headers.size).to eq(test['num_headers'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_parser.rb
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler