goliath 0.9.0 → 0.9.1

data/spec/unit/rack/formatters/xml_spec.rb

@@ -4,7 +4,7 @@ require 'nokogiri'
 
 describe Goliath::Rack::Formatters::XML do
   it 'accepts an app' do
-    lambda { Goliath::Rack::Formatters::XML.new('my app') }.should_not raise_error Exception
+    lambda { Goliath::Rack::Formatters::XML.new('my app') }.should_not raise_error
   end
 
   describe 'with a formatter' do
@@ -31,7 +31,7 @@ describe Goliath::Rack::Formatters::XML do
       @app.should_receive(:call).and_return([200, {'Content-Type' => 'application/xml'}, {:a => 1, :b => 2}])
 
       status, header, body = @xml.call({})
-      lambda { Nokogiri.parse(body.first).search('a').inner_text.should == '1' }.should_not raise_error Exception
+      lambda { Nokogiri.parse(body.first).search('a').inner_text.should == '1' }.should_not raise_error
     end
 
     it 'generates arrays correctly' do
@@ -42,7 +42,7 @@ describe Goliath::Rack::Formatters::XML do
         doc = Nokogiri.parse(body.first)
         doc.search('item').first.inner_text.should == '1'
         doc.search('item').last.inner_text.should == '2'
-      }.should_not raise_error Exception
+      }.should_not raise_error
     end
 
     it "doesn't format to xml if the type is not application/xml" do

data/spec/unit/rack/heartbeat_spec.rb

@@ -4,7 +4,7 @@ require 'goliath/env'
 
 describe Goliath::Rack::Heartbeat do
   it 'accepts an app' do
-    lambda { Goliath::Rack::Heartbeat.new('my app') }.should_not raise_error(Exception)
+    lambda { Goliath::Rack::Heartbeat.new('my app') }.should_not raise_error
   end
 
   describe 'with the middleware' do

data/spec/unit/rack/params_spec.rb

@@ -3,13 +3,14 @@ require 'goliath/rack/params'
 
 describe Goliath::Rack::Params do
   it 'accepts an app' do
-    lambda { Goliath::Rack::Params.new('my app') }.should_not raise_error(Exception)
+    lambda { Goliath::Rack::Params.new('my app') }.should_not raise_error
   end
 
   describe 'with middleware' do
     before(:each) do
       @app = mock('app').as_null_object
       @env = {}
+      @env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded; charset=utf-8'
       @params = Goliath::Rack::Params.new(@app)
     end
 
@@ -21,18 +22,26 @@ describe Goliath::Rack::Params do
       ret['baz'].should == 'bonkey'
     end
 
+    it 'parses the nested query string' do
+      @env['QUERY_STRING'] = 'foo[bar]=baz'
+
+      ret = @params.retrieve_params(@env)
+      ret['foo'].should == {'bar' => 'baz'}
+    end
+
     it 'parses the post body' do
       @env['rack.input'] = StringIO.new
-      @env['rack.input'] << "foo=bar&baz=bonkey"
+      @env['rack.input'] << "foo=bar&baz=bonkey&zonk[donk]=monk"
       @env['rack.input'].rewind
 
       ret = @params.retrieve_params(@env)
       ret['foo'].should == 'bar'
       ret['baz'].should == 'bonkey'
+      ret['zonk'].should == {'donk' => 'monk'}
     end
 
     it 'parses arrays of data' do
-      @env['QUERY_STRING'] = 'foo=bar&foo=baz&foo=foos'
+      @env['QUERY_STRING'] = 'foo[]=bar&foo[]=baz&foo[]=foos'
 
       ret = @params.retrieve_params(@env)
       ret['foo'].is_a?(Array).should be_true
@@ -40,6 +49,27 @@ describe Goliath::Rack::Params do
       ret['foo'].should == %w(bar baz foos)
     end
 
+    it 'parses multipart data' do
+      @env[Goliath::Constants::CONTENT_TYPE] = 'multipart/boundary="AaB03x"'
+      @env['rack.input'] = StringIO.new
+      @env['rack.input'] <<"--AaB03x\r
+Content-Disposition: form-data; name=\"submit-name\"\r
+\r
+Larry\r
+--AaB03x\r
+Content-Disposition: form-data; name=\"submit-name-with-content\"\r
+\r
+Berry\r
+--AaB03x--\r
+"
+
+      @env[Goliath::Constants::CONTENT_LENGTH] = @env['rack.input'].length
+
+      ret = @params.retrieve_params(@env)
+      ret['submit-name'].should == 'Larry'
+      ret['submit-name-with-content'].should == 'Berry'
+    end
+
     it 'combines query string and post body params' do
       @env['QUERY_STRING'] = "baz=bar"
 
@@ -90,5 +120,38 @@ describe Goliath::Rack::Params do
       headers.should == app_headers
       body.should == app_body
     end
+
+    context 'content type' do
+      it "parses application/x-www-form-urlencoded" do
+        @env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded; charset=utf-8'
+        @env['rack.input'] = StringIO.new
+        @env['rack.input'] << "foos=bonkey"
+        @env['rack.input'].rewind
+
+        ret = @params.retrieve_params(@env)
+        ret['foos'].should == 'bonkey'
+      end
+
+      it "parses json" do
+        @env['CONTENT_TYPE'] = 'application/json'
+        @env['rack.input'] = StringIO.new
+        @env['rack.input'] << %|{"foo":"bar"}|
+        @env['rack.input'].rewind
+
+        ret = @params.retrieve_params(@env)
+        ret['foo'].should == 'bar'
+      end
+
+
+      it "doesn't parse unknown content types" do
+        @env['CONTENT_TYPE'] = 'fake/form -- type'
+        @env['rack.input'] = StringIO.new
+        @env['rack.input'] << %|{"foo":"bar"}|
+        @env['rack.input'].rewind
+
+        ret = @params.retrieve_params(@env)
+        ret.should == {}
+      end
+    end
   end
 end

data/spec/unit/rack/render_spec.rb

@@ -13,7 +13,7 @@ describe Goliath::Rack::Render do
   let(:render) { Goliath::Rack::Render.new(app) }
 
   it 'accepts an app' do
-    lambda { Goliath::Rack::Render.new('my app') }.should_not raise_error(Exception)
+    lambda { Goliath::Rack::Render.new('my app') }.should_not raise_error
   end
 
   it 'returns the status, body and app headers' do

data/spec/unit/rack/validation/default_params_spec.rb

@@ -4,15 +4,15 @@ require 'goliath/rack/validation/default_params'
 describe Goliath::Rack::Validation::DefaultParams do
   it 'accepts an app' do
     opts = {:defaults => ['title'], :key => 'fields'}
-    lambda { Goliath::Rack::Validation::DefaultParams.new('my app', opts) }.should_not raise_error(Exception)
+    lambda { Goliath::Rack::Validation::DefaultParams.new('my app', opts) }.should_not raise_error
   end
 
   it 'requires defaults to be set' do
-    lambda { Goliath::Rack::Validation::DefaultParams.new('my app', {:key => 'test'}) }.should raise_error(Exception)
+    lambda { Goliath::Rack::Validation::DefaultParams.new('my app', {:key => 'test'}) }.should raise_error
   end
 
   it 'requires key to be set' do
-    lambda { Goliath::Rack::Validation::DefaultParams.new('my app', {:defaults => 'test'}) }.should raise_error(Exception)
+    lambda { Goliath::Rack::Validation::DefaultParams.new('my app', {:defaults => 'test'}) }.should raise_error
   end
 
   describe 'with middleware' do

data/spec/unit/rack/validation/numeric_range_spec.rb

@@ -9,7 +9,7 @@ describe Goliath::Rack::Validation::NumericRange do
 
   it 'accepts options on create' do
     opts = { :min => 1, :key => 2 }
-    lambda { Goliath::Rack::Validation::NumericRange.new('my app', opts) }.should_not raise_error(Exception)
+    lambda { Goliath::Rack::Validation::NumericRange.new('my app', opts) }.should_not raise_error
   end
 
   describe 'with middleware' do
@@ -59,11 +59,11 @@ describe Goliath::Rack::Validation::NumericRange do
   end
 
   it 'raises error if key is not set' do
-    lambda { Goliath::Rack::Validation::NumericRange.new('app', {:min => 5}) }.should raise_error(Exception)
+    lambda { Goliath::Rack::Validation::NumericRange.new('app', {:min => 5}) }.should raise_error
   end
 
   it 'raises error if neither min nor max set' do
-    lambda { Goliath::Rack::Validation::NumericRange.new('app', {:key => 5}) }.should raise_error(Exception)
+    lambda { Goliath::Rack::Validation::NumericRange.new('app', {:key => 5}) }.should raise_error
   end
 
   it 'uses min if default not set' do

data/spec/unit/rack/validation/request_method_spec.rb

@@ -7,7 +7,7 @@ describe Goliath::Rack::Validation::RequestMethod do
   end
 
   it 'accepts an app' do
-    lambda { Goliath::Rack::Validation::RequestMethod.new('my app') }.should_not raise_error(Exception)
+    lambda { Goliath::Rack::Validation::RequestMethod.new('my app') }.should_not raise_error
   end
 
   describe 'with defaults' do

data/spec/unit/rack/validation/required_param_spec.rb

@@ -3,12 +3,12 @@ require 'goliath/rack/validation/required_param'
 
 describe Goliath::Rack::Validation::RequiredParam do
   it 'accepts an app' do
-    lambda { Goliath::Rack::Validation::RequiredParam.new('my app') }.should_not raise_error(Exception)
+    lambda { Goliath::Rack::Validation::RequiredParam.new('my app') }.should_not raise_error
   end
 
   it 'accepts options on create' do
     opts = { :type => 1, :key => 2 }
-    lambda { Goliath::Rack::Validation::RequiredParam.new('my app', opts) }.should_not raise_error(Exception)
+    lambda { Goliath::Rack::Validation::RequiredParam.new('my app', opts) }.should_not raise_error
   end
 
   it 'defaults type and key' do

data/spec/unit/rack/validation/required_value_spec.rb

@@ -3,12 +3,12 @@ require 'goliath/rack/validation/required_value'
 
 describe Goliath::Rack::Validation::RequiredValue do
   it 'accepts an app' do
-    lambda { Goliath::Rack::Validation::RequiredValue.new('my app') }.should_not raise_error(Exception)
+    lambda { Goliath::Rack::Validation::RequiredValue.new('my app') }.should_not raise_error
   end
 
   it 'accepts options on create' do
     opts = { :key => 2, :values => ["foo", "bar"] }
-    lambda { Goliath::Rack::Validation::RequiredValue.new('my app', opts) }.should_not raise_error(Exception)
+    lambda { Goliath::Rack::Validation::RequiredValue.new('my app', opts) }.should_not raise_error
   end
 
 

data/spec/unit/rack/validation_error_spec.rb

@@ -3,7 +3,7 @@ require 'goliath/rack/validation_error'
 
 describe Goliath::Rack::ValidationError do
   it 'accepts an app' do
-    lambda { Goliath::Rack::ValidationError.new('my app') }.should_not raise_error(Exception)
+    lambda { Goliath::Rack::ValidationError.new('my app') }.should_not raise_error
   end
 
   describe 'with middleware' do

data/spec/unit/request_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe Goliath::Request do
   before(:each) do
-
     app = mock('app').as_null_object
     env = Goliath::Env.new
 
@@ -10,7 +9,6 @@ describe Goliath::Request do
   end
 
   describe 'initialization' do
-
     it 'initializes env defaults' do
       env = Goliath::Env.new
       env['INIT'] = 'init'
@@ -29,7 +27,6 @@ describe Goliath::Request do
   end
 
   describe 'process' do
-
     it 'executes the application' do
       app_mock = mock('app').as_null_object
       env_mock = mock('app').as_null_object
@@ -40,7 +37,6 @@ describe Goliath::Request do
 
       request.process
     end
-
   end
 
   describe 'finished?' do
@@ -54,6 +50,29 @@ describe Goliath::Request do
 
       @r.finished?.should be_true
     end
+  end
+
+  describe 'parse_headers' do
+    it 'sets content_type correctly' do
+      parser = mock('parser').as_null_object
 
+      @r.parse_header({'Content-Type' => 'text/plain'}, parser)
+      @r.env['CONTENT_TYPE'].should == 'text/plain'
+    end
+
+    it 'sets content_length correctly' do
+      parser = mock('parser').as_null_object
+
+      @r.parse_header({'Content-Length' => 42}, parser)
+      @r.env['CONTENT_LENGTH'].should == 42
+    end
+
+    it 'sets server_name and server_port correctly' do
+      parser = mock('parser').as_null_object
+
+      @r.parse_header({'Host' => 'myhost.com:3000'}, parser)
+      @r.env['SERVER_NAME'].should == 'myhost.com'
+      @r.env['SERVER_PORT'].should == '3000'
+    end
   end
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: goliath
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 0
-  version: 0.9.0
+  prerelease: 
+  version: 0.9.1
 platform: ruby
 authors: 
 - dan sinclair
@@ -15,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 -05:00
+date: 2011-04-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +22,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        - beta
-        - 1
         version: 1.0.0.beta.1
   type: :runtime
   version_requirements: *id001
@@ -43,12 +33,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
-        - beta
-        - 1
         version: 0.3.0.beta.1
   type: :runtime
   version_requirements: *id002
@@ -60,8 +44,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -73,8 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -86,9 +66,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: 1.2.2
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -99,8 +77,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id006
@@ -112,8 +88,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id007
@@ -125,8 +99,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id008
@@ -138,8 +110,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id009
@@ -151,9 +121,6 @@ dependencies:
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
         version: "2.0"
   type: :development
   version_requirements: *id010
@@ -165,8 +132,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id011
@@ -178,12 +143,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        - beta
-        - 1
         version: 1.0.0.beta.1
   type: :development
   version_requirements: *id012
@@ -195,8 +154,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id013
@@ -208,8 +165,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id014
@@ -221,37 +176,53 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: multipart_body
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: bluecloth
+  name: amqp
   prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: 0.7.1
   type: :development
   version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
+  name: bluecloth
+  prerelease: false
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id019
 description: Framework for writing API servers
 email: 
 - dj2@everburning.com
@@ -263,6 +234,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gemtest
 - .gitignore
 - .rspec
 - .yardopts
@@ -275,9 +247,11 @@ files:
 - examples/async_upload.rb
 - examples/conf_test.rb
 - examples/config/conf_test.rb
+- examples/config/content_stream.rb
 - examples/config/echo.rb
 - examples/config/http_log.rb
 - examples/config/shared.rb
+- examples/content_stream.rb
 - examples/custom_server.rb
 - examples/echo.rb
 - examples/gziped.rb
@@ -322,8 +296,11 @@ files:
 - lib/goliath/version.rb
 - spec/integration/async_request_processing.rb
 - spec/integration/echo_spec.rb
+- spec/integration/empty_body_spec.rb
+- spec/integration/http_log_spec.rb
 - spec/integration/keepalive_spec.rb
 - spec/integration/pipelining_spec.rb
+- spec/integration/reloader_spec.rb
 - spec/integration/valid_spec.rb
 - spec/spec_helper.rb
 - spec/unit/connection_spec.rb
@@ -360,31 +337,28 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 2
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Framework for writing API servers
 test_files: 
 - spec/integration/async_request_processing.rb
 - spec/integration/echo_spec.rb
+- spec/integration/empty_body_spec.rb
+- spec/integration/http_log_spec.rb
 - spec/integration/keepalive_spec.rb
 - spec/integration/pipelining_spec.rb
+- spec/integration/reloader_spec.rb
 - spec/integration/valid_spec.rb
 - spec/spec_helper.rb
 - spec/unit/connection_spec.rb