calavera-tomcat-rails 0.1.2 → 0.2.0

data/.gitignore

@@ -3,3 +3,4 @@
 coverage
 rdoc
 pkg
+nbproject

data/History.txt

@@ -1,3 +1,14 @@
+== 0.2.0 (2009-06-23)
+
+* custom configuration from a yaml file
+* load options from a custom web.xml
+
+== 0.1.2
+
+* Autoload application custom jars and classes.
+* Added some specs.
+* Server refactor.
+
 == 0.1
 
 * Initial release.

data/LICENSE

@@ -1,3 +1,5 @@
+== Tomcat Rails
+
 Copyright (c) 2009 David Calavera
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -18,3 +20,7 @@ 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.
+
+== Additional Bundled Software
+
+Apache Tomcat is licensed according to the terms of Apache License, Version 2.0 (current). See http://www.apache.org/licenses/LICENSE-2.0 for details.

data/README.rdoc

@@ -12,6 +12,21 @@ This project has just born, there are a lot of things to do. Take a look at the
 
   cd myrailsapp
   jruby -S tomcat_rails
+  
+== CONFIGURATION:
+
+Tomcat-Rails allows you to configure some parameters when the server is started from the command line, the following is a list of the currently supported options:
+
+  * -p, --port PORT         =>    port to bind to.
+  * -e, --env ENVIRONMENT   =>    rails environment.
+  * -c, --context CONTEXT   =>    application context path.
+  * --lib, --jars LIBS_DIR  =>    directory containing jars.
+  * --classes CLASSES_DIR   =>    directory containing classes.    
+
+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).
+
+  jruby -S tomcat_rails -f
+  jruby -S tomcat_rails --config my_custom_configuration.yml
 
 == Copyright
 

data/Rakefile

@@ -5,9 +5,9 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "tomcat-rails"
-    gem.summary = %Q{Simple library to run a rails application into an embed Tomcat}
+    gem.summary = %Q{Simple library to run rails applications into an embedded Tomcat}
     gem.email = "david.calavera@gmail.com"
-    gem.homepage = "http://github.com/calavera/tomcat-rails"
+    gem.homepage = "http://calavera.github.com/tomcat-rails"
     gem.authors = ["David Calavera"]
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/TODO.txt

@@ -1,6 +1,5 @@
 == TODO
 
-* Add tests!!!!!!!
+* Add more tests!!!!!!!
 * Add rdocs
-* configure it from warbler
-* configure it from a config file
+* configure it from warbler

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/tomcat-rails/command_line_parser.rb

@@ -4,11 +4,12 @@ module TomcatRails
   class CommandLineParser
     def self.parse
       default_options = {
-        :port => '3000',
+        :port => 3000,
         :environment => 'development',
         :context_path => '/',
         :libs_dir => 'lib',
-        :classes_dir => 'classes'
+        :classes_dir => 'classes',
+        :config => 'config/tomcat.yml'
       }
       
       parser = OptionParser.new do |opts|
@@ -38,6 +39,12 @@ module TomcatRails
         opts.on('--classes', '--classes CLASSES_DIR', 'Directory containing classes used by the application', 
             "default: #{default_options[:classes_dir]}") do |v| 
           default_options[:classes_dir] = v
+        end        
+
+        opts.on('-f', '--config [CONFIG_FILE]', 'Configuration file',
+            "default: #{default_options[:config]}") do |v|
+          default_options[:config] = v if v
+          default_options.merge! YAML.load_file(default_options[:config])
         end
         
         opts.on('-v', '--version', 'display the current version') do

data/lib/tomcat-rails/server.rb

@@ -6,24 +6,32 @@ module TomcatRails
       :context_path => '/',
       :libs_dir => 'lib',
       :classes_dir => 'classes',
+      :default_web_xml => 'config/web.xml',
       :port => 3000,
       :jruby_min_runtimes => 1,
       :jruby_max_runtimes => 5
     }
     
     def initialize(config = {})
+      load_config(config)
+      load_tomcat_server
+      create_web_app      
+    end
+    
+    def load_config(config)
       @config = @@defaults.merge!(config)
       @config[:web_app_dir] = Dir.pwd
-      
+    end
+    
+    def load_tomcat_server
       @tomcat = TomcatRails::Tomcat::Tomcat.new
       @tomcat.setPort(@config[:port].to_i)
-      
-      create_web_app      
     end
     
     def create_web_app
       web_app = WebApp.new(@tomcat.addWebapp(@config[:context_path].to_s, @config[:web_app_dir]), @config)
-      
+
+      web_app.load_default_web_xml
       web_app.add_rack_filter
       web_app.add_context_loader
       web_app.add_init_params

data/lib/tomcat-rails/web_app.rb

@@ -1,9 +1,9 @@
 module TomcatRails
   class WebApp
-    attr_reader :web_app, :config
+    attr_reader :context, :config
     
-    def initialize(web_app, config)
-      @web_app = web_app
+    def initialize(context, config)
+      @context = context
       @config = config
     end
     
@@ -17,8 +17,8 @@ module TomcatRails
       filter_map.setFilterName('RackFilter')
       filter_map.addURLPattern("#{pattern}/*")
       
-      @web_app.addFilterDef(filter_def)
-      @web_app.addFilterMap(filter_map)
+      @context.addFilterDef(filter_def)
+      @context.addFilterMap(filter_map)
     end
     
     def add_context_loader
@@ -28,28 +28,25 @@ module TomcatRails
       
       loader = TomcatRails::Tomcat::WebappLoader.new(class_loader)
 
-      loader.container = @web_app
-      @web_app.loader = loader
+      loader.container = @context
+      @context.loader = loader
     end
     
     def add_init_params
-      [:jruby_min_runtimes, :jruby_max_runtimes].each do |param|
-        @web_app.addParameter(param.to_s.gsub(/_/, '.'), @config[param].to_s)
-      end
-      
-      @web_app.addParameter('jruby.initial.runtimes', @config[:jruby_min_runtimes].to_s)
-      @web_app.addParameter('rails.env', @config[:environment].to_s)
-      @web_app.addParameter('rails.root', '/')
-      @web_app.addParameter('public.root', '/public')
+      add_init_params_array([:jruby_min_runtimes, :jruby_max_runtimes])
       
+      @context.addParameter('jruby.initial.runtimes', @config[:jruby_min_runtimes].to_s)
+      @context.addParameter('rails.env', @config[:environment].to_s)
+      @context.addParameter('rails.root', '/')
+      @context.addParameter('public.root', '/public')
     end
     
     def add_web_dir_resources
-      @web_app.setDocBase(File.join(Dir.pwd, "public/"))
+      @context.setDocBase(File.join(@config[:web_app_dir], "public/"))
     end
     
     def add_rack_context_listener
-      @web_app.addApplicationListener('org.jruby.rack.rails.RailsServletContextListener')
+      @context.addApplicationListener('org.jruby.rack.rails.RailsServletContextListener')
     end
     
     def add_application_libs(class_loader)
@@ -64,5 +61,26 @@ module TomcatRails
       resources_dir = File.join(@config[:web_app_dir], @config[:classes_dir])
       class_loader.addURL(java.io.File.new(resources_dir).to_url)
     end
+
+    def load_default_web_xml
+      default_web_xml = File.expand_path(File.join(@config[:web_app_dir], @config[:default_web_xml]))
+      
+      if File.exist?(default_web_xml)
+        @context.setDefaultWebXml(default_web_xml)
+        @context.setDefaultContextXml(default_web_xml)
+
+        context_config = TomcatRails::Tomcat::ContextConfig.new
+        context_config.setDefaultWebXml(default_web_xml)
+
+        @context.addLifecycleListener(context_config)
+      end
+    end
+    
+    private
+    def add_init_params_array(array)
+      array.each do |param|
+        @context.addParameter(param.to_s.gsub(/_/, '.'), @config[param].to_s)
+      end
+    end
   end
 end

data/spec/tomcat-rails/command_line_parser_spec.rb

@@ -21,4 +21,12 @@ describe TomcatRails::CommandLineParser do
     options = TomcatRails::CommandLineParser.parse
     options[:libs_dir].should == 'my_jars'
   end
+  
+  it "should override the config file when it's especified" do
+    ARGV = "-f #{File.join(File.dirname(__FILE__), '..', 'web_app_mock', 'tomcat.yml')}".split
+    
+    options = TomcatRails::CommandLineParser.parse
+    options[:environment].should == 'production'
+  end
+  
 end

data/spec/tomcat-rails/web_app_spec.rb

@@ -2,12 +2,15 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe TomcatRails::WebApp do
   before do
-    tomcat = TomcatRails::Tomcat::Tomcat.new
-    tomcat_web_app = tomcat.addWebapp('/', File.dirname(__FILE__) + '/../../')
+    @tomcat = TomcatRails::Tomcat::Tomcat.new
+    tomcat_web_app = @tomcat.addWebapp('/', File.dirname(__FILE__) + '/../../')
     config = { 
       :libs_dir => 'lib',
       :classes_dir => 'classes',
-      :web_app_dir => File.join(File.dirname(__FILE__), '..', 'web_app_mock') 
+      :default_web_xml => 'config/web.xml',
+      :web_app_dir => File.join(File.dirname(__FILE__), '..', 'web_app_mock'),
+      :jruby_min_runtimes => 2,
+      :jruby_max_runtimes => 6,
     }
     @web_app = TomcatRails::WebApp.new(tomcat_web_app, config)
   end
@@ -27,5 +30,29 @@ describe TomcatRails::WebApp do
     resource = class_loader.find_class('HelloTomcat')
     resource.should_not == nil    
   end
+
+  it "should start application context without errors" do
+    load_tomcat_libs
+    lambda { @web_app.context.start }.should_not raise_error
+  end
+
+  it "should add a filter from the default web.xml" do
+    load_tomcat_libs
+    @web_app.load_default_web_xml
+    lambda { @web_app.context.start }.should_not raise_error
+    @web_app.context.findFilterDefs().size().should == 1
+  end
+  
+  it "should load init params" do
+    @web_app.add_init_params
+    
+    @web_app.context.findParameter('jruby.min.runtimes').should == '2'
+    @web_app.context.findParameter('jruby.max.runtimes').should == '6'
+  end
+
+  def load_tomcat_libs
+    @web_app.config[:libs_dir] = File.join(File.dirname(__FILE__), '..', '..', 'tomcat-libs')
+    @web_app.add_context_loader
+  end
   
 end

data/spec/web_app_mock/config/web.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app>
+    <filter>
+        <filter-name>RackFilter</filter-name>
+        <filter-class>org.jruby.rack.RackFilter</filter-class>
+    </filter>
+</web-app>

data/spec/web_app_mock/tomcat.yml

@@ -0,0 +1,3 @@
+---
+  :environment: 'production'
+  :port: 4000

data/tomcat-rails.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tomcat-rails}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Calavera"]
-  s.date = %q{2009-06-13}
+  s.date = %q{2009-06-23}
   s.default_executable = %q{tomcat_rails}
   s.email = %q{david.calavera@gmail.com}
   s.executables = ["tomcat_rails"]
@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
-     "HelloTomcat.java",
      "History.txt",
      "LICENSE",
      "README.rdoc",
@@ -32,9 +31,12 @@ Gem::Specification.new do |s|
      "lib/tomcat-rails/web_app.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
+     "spec/tomcat-rails/command_line_parser_spec.rb",
      "spec/tomcat-rails/web_app_spec.rb",
      "spec/web_app_mock/classes/HelloTomcat.class",
+     "spec/web_app_mock/config/web.xml",
      "spec/web_app_mock/lib/jyaml-1.3.jar",
+     "spec/web_app_mock/tomcat.yml",
      "tomcat-libs/core-3.1.1.jar",
      "tomcat-libs/jasper-el.jar",
      "tomcat-libs/jasper-jdt.jar",
@@ -50,11 +52,11 @@ Gem::Specification.new do |s|
      "tomcat-rails.gemspec"
   ]
   s.has_rdoc = true
-  s.homepage = %q{http://github.com/calavera/tomcat-rails}
+  s.homepage = %q{http://calavera.github.com/tomcat-rails}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.2}
-  s.summary = %q{Simple library to run a rails application into an embed Tomcat}
+  s.summary = %q{Simple library to run rails applications into an embedded Tomcat}
   s.test_files = [
     "spec/spec_helper.rb",
      "spec/tomcat-rails/command_line_parser_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: calavera-tomcat-rails
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - David Calavera
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-13 00:00:00 -07:00
+date: 2009-06-23 00:00:00 -07:00
 default_executable: tomcat_rails
 dependencies: []
 
@@ -25,7 +25,6 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
-- HelloTomcat.java
 - History.txt
 - LICENSE
 - README.rdoc
@@ -40,9 +39,12 @@ files:
 - lib/tomcat-rails/web_app.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/tomcat-rails/command_line_parser_spec.rb
 - spec/tomcat-rails/web_app_spec.rb
 - spec/web_app_mock/classes/HelloTomcat.class
+- spec/web_app_mock/config/web.xml
 - spec/web_app_mock/lib/jyaml-1.3.jar
+- spec/web_app_mock/tomcat.yml
 - tomcat-libs/core-3.1.1.jar
 - tomcat-libs/jasper-el.jar
 - tomcat-libs/jasper-jdt.jar
@@ -57,7 +59,7 @@ files:
 - tomcat-libs/tomcat-jasper.jar
 - tomcat-rails.gemspec
 has_rdoc: true
-homepage: http://github.com/calavera/tomcat-rails
+homepage: http://calavera.github.com/tomcat-rails
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -81,7 +83,7 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
-summary: Simple library to run a rails application into an embed Tomcat
+summary: Simple library to run rails applications into an embedded Tomcat
 test_files: 
 - spec/spec_helper.rb
 - spec/tomcat-rails/command_line_parser_spec.rb

data/HelloTomcat.java

@@ -1 +0,0 @@
-class HelloTomcat {}