jetty-rails 0.5 → 0.6

data/spec/jetty_merb_spec.rb

@@ -52,6 +52,23 @@ describe "binary executable with no command line arguments" do
     load File.dirname(__FILE__) + '/../bin/jetty_merb'
   end
   
+  it "should not set classes dir by default" do
+    runner = mock("runner", :null_object => true)
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should_not have_key(:classes_dir)
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_merb'
+  end
+  
+  it "should not set lib dir by default" do
+    runner = mock("runner", :null_object => true)
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should_not have_key(:lib_dir)
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_merb'
+  end
 end
 
 describe "binary executable with command line arguments" do
@@ -139,4 +156,40 @@ describe "binary executable with command line arguments" do
     load File.dirname(__FILE__) + '/../bin/jetty_merb'
   end
   
+  it "should take --classes command line option as custom classes dir" do
+    ARGV[0] = '--classes'
+    ARGV[1] = 'build/java/classes'
+    runner = mock("runner", :null_object => true)
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should have_key(:classes_dir)
+      config[:classes_dir].should == 'build/java/classes'
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_merb'
+  end
+  
+  it "should take --lib command line option as custom jars dir" do
+    ARGV[0] = '--lib'
+    ARGV[1] = 'java/jars'
+    runner = mock("runner", :null_object => true)
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should have_key(:lib_dir)
+      config[:lib_dir].should == 'java/jars'
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_merb'
+  end
+    
+  it "should take --jars command line option as custom jars dir" do
+    ARGV[0] = '--jars'
+    ARGV[1] = 'java/jars'
+    runner = mock("runner", :null_object => true)
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should have_key(:lib_dir)
+      config[:lib_dir].should == 'java/jars'
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_merb'
+  end
+  
 end

data/spec/jetty_rails/config_file_spec.rb

@@ -0,0 +1,68 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe JettyRails::Runner, "with config file containing several servers and apps" do
+  before do
+    @yaml_config = YAML.load_file(File.join(File.dirname(__FILE__), '..', 'config.yml'))
+  end
+  
+  it "should instantiate runner with config.yml and setup servers" do
+    runner = JettyRails::Runner.new(@yaml_config)
+    runner.servers.size.should == 3
+    runner.servers[4000].should_not == nil
+    runner.servers[3000].should_not == nil
+    server = runner.servers[8080]
+    server.should_not == nil
+    server.app_contexts.size.should == 2
+  end
+  
+  it "should setup correct context_paths" do
+    runner = JettyRails::Runner.new(@yaml_config)
+    runner.servers[4000].config[:context_path].should == "/testB"
+    runner.servers[3000].config[:context_path].should == "/testA"
+    
+    runner.servers[8080].config[:context_path].should == "/"
+    runner.servers[8080].app_contexts[0].context_path.should == "/testC"
+    runner.servers[8080].app_contexts[1].context_path.should == "/testD"
+  end  
+  
+  it "should setup correct adapters" do
+    runner = JettyRails::Runner.new(@yaml_config)
+    runner.servers[4000].config[:adapter].should == :merb
+    runner.servers[3000].config[:adapter].should == :rails
+    
+    runner.servers[8080].config[:adapter].should == :rails # default
+    runner.servers[8080].app_contexts[0].config[:adapter].should == :merb
+    runner.servers[8080].app_contexts[1].config[:adapter].should == :rails
+  end  
+  
+  it "should inherit environment" do
+    runner = JettyRails::Runner.new(@yaml_config)
+    runner.servers[4000].config[:environment].should == "production"
+    runner.servers[3000].config[:environment].should == "development"
+    
+    runner.servers[8080].config[:environment].should == "production"
+    runner.servers[8080].app_contexts[0].config[:environment].should =="test"
+    runner.servers[8080].app_contexts[1].config[:environment].should =="production"
+  end
+
+  it "should setup jruby environment" do
+    runner = JettyRails::Runner.new(@yaml_config)
+    runner.servers[4000].app_contexts.first.adapter.init_params['jruby.min.runtimes'].should == '1'
+    runner.servers[4000].app_contexts.first.adapter.init_params['jruby.max.runtimes'].should == '2'
+
+    runner.servers[3000].app_contexts.first.adapter.init_params['jruby.min.runtimes'].should == '2'
+    runner.servers[3000].app_contexts.first.adapter.init_params['jruby.max.runtimes'].should == '2'    
+  end
+  
+  it "should setup the server thread pool" do
+    runner = JettyRails::Runner.new(@yaml_config)
+    runner.servers[4000].server.thread_pool.max_threads.should == 40
+    runner.servers[4000].server.thread_pool.min_threads.should == 1
+  end
+
+  it "should setup the server acceptors" do
+    runner = JettyRails::Runner.new(@yaml_config)
+    runner.servers[3000].server.connectors[0].acceptors.should == 20
+  end
+  
+end

data/spec/jetty_rails/runner_spec.rb

@@ -7,83 +7,88 @@ describe JettyRails::Runner, "with no extra configuration (rails adapter)" do
   
   it "should receive basedir configuration" do
     runner = JettyRails::Runner.new :base => '/any/app/dir'
-    runner.config.should have_key(:base)
-    runner.config[:base].should == '/any/app/dir'
+    runner.servers[8080].config.should have_key(:base)
+    runner.servers[8080].config[:base].should == '/any/app/dir'
   end
   
   it "should default to development environment" do
     runner = JettyRails::Runner.new :base => Dir.pwd
-    runner.config.should have_key(:environment)
-    runner.config[:environment].should == 'development'
-    runner.app_context.init_params['rails.env'].should == 'development'
+    runner.servers[8080].config.should have_key(:environment)
+    runner.servers[8080].config[:environment].should == 'development'
+    runner.servers[8080].app_contexts.first.init_params['rails.env'].should == 'development'
   end
   
   it "should default to the root context path" do
     runner = JettyRails::Runner.new :base => Dir.pwd
-    runner.config.should have_key(:context_path)
-    runner.config[:context_path].should == '/'
-    runner.app_context.context_path.should == '/'
+    runner.servers[8080].config.should have_key(:context_path)
+    runner.servers[8080].config[:context_path].should == '/'
+    runner.servers[8080].app_contexts.first.context_path.should == '/'
   end
   
   it "should set server default port to 8080" do
     runner = JettyRails::Runner.new :base => Dir.pwd
-    runner.config.should have_key(:port)
-    runner.config[:port].should == 8080
+    runner.servers[8080].config.should have_key(:port)
+    runner.servers[8080].config[:port].should == 8080
   end
   
   it "should default lib_dir to lib/*.jar" do
     runner = JettyRails::Runner.new :base => Dir.pwd
-    runner.config.should have_key(:lib_dir)
-    runner.config[:lib_dir].should == 'lib/**/*.jar'
+    runner.servers[8080].config.should have_key(:lib_dir)
+    runner.servers[8080].config[:lib_dir].should == 'lib/**/*.jar'
   end
   
   it "should set rails root" do
     runner = JettyRails::Runner.new :base => Dir.pwd
-    runner.app_context.init_params['rails.root'].should == '/'
+    runner.servers[8080].app_contexts.first.init_params['rails.root'].should == '/'
   end
   
   it "should set public root" do
     runner = JettyRails::Runner.new :base => Dir.pwd
-    runner.app_context.init_params['public.root'].should == '/public'
+    runner.servers[8080].app_contexts.first.init_params['public.root'].should == '/public'
   end
   
   it "should set gem path" do
-    runner = JettyRails::Runner.new :base => Dir.pwd
-    runner.app_context.init_params['gem.path'].should == 'tmp/war/WEB-INF/gems'
+    original = ENV['GEM_PATH']
+    ENV['GEM_PATH'] = nil
+    begin
+      runner = JettyRails::Runner.new :base => Dir.pwd
+      runner.servers[8080].app_contexts.first.init_params['gem.path'].should == 'tmp/war/WEB-INF/gems'
+    ensure
+      ENV['GEM_PATH'] = original
+    end
   end
   
+  it "should set gem path from environment" do
+    original = ENV['GEM_PATH']
+    ENV['GEM_PATH'] = "/usr/lib/ruby/gems/1.8/gems"
+    begin
+      runner = JettyRails::Runner.new :base => Dir.pwd
+      runner.servers[8080].app_contexts.first.init_params['gem.path'].should == ENV['GEM_PATH']
+    ensure
+      ENV['GEM_PATH'] = original
+    end
+  end
+  
+  
   it "should install RailsServletContextListener" do
     runner = JettyRails::Runner.new :base => Dir.pwd
-    listeners = runner.app_context.event_listeners
+    listeners = runner.servers[8080].app_contexts.first.event_listeners
     listeners.size.should == 1
     listeners[0].should be_kind_of(JettyRails::Rack::RailsServletContextListener)
   end
-  
-  it "should install RackFilter" do
-    context = mock("web application context", :null_object => true)
-    server = JettyRails::Jetty::Server.new
-    context.stub!(:getServer).and_return(server)
-    JettyRails::Jetty::Handler::WebAppContext.should_receive(:new).and_return(context)
-    context.should_receive(:add_filter).once do |filter_holder, url_pattern, dispatches|
-      filter_holder.filter.should be_kind_of(JettyRails::Rack::RackFilter)
-      url_pattern.should == '/*'
-      dispatches.should == JettyRails::Jetty::Context::DEFAULT
-    end
-    runner = JettyRails::Runner.new :base => Dir.pwd
-  end
-  
+    
   it "should have handlers for static and dynamic content" do
     runner = JettyRails::Runner.new :base => Dir.pwd
-    runner.server.handlers.size.should == 2
-    resource_handlers = runner.server.getChildHandlersByClass(JettyRails::Jetty::Handler::ResourceHandler)
+    runner.servers[8080].server.handlers.size.should == 2
+    resource_handlers = runner.servers[8080].server.getChildHandlersByClass(JettyRails::Jetty::Handler::ResourceHandler)
     resource_handlers.size.should == 1
-    webapp_handlers = runner.server.getChildHandlersByClass(JettyRails::Jetty::Handler::WebAppContext)
+    webapp_handlers = runner.servers[8080].server.getChildHandlersByClass(JettyRails::Jetty::Handler::WebAppContext)
     webapp_handlers.size.should == 1
   end
   
   it "should delegate to rails handler if requested dir has no welcome file" do
     runner = JettyRails::Runner.new :base => Dir.pwd
-    delegate_handler = runner.server.handlers[0]
+    delegate_handler = runner.servers[8080].server.handlers[0]
     delegate_handler.should be_kind_of(JettyRails::Handler::DelegateOnErrorsHandler)
   end
   
@@ -93,28 +98,28 @@ describe JettyRails::Runner, "with custom configuration" do
   
   it "should allow to override the environment" do
     runner = JettyRails::Runner.new :base => Dir.pwd, :environment => 'production'
-    runner.config.should have_key(:environment)
-    runner.config[:environment].should == 'production'
-    runner.app_context.init_params['rails.env'].should == 'production'
+    runner.servers[8080].config.should have_key(:environment)
+    runner.servers[8080].config[:environment].should == 'production'
+    runner.servers[8080].app_contexts.first.init_params['rails.env'].should == 'production'
   end
   
   it "should allow to override the context path" do
     runner = JettyRails::Runner.new :base => Dir.pwd, :context_path => "/myapp" 
-    runner.config.should have_key(:context_path)
-    runner.config[:context_path].should == '/myapp'
-    runner.app_context.context_path.should == '/myapp'
+    runner.servers[8080].config.should have_key(:context_path)
+    runner.servers[8080].config[:context_path].should == '/myapp'
+    runner.servers[8080].app_contexts.first.context_path.should == '/myapp'
   end
   
   it "should allow to override the server port" do
     runner = JettyRails::Runner.new :base => Dir.pwd, :port => 8585 
-    runner.config.should have_key(:port)
-    runner.config[:port].should == 8585
-    runner.server.connectors[0].port.should == 8585
+    runner.servers[8585].config.should have_key(:port)
+    runner.servers[8585].config[:port].should == 8585
+    runner.servers[8585].server.connectors[0].port.should == 8585
   end
   
   it "should handle custom context paths for static and dynamic content" do
     runner = JettyRails::Runner.new :base => Dir.pwd, :context_path => "/myapp" 
-    context_handlers = runner.server.getChildHandlersByClass(JettyRails::Jetty::Handler::ContextHandler)
+    context_handlers = runner.servers[8080].server.getChildHandlersByClass(JettyRails::Jetty::Handler::ContextHandler)
     context_handlers.size.should == 2 # one for static, one for dynamic
   end
 end
@@ -123,30 +128,35 @@ describe JettyRails::Runner, "with merb adapter" do
   
   it "should set merb root" do
     runner = JettyRails::Runner.new :adapter => :merb, :base => Dir.pwd
-    runner.app_context.init_params['merb.root'].should == '/'
+    runner.servers[8080].app_contexts.first.init_params['merb.root'].should == '/'
   end
   
   it "should set public root" do
     runner = JettyRails::Runner.new :adapter => :merb, :base => Dir.pwd
-    runner.app_context.init_params['public.root'].should == '/public'
+    runner.servers[8080].app_contexts.first.init_params['public.root'].should == '/public'
   end
   
   it "should set gem path" do
-    runner = JettyRails::Runner.new :adapter => :merb, :base => Dir.pwd
-    runner.app_context.init_params['gem.path'].should == 'tmp/war/WEB-INF/gems'
+    original = ENV['GEM_PATH']
+    ENV['GEM_PATH'] = nil
+    begin
+      runner = JettyRails::Runner.new :adapter => :merb, :base => Dir.pwd
+      runner.servers[8080].app_contexts.first.init_params['gem.path'].should == 'tmp/war/WEB-INF/gems'
+    ensure
+      ENV['GEM_PATH'] = original
+    end
   end
   
   it "should set merb environment to development" do
     runner = JettyRails::Runner.new :adapter => :merb, :base => Dir.pwd
-    runner.app_context.init_params['merb.environment'].should == 'development'
+    runner.servers[8080].app_contexts.first.init_params['merb.environment'].should == 'development'
   end
   
   it "should install MerbServletContextListener and SignalHandler" do
     runner = JettyRails::Runner.new :adapter => :merb, :base => Dir.pwd
-    listeners = runner.app_context.event_listeners
+    listeners = runner.servers[8080].app_contexts.first.event_listeners
     listeners.size.should == 2
     listeners[0].should be_kind_of(JettyRails::Rack::MerbServletContextListener)
     listeners[1].should be_kind_of(JettyRails::Adapters::MerbAdapter::SignalHandler)
   end
 end
-

data/spec/jetty_rails_sample_1.yml

@@ -0,0 +1,13 @@
+--- 
+:servers: 
+- :context_path: /testB
+  :adapter: :rails
+  :base: jetty_rails_proj
+  :environment: development
+  :port: 3000
+:environment: production
+:jruby_min_runtimes: 1
+:jruby_max_runtimes: 2
+:thread_pool_max: 40
+:thread_pool_min: 1
+:acceptor_size: 20

data/spec/jetty_rails_sample_2.yml

@@ -0,0 +1,28 @@
+--- 
+:servers: 
+- :context_path: /testA
+  :base: jetty_rails_proj_2
+  :adapter: :rails
+  :environment: development
+  :port: 2000
+- :context_path: /testB
+  :adapter: :rails
+  :base: jetty_rails_proj
+  :environment: production
+  :port: 3000
+- :port: 4000
+  :apps:
+  - :context_path: /testB
+    :adapter: :rails
+    :base: jetty_rails_proj
+    :environment: development
+  - :context_path: /testA
+    :adapter: :rails
+    :base: jetty_rails_proj_2
+    :environment: production
+:environment: production
+:jruby_min_runtimes: 1
+:jruby_max_runtimes: 2
+:thread_pool_max: 40
+:thread_pool_min: 1
+:acceptor_size: 20

data/spec/jetty_rails_spec.rb

@@ -52,6 +52,23 @@ describe "binary executable with no command line arguments" do
     load File.dirname(__FILE__) + '/../bin/jetty_rails'
   end
   
+  it "should not set classes dir by default" do
+    runner = mock("runner", :null_object => true)
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should_not have_key(:classes_dir)
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_rails'
+  end
+  
+  it "should not set lib dir by default" do
+    runner = mock("runner", :null_object => true)
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should_not have_key(:lib_dir)
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_rails'
+  end
 end
 
 describe "binary executable with command line arguments" do
@@ -139,4 +156,40 @@ describe "binary executable with command line arguments" do
     load File.dirname(__FILE__) + '/../bin/jetty_rails'
   end
   
+  it "should take --classes command line option as custom classes dir" do
+    ARGV[0] = '--classes'
+    ARGV[1] = 'build/java/classes'
+    runner = mock("runner", :null_object => true)
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should have_key(:classes_dir)
+      config[:classes_dir].should == 'build/java/classes'
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_rails'
+  end
+  
+  it "should take --lib command line option as custom jars dir" do
+    ARGV[0] = '--lib'
+    ARGV[1] = 'java/jars'
+    runner = mock("runner", :null_object => true)
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should have_key(:lib_dir)
+      config[:lib_dir].should == 'java/jars'
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_rails'
+  end
+    
+  it "should take --jars command line option as custom jars dir" do
+    ARGV[0] = '--jars'
+    ARGV[1] = 'java/jars'
+    runner = mock("runner", :null_object => true)
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should have_key(:lib_dir)
+      config[:lib_dir].should == 'java/jars'
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_rails'
+  end
+  
 end

data/spec/spec.opts

@@ -1 +1,2 @@
---colour
+--colour
+--format specdoc