jetty-rails 0.2 → 0.3

data/History.txt

@@ -1,5 +1,14 @@
-== 0.0.1 2008-04-24
+== 0.3
 
-* Initial release
+* Improved Documentation: rdoc and site.
 
-* Running default rails applications inside Jetty
+== 0.2
+
+* Running any rails applications with no extra classpath.
+* Command line options for jett_rails binary executable.
+  See: <tt>jruby -S jetty_rails --help</tt> for details.
+
+== 0.1
+
+* Initial release.
+* Running default rails applications inside Jetty.

data/{License.txt → Licenses.txt}

@@ -1,3 +1,7 @@
+= Jetty Rails
+
+Jetty Rails is distributed under the terms of the MIT License.
+
 Copyright (c) 2008 Fabio Kung
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -17,4 +21,17 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+= Additional Bundled Software
+
+JRuby-Rack (jruby-rack-*.jar) is distributed under the terms of the 
+MIT license. See http://svn.codehaus.org/jruby-contrib/trunk/rack/LICENSE.txt
+for details.
+
+Jetty (jetty-*.jar) is distributed under the terms of the Apache 2.0 License. 
+See http://jetty.mortbay.org/jetty-6/LICENSE.txt for details.
+
+Servlet API 2.5, a.k.a JSR-154, (servlet-api-2.5-*.jar) is distributed 
+under the terms of the Berkeley License. See http://developers.sun.com/license/berkeley_license.html 
+for details.

data/Manifest.txt

@@ -1,5 +1,5 @@
 History.txt
-License.txt
+Licenses.txt
 Manifest.txt
 PostInstall.txt
 README.txt
@@ -15,13 +15,14 @@ lib/jetty_rails/handler/delegate_on_errors_handler.rb
 lib/jetty_rails/jars.rb
 lib/jetty_rails/runner.rb
 lib/jetty_rails/version.rb
-lib/jruby-rack-1.0-SNAPSHOT.jar
+lib/jruby-rack-0.9.jar
 lib/servlet-api-2.5-6.1.9.jar
 script/console
 script/destroy
 script/generate
 script/txt2html
 setup.rb
+spec/jetty_rails/handler/delegate_on_errors_handler_spec.rb
 spec/jetty_rails/runner_spec.rb
 spec/jetty_rails_spec.rb
 spec/spec.opts

data/README.txt

@@ -8,50 +8,45 @@ jetty_rails aims to run any Warbler based jruby on rails applications with Jetty
 
 This project is useful for people developing jruby on rails apps that can not use mongrel for development. Rails applications integrated with servlet based applications in the same context would be a reasonable reason.
 
-The project has born from my own needs. I needed to run JForum (http://jforum.net) on the same context of my jruby on rails application. I wanted to integrate HttpSessions (avoiding single sign on) and use ServletContext in-memory cache store.
+The project has born from my own needs. I needed to run JForum (http://jforum.net) on the same context of my jruby on rails application. I had also to integrate HttpSessions (avoiding single sign on) and use ServletContext in-memory cache store.
 
-== FEATURES/PROBLEMS:
+== FEATURES:
 
-* FIX (list of features or problems)
+* Uses {JRuby Rack}[http://wiki.jruby.org/wiki/JRuby_Rack].
+* FIX (list of features)
 
-== SYNOPSIS:
+== KNOWN ISSUES
 
-* FIX (code sample of usage)
-
-== REQUIREMENTS:
-
-* FIX (list of requirements)
+* To generate coverage report with jruby (>= 1.1) follow instructions from http://www.ruby-forum.com/topic/146252 and run (inside jetty-rails root dir):
+jruby -S rake rcov
 
-* To generate coverage report with jruby (>= 1.1) follow 
-http://www.ruby-forum.com/topic/146252 and:
+* Hoe in jruby has an issue reading the ~/.hoerc file. Just remove it.
 
-jruby -S rake rcov
+== USAGE:
 
-== INSTALL:
+  cd myrailsapp
+  jruby -S jetty_rails
+  
+--help option shows usage details:
+  
+  jruby -S jetty_rails --help
 
-* FIX (sudo gem install, anything else)
+== REQUIREMENTS:
 
-== LICENSE:
+jetty-rails requires jruby (>=1.1). Please make sure you already have 
+it properly installed and inserted in your PATH environment variable.
 
-(The MIT License)
+{Installing JRuby Instructions}[http://wiki.jruby.org/wiki/Getting_Started]
 
-Copyright (c) 2008 FIX
+== INSTALL:
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+  jruby -S gem install jetty-rails
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+== LICENSE:
 
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Jetty Rails is distributed under the terms of The MIT License.
+Copyright (c) 2008 Fabio Kung <fabio.kung@gmail.com>
+  
+Read more details in the bundled +Licenses.txt+ file. There are other 
+pieces of software bundled with jetty-rails. Before using jetty-rails, 
+make sure you agree with all of them.

data/bin/jetty_rails

@@ -8,19 +8,20 @@
 #
 # jetty_tails [OPTION] ... BASEDIR
 #
-# -h, --help:
+# -h, --help::
 #    show help
 #
-# --context-path PATH, -u PATH:
+# --context-path PATH, -u PATH::
 #    change the application context path (default: '/')
 #
-# --port PORT, -p PORT:
+# --port PORT, -p PORT::
 #    change server port (default: 8080)
 #
-# --environment ENV, -e ENV:
+# --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'

data/config/hoe.rb

@@ -2,7 +2,7 @@ require 'jetty_rails/version'
 
 AUTHOR = 'Fabio Kung'  # can also be an array of Authors
 EMAIL = "fabio.kung@gmail.com"
-DESCRIPTION = "description of gem"
+DESCRIPTION = "jetty server for rails applications"
 GEM_NAME = 'jetty-rails' # what ppl will type to install your gem
 RUBYFORGE_PROJECT = 'jetty-rails' # The unix name for your project
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
@@ -39,6 +39,7 @@ RDOC_OPTS = ['--quiet', '--title', 'jetty-rails documentation',
     "--opname", "index.html",
     "--line-numbers",
     "--main", "README",
+    "--exclude", "*.jar",
     "--inline-source"]
 
 class Hoe
@@ -57,16 +58,14 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.url = HOMEPATH
   p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
   p.test_globs = ["spec/**/*_spec.rb"]
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-
-  # == Optional
-  # p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = EXTRA_DEPENDENCIES
+  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']
+  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
+  p.extra_deps = EXTRA_DEPENDENCIES
 
   # A hash of extra values to set in the gemspec.
-  p.spec_extras = {
+  # p.spec_extras = {
     # :platform => "java"
-  }
+  # }
 end
 
 CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")

data/lib/jetty_rails/jars.rb

@@ -1,19 +1,22 @@
-require "jetty-6.1.9"
-require "servlet-api-2.5-6.1.9"
-require "jetty-util-6.1.9"
-require "jetty-plus-6.1.9"
-
-module Jetty
-  include_package "org.mortbay.jetty"
-  include_package "org.mortbay.jetty.servlet"
-  module Handler
-    include_package "org.mortbay.jetty.handler"
-    include_package "org.mortbay.jetty.webapp"
+module JettyRails
+  
+  require "jetty-6.1.9"
+  require "servlet-api-2.5-6.1.9"
+  require "jetty-util-6.1.9"
+  require "jetty-plus-6.1.9"
+  module Jetty
+    include_package "org.mortbay.jetty"
+    include_package "org.mortbay.jetty.servlet"
+    module Handler
+      include_package "org.mortbay.jetty.handler"
+      include_package "org.mortbay.jetty.webapp"
+    end
   end
-end
 
-require "jruby-rack-1.0-SNAPSHOT"
-module Rack
-  include_package "org.jruby.rack"
-  include_package "org.jruby.rack.rails"
+  require "jruby-rack-0.9"
+  module Rack
+    include_package "org.jruby.rack"
+    include_package "org.jruby.rack.rails"
+  end
+  
 end

data/lib/jetty_rails/version.rb

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

data/spec/jetty_rails/runner_spec.rb

@@ -51,18 +51,18 @@ describe JettyRails::Runner, "with no extra configuration" do
     runner = JettyRails::Runner.new :base => Dir.pwd
     listeners = runner.app_context.event_listeners
     listeners.size.should eql(1)
-    listeners[0].should be_kind_of(Rack::RailsServletContextListener)
+    listeners[0].should be_kind_of(JettyRails::Rack::RailsServletContextListener)
   end
   
   it "should install RackFilter" do
     context = mock("web application context", :null_object => true)
-    server = Jetty::Server.new
+    server = JettyRails::Jetty::Server.new
     context.stub!(:getServer).and_return(server)
-    Jetty::Handler::WebAppContext.should_receive(:new).and_return(context)
+    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(Rack::RackFilter)
+      filter_holder.filter.should be_kind_of(JettyRails::Rack::RackFilter)
       url_pattern.should eql('/*')
-      dispatches.should eql(Jetty::Context::DEFAULT)
+      dispatches.should eql(JettyRails::Jetty::Context::DEFAULT)
     end
     runner = JettyRails::Runner.new :base => Dir.pwd
   end
@@ -70,9 +70,9 @@ describe JettyRails::Runner, "with no extra configuration" do
   it "should have handlers for static and dynamic content" do
     runner = JettyRails::Runner.new :base => Dir.pwd
     runner.server.handlers.size.should eql(2)
-    resource_handlers = runner.server.getChildHandlersByClass(Jetty::Handler::ResourceHandler)
+    resource_handlers = runner.server.getChildHandlersByClass(JettyRails::Jetty::Handler::ResourceHandler)
     resource_handlers.size.should eql(1)
-    webapp_handlers = runner.server.getChildHandlersByClass(Jetty::Handler::WebAppContext)
+    webapp_handlers = runner.server.getChildHandlersByClass(JettyRails::Jetty::Handler::WebAppContext)
     webapp_handlers.size.should eql(1)
   end
   
@@ -109,7 +109,7 @@ describe JettyRails::Runner, "with custom configuration" do
   
   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(Jetty::Handler::ContextHandler)
+    context_handlers = runner.server.getChildHandlersByClass(JettyRails::Jetty::Handler::ContextHandler)
     context_handlers.size.should eql(2) # one for static, one for dynamic
   end
 end

data/tasks/rspec.rake

@@ -33,4 +33,17 @@ Spec::Rake::SpecTask.new('spec_report') do |t|
   t.spec_opts = ["--format", "html:../doc/rspec/specs.html", "--diff"]
   t.spec_files = FileList['spec/**/*_spec.rb']
   t.fail_on_error = false
-end
+end
+
+# credits to http://blog.jayfields.com/2008/02/rake-task-overwriting.html
+class Rake::Task
+  def overwrite(&block)
+    @actions.clear
+    prerequisites.clear
+    enhance(&block)
+  end
+end
+
+Rake::Task['test'].overwrite do
+  Rake::Task['spec'].invoke
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jetty-rails
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Fabio Kung
@@ -9,11 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-06 00:00:00 -03:00
+date: 2008-05-10 00:00:00 -03:00
 default_executable: 
-dependencies: []
-
-description: description of gem
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
+    version: 
+description: jetty server for rails applications
 email: 
 - fabio.kung@gmail.com
 executables: 
@@ -22,13 +30,13 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
-- License.txt
+- Licenses.txt
 - Manifest.txt
 - PostInstall.txt
 - README.txt
 files: 
 - History.txt
-- License.txt
+- Licenses.txt
 - Manifest.txt
 - PostInstall.txt
 - README.txt
@@ -44,13 +52,14 @@ files:
 - lib/jetty_rails/jars.rb
 - lib/jetty_rails/runner.rb
 - lib/jetty_rails/version.rb
-- lib/jruby-rack-1.0-SNAPSHOT.jar
+- lib/jruby-rack-0.9.jar
 - lib/servlet-api-2.5-6.1.9.jar
 - script/console
 - script/destroy
 - script/generate
 - script/txt2html
 - setup.rb
+- spec/jetty_rails/handler/delegate_on_errors_handler_spec.rb
 - spec/jetty_rails/runner_spec.rb
 - spec/jetty_rails_spec.rb
 - spec/spec.opts
@@ -88,7 +97,7 @@ rubyforge_project: jetty-rails
 rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
-summary: description of gem
+summary: jetty server for rails applications
 test_files: 
 - spec/jetty_rails/handler/delegate_on_errors_handler_spec.rb
 - spec/jetty_rails/runner_spec.rb