Merge pull request #73 from tmm1/fix-jruby-support

 JRuby: Revert unimplemented "status" support and fix an failed test

Author: ashie

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 }

ext/ruby_http_parser/org/ruby_http_parser/RubyHttpParser.java

@@ -67,7 +67,6 @@ public class StopException extends RuntimeException {
   private IRubyObject on_body;
   private IRubyObject on_message_complete;
 
-  private IRubyObject status;
   private IRubyObject requestUrl;
   private IRubyObject requestPath;
   private IRubyObject queryString;
@@ -114,18 +113,6 @@ public RubyHttpParser(final Ruby runtime, RubyClass clazz) {
   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);
@@ -222,14 +209,12 @@ public int cb(http_parser.lolevel.HTTPParser p) {
         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);
@@ -331,8 +316,7 @@ private void init() {
     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();
@@ -469,11 +453,6 @@ public IRubyObject getHeaders() {
     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;

spec/parser_spec.rb

@@ -406,10 +406,15 @@
         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'])