jetty-rails 0.3 → 0.4

data/Manifest.txt

@@ -4,6 +4,7 @@ Manifest.txt
 PostInstall.txt
 README.txt
 Rakefile
+bin/jetty_merb
 bin/jetty_rails
 config/hoe.rb
 config/requirements.rb
@@ -11,6 +12,8 @@ lib/jetty-6.1.9.jar
 lib/jetty-plus-6.1.9.jar
 lib/jetty-util-6.1.9.jar
 lib/jetty_rails.rb
+lib/jetty_rails/adapters/merb_adapter.rb
+lib/jetty_rails/adapters/rails_adapter.rb
 lib/jetty_rails/handler/delegate_on_errors_handler.rb
 lib/jetty_rails/jars.rb
 lib/jetty_rails/runner.rb
@@ -22,6 +25,7 @@ script/destroy
 script/generate
 script/txt2html
 setup.rb
+spec/jetty_merb_spec.rb
 spec/jetty_rails/handler/delegate_on_errors_handler_spec.rb
 spec/jetty_rails/runner_spec.rb
 spec/jetty_rails_spec.rb

data/bin/jetty_merb

@@ -0,0 +1,86 @@
+#!/usr/bin/env jruby
+
+# == Synopsis
+#
+# jetty_merb: jetty server for merb applications
+#
+# == Usage
+#
+# jetty_merb [OPTION] ... BASEDIR
+#
+# -h, --help::
+#    show help
+#
+# --context-path PATH, -u PATH::
+#    change the application context path (default: '/')
+#
+# --port PORT, -p PORT::
+#    change server port (default: 4000)
+#
+# --environment ENV, -e ENV::
+#    change rails environment (default: development)
+#
+# BASEDIR (optional): directory to be run (default: current).
+
+require "java"
+require "jetty_rails"
+require 'rdoc/usage'
+require 'getoptlong'
+
+# fix to work with rubygems (use current file instead of main)
+def RDoc.usage_no_exit(*args)
+  comment = File.open(__FILE__) do |file|
+    find_comment(file)
+  end
+
+  comment = comment.gsub(/^\s*#/, '')
+
+  markup = SM::SimpleMarkup.new
+  flow_convertor = SM::ToFlow.new
+
+  flow = markup.convert(comment, flow_convertor)
+
+  format = "plain"
+
+  unless args.empty?
+    flow = extract_sections(flow, args)
+  end
+
+  options = RI::Options.instance
+  if args = ENV["RI"]
+    options.parse(args.split)
+  end
+  formatter = options.formatter.new(options, "")
+  formatter.display_flow(flow)
+end
+
+opts = GetoptLong.new(
+    [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
+    [ '--context-path', '-u', GetoptLong::REQUIRED_ARGUMENT ],
+    [ '--port', '-p', GetoptLong::REQUIRED_ARGUMENT ],
+    [ '--environment', '-e', GetoptLong::REQUIRED_ARGUMENT ]
+  )
+
+config = {
+  :base => Dir.pwd,
+  :port => 4000,
+  :adapter => :merb
+}
+
+opts.each do |opt, arg|
+  case opt
+    when '--help'
+      RDoc::usage
+    when '--context-path'
+      config[:context_path] = arg
+    when '--port'
+      config[:port] = arg.to_i
+    when '--environment'
+      config[:environment] = arg
+  end
+end
+
+config[:base] = ARGV.shift unless ARGV.empty?
+
+runner = JettyRails::Runner.new(config)
+runner.start

data/bin/jetty_rails

@@ -6,7 +6,7 @@
 #
 # == Usage
 #
-# jetty_tails [OPTION] ... BASEDIR
+# jetty_rails [OPTION] ... BASEDIR
 #
 # -h, --help::
 #    show help
@@ -15,7 +15,7 @@
 #    change the application context path (default: '/')
 #
 # --port PORT, -p PORT::
-#    change server port (default: 8080)
+#    change server port (default: 3000)
 #
 # --environment ENV, -e ENV::
 #    change rails environment (default: development)
@@ -62,7 +62,9 @@ opts = GetoptLong.new(
   )
 
 config = {
-  :base => Dir.pwd
+  :base => Dir.pwd,
+  :port => 3000,
+  :adapter => :rails
 }
 
 opts.each do |opt, arg|

data/lib/jetty_rails.rb

@@ -5,6 +5,8 @@ require "java"
 require "rubygems"
 require "activesupport"
 require "jetty_rails/jars"
+require "jetty_rails/adapters/rails_adapter"
+require "jetty_rails/adapters/merb_adapter"
 require "jetty_rails/runner"
 require "jetty_rails/handler/delegate_on_errors_handler"
 

data/lib/jetty_rails/adapters/merb_adapter.rb

@@ -0,0 +1,28 @@
+module JettyRails
+  module Adapters
+    
+    class MerbAdapter
+      attr_reader :config
+      
+      def initialize(config)
+        @config = config
+      end
+      
+      def init_params
+        # please refer to goldspike and jruby-rack documentation
+        @merb_params ||= {
+          'merb.root' => '/',
+          'public.root' => '/public',
+          'merb.environment' => config[:environment],
+          'gem.path' => 'tmp/war/WEB-INF/gems'
+        }
+      end
+      
+      def rack_event_listener
+        Rack::MerbServletContextListener.new
+      end
+      
+    end
+    
+  end
+end

data/lib/jetty_rails/adapters/rails_adapter.rb

@@ -0,0 +1,28 @@
+module JettyRails
+  module Adapters
+    
+    class RailsAdapter
+      attr_reader :config
+      
+      def initialize(config)
+        @config = config
+      end
+      
+      def init_params
+        # please refer to goldspike and jruby-rack documentation
+        @rails_params ||= {
+          'rails.root' => '/',
+          'public.root' => '/public',
+          'rails.env' => config[:environment],
+          'gem.path' => 'tmp/war/WEB-INF/gems'
+        }
+      end
+      
+      def rack_event_listener
+        Rack::RailsServletContextListener.new
+      end
+      
+    end
+    
+  end
+end

data/lib/jetty_rails/jars.rb

@@ -7,6 +7,7 @@ module JettyRails
   module Jetty
     include_package "org.mortbay.jetty"
     include_package "org.mortbay.jetty.servlet"
+    include_package "org.mortbay.jetty.nio"
     module Handler
       include_package "org.mortbay.jetty.handler"
       include_package "org.mortbay.jetty.webapp"
@@ -17,6 +18,7 @@ module JettyRails
   module Rack
     include_package "org.jruby.rack"
     include_package "org.jruby.rack.rails"
+    include_package "org.jruby.rack.merb"
   end
   
 end

data/lib/jetty_rails/runner.rb

@@ -8,18 +8,27 @@ module JettyRails
     attr_reader :app_context
     
     @@defaults = {
+      :adapter => :rails, 
       :environment => 'development',
       :context_path => '/',
       :port => 8080 
     }
     
+    @@adapters = {
+      :rails => JettyRails::Adapters::RailsAdapter,
+      :merb => JettyRails::Adapters::MerbAdapter
+    }
+    
     def initialize(config = {})
       @config = config.symbolize_keys!.reverse_merge!(@@defaults)
       add_root_method_to @config[:context_path]
       
       raise 'Basedir to be run must be provided' unless config[:base]
       
-      @server = Jetty::Server.new(config[:port])
+      @server = Jetty::Server.new
+      connector = Jetty::SelectChannelConnector.new
+      connector.port = config[:port]
+      @server.add_connector(connector)
       
       add_public_dir_to server
       install_rack_on server
@@ -52,15 +61,10 @@ module JettyRails
       @app_context.class_loader = JRuby.runtime.jruby_class_loader
       @app_context.resource_base = config[:base]
       
-      # refer to goldspike and jruby-rack documentation
-      @app_context.init_params = {
-        'rails.root' => '/',
-        'public.root' => '/public',
-        'rails.env' => config[:environment],
-        'gem.path' => 'tmp/war/WEB-INF/gems'
-      }
+      adapter = adapter_for config[:adapter]
+      @app_context.init_params = adapter.init_params
+      @app_context.add_event_listener(adapter.rack_event_listener)
       
-      @app_context.add_event_listener(Rack::RailsServletContextListener.new)
       @app_context.add_filter(rack_filter, "/*", Jetty::Context::DEFAULT)
       server.add_handler(@app_context)
     end
@@ -77,5 +81,9 @@ module JettyRails
       end
     end
     
+    def adapter_for(kind)
+      @@adapters[kind.to_sym].new(config)
+    end
+    
   end
 end

data/lib/jetty_rails/version.rb

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

data/spec/jetty_merb_spec.rb

@@ -0,0 +1,142 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe "binary executable with no command line arguments" do
+  
+  it "should set adapter to merb" do
+    runner = mock("runner", :null_object => true)
+    current_dir = Dir.pwd
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should have_key(:adapter)
+      config[:adapter].should eql(:merb)
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_merb'
+  end
+  
+  it "should provide the current execution dir as basedir" do
+    runner = mock("runner", :null_object => true)
+    current_dir = Dir.pwd
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should have_key(:base)
+      config[:base].should eql(current_dir)
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_merb'
+  end
+  
+  it "should not set the context path by default" do
+    runner = mock("runner", :null_object => true)
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should_not have_key(:context_path)
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_merb'
+  end
+  
+  it "should not set the environment by default" do
+    runner = mock("runner", :null_object => true)
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should_not have_key(:environment)
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_merb'
+  end
+  
+  it "should set the port to 4000 by default" do
+    runner = mock("runner", :null_object => true)
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should have_key(:port)
+      config[:port].should eql(4000)
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_merb'
+  end
+  
+end
+
+describe "binary executable with command line arguments" do
+  
+  it "should take the first command line argument as basedir" do
+    ARGV[0] = '/any/app/dir'
+    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')
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_merb'
+  end
+  
+  it "should take --context-path command line option as context path" do
+    ARGV[0] = '--context-path'
+    ARGV[1] = '/myapp'
+    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')
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_merb'
+  end
+  
+  it "should take -u command line option as context path" do
+    ARGV[0] = '-u'
+    ARGV[1] = '/myapp'
+    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')
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_merb'
+  end
+  
+  it "should take --environment command line option as custom environment" do
+    ARGV[0] = '--environment'
+    ARGV[1] = 'production'
+    runner = mock("runner", :null_object => true)
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should have_key(:environment)
+      config[:environment].should eql('production')
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_merb'
+  end
+  
+  it "should take -e command line option as custom environment" do
+    ARGV[0] = '-e'
+    ARGV[1] = 'production'
+    runner = mock("runner", :null_object => true)
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should have_key(:environment)
+      config[:environment].should eql('production')
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_merb'
+  end
+  
+  it "should take --port command line option as custom server port" do
+    ARGV[0] = '--port'
+    ARGV[1] = '80'
+    runner = mock("runner", :null_object => true)
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should have_key(:port)
+      config[:port].should eql(80)
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_merb'
+  end
+  
+  it "should take -p command line option as custom server port" do
+    ARGV[0] = '-p'
+    ARGV[1] = '80'
+    runner = mock("runner", :null_object => true)
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should have_key(:port)
+      config[:port].should eql(80)
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_merb'
+  end
+  
+end

data/spec/jetty_rails/runner_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe JettyRails::Runner, "with no extra configuration" do
+describe JettyRails::Runner, "with no extra configuration (rails adapter)" do
   it "should require basedir to be run" do
     lambda { JettyRails::Runner.new }.should raise_error 
   end
@@ -113,3 +113,34 @@ describe JettyRails::Runner, "with custom configuration" do
     context_handlers.size.should eql(2) # one for static, one for dynamic
   end
 end
+
+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('/')
+  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')
+  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')
+  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')
+  end
+  
+  it "should install MerbServletContextListener" do
+    runner = JettyRails::Runner.new :adapter => :merb, :base => Dir.pwd
+    listeners = runner.app_context.event_listeners
+    listeners.size.should eql(1)
+    listeners[0].should be_kind_of(JettyRails::Rack::MerbServletContextListener)
+  end
+end
+

data/spec/jetty_rails_spec.rb

@@ -2,6 +2,17 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe "binary executable with no command line arguments" do
   
+  it "should set adapter to rails" do
+    runner = mock("runner", :null_object => true)
+    current_dir = Dir.pwd
+    JettyRails::Runner.should_receive(:new) do |config|
+      config.should have_key(:adapter)
+      config[:adapter].should eql(:rails)
+      runner
+    end
+    load File.dirname(__FILE__) + '/../bin/jetty_rails'
+  end
+  
   it "should provide the current execution dir as basedir" do
     runner = mock("runner", :null_object => true)
     current_dir = Dir.pwd
@@ -31,10 +42,11 @@ describe "binary executable with no command line arguments" do
     load File.dirname(__FILE__) + '/../bin/jetty_rails'
   end
   
-  it "should not set the port by default" do
+  it "should set the port to 3000 by default" do
     runner = mock("runner", :null_object => true)
     JettyRails::Runner.should_receive(:new) do |config|
-      config.should_not have_key(:port)
+      config.should have_key(:port)
+      config[:port].should eql(3000)
       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.3"
+  version: "0.4"
 platform: ruby
 authors: 
 - Fabio Kung
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-10 00:00:00 -03:00
+date: 2008-05-22 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +25,7 @@ description: jetty server for rails applications
 email: 
 - fabio.kung@gmail.com
 executables: 
+- jetty_merb
 - jetty_rails
 extensions: []
 
@@ -41,6 +42,7 @@ files:
 - PostInstall.txt
 - README.txt
 - Rakefile
+- bin/jetty_merb
 - bin/jetty_rails
 - config/hoe.rb
 - config/requirements.rb
@@ -48,6 +50,8 @@ files:
 - lib/jetty-plus-6.1.9.jar
 - lib/jetty-util-6.1.9.jar
 - lib/jetty_rails.rb
+- lib/jetty_rails/adapters/merb_adapter.rb
+- lib/jetty_rails/adapters/rails_adapter.rb
 - lib/jetty_rails/handler/delegate_on_errors_handler.rb
 - lib/jetty_rails/jars.rb
 - lib/jetty_rails/runner.rb
@@ -59,6 +63,7 @@ files:
 - script/generate
 - script/txt2html
 - setup.rb
+- spec/jetty_merb_spec.rb
 - spec/jetty_rails/handler/delegate_on_errors_handler_spec.rb
 - spec/jetty_rails/runner_spec.rb
 - spec/jetty_rails_spec.rb
@@ -99,6 +104,7 @@ signing_key:
 specification_version: 2
 summary: jetty server for rails applications
 test_files: 
+- spec/jetty_merb_spec.rb
 - spec/jetty_rails/handler/delegate_on_errors_handler_spec.rb
 - spec/jetty_rails/runner_spec.rb
 - spec/jetty_rails_spec.rb