http_parser.rb 0.5.1 → 0.5.2

data/http_parser.rb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "http_parser.rb"
-  s.version = "0.5.1"
+  s.version = "0.5.2"
   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

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

@@ -27,8 +27,37 @@ 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
     @parser <<
       "GET /test?ok=1 HTTP/1.1\r\n" +
@@ -132,16 +161,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 +242,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

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

metadata

@@ -1,136 +1,176 @@
 --- !ruby/object:Gem::Specification 
 name: http_parser.rb
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
-    - 0
-    - 5
-    - 1
-  version: 0.5.1
+  - 0
+  - 5
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
-  - Marc-Andre Cournoyer
-  - Aman Gupta
+- Marc-Andre Cournoyer
+- Aman Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 -08:00
+date: 2011-08-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rake-compiler
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 7
-              - 5
-            version: 0.7.5
-    type: :development
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 2
-              - 0
-              - 1
-            version: 2.0.1
-    type: :development
-    version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: json
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 4
-              - 6
-            version: 1.4.6
-    type: :development
-    version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 7
+        - 9
+        version: 0.7.9
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 0
+        - 1
+        version: 2.0.1
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 4
+        - 6
+        version: 1.4.6
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 8
+        - 1
+        version: 0.8.1
+  type: :development
+  version_requirements: *id004
 description: Ruby bindings to http://github.com/ry/http-parser and http://github.com/a2800276/http-parser.java
 email: 
-  - macournoyer@gmail.com
-  - aman@tmm1.net
+- macournoyer@gmail.com
+- aman@tmm1.net
 executables: []
 
 extensions: 
-  - ext/ruby_http_parser/extconf.rb
+- ext/ruby_http_parser/extconf.rb
 extra_rdoc_files: []
 
 files: 
-  - .gitignore
-  - .gitmodules
-  - Gemfile
-  - Gemfile.lock
-  - README.md
-  - Rakefile
-  - bench/thin.rb
-  - ext/ruby_http_parser/.gitignore
-  - ext/ruby_http_parser/RubyHttpParserService.java
-  - ext/ruby_http_parser/ext_help.h
-  - ext/ruby_http_parser/extconf.rb
-  - ext/ruby_http_parser/org/ruby_http_parser/RubyHttpParser.java
-  - ext/ruby_http_parser/ruby_http_parser.c
-  - ext/ruby_http_parser/vendor/.gitkeep
-  - 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
-  - tasks/submodules.rake
-  - ext/ruby_http_parser/vendor/http-parser/CONTRIBUTIONS
-  - ext/ruby_http_parser/vendor/http-parser/http_parser.c
-  - ext/ruby_http_parser/vendor/http-parser/http_parser.h
-  - ext/ruby_http_parser/vendor/http-parser/LICENSE-MIT
-  - ext/ruby_http_parser/vendor/http-parser/Makefile
-  - ext/ruby_http_parser/vendor/http-parser/README.md
-  - ext/ruby_http_parser/vendor/http-parser/test.c
-  - ext/ruby_http_parser/vendor/http-parser-java/compile
-  - ext/ruby_http_parser/vendor/http-parser-java/CONTRIBUTIONS
-  - ext/ruby_http_parser/vendor/http-parser-java/http_parser.c
-  - ext/ruby_http_parser/vendor/http-parser-java/http_parser.h
-  - ext/ruby_http_parser/vendor/http-parser-java/LICENSE-MIT
-  - ext/ruby_http_parser/vendor/http-parser-java/Makefile
-  - ext/ruby_http_parser/vendor/http-parser-java/README.md
-  - ext/ruby_http_parser/vendor/http-parser-java/test.c
-  - ext/ruby_http_parser/vendor/http-parser-java/test_permutations
-  - ext/ruby_http_parser/vendor/http-parser-java/test_unit
-  - ext/ruby_http_parser/vendor/http-parser-java/tests.dumped
-  - ext/ruby_http_parser/vendor/http-parser-java/TODO
-  - ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/HTTPException.java
-  - ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/HTTPMethod.java
-  - ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/HTTPParser.java
-  - ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/ParserType.java
-  - ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/lolevel/HTTPCallback.java
-  - ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/lolevel/HTTPDataCallback.java
-  - ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/lolevel/HTTPErrorCallback.java
-  - ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/lolevel/HTTPParser.java
-  - ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/lolevel/ParserSettings.java
-  - ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/lolevel/Util.java
-  - ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/TestLoaderNG.java
-  - ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/UnitTest.java
-  - ext/ruby_http_parser/vendor/http-parser-java/tools/byte_constants.rb
-  - ext/ruby_http_parser/vendor/http-parser-java/tools/const_char.rb
-  - ext/ruby_http_parser/vendor/http-parser-java/tools/lowcase.rb
-  - ext/ruby_http_parser/vendor/http-parser-java/tools/parse_tests.rb
+- .gitignore
+- .gitmodules
+- Gemfile
+- Gemfile.lock
+- LICENSE-MIT
+- README.md
+- Rakefile
+- bench/thin.rb
+- ext/ruby_http_parser/.gitignore
+- ext/ruby_http_parser/RubyHttpParserService.java
+- ext/ruby_http_parser/ext_help.h
+- ext/ruby_http_parser/extconf.rb
+- ext/ruby_http_parser/org/ruby_http_parser/RubyHttpParser.java
+- ext/ruby_http_parser/ruby_http_parser.c
+- ext/ruby_http_parser/vendor/.gitkeep
+- 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
+- tasks/submodules.rake
+- ext/ruby_http_parser/vendor/http-parser/CONTRIBUTIONS
+- ext/ruby_http_parser/vendor/http-parser/http_parser.c
+- ext/ruby_http_parser/vendor/http-parser/http_parser.h
+- ext/ruby_http_parser/vendor/http-parser/LICENSE-MIT
+- ext/ruby_http_parser/vendor/http-parser/Makefile
+- ext/ruby_http_parser/vendor/http-parser/README.md
+- ext/ruby_http_parser/vendor/http-parser/test.c
+- ext/ruby_http_parser/vendor/http-parser-java/build.xml
+- ext/ruby_http_parser/vendor/http-parser-java/compile
+- ext/ruby_http_parser/vendor/http-parser-java/ext/primitives.jar
+- ext/ruby_http_parser/vendor/http-parser-java/http_parser.c
+- ext/ruby_http_parser/vendor/http-parser-java/http_parser.h
+- ext/ruby_http_parser/vendor/http-parser-java/LICENSE-MIT
+- ext/ruby_http_parser/vendor/http-parser-java/Makefile
+- ext/ruby_http_parser/vendor/http-parser-java/README.md
+- ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/HTTPCallback.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/HTTPDataCallback.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/HTTPErrorCallback.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/HTTPException.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/HTTPMethod.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/HTTPParser.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/lolevel/HTTPCallback.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/lolevel/HTTPDataCallback.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/lolevel/HTTPErrorCallback.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/lolevel/HTTPParser.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/lolevel/ParserSettings.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/ParserSettings.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/ParserType.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/Util.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/Message.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/Requests.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/Responses.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/Test.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/TestHeaderOverflowError.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/TestLoaderNG.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/TestNoOverflowLongBody.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/UnitTest.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/Upgrade.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/Util.java
+- ext/ruby_http_parser/vendor/http-parser-java/src/test/http_parser/lolevel/WrongContentLength.java
+- ext/ruby_http_parser/vendor/http-parser-java/test.c
+- ext/ruby_http_parser/vendor/http-parser-java/test_permutations
+- ext/ruby_http_parser/vendor/http-parser-java/test_unit
+- ext/ruby_http_parser/vendor/http-parser-java/test_utf8
+- ext/ruby_http_parser/vendor/http-parser-java/tests.dumped
+- ext/ruby_http_parser/vendor/http-parser-java/tests.utf8
+- ext/ruby_http_parser/vendor/http-parser-java/TODO
+- ext/ruby_http_parser/vendor/http-parser-java/tools/byte_constants.rb
+- ext/ruby_http_parser/vendor/http-parser-java/tools/const_char.rb
+- ext/ruby_http_parser/vendor/http-parser-java/tools/lowcase.rb
+- ext/ruby_http_parser/vendor/http-parser-java/tools/parse_tests.rb
 has_rdoc: true
 homepage: http://github.com/tmm1/http_parser.rb
 licenses: []
@@ -139,25 +179,29 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple callback-based HTTP request/response parser