RubyGems - http_parser.rb - Versions diffs - 0.5.1 → 0.5.3 - Mend

http_parser.rb 0.5.1 → 0.5.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (51) hide show

data/ext/ruby_http_parser/vendor/http-parser-java/tests.dumped CHANGED Viewed

@@ -304,12 +304,12 @@ http_major                :1
 http_minor                :1
 name  :connect request
-raw   :"CONNECT home.netscape.com:443 HTTP/1.0\r\nUser-agent: Mozilla/1.1N\r\nProxy-authorization: basic aGVsbG86d29ybGQ=\r\n\r\n"
+raw   :"CONNECT home0.netscape.com:443 HTTP/1.0\r\nUser-agent: Mozilla/1.1N\r\nProxy-authorization: basic aGVsbG86d29ybGQ=\r\n\r\n"
 type  :HTTP_REQUEST
 method: HTTP_CONNECT
 status_code :0
 request_path:
-request_url :home.netscape.com:443
+request_url :home0.netscape.com:443
 fragment    :
 query_string:
 body        :""
@@ -324,7 +324,7 @@ http_minor                :0
 name  :report request
 raw   :"REPORT /test HTTP/1.1\r\n\r\n"
 type  :HTTP_REQUEST
-method: REPORT
+method: HTTP_REPORT
 status_code :0
 request_path:/test
 request_url :/test
@@ -337,8 +337,108 @@ upgrade                   :0
 http_major                :1
 http_minor                :1
+name  :request with no http version
+raw   :"GET /\r\n\r\n"
+type  :HTTP_REQUEST
+method: HTTP_GET
+status_code :0
+request_path:/
+request_url :/
+fragment    :
+query_string:
+body        :""
+body_size   :0
+should_keep_alive         :0
+upgrade                   :0
+http_major                :0
+http_minor                :9
+name  :m-search request
+raw   :"M-SEARCH * HTTP/1.1\r\nHOST: 239.255.255.250:1900\r\nMAN: \"ssdp:discover\"\r\nST: \"ssdp:all\"\r\n\r\n"
+type  :HTTP_REQUEST
+method: HTTP_MSEARCH
+status_code :0
+request_path:*
+request_url :*
+fragment    :
+query_string:
+body        :""
+body_size   :0
+header_0 :{ "HOST": "239.255.255.250:1900"}
+header_1 :{ "MAN": ""ssdp:discover""}
+header_2 :{ "ST": ""ssdp:all""}
+should_keep_alive         :1
+upgrade                   :0
+http_major                :1
+http_minor                :1
+name  :utf-8 path request
+raw   :"GET /δ¶/δt/pope?q=1#narf HTTP/1.1\r\nHost: github.com\r\n\r\n"
+type  :HTTP_REQUEST
+method: HTTP_GET
+status_code :0
+request_path:/δ¶/δt/pope
+request_url :/δ¶/δt/pope?q=1#narf
+fragment    :narf
+query_string:q=1
+body        :""
+body_size   :0
+header_0 :{ "Host": "github.com"}
+should_keep_alive         :1
+upgrade                   :0
+http_major                :1
+http_minor                :1
+name  :host terminated by a query string
+raw   :"GET http://hypnotoad.org?hail=all HTTP/1.1\r\n\r\n"
+type  :HTTP_REQUEST
+method: HTTP_GET
+status_code :0
+request_path:
+request_url :http://hypnotoad.org?hail=all
+fragment    :
+query_string:hail=all
+body        :""
+body_size   :0
+should_keep_alive         :1
+upgrade                   :0
+http_major                :1
+http_minor                :1
+name  :host:port terminated by a query string
+raw   :"GET http://hypnotoad.org:1234?hail=all HTTP/1.1\r\n\r\n"
+type  :HTTP_REQUEST
+method: HTTP_GET
+status_code :0
+request_path:
+request_url :http://hypnotoad.org:1234?hail=all
+fragment    :
+query_string:hail=all
+body        :""
+body_size   :0
+should_keep_alive         :1
+upgrade                   :0
+http_major                :1
+http_minor                :1
+name  :host:port terminated by a space
+raw   :"GET http://hypnotoad.org:1234 HTTP/1.1\r\n\r\n"
+type  :HTTP_REQUEST
+method: HTTP_GET
+status_code :0
+request_path:
+request_url :http://hypnotoad.org:1234
+fragment    :
+query_string:
+body        :""
+body_size   :0
+should_keep_alive         :1
+upgrade                   :0
+http_major                :1
+http_minor                :1
 name  :google 301
-raw   :"HTTP/1.1 301 Moved Permanently\r\nLocation: http://www.google.com/\r\nContent-Type: text/html; charset=UTF-8\r\nDate: Sun, 26 Apr 2009 11:11:49 GMT\r\nExpires: Tue, 26 May 2009 11:11:49 GMT\r\nCache-Control: public, max-age=2592000\r\nServer: gws\r\nContent-Length: 219\r\n\r\n<HTML><HEAD><meta http-equiv=\"content-type\" content=\"text/html;charset=utf-8\">\n<TITLE>301 Moved</TITLE></HEAD><BODY>\n<H1>301 Moved</H1>\nThe document has moved\n<A HREF=\"http://www.google.com/\">here</A>.\r\n</BODY></HTML>\r\n"
+raw   :"HTTP/1.1 301 Moved Permanently\r\nLocation: http://www.google.com/\r\nContent-Type: text/html; charset=UTF-8\r\nDate: Sun, 26 Apr 2009 11:11:49 GMT\r\nExpires: Tue, 26 May 2009 11:11:49 GMT\r\nX-$PrototypeBI-Version: 1.6.0.3\r\nCache-Control: public, max-age=2592000\r\nServer: gws\r\nContent-Length:  219  \r\n\r\n<HTML><HEAD><meta http-equiv=\"content-type\" content=\"text/html;charset=utf-8\">\n<TITLE>301 Moved</TITLE></HEAD><BODY>\n<H1>301 Moved</H1>\nThe document has moved\n<A HREF=\"http://www.google.com/\">here</A>.\r\n</BODY></HTML>\r\n"
 type  :HTTP_RESPONSE
 method: HTTP_DELETE
 status_code :301
@@ -352,9 +452,10 @@ header_0 :{ "Location": "http://www.google.com/"}
 header_1 :{ "Content-Type": "text/html; charset=UTF-8"}
 header_2 :{ "Date": "Sun, 26 Apr 2009 11:11:49 GMT"}
 header_3 :{ "Expires": "Tue, 26 May 2009 11:11:49 GMT"}
-header_4 :{ "Cache-Control": "public, max-age=2592000"}
-header_5 :{ "Server": "gws"}
-header_6 :{ "Content-Length": "219"}
+header_4 :{ "X-$PrototypeBI-Version": "1.6.0.3"}
+header_5 :{ "Cache-Control": "public, max-age=2592000"}
+header_6 :{ "Server": "gws"}
+header_7 :{ "Content-Length": "219  "}
 should_keep_alive         :1
 upgrade                   :0
 http_major                :1
@@ -537,3 +638,49 @@ upgrade                   :0
 http_major                :1
 http_minor                :1
+name  :field underscore
+raw   :"HTTP/1.1 200 OK\r\nDate: Tue, 28 Sep 2010 01:14:13 GMT\r\nServer: Apache\r\nCache-Control: no-cache, must-revalidate\r\nExpires: Mon, 26 Jul 1997 05:00:00 GMT\r\n.et-Cookie: PlaxoCS=1274804622353690521; path=/; domain=.plaxo.com\r\nVary: Accept-Encoding\r\n_eep-Alive: timeout=45\r\n_onnection: Keep-Alive\r\nTransfer-Encoding: chunked\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n0\r\n\r\n"
+type  :HTTP_RESPONSE
+method: HTTP_DELETE
+status_code :200
+request_path:
+request_url :
+fragment    :
+query_string:
+body        :""
+body_size   :0
+header_0 :{ "Date": "Tue, 28 Sep 2010 01:14:13 GMT"}
+header_1 :{ "Server": "Apache"}
+header_2 :{ "Cache-Control": "no-cache, must-revalidate"}
+header_3 :{ "Expires": "Mon, 26 Jul 1997 05:00:00 GMT"}
+header_4 :{ ".et-Cookie": "PlaxoCS=1274804622353690521; path=/; domain=.plaxo.com"}
+header_5 :{ "Vary": "Accept-Encoding"}
+header_6 :{ "_eep-Alive": "timeout=45"}
+header_7 :{ "_onnection": "Keep-Alive"}
+header_8 :{ "Transfer-Encoding": "chunked"}
+header_9 :{ "Content-Type": "text/html"}
+header_10 :{ "Connection": "close"}
+should_keep_alive         :0
+upgrade                   :0
+http_major                :1
+http_minor                :1
+name  :non-ASCII in status line
+raw   :"HTTP/1.1 500 Oriëntatieprobleem\r\nDate: Fri, 5 Nov 2010 23:07:12 GMT+2\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
+type  :HTTP_RESPONSE
+method: HTTP_DELETE
+status_code :500
+request_path:
+request_url :
+fragment    :
+query_string:
+body        :""
+body_size   :0
+header_0 :{ "Date": "Fri, 5 Nov 2010 23:07:12 GMT+2"}
+header_1 :{ "Content-Length": "0"}
+header_2 :{ "Connection": "close"}
+should_keep_alive         :0
+upgrade                   :0
+http_major                :1
+http_minor                :1

data/ext/ruby_http_parser/vendor/http-parser-java/tests.utf8 ADDED Viewed

@@ -0,0 +1,17 @@
+name  :utf-8 path request
+raw   :"GET /δ¶/δt/pope?q=1#narf HTTP/1.1\r\nHost: github.com\r\n\r\n"
+type  :HTTP_REQUEST
+method: HTTP_GET
+status_code :0
+request_path:/δ¶/δt/pope
+request_url :/δ¶/δt/pope?q=1#narf
+fragment    :narf
+query_string:q=1
+body        :""
+body_size   :0
+header_0 :{ "Host": "github.com"}
+should_keep_alive         :1
+upgrade                   :0
+http_major                :1
+http_minor                :1

data/http_parser.rb.gemspec CHANGED Viewed

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "http_parser.rb"
-  s.version = "0.5.1"
+  s.version = "0.5.3"
   s.summary = "Simple callback-based HTTP request/response parser"
   s.description = "Ruby bindings to http://github.com/ry/http-parser and http://github.com/a2800276/http-parser.java"
@@ -13,7 +13,13 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.extensions    = ["ext/ruby_http_parser/extconf.rb"]
-  s.add_development_dependency 'rake-compiler', '>= 0.7.5'
+  s.add_development_dependency 'rake-compiler', '>= 0.7.9'
   s.add_development_dependency 'rspec', '>= 2.0.1'
   s.add_development_dependency 'json', '>= 1.4.6'
+  if RUBY_PLATFORM =~ /java/
+    s.add_development_dependency 'jruby-openssl'
+  else
+    s.add_development_dependency 'yajl-ruby', '>= 0.8.1'
+  end
 end

data/lib/http_parser.rb CHANGED Viewed

@@ -2,3 +2,20 @@ $:.unshift File.expand_path('../', __FILE__)
 require 'ruby_http_parser'
 Http = HTTP
+module HTTP
+  class Parser
+    class << self
+      attr_reader :default_header_value_type
+      def default_header_value_type=(val)
+        if (val != :mixed && val != :strings && val != :arrays)
+          raise ArgumentError, "Invalid header value type"
+        end
+        @default_header_value_type = val
+      end
+    end
+  end
+end
+HTTP::Parser.default_header_value_type = :mixed

data/spec/parser_spec.rb CHANGED Viewed

@@ -27,6 +27,35 @@ describe HTTP::Parser do
     @parser.request_path.should be_nil
     @parser.query_string.should be_nil
     @parser.fragment.should be_nil
+    @parser.header_value_type.should == :mixed
+  end
+  it "should allow us to set the header value type" do
+    [:mixed, :arrays, :strings].each do |type|
+      @parser.header_value_type = type
+      @parser.header_value_type.should == type
+      parser_tmp = HTTP::Parser.new(nil, type)
+      parser_tmp.header_value_type.should == type
+    end
+  end
+  it "should allow us to set the default header value type" do
+    [:mixed, :arrays, :strings].each do |type|
+      HTTP::Parser.default_header_value_type = type
+      parser = HTTP::Parser.new
+      parser.header_value_type.should == type
+    end
+  end
+  it "should throw an Argument Error if header value type is invalid" do
+    proc{ @parser.header_value_type = 'bob' }.should raise_error(ArgumentError)
+  end
+  it "should throw an Argument Error if default header value type is invalid" do
+    proc{ HTTP::Parser.default_header_value_type = 'bob' }.should raise_error(ArgumentError)
   end
   it "should implement basic api" do
@@ -106,6 +135,25 @@ describe HTTP::Parser do
     @parser.fragment.should be_nil
   end
+  it "should optionally reset parser state on no-body responses" do
+   @parser.reset!.should be_true
+   @head, @complete = 0, 0
+   @parser.on_headers_complete = proc {|h| @head += 1; :reset }
+   @parser.on_message_complete = proc { @complete += 1 }
+   @parser.on_body = proc {|b| fail }
+   head_response = "HTTP/1.1 200 OK\r\nContent-Length:10\r\n\r\n"
+   @parser << head_response
+   @head.should == 1
+   @complete.should == 1
+   @parser << head_response
+   @head.should == 2
+   @complete.should == 2
+  end
   it "should retain callbacks after reset" do
     @parser.reset!.should be_true
@@ -132,16 +180,57 @@ describe HTTP::Parser do
     }
   end
-  it "should handle multiple headers" do
+  it "should handle multiple headers using strings" do
+    @parser.header_value_type = :strings
     @parser <<
       "GET / HTTP/1.0\r\n" +
-      "Header: value 1\r\n" +
-      "Header: value 2\r\n" +
+      "Set-Cookie: PREF=ID=a7d2c98; expires=Fri, 05-Apr-2013 05:00:45 GMT; path=/; domain=.bob.com\r\n" +
+      "Set-Cookie: NID=46jSHxPM; path=/; domain=.bob.com; HttpOnly\r\n" +
       "\r\n"
-    @parser.headers.should == {
-      'Header' => 'value 1, value 2'
-    }
+    @parser.headers["Set-Cookie"].should == "PREF=ID=a7d2c98; expires=Fri, 05-Apr-2013 05:00:45 GMT; path=/; domain=.bob.com, NID=46jSHxPM; path=/; domain=.bob.com; HttpOnly"
+  end
+  it "should handle multiple headers using strings" do
+    @parser.header_value_type = :arrays
+    @parser <<
+      "GET / HTTP/1.0\r\n" +
+      "Set-Cookie: PREF=ID=a7d2c98; expires=Fri, 05-Apr-2013 05:00:45 GMT; path=/; domain=.bob.com\r\n" +
+      "Set-Cookie: NID=46jSHxPM; path=/; domain=.bob.com; HttpOnly\r\n" +
+      "\r\n"
+    @parser.headers["Set-Cookie"].should == [
+        "PREF=ID=a7d2c98; expires=Fri, 05-Apr-2013 05:00:45 GMT; path=/; domain=.bob.com",
+        "NID=46jSHxPM; path=/; domain=.bob.com; HttpOnly"
+    ]
+  end
+  it "should handle multiple headers using mixed" do
+    @parser.header_value_type = :mixed
+    @parser <<
+      "GET / HTTP/1.0\r\n" +
+      "Set-Cookie: PREF=ID=a7d2c98; expires=Fri, 05-Apr-2013 05:00:45 GMT; path=/; domain=.bob.com\r\n" +
+      "Set-Cookie: NID=46jSHxPM; path=/; domain=.bob.com; HttpOnly\r\n" +
+      "\r\n"
+    @parser.headers["Set-Cookie"].should == [
+        "PREF=ID=a7d2c98; expires=Fri, 05-Apr-2013 05:00:45 GMT; path=/; domain=.bob.com",
+        "NID=46jSHxPM; path=/; domain=.bob.com; HttpOnly"
+    ]
+  end
+  it "should handle a single cookie using mixed" do
+    @parser.header_value_type = :mixed
+    @parser <<
+      "GET / HTTP/1.0\r\n" +
+      "Set-Cookie: PREF=ID=a7d2c98; expires=Fri, 05-Apr-2013 05:00:45 GMT; path=/; domain=.bob.com\r\n" +
+      "\r\n"
+    @parser.headers["Set-Cookie"].should == "PREF=ID=a7d2c98; expires=Fri, 05-Apr-2013 05:00:45 GMT; path=/; domain=.bob.com"
   end
   it "should support alternative api" do
@@ -172,6 +261,27 @@ describe HTTP::Parser do
     @done.should be_true
   end
+  it 'sets upgrade_data if available' do
+    @parser <<
+      "GET /demo HTTP/1.1\r\n" +
+      "Connection: Upgrade\r\n" +
+      "Upgrade: WebSocket\r\n\r\n" +
+      "third key data"
+    @parser.upgrade?.should be_true
+    @parser.upgrade_data.should == 'third key data'
+  end
+  it 'sets upgrade_data to blank if un-available' do
+    @parser <<
+      "GET /demo HTTP/1.1\r\n" +
+      "Connection: Upgrade\r\n" +
+      "Upgrade: WebSocket\r\n\r\n"
+    @parser.upgrade?.should be_true
+    @parser.upgrade_data.should == ''
+  end
   %w[ request response ].each do |type|
     JSON.parse(File.read(File.expand_path("../support/#{type}s.json", __FILE__))).each do |test|
       test['headers'] ||= {}

data/tasks/compile.rake CHANGED Viewed

@@ -10,7 +10,9 @@ Rake::GemPackageTask.new(gemspec) do |pkg|
 end
 if RUBY_PLATFORM =~ /java/
-  Rake::JavaExtensionTask.new("ruby_http_parser", gemspec)
+  Rake::JavaExtensionTask.new("ruby_http_parser", gemspec) do |ext|
+    ext.classpath = File.expand_path('../../ext/ruby_http_parser/vendor/http-parser-java/ext/primitives.jar', __FILE__)
+  end
 else
   Rake::ExtensionTask.new("ruby_http_parser", gemspec) do |ext|
     unless RUBY_PLATFORM =~ /mswin|mingw/

data/tasks/fixtures.rake CHANGED Viewed

@@ -15,7 +15,7 @@ task :fixtures => :submodules do
     tmp.gsub!('FALSE', 'false')
     # remove macros and comments
-    tmp.gsub!(/^#define.+$/,'')
+    tmp.gsub!(/^#(if|elif|endif|define).+$/,'')
     tmp.gsub!(/\/\*(.+?)\*\/$/,'')
     # HTTP_* enums become strings