trinidad 0.5.0 → 0.6.0

data/History.txt

@@ -1,3 +1,12 @@
+== 0.6.0 (2009-11-02)
+
+* Rackup compatibe frameworks support
+
+== 0.5.0 (2009-10-27)
+
+* JRuby-rack updated to version 0.9.5
+* Added Rack dependency to avoid using vendorized version
+
 == 0.4.1 (2009-07-26)
 
 * using jruby-rack development version to solve some bugs related with it.

data/README.rdoc

@@ -1,6 +1,6 @@
 = trinidad
 
-Trinidad allows you to run a rails application within an embedded Apache Tomcat container.
+Trinidad allows you to run a rails or rackup applications within an embedded Apache Tomcat container.
 
 This project was initially called "Tomcat-rails" but due to legal issues with the ASF and the Tomcat trademark it has been renamed.
 
@@ -23,6 +23,8 @@ Trinidad allows you to configure some parameters when the server is started from
   * -c, --context CONTEXT   =>    application context path.
   * --lib, --jars LIBS_DIR  =>    directory containing jars.
   * --classes CLASSES_DIR   =>    directory containing classes.
+  * --rackup [RACKUP_FILE]  =>    run a provided rackup file instead of a rails application, by default it's config.ru.
+  * --public PUBLIC_DIR     =>    specify the public directory for your application, by default it's 'public'.
 
 The server can also be configured from a yaml file. If a file is not especified, the server tries to load the file <em>config/tomcat.yml</em>. Within this file you can add other options like jruby.min.runtimes(:jruby_min_runtimes) or jruby.max.runtimes(:jruby_max_runtimes).
 

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/trinidad.rb

@@ -10,7 +10,9 @@ require 'trinidad/command_line_parser'
 require 'trinidad/jars'
 require 'trinidad/server'
 require 'trinidad/web_app'
+require 'trinidad/rails_web_app'
+require 'trinidad/rackup_web_app'
 
 module Trinidad
   TRINIDAD_LIBS = File.dirname(__FILE__) + "/../trinidad-libs" unless defined?(TRINIDAD_LIBS)
-end
+end

data/lib/trinidad/command_line_parser.rb

@@ -60,6 +60,15 @@ module Trinidad
           default_options[:config] = v if v
           default_options.deep_merge! YAML.load_file(default_options[:config])
         end
+
+        opts.on('-r', '--rackup [RACKUP_FILE]', 'Rackup configuration file',
+            'default: config.ru') do |v|
+          default_options[:rackup] = v || 'config.ru'  
+        end
+
+        opts.on('--public', '--public DIRECTORY', 'Public directory', 'default: public') do |v|
+          default_options[:public] = v
+        end
         
         opts.on('-v', '--version', 'display the current version') do
           puts File.read(File.join(File.dirname(__FILE__), '..', '..', 'VERSION')).chomp
@@ -77,4 +86,4 @@ module Trinidad
         default_options
     end
   end
-end
+end

data/lib/trinidad/rackup_web_app.rb

@@ -0,0 +1,17 @@
+module Trinidad
+  class RackupWebApp < WebApp
+
+    def add_init_params
+      super
+      @context.addParameter('rackup', rackup_script) unless @context.findParameter('rackup')
+    end    
+
+    def context_listener
+      'org.jruby.rack.RackServletContextListener'
+    end
+
+    def rackup_script
+      IO.read(File.join(@config[:web_app_dir], @config[:rackup]))
+    end
+  end
+end

data/lib/trinidad/rails_web_app.rb

@@ -0,0 +1,14 @@
+module Trinidad
+  class RailsWebApp < WebApp
+
+    def add_init_params
+      super
+      @context.addParameter('rails.env', @config[:environment].to_s) unless @context.findParameter('rails.env')
+      @context.addParameter('rails.root', '/') unless @context.findParameter('rails.root')
+    end
+
+    def context_listener
+      'org.jruby.rack.rails.RailsServletContextListener'
+    end
+  end
+end

data/lib/trinidad/server.rb

@@ -41,7 +41,7 @@ module Trinidad
     end
     
     def create_web_app
-      web_app = WebApp.new(@tomcat.addWebapp(@config[:context_path].to_s, @config[:web_app_dir]), @config)
+      web_app = WebApp.create(@tomcat.addWebapp(@config[:context_path].to_s, @config[:web_app_dir]), @config)
 
       web_app.load_default_web_xml
       web_app.add_rack_filter

data/lib/trinidad/web_app.rb

@@ -1,6 +1,10 @@
 module Trinidad
   class WebApp
     attr_reader :context, :config
+  
+    def self.create(context, config)
+      config.has_key?(:rackup) ? RackupWebApp.new(context, config) : RailsWebApp.new(context, config) 
+    end
     
     def initialize(context, config)
       @context = context
@@ -41,18 +45,16 @@ module Trinidad
       end
       
       @context.addParameter('jruby.initial.runtimes', @config[:jruby_min_runtimes].to_s) unless @context.findParameter('jruby.initial.runtimes')
-      @context.addParameter('rails.env', @config[:environment].to_s) unless @context.findParameter('rails.env')
-      @context.addParameter('rails.root', '/') unless @context.findParameter('rails.root')
-      @context.addParameter('public.root', '/public') unless @context.findParameter('public.root')
+      @context.addParameter('public.root', File.join('/', public_root)) unless @context.findParameter('public.root')
     end
     
     def add_web_dir_resources
-      @context.setDocBase(File.join(@config[:web_app_dir], "public/"))
+      @context.setDocBase(File.join(@config[:web_app_dir], public_root)) if File.exist?(File.join(@config[:web_app_dir], public_root))
     end
     
     def add_rack_context_listener
       unless rack_listener_configured?
-        @context.addApplicationListener('org.jruby.rack.rails.RailsServletContextListener')
+        @context.addApplicationListener(context_listener)
       end
     end
     
@@ -86,7 +88,7 @@ module Trinidad
     def rack_filter_configured?
       return false if @context.getDefaultWebXml().nil?
 
-      web_xml = IO.read(@context.getDefaultWebXml())
+      web_xml = IO.read(@context.getDefaultWebXml()).gsub(/\s+/, '')
 
       return web_xml.include?('<servlet-class>org.jruby.rack.RackServlet') ||
               web_xml.include?('<filter-class>org.jruby.rack.RackFilter')
@@ -95,9 +97,13 @@ module Trinidad
     def rack_listener_configured?
       return false if @context.getDefaultWebXml().nil?
 
-      web_xml = IO.read(@context.getDefaultWebXml())
+      web_xml = IO.read(@context.getDefaultWebXml()).gsub(/\s+/, '')
+
+      return web_xml.include?("<listener-class>#{context_listener}")
+    end
 
-      return web_xml.include?('<listener-class>org.jruby.rack.rails.RailsServletContextListener')
+    def public_root
+      @context.findParameter('public.root') || @config[:public] || 'public'
     end
   end
-end
+end

data/spec/trinidad/command_line_parser_spec.rb

@@ -64,4 +64,22 @@ describe Trinidad::CommandLineParser do
     options[:ajp][:port].should == 8099
     options[:ajp][:secure].should == true
   end
-end
+  
+  it "uses default rackup file to configure the server" do
+    ARGV = "--rackup".split
+    options = Trinidad::CommandLineParser.parse
+    options[:rackup].should == 'config.ru'
+  end
+
+  it "uses a custom rackup file if it's provided" do
+    ARGV = "--rackup custom_config.ru".split
+    options = Trinidad::CommandLineParser.parse
+    options[:rackup].should == 'custom_config.ru'
+  end
+
+  it "uses a custom public directory" do
+    ARGV = "--public web".split
+    options = Trinidad::CommandLineParser.parse
+    options[:public].should == 'web'
+  end
+end

data/spec/trinidad/web_app_spec.rb

@@ -3,8 +3,8 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe Trinidad::WebApp do
   before do
     @tomcat = Trinidad::Tomcat::Tomcat.new
-    tomcat_web_app = @tomcat.addWebapp('/', File.dirname(__FILE__) + '/../../')
-    config = {
+    @tomcat_web_app = @tomcat.addWebapp('/', File.dirname(__FILE__) + '/../../')
+    @config = {
       :libs_dir => 'lib',
       :classes_dir => 'classes',
       :default_web_xml => 'config/web.xml',
@@ -13,9 +13,17 @@ describe Trinidad::WebApp do
       :jruby_max_runtimes => 6,
       :context_path => '/'
     }
-    @web_app = Trinidad::WebApp.new(tomcat_web_app, config)
+    @web_app = Trinidad::RailsWebApp.new(@tomcat_web_app, @config)
   end
   
+  it "creates a RailsWebApp if rackup option is not present" do
+    Trinidad::WebApp.create(@tomcat_web_app, @config).is_a?(Trinidad::RailsWebApp).should be_true
+  end
+
+  it "creates a RackupWebApp if rackup option is present" do
+    Trinidad::WebApp.create(@tomcat_web_app, @config.merge(:rackup => 'config.ru')).is_a?(Trinidad::RackupWebApp).should be_true
+  end
+
   it "should load custom jars" do 
     class_loader = org.jruby.util.JRubyClassLoader.new(JRuby.runtime.jruby_class_loader)
     @web_app.add_application_libs(class_loader)
@@ -94,4 +102,4 @@ describe Trinidad::WebApp do
     @web_app.add_context_loader
   end
   
-end
+end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification 
-name: trinidad
-version: !ruby/object:Gem::Version 
-  version: 0.5.0
-platform: ruby
-authors: 
-- David Calavera
-autorequire: 
-bindir: bin
-cert_chain: []
-
-date: 2009-10-26 00:00:00 +01:00
-default_executable: trinidad
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.0"
-    version: 
-description: 
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - '>='
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 email: calavera@apache.org
-executables: 
-- trinidad
-extensions: []
+cert_chain: []
 
+summary: Simple library to run rails applications into an embedded Tomcat
+post_install_message: 
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
+homepage: http://calavera.github.com/trinidad
+signing_key: 
+name: trinidad
+rdoc_options: 
+- --charset=UTF-8
+rubyforge_project: trinidad
+autorequire: 
+licenses: []
+
+executables: 
+- trinidad
+description: 
+specification_version: 3
+default_executable: trinidad
 files: 
 - History.txt
 - LICENSE
@@ -42,6 +38,8 @@ files:
 - lib/trinidad/command_line_parser.rb
 - lib/trinidad/core_ext.rb
 - lib/trinidad/jars.rb
+- lib/trinidad/rackup_web_app.rb
+- lib/trinidad/rails_web_app.rb
 - lib/trinidad/server.rb
 - lib/trinidad/web_app.rb
 - trinidad-libs/core-3.1.1.jar
@@ -56,36 +54,40 @@ files:
 - trinidad-libs/tomcat-core.jar
 - trinidad-libs/tomcat-dbcp.jar
 - trinidad-libs/tomcat-jasper.jar
-has_rdoc: true
-homepage: http://calavera.github.com/trinidad
-licenses: []
-
-post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-requirements: []
+extensions: []
 
-rubyforge_project: trinidad
 rubygems_version: 1.3.5
-signing_key: 
-specification_version: 3
-summary: Simple library to run rails applications into an embedded Tomcat
+requirements: []
+
+authors: 
+- David Calavera
+date: 2009-11-01 23:00:00 +00:00
+platform: ruby
 test_files: 
 - spec/spec_helper.rb
-- spec/trinidad/server_spec.rb
 - spec/trinidad/command_line_parser_spec.rb
+- spec/trinidad/server_spec.rb
 - spec/trinidad/web_app_spec.rb
+version: !ruby/object:Gem::Version 
+  version: 0.6.0
+require_paths: 
+- lib
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - '>='
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+    version: 
+  type: :runtime
+  version_requirement: 
+  name: rack
+bindir: bin
+has_rdoc: true