jetty-rails 0.4 → 0.5

data/History.txt

@@ -1,3 +1,13 @@
+== 0.5
+* load all jars inside lib/ by default
+* using GEM_PATH environment variable, if exists
+* fix signal handling (ctrl + c) for jetty_merb
+
+== 0.4
+* Merb support! jruby -S jetty_merb
+* Changed default ports to 3000 (rails) and 4000 (merb)
+* More specs
+
 == 0.3
 
 * Improved Documentation: rdoc and site.

data/README.txt

@@ -13,7 +13,8 @@ The project has born from my own needs. I needed to run JForum (http://jforum.ne
 == FEATURES:
 
 * Uses {JRuby Rack}[http://wiki.jruby.org/wiki/JRuby_Rack].
-* FIX (list of features)
+* Loads all jars inside your application lib/ dir, by default.
+* Supports rails and merb applications out of the box.
 
 == KNOWN ISSUES
 
@@ -24,12 +25,23 @@ jruby -S rake rcov
 
 == USAGE:
 
+=== Rails:
+
   cd myrailsapp
   jruby -S jetty_rails
   
 --help option shows usage details:
   
   jruby -S jetty_rails --help
+  
+=== Merb:
+
+  cd mymerbapp
+  jruby -S jetty_merb
+
+--help option shows usage details:
+
+  jruby -S jetty_rails --help
 
 == REQUIREMENTS:
 

data/bin/jetty_merb

@@ -24,8 +24,8 @@
 
 require "java"
 require "jetty_rails"
-require 'rdoc/usage'
 require 'getoptlong'
+require 'rdoc/usage'
 
 # fix to work with rubygems (use current file instead of main)
 def RDoc.usage_no_exit(*args)

data/bin/jetty_rails

@@ -24,8 +24,8 @@
 
 require "java"
 require "jetty_rails"
-require 'rdoc/usage'
 require 'getoptlong'
+require 'rdoc/usage'
 
 # fix to work with rubygems (use current file instead of main)
 def RDoc.usage_no_exit(*args)

data/lib/jetty_rails/adapters/merb_adapter.rb

@@ -14,15 +14,28 @@ module JettyRails
           'merb.root' => '/',
           'public.root' => '/public',
           'merb.environment' => config[:environment],
-          'gem.path' => 'tmp/war/WEB-INF/gems'
+          'gem.path' => ENV['GEM_PATH'] || 'tmp/war/WEB-INF/gems'
         }
       end
       
-      def rack_event_listener
-        Rack::MerbServletContextListener.new
+      def event_listeners
+        [ Rack::MerbServletContextListener.new, SignalHandler.new ]
+      end
+      
+      class SignalHandler
+        include Java::JavaxServlet::ServletContextListener
+        
+        def contextInitialized(cfg)
+          trap("INT") do
+            puts "\nbye!"
+            java.lang.System.exit(0)
+          end
+        end
+        
+        def contextDestroyed(cfg)
+        end
       end
       
     end
-    
   end
 end

data/lib/jetty_rails/adapters/rails_adapter.rb

@@ -14,12 +14,12 @@ module JettyRails
           'rails.root' => '/',
           'public.root' => '/public',
           'rails.env' => config[:environment],
-          'gem.path' => 'tmp/war/WEB-INF/gems'
+          'gem.path' => ENV['GEM_PATH'] || 'tmp/war/WEB-INF/gems'
         }
       end
       
-      def rack_event_listener
-        Rack::RailsServletContextListener.new
+      def event_listeners
+        [ Rack::RailsServletContextListener.new ]
       end
       
     end

data/lib/jetty_rails/runner.rb

@@ -11,6 +11,7 @@ module JettyRails
       :adapter => :rails, 
       :environment => 'development',
       :context_path => '/',
+      :lib_dir => 'lib/**/*.jar',
       :port => 8080 
     }
     
@@ -21,7 +22,7 @@ module JettyRails
     
     def initialize(config = {})
       @config = config.symbolize_keys!.reverse_merge!(@@defaults)
-      add_root_method_to @config[:context_path]
+      @config[:context_path].extend ContextPath
       
       raise 'Basedir to be run must be provided' unless config[:base]
       
@@ -30,6 +31,7 @@ module JettyRails
       connector.port = config[:port]
       @server.add_connector(connector)
       
+      add_stuff_to_classpath
       add_public_dir_to server
       install_rack_on server
     end
@@ -40,6 +42,13 @@ module JettyRails
     end
     
     private
+    def add_stuff_to_classpath
+      lib_dir = "#{config[:base]}/#{config[:lib_dir]}"
+      Dir[lib_dir].each do |jar|
+        require jar
+      end
+    end
+    
     def add_public_dir_to(server)
       @resources = Jetty::Handler::ResourceHandler.new
       @resources.resource_base = config[:base] + '/public'
@@ -63,7 +72,9 @@ module JettyRails
       
       adapter = adapter_for config[:adapter]
       @app_context.init_params = adapter.init_params
-      @app_context.add_event_listener(adapter.rack_event_listener)
+      adapter.event_listeners.each do |listener|
+        @app_context.add_event_listener(listener)
+      end
       
       @app_context.add_filter(rack_filter, "/*", Jetty::Context::DEFAULT)
       server.add_handler(@app_context)
@@ -73,17 +84,16 @@ module JettyRails
       Jetty::FilterHolder.new(Rack::RackFilter.new)
     end
     
-    def add_root_method_to(target)
-      (class << target; self; end).class_eval do
-        def root?
-          self == '/'
-        end
-      end
-    end
-    
     def adapter_for(kind)
       @@adapters[kind.to_sym].new(config)
     end
     
   end
+  
+  module ContextPath
+    def root?
+      self == '/'
+    end
+  end
+  
 end

data/lib/jetty_rails/version.rb

@@ -1,7 +1,7 @@
 module JettyRails #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 4
+    MINOR = 5
 
     STRING = [MAJOR, MINOR].join('.')
   end

data/spec/jetty_merb_spec.rb

@@ -7,7 +7,7 @@ describe "binary executable with no command line arguments" do
     current_dir = Dir.pwd
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:adapter)
-      config[:adapter].should eql(:merb)
+      config[:adapter].should == :merb
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_merb'
@@ -18,7 +18,7 @@ describe "binary executable with no command line arguments" do
     current_dir = Dir.pwd
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:base)
-      config[:base].should eql(current_dir)
+      config[:base].should == current_dir
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_merb'
@@ -46,7 +46,7 @@ describe "binary executable with no command line arguments" do
     runner = mock("runner", :null_object => true)
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:port)
-      config[:port].should eql(4000)
+      config[:port].should == 4000
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_merb'
@@ -61,7 +61,7 @@ describe "binary executable with command line arguments" do
     runner = mock("runner", :null_object => true)
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:base)
-      config[:base].should eql('/any/app/dir')
+      config[:base].should == '/any/app/dir'
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_merb'
@@ -73,7 +73,7 @@ describe "binary executable with command line arguments" do
     runner = mock("runner", :null_object => true)
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:context_path)
-      config[:context_path].should eql('/myapp')
+      config[:context_path].should == '/myapp'
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_merb'
@@ -85,7 +85,7 @@ describe "binary executable with command line arguments" do
     runner = mock("runner", :null_object => true)
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:context_path)
-      config[:context_path].should eql('/myapp')
+      config[:context_path].should == '/myapp'
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_merb'
@@ -97,7 +97,7 @@ describe "binary executable with command line arguments" do
     runner = mock("runner", :null_object => true)
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:environment)
-      config[:environment].should eql('production')
+      config[:environment].should == 'production'
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_merb'
@@ -109,7 +109,7 @@ describe "binary executable with command line arguments" do
     runner = mock("runner", :null_object => true)
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:environment)
-      config[:environment].should eql('production')
+      config[:environment].should == 'production'
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_merb'
@@ -121,7 +121,7 @@ describe "binary executable with command line arguments" do
     runner = mock("runner", :null_object => true)
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:port)
-      config[:port].should eql(80)
+      config[:port].should == 80
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_merb'
@@ -133,7 +133,7 @@ describe "binary executable with command line arguments" do
     runner = mock("runner", :null_object => true)
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:port)
-      config[:port].should eql(80)
+      config[:port].should == 80
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_merb'

data/spec/jetty_rails/handler/delegate_on_errors_handler_spec.rb

@@ -17,7 +17,7 @@ describe JettyRails::Handler::DelegateOnErrorsResponse do
     response = mock('original response')
     response.should_receive(:getContentType).once.and_return('text/html; charset=UTF-8')
     wrapper = JettyRails::Handler::DelegateOnErrorsResponse.new response, mock('request')
-    wrapper.getContentType.should eql('text/html; charset=UTF-8')
+    wrapper.getContentType.should == 'text/html; charset=UTF-8'
   end
   
   it "should set request to not handled state on error" do

data/spec/jetty_rails/runner_spec.rb

@@ -8,49 +8,54 @@ 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 eql('/any/app/dir')
+    runner.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 eql('development')
-    runner.app_context.init_params['rails.env'].should eql('development')
+    runner.config[:environment].should == 'development'
+    runner.app_context.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 eql('/')
-    runner.app_context.context_path.should eql('/')
+    runner.config[:context_path].should == '/'
+    runner.app_context.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 eql(8080)
-    runner.app_context.context_path.should eql('/')
+    runner.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'
   end
   
   it "should set rails root" do
     runner = JettyRails::Runner.new :base => Dir.pwd
-    runner.app_context.init_params['rails.root'].should eql('/')
+    runner.app_context.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 eql('/public')
+    runner.app_context.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 eql('tmp/war/WEB-INF/gems')
+    runner.app_context.init_params['gem.path'].should == 'tmp/war/WEB-INF/gems'
   end
   
   it "should install RailsServletContextListener" do
     runner = JettyRails::Runner.new :base => Dir.pwd
     listeners = runner.app_context.event_listeners
-    listeners.size.should eql(1)
+    listeners.size.should == 1
     listeners[0].should be_kind_of(JettyRails::Rack::RailsServletContextListener)
   end
   
@@ -61,19 +66,19 @@ describe JettyRails::Runner, "with no extra configuration (rails adapter)" do
     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 eql('/*')
-      dispatches.should eql(JettyRails::Jetty::Context::DEFAULT)
+      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 eql(2)
+    runner.server.handlers.size.should == 2
     resource_handlers = runner.server.getChildHandlersByClass(JettyRails::Jetty::Handler::ResourceHandler)
-    resource_handlers.size.should eql(1)
+    resource_handlers.size.should == 1
     webapp_handlers = runner.server.getChildHandlersByClass(JettyRails::Jetty::Handler::WebAppContext)
-    webapp_handlers.size.should eql(1)
+    webapp_handlers.size.should == 1
   end
   
   it "should delegate to rails handler if requested dir has no welcome file" do
@@ -89,28 +94,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 eql('production')
-    runner.app_context.init_params['rails.env'].should eql('production')
+    runner.config[:environment].should == 'production'
+    runner.app_context.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 eql('/myapp')
-    runner.app_context.context_path.should eql('/myapp')
+    runner.config[:context_path].should == '/myapp'
+    runner.app_context.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 eql(8585)
-    runner.server.connectors[0].port.should eql(8585)
+    runner.config[:port].should == 8585
+    runner.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.size.should eql(2) # one for static, one for dynamic
+    context_handlers.size.should == 2 # one for static, one for dynamic
   end
 end
 
@@ -118,29 +123,30 @@ 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 eql('/')
+    runner.app_context.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 eql('/public')
+    runner.app_context.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 eql('tmp/war/WEB-INF/gems')
+    runner.app_context.init_params['gem.path'].should == 'tmp/war/WEB-INF/gems'
   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 eql('development')
+    runner.app_context.init_params['merb.environment'].should == 'development'
   end
   
-  it "should install MerbServletContextListener" do
+  it "should install MerbServletContextListener and SignalHandler" do
     runner = JettyRails::Runner.new :adapter => :merb, :base => Dir.pwd
     listeners = runner.app_context.event_listeners
-    listeners.size.should eql(1)
+    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_spec.rb

@@ -7,7 +7,7 @@ describe "binary executable with no command line arguments" do
     current_dir = Dir.pwd
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:adapter)
-      config[:adapter].should eql(:rails)
+      config[:adapter].should == :rails
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_rails'
@@ -18,7 +18,7 @@ describe "binary executable with no command line arguments" do
     current_dir = Dir.pwd
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:base)
-      config[:base].should eql(current_dir)
+      config[:base].should == current_dir
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_rails'
@@ -46,7 +46,7 @@ describe "binary executable with no command line arguments" do
     runner = mock("runner", :null_object => true)
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:port)
-      config[:port].should eql(3000)
+      config[:port].should == 3000
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_rails'
@@ -61,7 +61,7 @@ describe "binary executable with command line arguments" do
     runner = mock("runner", :null_object => true)
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:base)
-      config[:base].should eql('/any/app/dir')
+      config[:base].should == '/any/app/dir'
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_rails'
@@ -73,7 +73,7 @@ describe "binary executable with command line arguments" do
     runner = mock("runner", :null_object => true)
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:context_path)
-      config[:context_path].should eql('/myapp')
+      config[:context_path].should == '/myapp'
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_rails'
@@ -85,7 +85,7 @@ describe "binary executable with command line arguments" do
     runner = mock("runner", :null_object => true)
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:context_path)
-      config[:context_path].should eql('/myapp')
+      config[:context_path].should == '/myapp'
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_rails'
@@ -97,7 +97,7 @@ describe "binary executable with command line arguments" do
     runner = mock("runner", :null_object => true)
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:environment)
-      config[:environment].should eql('production')
+      config[:environment].should == 'production'
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_rails'
@@ -109,7 +109,7 @@ describe "binary executable with command line arguments" do
     runner = mock("runner", :null_object => true)
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:environment)
-      config[:environment].should eql('production')
+      config[:environment].should == 'production'
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_rails'
@@ -121,7 +121,7 @@ describe "binary executable with command line arguments" do
     runner = mock("runner", :null_object => true)
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:port)
-      config[:port].should eql(80)
+      config[:port].should == 80
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_rails'
@@ -133,7 +133,7 @@ describe "binary executable with command line arguments" do
     runner = mock("runner", :null_object => true)
     JettyRails::Runner.should_receive(:new) do |config|
       config.should have_key(:port)
-      config[:port].should eql(80)
+      config[:port].should == 80
       runner
     end
     load File.dirname(__FILE__) + '/../bin/jetty_rails'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jetty-rails
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: "0.5"
 platform: ruby
 authors: 
 - Fabio Kung
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-22 00:00:00 -03:00
+date: 2008-06-10 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency