goliath 1.0.4 → 1.0.5

data/spec/integration/jsonp_spec.rb

@@ -6,26 +6,77 @@ class JSON_API < Goliath::API
   use Goliath::Rack::Render, 'json'
 
   def response(env)
-    [200, {'CONTENT_TYPE' => 'application/json'}, "OK"]
+    headers = {
+      'CONTENT_TYPE' => 'application/json',
+      # Note: specifically not 'CONTENT_LENGTH'. 'Content-Length' gets set by
+      # AsyncRack::ContentLength if not already present. So if we set
+      # 'CONTENT_LENGTH', no problem - AsyncRack recalculates the body's
+      # content length anyway and stores it in the 'Content-Length' header. But
+      # if we set 'Content-Length', AsyncRack will avoid overwriting it. We
+      # thus want the JSONP middleware to react to the case where we've
+      # *already* set the 'Content-Length' header before hitting it.
+      'Content-Length' => '2',
+    }
+    [200, headers, 'OK']
   end
 end
 
 describe 'JSONP' do
   let(:err) { Proc.new { fail "API request failed" } }
 
-  it 'sets the content type' do
-    with_api(JSON_API) do
-      get_request({:query => {:callback => 'test'}}, err) do |c|
-        c.response_header['CONTENT_TYPE'].should =~ %r{^application/javascript}
+  context 'without a callback param' do
+    let(:query) { {} }
+
+    it 'does not alter the content type' do
+      with_api(JSON_API) do
+        get_request({ query: query }, err) do |c|
+          c.response_header['CONTENT_TYPE'].should =~ %r{^application/json}
+        end
+      end
+    end
+
+    it 'does not alter the content length' do
+      with_api(JSON_API) do
+        get_request({ query: query }, err) do |c|
+          c.response_header['CONTENT_LENGTH'].to_i.should == 2
+        end
+      end
+    end
+
+    it 'does not wrap the response with anything' do
+      with_api(JSON_API) do
+        get_request({ query: query }, err) do |c|
+          c.response.should == 'OK'
+        end
       end
     end
   end
 
-  it 'wraps response with callback' do
-    with_api(JSON_API) do
-      get_request({:query => {:callback => 'test'}}, err) do |c|
-        c.response.should =~ /^test\(.*\)$/
+  context 'with a callback param' do
+    let(:query) { { callback: 'test' } }
+
+    it 'adjusts the content type' do
+      with_api(JSON_API) do
+        get_request({ query: query }, err) do |c|
+          c.response_header['CONTENT_TYPE'].should =~ %r{^application/javascript}
+        end
+      end
+    end
+
+    it 'adjusts the content length' do
+      with_api(JSON_API) do
+        get_request({ query: query }, err) do |c|
+          c.response_header['CONTENT_LENGTH'].to_i.should == 8
+        end
+      end
+    end
+
+    it 'wraps response with callback' do
+      with_api(JSON_API) do
+        get_request({ query: query }, err) do |c|
+          c.response.should =~ /^test\(.*\)$/
+        end
       end
     end
   end
-end
+end

data/spec/integration/test_helper_spec.rb

@@ -11,7 +11,7 @@ describe "with_api" do
     with_api(DummyServer, :log_file => "test.log") do |api|
       get_request({},err)
     end
-    File.exist?("test.log").should be_true
+    File.exist?("test.log").should be_truthy
     File.unlink("test.log")
   end
 

data/spec/integration/valid_spec.rb

@@ -54,7 +54,7 @@ end
 
 class ValidationErrorInEndpoint < Goliath::API
   def response(env)
-    raise Goliath::Validation::Error.new(420, 'You Must Chill')
+    raise Goliath::Validation::Error.new(420, 'You Must Chill', {'Foo' => 'Bar'})
   end
 end
 
@@ -66,8 +66,28 @@ describe ValidationErrorInEndpoint do
       get_request({}, err) do |c|
         c.response.should == '[:error, "You Must Chill"]'
         c.response_header.status.should == 420
+        c.response_header["Foo"].should == 'Bar'
       end
     end
   end
 end
 
+class ValidationErrorWhileParsing < Goliath::API
+  def on_headers(env, headers)
+    raise Goliath::Validation::Error.new(420, 'You Must Chill', {'Foo' => 'Bar'})
+  end
+end
+
+describe ValidationErrorWhileParsing do
+  let(:err) { Proc.new { fail "API request failed" } }
+
+  it 'handles Goliath::Validation::Error correctly' do
+    with_api(ValidationErrorInEndpoint) do
+      get_request({}, err) do |c|
+        c.response.should == '[:error, "You Must Chill"]'
+        c.response_header.status.should == 420
+        c.response_header["Foo"].should == 'Bar'
+      end
+    end
+  end
+end

data/spec/unit/api_spec.rb

@@ -7,7 +7,7 @@ describe Goliath::API do
 
   describe "middlewares" do
     it "doesn't change after multi calls" do
-      2.times { DummyApi.should have(2).middlewares }
+      2.times { DummyApi.middlewares.size.should eq(2) }
     end
   end
 end

data/spec/unit/env_spec.rb

@@ -31,25 +31,25 @@ describe Goliath::Env do
   context '#respond_to?' do
     it 'returns true for items in the hash' do
       @env['test'] = 'true'
-      @env.respond_to?(:test).should be_true
+      @env.respond_to?(:test).should be true
     end
 
     it 'returns false for items not in hash' do
-      @env.respond_to?(:test).should be_false
+      @env.respond_to?(:test).should be false
     end
 
     it 'returns true for items in the config hash' do
       @env['config'] = {'test' => true}
-      @env.respond_to?(:test).should be_true
+      @env.respond_to?(:test).should be true
     end
 
     it 'returns false for items not in the config hash' do
       @env['config'] = {}
-      @env.respond_to?(:test).should be_false
+      @env.respond_to?(:test).should be false
     end
 
     it 'delegates if not found' do
-      @env.respond_to?(:[]).should be_true
+      @env.respond_to?(:[]).should be true
     end
   end
 end

data/spec/unit/headers_spec.rb

@@ -19,11 +19,11 @@ describe Goliath::Headers do
 
   it 'returns true if a key has been set' do
     @h['my_header'] = 'my_value'
-    @h.has_key?('my_header').should be_true
+    @h.has_key?('my_header').should be true
   end
 
   it 'returns false if the key has not been set' do
-    @h.has_key?('my_header').should be_false
+    @h.has_key?('my_header').should be false
   end
 
   it 'ignores nil values' do

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

@@ -13,11 +13,11 @@ describe Goliath::Rack::Formatters::JSON do
     end
 
     it 'checks content type for application/json' do
-      @js.json_response?({'Content-Type' => 'application/json'}).should be_true
+      @js.json_response?({'Content-Type' => 'application/json'}).should be_truthy
     end
 
     it 'returns false for non-applicaton/json types' do
-      @js.json_response?({'Content-Type' => 'application/xml'}).should be_false
+      @js.json_response?({'Content-Type' => 'application/xml'}).should be_falsey
     end
 
     it 'calls the app with the provided environment' do

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

@@ -14,11 +14,11 @@ describe Goliath::Rack::Formatters::XML do
     end
 
     it 'checks content type for application/xml' do
-      @xml.xml_response?({'Content-Type' => 'application/xml'}).should be_true
+      @xml.xml_response?({'Content-Type' => 'application/xml'}).should be_truthy
     end
 
     it 'returns false for non-applicaton/xml types' do
-      @xml.xml_response?({'Content-Type' => 'application/json'}).should be_false
+      @xml.xml_response?({'Content-Type' => 'application/json'}).should be_falsey
     end
 
     it 'calls the app with the provided environment' do

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

@@ -13,11 +13,11 @@ describe Goliath::Rack::Formatters::YAML do
     end
 
     it 'checks content type for text/yaml' do
-      @ym.yaml_response?({'Content-Type' => 'text/yaml'}).should be_true
+      @ym.yaml_response?({'Content-Type' => 'text/yaml'}).should be_truthy
     end
 
     it 'returns false for non-applicaton/yaml types' do
-      @ym.yaml_response?({'Content-Type' => 'application/xml'}).should be_false
+      @ym.yaml_response?({'Content-Type' => 'application/xml'}).should be_falsey
     end
 
     it 'calls the app with the provided environment' do

data/spec/unit/rack/params_spec.rb

@@ -21,6 +21,13 @@ describe Goliath::Rack::Params do
       }.to raise_error(Goliath::Validation::BadRequestError)
     end
 
+    it 'handles ambiguous query strings' do
+      @env['QUERY_STRING'] = 'ambiguous[]=&ambiguous[4]='
+      expect {
+        @params.retrieve_params(@env)
+      }.to raise_error(Goliath::Validation::Error)
+    end
+
     it 'parses the query string' do
       @env['QUERY_STRING'] = 'foo=bar&baz=bonkey'
 
@@ -51,7 +58,7 @@ describe Goliath::Rack::Params do
       @env['QUERY_STRING'] = 'foo[]=bar&foo[]=baz&foo[]=foos'
 
       ret = @params.retrieve_params(@env)
-      ret['foo'].is_a?(Array).should be_true
+      ret['foo'].is_a?(Array).should be true
       ret['foo'].length.should == 3
       ret['foo'].should == %w(bar baz foos)
     end
@@ -91,7 +98,7 @@ Berry\r
 
     it 'handles empty query and post body' do
       ret = @params.retrieve_params(@env)
-      ret.is_a?(Hash).should be_true
+      ret.is_a?(Hash).should be true
       ret.should be_empty
     end
 
@@ -108,10 +115,7 @@ Berry\r
     end
 
     it 'sets the params into the environment' do
-      @app.should_receive(:call).with do |app_env|
-        app_env.has_key?('params').should be_true
-        app_env['params']['a'].should == 'b'
-      end
+      @app.should receive(:call).with(hash_including("params"=>{"a"=>"b"}))
 
       @env['QUERY_STRING'] = "a=b"
       @params.call(@env)
@@ -128,6 +132,37 @@ Berry\r
       body.should == app_body
     end
 
+    it 'returns a validation error if one is raised while parsing' do
+      expect(@app).to_not receive(:call)
+      params_exception = Goliath::Validation::Error.new(423, 'invalid')
+      expect(@params).to receive(:retrieve_params).and_raise(params_exception)
+      status, headers, body = @params.call(@env)
+      expect(status).to eq 423
+      expect(headers).to eq({})
+      expect(body).to eq(error: 'invalid')
+    end
+
+    it 'returns a 500 error if an unexpected error is raised while parsing' do
+      expect(@app).to_not receive(:call)
+
+      params_exception = Exception.new('uh oh')
+      expect(@params).to receive(:retrieve_params).and_raise(params_exception)
+
+      logger = double('logger').as_null_object
+      expect(@env).to receive(:logger).twice.and_return(logger)
+
+      status, headers, body = @params.call(@env)
+      expect(status).to eq 500
+      expect(headers).to eq({})
+      expect(body).to eq(error: 'uh oh')
+    end
+
+    it 'does not swallow exceptions from the app' do
+      app_exception = Class.new(Exception)
+      expect(@app).to receive(:call).and_raise(app_exception)
+      expect { @params.call(@env) }.to raise_error(app_exception)
+    end
+
     context 'content type' do
       it "parses application/x-www-form-urlencoded" do
         @env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded; charset=utf-8'

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

@@ -8,11 +8,11 @@ describe Goliath::Rack::Validation::DefaultParams do
   end
 
   it 'requires defaults to be set' do
-    lambda { Goliath::Rack::Validation::DefaultParams.new('my app', {:key => 'test'}) }.should raise_error
+    lambda { Goliath::Rack::Validation::DefaultParams.new('my app', {:key => 'test'}) }.should raise_error('Must provide defaults to DefaultParams')
   end
 
   it 'requires key to be set' do
-    lambda { Goliath::Rack::Validation::DefaultParams.new('my app', {:defaults => 'test'}) }.should raise_error
+    lambda { Goliath::Rack::Validation::DefaultParams.new('my app', {:defaults => 'test'}) }.should raise_error('must provide key to DefaultParams')
   end
 
   describe 'with middleware' do

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

@@ -66,11 +66,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
+    lambda { Goliath::Rack::Validation::NumericRange.new('app', {:min => 5}) }.should raise_error('NumericRange key required')
   end
 
   it 'raises error if neither min nor max set' do
-    lambda { Goliath::Rack::Validation::NumericRange.new('app', {:key => 5}) }.should raise_error
+    lambda { Goliath::Rack::Validation::NumericRange.new('app', {:key => 5}) }.should raise_error('NumericRange requires :min or :max')
   end
 
   it 'uses min if default not set' do

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

@@ -10,7 +10,7 @@ describe Goliath::Rack::Validation::Param do
   it "should not allow invalid options" do
     lambda {
       Goliath::Rack::Validation::Param.new(@app, {:key => 'user', :as => Class.new})
-    }.should raise_error
+    }.should raise_error(Exception)
   end
 
   it "raises if key is not supplied" do
@@ -21,7 +21,7 @@ describe Goliath::Rack::Validation::Param do
 
   it "uses a default value if optional is not supplied" do
     cv = Goliath::Rack::Validation::Param.new(@app, :key => 'key')
-    cv.optional.should be_false
+    cv.optional.should be false
   end
 
   it "should have default and message be optional" do
@@ -40,7 +40,7 @@ describe Goliath::Rack::Validation::Param do
     lambda {
       cv = Goliath::Rack::Validation::Param.new(@app, {:key => 'flag',
           :as => Goliath::Rack::Types::Boolean, :animal => :monkey})
-    }.should raise_error
+    }.should raise_error('Unknown options: {:animal=>:monkey}')
   end
 
   context "fetch_key" do
@@ -127,52 +127,52 @@ describe Goliath::Rack::Validation::Param do
 
       context 'key_valid?' do
         it 'raises exception if the key is not provided' do
-          @rp.key_valid?(@env['params']).should be_false
+          @rp.key_valid?(@env['params']).should be false
         end
 
         it 'raises exception if the key is blank' do
           @env['params']['mk'] = ''
-          @rp.key_valid?(@env['params']).should be_false
+          @rp.key_valid?(@env['params']).should be false
         end
 
         it 'raises exception if the key is nil' do
           @env['params']['mk'] = nil
-          @rp.key_valid?(@env['params']).should be_false
+          @rp.key_valid?(@env['params']).should be false
         end
 
         it 'handles an empty array' do
           @env['params']['mk'] = []
-          @rp.key_valid?(@env['params']).should be_false
+          @rp.key_valid?(@env['params']).should be false
         end
 
         it 'handles an array of nils' do
           @env['params']['mk'] = [nil, nil, nil]
-          @rp.key_valid?(@env['params']).should be_false
+          @rp.key_valid?(@env['params']).should be false
         end
 
         it 'handles an array of blanks' do
           @env['params']['mk'] = ['', '', '']
-          @rp.key_valid?(@env['params']).should be_false
+          @rp.key_valid?(@env['params']).should be false
         end
 
         it "doesn't raise if the key provided" do
           @env['params']['mk'] = 'my value'
-          @rp.key_valid?(@env['params']).should be_true
+          @rp.key_valid?(@env['params']).should be true
         end
 
         it "doesn't raise if the array contains valid data" do
           @env['params']['mk'] = [1, 2, 3, 4]
-          @rp.key_valid?(@env['params']).should be_true
+          @rp.key_valid?(@env['params']).should be true
         end
 
         it "doesn't raise if the key provided is multiline and has blanks" do
           @env['params']['mk'] = "my\n  \nvalue"
-          @rp.key_valid?(@env['params']).should be_true
+          @rp.key_valid?(@env['params']).should be true
         end
 
         it "doesn't raise if the key provided is an array and contains multiline with blanks" do
           @env['params']['mk'] = ["my\n  \nvalue", "my\n  \nother\n  \nvalue"]
-          @rp.key_valid?(@env['params']).should be_true
+          @rp.key_valid?(@env['params']).should be true
         end
       end
     end
@@ -194,7 +194,7 @@ describe Goliath::Rack::Validation::Param do
         }
         }
 
-        @rp.key_valid?(@env['params']).should be_false
+        @rp.key_valid?(@env['params']).should be false
       end
 
       it "return true if key is present" do
@@ -205,7 +205,7 @@ describe Goliath::Rack::Validation::Param do
         }
         }
 
-        @rp.key_valid?(@env['params']).should be_true
+        @rp.key_valid?(@env['params']).should be true
       end
     end
 
@@ -225,7 +225,7 @@ describe Goliath::Rack::Validation::Param do
         }
         }
 
-        @rp.key_valid?(@env['params']).should be_false
+        @rp.key_valid?(@env['params']).should be false
       end
 
       it "return true if key is present" do
@@ -236,7 +236,7 @@ describe Goliath::Rack::Validation::Param do
         }
         }
 
-        @rp.key_valid?(@env['params']).should be_true
+        @rp.key_valid?(@env['params']).should be true
       end
     end
 
@@ -247,7 +247,7 @@ describe Goliath::Rack::Validation::Param do
     it "should only accept a class in the :as" do
       lambda {
         Goliath::Rack::Validation::Param.new(@app, {:key => 'user', :as => "not a class"})
-      }.should raise_error
+      }.should raise_error('Params as must be a class')
     end
 
     context 'with middleware' do