goliath 0.9.4 → 1.0.0.beta.1

data/spec/integration/keepalive_spec.rb

@@ -9,13 +9,13 @@ describe 'HTTP Keep-Alive support' do
 
       r1.errback { fail }
       r1.callback do |c|
-        b = Yajl::Parser.parse(c.response)
+        b = MultiJson.load(c.response)
         b['response'].should == 'test'
 
         r2 = conn.get(:query => {:echo => 'test2'})
         r2.errback { fail }
         r2.callback do |c|
-          b = Yajl::Parser.parse(c.response)
+          b = MultiJson.load(c.response)
           b['response'].should == 'test2'
 
           stop

data/spec/integration/template_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 require File.join(File.dirname(__FILE__), '../../', 'examples/template')
 
-
 describe Template do
-
   def config_file
     File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'examples', 'config', 'template.rb'))
   end
@@ -11,18 +9,25 @@ describe Template do
   let(:api_options) { { :config => config_file } }
 
   it 'renders haml template with default haml layout' do
-    
     with_api(Template, api_options) do
-      get_request do |c|
+      get_request(:path => '/root') do |c|
         c.response.should =~ %r{<li><a href="/joke">Tell me a joke</a></li>}
       end
     end
   end
 
+  it 'renders haml template from string with default haml layout' do
+    with_api(Template, api_options) do
+      get_request(:path => '/haml_str') do |c|
+        c.response.should =~ %r{<h1>Header</h1>}
+      end
+    end
+  end
+
   it 'renders a markdown template with default haml layout' do
     with_api(Template, api_options) do
       get_request(:path => '/joke') do |c|
-        c.response.should =~ %r{<code>"Arr, I dunno matey -- but it's drivin' me nuts!"\s*</code>}m
+        c.response.should =~ %r{<code>Arr, I dunno matey -- but it is driving me nuts!\s*</code>}m
       end
     end
   end

data/spec/integration/test_helper_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+class DummyServer < Goliath::API
+
+end
+
+describe "with_api" do
+ let(:err) { Proc.new { fail "API request failed" } }
+
+  it "should log in file if requested" do
+    with_api(DummyServer, :log_file => "test.log") do |api|
+      get_request({},err)
+    end
+    File.exist?("test.log").should be_true
+    File.unlink("test.log")
+  end
+
+  it "should log on console if requested" do
+    with_api(DummyServer, {:log_stdout => true }) do |api|
+      api.logger.outputters.select {|o| o.is_a? Log4r::StdoutOutputter}.should_not be_empty
+      EM.stop
+    end
+  end
+
+  it "should be verbose if asked" do
+    with_api(DummyServer, {:verbose => true, :log_stdout => true }) do |api|
+      api.logger.level.should == Log4r::DEBUG
+      EM.stop
+    end
+
+  end
+
+end

data/spec/integration/valid_spec.rb

@@ -1,12 +1,42 @@
 require 'spec_helper'
 require 'json'
-require File.join(File.dirname(__FILE__), '../../', 'examples/valid')
 
-describe Valid do
+class ValidSingleParam < Goliath::API
+  use Goliath::Rack::Params
+  use Goliath::Rack::Validation::RequiredParam, {:key => 'test'}
+
+  # If you are using Golaith version <=0.9.1 you need to use Goliath::Rack::ValidationError
+  # to prevent the request from remaining open after an error occurs
+  #use Goliath::Rack::ValidationError
+
+  def response(env)
+    [200, {}, 'OK']
+  end
+end
+
+
+class ValidNestedParams < Goliath::API
+  use Goliath::Rack::Params
+
+  # For this validation to pass you need to have this as parameter (json body here)
+  # {
+  #   'data' : {
+  #     'login' : 'my_login'
+  #   }
+  # }
+  #
+  use Goliath::Rack::Validation::RequiredParam, :key => %w(data login)
+
+  def response(env)
+    [200, {}, 'OK']
+  end
+end
+
+describe ValidSingleParam do
   let(:err) { Proc.new { fail "API request failed" } }
 
   it 'returns OK with param' do
-    with_api(Valid) do
+    with_api(ValidSingleParam) do
       get_request({:query => {:test => 'test'}}, err) do |c|
         c.response.should == 'OK'
       end
@@ -14,9 +44,9 @@ describe Valid do
   end
 
   it 'returns error without param' do
-    with_api(Valid) do
+    with_api(ValidSingleParam) do
       get_request({}, err) do |c|
-        c.response.should == '[:error, "Test identifier missing"]'
+        c.response.should == '[:error, "test identifier missing"]'
       end
     end
   end

data/spec/integration/websocket_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+require File.join(File.dirname(__FILE__), '../../', 'lib/goliath/test_helper_ws')
+require File.join(File.dirname(__FILE__), '../../', 'lib/goliath')
+require File.join(File.dirname(__FILE__), '../../', 'lib/goliath/websocket')
+
+class WebSocketEndPoint < Goliath::WebSocket
+  def on_open(env)
+  end
+
+  def on_error(env, error)
+    env.logger.error error
+  end
+
+  def on_message(env, msg)
+    env.stream_send(msg)
+  end
+
+  def on_close(env)
+  end
+end
+
+describe "WebSocket" do
+  include Goliath::TestHelper
+
+  let(:err) { Proc.new { |c| fail "HTTP Request failed #{c.response}" } }
+
+  it "should accept connection" do
+    with_api(WebSocketEndPoint, {:verbose => true, :log_stdout => true}) do |server|
+      WebSocketEndPoint.any_instance.should_receive(:on_open)
+      ws_client_connect('/ws')
+    end
+  end
+
+  it "should accept traffic" do
+    with_api(WebSocketEndPoint, {:verbose => true, :log_stdout => true}) do |server|
+      ws_client_connect('/ws') do |client|
+        client.send "hello"
+        client.receive.should == "hello"
+      end
+    end
+  end
+end
+
+

data/spec/unit/api_spec.rb

@@ -5,26 +5,9 @@ describe Goliath::API do
 
   DummyApi = Class.new(Goliath::API)
 
-  describe 'middlewares' do
+  describe "middlewares" do
     it "doesn't change after multi calls" do
-      2.times { Goliath::API.should have(2).middlewares }
+      2.times { DummyApi.should have(2).middlewares }
     end
   end
-
-  describe ".maps?" do
-    context "when not using maps" do
-      it "returns false" do
-        DummyApi.maps?.should be_false
-      end
-    end
-
-    context "when using maps" do
-      it "returns true" do
-        DummyApi.map "/foo"
-        DummyApi.maps?.should be_true
-      end
-    end
-  end
-
-
 end

data/spec/unit/connection_spec.rb

@@ -43,7 +43,10 @@ describe Goliath::Connection do
       request_mock = mock("parser").as_null_object
       request_mock.should_receive(:<<)
 
+      current_mock = mock("current").as_null_object
+
       @c.instance_variable_set("@parser", request_mock)
+      @c.instance_variable_set("@current", current_mock)
       @c.receive_data('more_data')
     end
 

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

@@ -30,13 +30,13 @@ describe Goliath::Rack::Formatters::JSON do
       @app.should_receive(:call).and_return([200, {'Content-Type' => 'application/json'}, {:a => 1, :b => 2}])
 
       status, header, body = @js.call({})
-      lambda { Yajl::Parser.parse(body.first)['a'].should == 1 }.should_not raise_error
+      lambda { MultiJson.load(body.first)['a'].should == 1 }.should_not raise_error
     end
 
     it "doesn't format to json if the type is not application/json" do
       @app.should_receive(:call).and_return([200, {'Content-Type' => 'application/xml'}, {:a => 1, :b => 2}])
 
-      Yajl::Parser.should_not_receive(:encode)
+      MultiJson.should_not_receive(:dump)
       status, header, body = @js.call({})
       body[:a].should == 1
     end
@@ -44,7 +44,7 @@ describe Goliath::Rack::Formatters::JSON do
     it 'returns the status and headers' do
       @app.should_receive(:call).and_return([200, {'Content-Type' => 'application/xml'}, {:a => 1, :b => 2}])
 
-      Yajl::Parser.should_not_receive(:encode)
+      MultiJson.should_not_receive(:dump)
       status, header, body = @js.call({})
       status.should == 200
       header.should == {'Content-Type' => 'application/xml'}

data/spec/unit/rack/heartbeat_spec.rb

@@ -52,6 +52,19 @@ describe Goliath::Rack::Heartbeat do
       headers.should == {}
       body.should == nil
     end
+
+    it 'does not log the request by default' do
+      @env['PATH_INFO'] = '/status'
+      @hb.call(@env)
+      @env[Goliath::Constants::RACK_LOGGER].should == Log4r::Logger.root
+    end
+
+    it 'logs the request only if asked' do
+      @env['PATH_INFO'] = '/status'
+      @hb = Goliath::Rack::Heartbeat.new(@app, :log => true)
+      @hb.call(@env)
+      @env[Goliath::Constants::RACK_LOGGER].should_not == Log4r::Logger.root
+    end
   end
 end
 

data/spec/unit/rack/params_spec.rb

@@ -19,7 +19,6 @@ describe Goliath::Rack::Params do
 
       ret = @params.retrieve_params(@env)
       ret['foo'].should == 'bar'
-      ret[:foo].should == 'bar'
       ret['baz'].should == 'bonkey'
     end
 
@@ -39,8 +38,6 @@ describe Goliath::Rack::Params do
       ret['foo'].should == 'bar'
       ret['baz'].should == 'bonkey'
       ret['zonk'].should == {'donk' => 'monk'}
-      ret[:zonk].should == {'donk' => 'monk'}
-      ret[:zonk][:donk].should == 'monk'
     end
 
     it 'parses arrays of data' do
@@ -50,7 +47,6 @@ describe Goliath::Rack::Params do
       ret['foo'].is_a?(Array).should be_true
       ret['foo'].length.should == 3
       ret['foo'].should == %w(bar baz foos)
-      ret[:foo].should == %w(bar baz foos)
     end
 
     it 'parses multipart data' do
@@ -71,7 +67,6 @@ Berry\r
 
       ret = @params.retrieve_params(@env)
       ret['submit-name'].should == 'Larry'
-      ret[:"submit-name"].should == 'Larry'
       ret['submit-name-with-content'].should == 'Berry'
     end
 
@@ -145,13 +140,12 @@ Berry\r
 
         ret = @params.retrieve_params(@env)
         ret['foo'].should == 'bar'
-        ret[:foo].should == 'bar'
       end
-      
+
       it "handles empty input gracefully on JSON" do
         @env['CONTENT_TYPE'] = 'application/json'
         @env['rack.input'] = StringIO.new
-        
+
         ret = @params.retrieve_params(@env)
         ret.should be_empty
       end